Code clean up

This commit is contained in:
James Cole
2016-09-16 12:15:58 +02:00
parent f38984398d
commit d25d0454fc
52 changed files with 135 additions and 185 deletions

View File

@@ -41,7 +41,7 @@ class Authenticate
return redirect()->guest('login');
}
if (intval(Auth::user()->blocked) === 1) {
if (intval(auth()->user()->blocked) === 1) {
Auth::guard($guard)->logout();
Session::flash('logoutMessage', trans('firefly.block_account_logout'));

View File

@@ -45,7 +45,7 @@ class AuthenticateTwoFactor
return redirect()->guest('login');
}
if (intval(Auth::user()->blocked) === 1) {
if (intval(auth()->user()->blocked) === 1) {
Auth::guard($guard)->logout();
Session::flash('logoutMessage', trans('firefly.block_account_logout'));

View File

@@ -43,7 +43,7 @@ class IsAdmin
return redirect()->guest('login');
}
/** @var User $user */
$user = Auth::user();
$user = auth()->user();
if (!$user->hasRole('owner')) {
return redirect(route('home'));
}