diff --git a/app/Http/Middleware/CheckAuthenticated.php b/app/Http/Middleware/CheckAuthenticated.php index 05175325..a6fb4d2d 100644 --- a/app/Http/Middleware/CheckAuthenticated.php +++ b/app/Http/Middleware/CheckAuthenticated.php @@ -14,7 +14,7 @@ class CheckAuthenticated public function handle($request, \Closure $next, $return_user = false) { if (Session::has('uid')) { - $user = App::make('users')->get(session('uid')); + $user = app('users')->get(session('uid')); if (session('token') != $user->getToken()) return redirect('auth/login')->with('msg', trans('auth.check.token')); diff --git a/app/Http/Middleware/CheckSessionUserValid.php b/app/Http/Middleware/CheckSessionUserValid.php index 014850c6..31635f9b 100644 --- a/app/Http/Middleware/CheckSessionUserValid.php +++ b/app/Http/Middleware/CheckSessionUserValid.php @@ -22,7 +22,7 @@ class CheckSessionUserValid if ($user && $user->getToken() == session('token')) { // push user instance to repository - App::make('users')->set($user->uid, $user); + app('users')->set($user->uid, $user); } else { // remove sessions & cookies delete_sessions(); diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 52cb65d3..b0545716 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -11,7 +11,7 @@ class RedirectIfAuthenticated public function handle($request, \Closure $next) { if (session()->has('uid')) { - if (session('token') != App::make('users')->get(session('uid'))->getToken()) { + if (session('token') != app('users')->get(session('uid'))->getToken()) { Session::put('msg', trans('auth.check.token')); } else { return redirect('user'); diff --git a/app/Models/User.php b/app/Models/User.php index 9456f9e6..c9e2b460 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -74,7 +74,7 @@ class User extends Model if (isset($responses[0])) { return (bool) $responses[0]; } else { - return (App::make('cipher')->encrypt($raw_passwd, config('secure.salt')) == $this->password); + return (app('cipher')->encrypt($raw_passwd, config('secure.salt')) == $this->password); } } @@ -93,7 +93,7 @@ class User extends Model if ($user->uid) return false; - $user->password = App::make('cipher')->encrypt($password, config('secure.salt')); + $user->password = app('cipher')->encrypt($password, config('secure.salt')); $callback($user); @@ -110,7 +110,7 @@ class User extends Model */ public function changePasswd($new_passwd) { - $this->password = App::make('cipher')->encrypt($new_passwd, config('secure.salt')); + $this->password = app('cipher')->encrypt($new_passwd, config('secure.salt')); return $this->save(); } diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl index 6b15829a..cd71e2d7 100644 --- a/resources/views/admin/master.tpl +++ b/resources/views/admin/master.tpl @@ -13,7 +13,7 @@ @yield('style') -get(session('uid')); ?> +get(session('uid')); ?>
diff --git a/resources/views/admin/users.tpl b/resources/views/admin/users.tpl index 8cb335ad..b0eca29b 100644 --- a/resources/views/admin/users.tpl +++ b/resources/views/admin/users.tpl @@ -26,7 +26,7 @@ - get(session('uid')); ?> + get(session('uid')); ?>
diff --git a/resources/views/skinlib/show.tpl b/resources/views/skinlib/show.tpl index 032b562d..35ed1fc9 100644 --- a/resources/views/skinlib/show.tpl +++ b/resources/views/skinlib/show.tpl @@ -75,7 +75,7 @@ {{ trans('skinlib.show.uploader') }} - get($texture->uploader); ?> + get($texture->uploader); ?> {{ $uploader->getNickName() }}