Поправил заголовки закрытия сайта и ip бана

visavi · Jul 4, 2021 · e8409e4 · e8409e4
1 parent cd1a5be
commit e8409e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -11,6 +11,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
+use Symfony\Component\HttpFoundation\Response;
 
 class HomeController extends Controller
 {
@@ -27,17 +28,15 @@ public function index(): View
     /**
      * Закрытие сайта
      *
-     * @return View|RedirectResponse
+     * @return Response
      */
     public function closed()
     {
         if (setting('closedsite') !== 2) {
             return redirect('/');
         }
 
-        header($_SERVER['SERVER_PROTOCOL'] . ' 503 Service Unavailable');
-
-        return view('pages/closed');
+        return response()->view('pages/closed', [], 503);
     }
 
     /**
@@ -55,9 +54,9 @@ public function search(): View
      *
      * @param Request $request
      *
-     * @return View|RedirectResponse
+     * @return Response
      */
-    public function ipban(Request $request)
+    public function ipban(Request $request): Response
     {
         $ban = Ban::query()
             ->where('ip', getIp())
@@ -69,7 +68,8 @@ public function ipban(Request $request)
             return redirect('/');
         }
 
-        if (! $ban->user_id
+        if (
+            ! $ban->user_id
             && $ban->created_at < strtotime('-1 minute', SITETIME)
             && $request->isMethod('post')
             && captchaVerify()
@@ -82,9 +82,7 @@ public function ipban(Request $request)
             return redirect('/');
         }
 
-        header($_SERVER['SERVER_PROTOCOL'] . ' 429 Too Many Requests');
-
-        return view('pages/ipban', compact('ban'));
+        return response()->view('pages/ipban', compact('ban'), 429);
     }
 
     /**

diff --git a/app/Http/Middleware/CheckAccessSite.php b/app/Http/Middleware/CheckAccessSite.php
@@ -32,17 +32,18 @@ public function handle(Request $request, Closure $next)
         if (
             setting('closedsite') === 1 &&
             ! getUser() &&
-            ! $request->is('register', 'login', 'recovery', 'captcha')
+            ! $request->is('login', 'register', 'recovery', 'captcha')
         ) {
             setFlash('danger', __('main.not_authorized'));
+
             return redirect('login');
         }
 
         // Сайт закрыт для всех
         if (
             setting('closedsite') === 2 &&
             ! isAdmin() &&
-            ! $request->is('login', 'closed')
+            ! $request->is('login', 'captcha', 'closed')
         ) {
             return redirect('closed');
         }

diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
@@ -15,7 +15,7 @@
         <div class="col-12 text-center">
             <h1>{{ __('errors.error') }} 403!</h1>
 
-            <div class="lead">{{ __('errors.forbidden') }}</div>
+            <div class="lead">{{ $exception->getMessage() ?: __('errors.forbidden') }}</div>
 
             <div class="my-3">
                 <a class="btn btn-primary" href="{{ url()->previous() }}"><i class="fa fa-arrow-circle-left"></i> {{ __('errors.return') }}</a>

diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
@@ -15,7 +15,7 @@
         <div class="col-12 text-center">
             <h1>{{ __('errors.error') }} 404!</h1>
 
-            <div class="lead">{{ __('errors.not_found') }}</div>
+            <div class="lead">{{ $exception->getMessage() ?: __('errors.not_found') }}</div>
 
             <div class="my-3">
                 <a class="btn btn-primary" href="{{ url()->previous() }}"><i class="fa fa-arrow-circle-left"></i> {{ __('errors.return') }}</a>