diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php index 37ba3a41..81fc77c6 100644 --- a/app/Http/Controllers/TextureController.php +++ b/app/Http/Controllers/TextureController.php @@ -180,9 +180,7 @@ class TextureController extends Controller public function raw($tid) { - if (! option('allow_downloading_texture')) { - abort(404); - } + abort_unless(option('allow_downloading_texture'), 404); return ($t = Texture::find($tid)) ? $this->texture($t->hash) @@ -192,10 +190,7 @@ class TextureController extends Controller public function avatarByPlayer($size, $name) { $player = Player::where('name', $name)->first(); - - if (! $player) { - return abort(404); - } + abort_unless($player, 404); $hash = $player->getTexture('skin'); if (Storage::disk('textures')->has($hash)) { @@ -213,11 +208,7 @@ class TextureController extends Controller protected function getPlayerInstance($player_name) { $player = Player::where('name', $player_name)->first(); - - if ($player->isBanned()) { - abort(403, trans('general.player-banned')); - } - + abort_if($player->isBanned(), 403, trans('general.player-banned')); return $player; } diff --git a/app/Http/Middleware/CheckAdministrator.php b/app/Http/Middleware/CheckAdministrator.php index ceb79b8a..c6a54b4c 100644 --- a/app/Http/Middleware/CheckAdministrator.php +++ b/app/Http/Middleware/CheckAdministrator.php @@ -6,10 +6,7 @@ class CheckAdministrator { public function handle($request, \Closure $next) { - if (! auth()->user()->isAdmin()) { - abort(403, trans('auth.check.admin')); - } - + abort_unless(auth()->user()->isAdmin(), 403, trans('auth.check.admin')); return $next($request); } } diff --git a/app/Http/Middleware/CheckSuperAdmin.php b/app/Http/Middleware/CheckSuperAdmin.php index d64760f7..4d3fb00e 100644 --- a/app/Http/Middleware/CheckSuperAdmin.php +++ b/app/Http/Middleware/CheckSuperAdmin.php @@ -9,10 +9,7 @@ class CheckSuperAdmin { public function handle($request, Closure $next) { - if (auth()->user()->permission != User::SUPER_ADMIN) { - abort(403, trans('auth.check.super-admin')); - } - + abort_if(auth()->user()->permission != User::SUPER_ADMIN, 403, trans('auth.check.super-admin')); return $next($request); } } diff --git a/app/Http/Middleware/CheckUserVerified.php b/app/Http/Middleware/CheckUserVerified.php index 958d90b9..71c47ac0 100644 --- a/app/Http/Middleware/CheckUserVerified.php +++ b/app/Http/Middleware/CheckUserVerified.php @@ -6,10 +6,7 @@ class CheckUserVerified { public function handle($request, \Closure $next) { - if (option('require_verification') && ! auth()->user()->verified) { - abort(403, trans('auth.check.verified')); - } - + abort_if(option('require_verification') && ! auth()->user()->verified, 403, trans('auth.check.verified')); return $next($request); } }