このコミットが含まれているのは:
テクニカル諏訪子 2019-02-18 18:17:31 +09:00
コミット 1259fdd2d0
7個のファイルの変更594行の追加607行の削除

ファイルの表示

@ -398,27 +398,21 @@ class AuthController extends Controller {
);
$checkName = json_decode(json_encode($checkName), true);
$login_ok = false;
$checkPass = hash('sha256', $request->password . $checkName['salt']);
$checkPass = hash('sha256', $request['password'] . $checkName['salt']);
for ($round = 0; $round < 65536; $round++) {
$checkPass = hash('sha256', $checkPass . $checkName['salt']);
}
if ($checkPass === $checkName['password']) {
$login_ok = true;
}
}
if ($login_ok) {
return array(
'uid' => $checkName['id'],
'username' => $checkName['username'],
'rawPassword' => $request->password,
'rawPassword' => $request['password'],
'password' => $checkPass
);
}
}
return array();
}

ファイルの表示

@ -11,8 +11,7 @@ class HomeController extends Controller
*
* @return void
*/
public function __construct()
{
public function __construct() {
$this->middleware('auth');
}
@ -21,8 +20,7 @@ class HomeController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
{
public function index() {
return view('home');
}
}

ファイルの表示

@ -814,7 +814,6 @@ class SiteController extends Controller {
'id' => $i->id,
'title' => $i->title,
'slug' => $i->slug,
'public_status' => $i->public_status,
'message' => $i->message
]);
}
@ -833,16 +832,13 @@ class SiteController extends Controller {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['blg_addpage'] == 1) {
$pubdate = 0;
$lorder = DB::table('blg_content')
->select('sortorder')
->where('isPost', 0)
->sortBy('sortorder', 'desc')
->first()->sortorder;
if ($request->public_status == 1) {
if ($request->publish_date <= time()) {
return \Response::json(array('error' => 'Publish date can\'t be older than post date.'));
}
}
if ($request->public_status == 1) $pubdate = $request->publish_date;
else $pubdate = time();
dd(lorder);
$add = DB::table('blg_content')
->insert([
@ -851,8 +847,8 @@ class SiteController extends Controller {
'title' => $request->title,
'slug' => $request->slug,
'post_date' => 0,
'publish_date' => $pubdate,
'sortorder' => $request->sortorder,
'publish_date' => 0,
'sortorder' => ($request->isMenu == 1 ? $lorder : 0),
'public_status' => $request->public_status,
'isMenu' => $request->isMenu,
'message' => $request->message

ファイルの表示

@ -842,4 +842,3 @@ class UserController extends Controller {
}
}
}