From a4daf54c8ae6b569d131e68755f65995498e533f Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 6 Aug 2018 13:53:43 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Exceptions/Handler.php | 1 + app/Http/Controllers/BasePageController.php | 1 - app/Http/Middleware/ClearanceMiddleware.php | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7ddf19098..c1207278a 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -51,6 +51,7 @@ class Handler extends ExceptionHandler if ($exception instanceof \Spatie\Permission\Exceptions\UnauthorizedException) { abort(401); } + return parent::render($request, $exception); } } diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index f79773c6a..4e878a7ca 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -214,7 +214,6 @@ class BasePageController extends Controller abort(429, $retry); } - public function render() { $this->smarty->display($this->page_template); diff --git a/app/Http/Middleware/ClearanceMiddleware.php b/app/Http/Middleware/ClearanceMiddleware.php index 80a2e73c2..46f27b893 100644 --- a/app/Http/Middleware/ClearanceMiddleware.php +++ b/app/Http/Middleware/ClearanceMiddleware.php @@ -18,12 +18,12 @@ class ClearanceMiddleware { $user = Auth::user(); - if ($user->hasRole(['Admin']) || ($user->hasRole(['Moderator']) && (!$request->is('Admin') || !$request->is('Admin/*')))) { + if ($user->hasRole(['Admin']) || ($user->hasRole(['Moderator']) && (! $request->is('Admin') || ! $request->is('Admin/*')))) { return $next($request); } if ($request->is('Movies') || $request->is('browse/Movies') || $request->is('browse/Movies/*')) { - if (!$user->hasDirectPermission('view movies') || !$user->hasPermissionTo('view movies')) { + if (! $user->hasDirectPermission('view movies') || ! $user->hasPermissionTo('view movies')) { abort(401); } else { return $next($request); @@ -31,7 +31,7 @@ class ClearanceMiddleware } if ($request->is('Console') || $request->is('browse/Console') || $request->is('browse/Console/*')) { - if (!$user->hasDirectPermission('view console') || !$user->hasPermissionTo('view console')) { + if (! $user->hasDirectPermission('view console') || ! $user->hasPermissionTo('view console')) { abort(401); } else { return $next($request); @@ -39,7 +39,7 @@ class ClearanceMiddleware } if ($request->is('Books') || $request->is('browse/Books') || $request->is('browse/Books/*')) { - if (!$user->hasDirectPermission('view books') || !$user->hasPermissionTo('view books')) { + if (! $user->hasDirectPermission('view books') || ! $user->hasPermissionTo('view books')) { abort(401); } else { return $next($request); @@ -47,7 +47,7 @@ class ClearanceMiddleware } if ($request->is('Audio') || $request->is('browse/Audio') || $request->is('browse/Audio/*')) { - if (!$user->hasDirectPermission('view audio') || !$user->hasPermissionTo('view audio')) { + if (! $user->hasDirectPermission('view audio') || ! $user->hasPermissionTo('view audio')) { abort(401); } else { return $next($request); @@ -55,7 +55,7 @@ class ClearanceMiddleware } if ($request->is('XXX') || $request->is('browse/XXX') || $request->is('browse/XXX/*')) { - if (!$user->hasDirectPermission('view adult') || !$user->hasPermissionTo('view adult')) { + if (! $user->hasDirectPermission('view adult') || ! $user->hasPermissionTo('view adult')) { abort(401); } else { return $next($request); @@ -63,7 +63,7 @@ class ClearanceMiddleware } if ($request->is('Games') || $request->is('browse/PC') || $request->is('browse/PC/*')) { - if (!$user->hasDirectPermission('view pc') || !$user->hasPermissionTo('view pc')) { + if (! $user->hasDirectPermission('view pc') || ! $user->hasPermissionTo('view pc')) { abort(401); } else { return $next($request);