Allow toggling between grid and list view in shelf view (shelves.show)

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index a979072e23822f5fcc54b633696ef4115a86c5bf..70a53497599d36216ae82bcdd787ab1901247043 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,14 +3,12 @@
 namespace BookStack\Exceptions;
 
 use Exception;
 namespace BookStack\Exceptions;
 
 use Exception;

+use Illuminate\Auth\Access\AuthorizationException;

 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Auth\AuthenticationException;

-use Illuminate\Http\Request;
-use Illuminate\Pipeline\Pipeline;
-use Illuminate\Validation\ValidationException;

 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

-use Symfony\Component\HttpKernel\Exception\HttpException;

 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

-use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\HttpException;

 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler extends ExceptionHandler
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler extends ExceptionHandler


@@ -33,6 +31,7 @@ class Handler extends ExceptionHandler
      *
      * @param  \Exception $e
      * @return mixed
      *
      * @param  \Exception $e
      * @return mixed

+     * @throws Exception

      */
     public function report(Exception $e)
     {
      */
     public function report(Exception $e)
     {


@@ -65,39 +64,24 @@ class Handler extends ExceptionHandler
 
         // Handle 404 errors with a loaded session to enable showing user-specific information
         if ($this->isExceptionType($e, NotFoundHttpException::class)) {
 
         // Handle 404 errors with a loaded session to enable showing user-specific information
         if ($this->isExceptionType($e, NotFoundHttpException::class)) {

-            return $this->loadErrorMiddleware($request, function ($request) use ($e) {
-                $message = $e->getMessage() ?: trans('errors.404_page_not_found');
-                return response()->view('errors/404', ['message' => $message], 404);
-            });
+            return \Route::respondWithRoute('fallback');

         }
 
         return parent::render($request, $e);
     }
 
         }
 
         return parent::render($request, $e);
     }
 

-    /**
-     * Load the middleware required to show state/session-enabled error pages.
-     * @param Request $request
-     * @param $callback
-     * @return mixed
-     */
-    protected function loadErrorMiddleware(Request $request, $callback)
-    {
-        $middleware = (\Route::getMiddlewareGroups()['web_errors']);
-        return (new Pipeline($this->container))
-            ->send($request)
-            ->through($middleware)
-            ->then($callback);
-    }
-

     /**
      * Check the exception chain to compare against the original exception type.
      * @param Exception $e
      * @param $type
      * @return bool
      */
     /**
      * Check the exception chain to compare against the original exception type.
      * @param Exception $e
      * @param $type
      * @return bool
      */

-    protected function isExceptionType(Exception $e, $type) {
+    protected function isExceptionType(Exception $e, $type)
+    {

         do {
         do {

-            if (is_a($e, $type)) return true;
+            if (is_a($e, $type)) {
+                return true;
+            }

         } while ($e = $e->getPrevious());
         return false;
     }
         } while ($e = $e->getPrevious());
         return false;
     }


@@ -107,7 +91,8 @@ class Handler extends ExceptionHandler
      * @param Exception $e
      * @return string
      */
      * @param Exception $e
      * @return string
      */

-    protected function getOriginalMessage(Exception $e) {
+    protected function getOriginalMessage(Exception $e)
+    {

         do {
             $message = $e->getMessage();
         } while ($e = $e->getPrevious());
         do {
             $message = $e->getMessage();
         } while ($e = $e->getPrevious());