Refactored the code to first check for the permissions before sorting the book.

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 36cdd3aefdff6477b4a5f069ea62e81be41af16e..9dc7d6401f97c07cd8915f802371ebc9bf395021 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -145,6 +145,7 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response
      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response

+     * @throws NotFoundException

      */
     public function show($bookSlug, $pageSlug)
     {
      */
     public function show($bookSlug, $pageSlug)
     {


@@ -152,7 +153,7 @@ class PageController extends Controller
             $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         } catch (NotFoundException $e) {
             $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug);
             $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         } catch (NotFoundException $e) {
             $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug);

-            if ($page === null) abort(404);
+            if ($page === null) throw $e;

             return redirect($page->getUrl());
         }
 
             return redirect($page->getUrl());
         }
 


@@ -163,18 +164,20 @@ class PageController extends Controller
         $pageNav = $this->entityRepo->getPageNav($page->html);
 
         // check if the comment's are enabled
         $pageNav = $this->entityRepo->getPageNav($page->html);
 
         // check if the comment's are enabled

-        $areCommentsEnabled = !setting('app-disable-comments');
-        if ($areCommentsEnabled) {
-          $page->load(['comments.createdBy']);
+        $commentsEnabled = !setting('app-disable-comments');
+        if ($commentsEnabled) {
+            $page->load(['comments.createdBy']);

         }
 
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         return view('pages/show', [
             'page' => $page,'book' => $page->book,
         }
 
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         return view('pages/show', [
             'page' => $page,'book' => $page->book,

-            'current' => $page, 'sidebarTree' => $sidebarTree,
-            'commentsEnabled' => $areCommentsEnabled,
-            'pageNav' => $pageNav]);
+            'current' => $page,
+            'sidebarTree' => $sidebarTree,
+            'commentsEnabled' => $commentsEnabled,
+            'pageNav' => $pageNav
+        ]);

     }
 
     /**
     }
 
     /**