Normalize ini and properties values

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index e3079047cac436c13873cdf8876841d98a23f165..45aa8f9347554d2de3cc2f951e3b3b19a2e533a0 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,32 +1,35 @@
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;
 <?php namespace BookStack\Http\Controllers;
 
 use Activity;

+use BookStack\Auth\UserRepo;
+use BookStack\Entities\Repos\PageRepo;

 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;

-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\UserRepo;
-use BookStack\Services\ExportService;
+use Exception;
+use GatherContent\Htmldiff\Htmldiff;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;

 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

+use Illuminate\Routing\Redirector;
+use Illuminate\View\View;
+use Throwable;

 use Views;
 use Views;

-use GatherContent\Htmldiff\Htmldiff;

 
 class PageController extends Controller
 {
 
 
 class PageController extends Controller
 {
 

-    protected $entityRepo;
-    protected $exportService;
+    protected $pageRepo;

     protected $userRepo;
 
     /**
      * PageController constructor.
     protected $userRepo;
 
     /**
      * PageController constructor.

-     * @param EntityRepo $entityRepo
-     * @param ExportService $exportService
+     * @param PageRepo $pageRepo

      * @param UserRepo $userRepo
      */
      * @param UserRepo $userRepo
      */

-    public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo)
+    public function __construct(PageRepo $pageRepo, UserRepo $userRepo)

     {
     {

-        $this->entityRepo = $entityRepo;
-        $this->exportService = $exportService;
+        $this->pageRepo = $pageRepo;

         $this->userRepo = $userRepo;
         parent::__construct();
     }
         $this->userRepo = $userRepo;
         parent::__construct();
     }


@@ -42,11 +45,11 @@ class PageController extends Controller
     public function create($bookSlug, $chapterSlug = null)
     {
         if ($chapterSlug !== null) {
     public function create($bookSlug, $chapterSlug = null)
     {
         if ($chapterSlug !== null) {

-            $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+            $chapter = $this->pageRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

             $book = $chapter->book;
         } else {
             $chapter = null;
             $book = $chapter->book;
         } else {
             $chapter = null;

-            $book = $this->entityRepo->getBySlug('book', $bookSlug);
+            $book = $this->pageRepo->getEntityBySlug('book', $bookSlug);

         }
 
         $parent = $chapter ? $chapter : $book;
         }
 
         $parent = $chapter ? $chapter : $book;


@@ -54,13 +57,13 @@ class PageController extends Controller
 
         // Redirect to draft edit screen if signed in
         if ($this->signedIn) {
 
         // Redirect to draft edit screen if signed in
         if ($this->signedIn) {

-            $draft = $this->entityRepo->getDraftPage($book, $chapter);
+            $draft = $this->pageRepo->getDraftPage($book, $chapter);

             return redirect($draft->getUrl());
         }
 
         // Otherwise show the edit view if they're a guest
         $this->setPageTitle(trans('entities.pages_new'));
             return redirect($draft->getUrl());
         }
 
         // Otherwise show the edit view if they're a guest
         $this->setPageTitle(trans('entities.pages_new'));

-        return view('pages/guest-create', ['parent' => $parent]);
+        return view('pages.guest-create', ['parent' => $parent]);

     }
 
     /**
     }
 
     /**


@@ -78,18 +81,18 @@ class PageController extends Controller
         ]);
 
         if ($chapterSlug !== null) {
         ]);
 
         if ($chapterSlug !== null) {

-            $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+            $chapter = $this->pageRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);

             $book = $chapter->book;
         } else {
             $chapter = null;
             $book = $chapter->book;
         } else {
             $chapter = null;

-            $book = $this->entityRepo->getBySlug('book', $bookSlug);
+            $book = $this->pageRepo->getEntityBySlug('book', $bookSlug);

         }
 
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 
         }
 
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 

-        $page = $this->entityRepo->getDraftPage($book, $chapter);
-        $this->entityRepo->publishPageDraft($page, [
+        $page = $this->pageRepo->getDraftPage($book, $chapter);
+        $this->pageRepo->publishPageDraft($page, [

             'name' => $request->get('name'),
             'html' => ''
         ]);
             'name' => $request->get('name'),
             'html' => ''
         ]);


@@ -100,20 +103,23 @@ class PageController extends Controller
      * Show form to continue editing a draft page.
      * @param string $bookSlug
      * @param int $pageId
      * Show form to continue editing a draft page.
      * @param string $bookSlug
      * @param int $pageId

-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View

      */
     public function editDraft($bookSlug, $pageId)
     {
      */
     public function editDraft($bookSlug, $pageId)
     {

-        $draft = $this->entityRepo->getById('page', $pageId, true);
+        $draft = $this->pageRepo->getById('page', $pageId, true);

         $this->checkOwnablePermission('page-create', $draft->parent);
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->signedIn;
         $this->checkOwnablePermission('page-create', $draft->parent);
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $draftsEnabled = $this->signedIn;

-        return view('pages/edit', [
+        $templates = $this->pageRepo->getPageTemplates(10);
+
+        return view('pages.edit', [

             'page' => $draft,
             'book' => $draft->book,
             'isDraft' => true,
             'page' => $draft,
             'book' => $draft->book,
             'isDraft' => true,

-            'draftsEnabled' => $draftsEnabled
+            'draftsEnabled' => $draftsEnabled,
+            'templates' => $templates,

         ]);
     }
 
         ]);
     }
 


@@ -131,19 +137,19 @@ class PageController extends Controller
         ]);
 
         $input = $request->all();
         ]);
 
         $input = $request->all();

-        $draftPage = $this->entityRepo->getById('page', $pageId, true);
+        $draftPage = $this->pageRepo->getById('page', $pageId, true);

         $book = $draftPage->book;
 
         $parent = $draftPage->parent;
         $this->checkOwnablePermission('page-create', $parent);
 
         if ($parent->isA('chapter')) {
         $book = $draftPage->book;
 
         $parent = $draftPage->parent;
         $this->checkOwnablePermission('page-create', $parent);
 
         if ($parent->isA('chapter')) {

-            $input['priority'] = $this->entityRepo->getNewChapterPriority($parent);
+            $input['priority'] = $this->pageRepo->getNewChapterPriority($parent);

         } else {
         } else {

-            $input['priority'] = $this->entityRepo->getNewBookPriority($parent);
+            $input['priority'] = $this->pageRepo->getNewBookPriority($parent);

         }
 
         }
 

-        $page = $this->entityRepo->publishPageDraft($draftPage, $input);
+        $page = $this->pageRepo->publishPageDraft($draftPage, $input);

 
         Activity::add($page, 'page_create', $book->id);
         return redirect($page->getUrl());
 
         Activity::add($page, 'page_create', $book->id);
         return redirect($page->getUrl());


@@ -160,9 +166,9 @@ class PageController extends Controller
     public function show($bookSlug, $pageSlug)
     {
         try {
     public function show($bookSlug, $pageSlug)
     {
         try {

-            $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+            $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         } catch (NotFoundException $e) {
         } catch (NotFoundException $e) {

-            $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug);
+            $page = $this->pageRepo->getPageByOldSlug($pageSlug, $bookSlug);

             if ($page === null) {
                 throw $e;
             }
             if ($page === null) {
                 throw $e;
             }


@@ -171,9 +177,9 @@ class PageController extends Controller
 
         $this->checkOwnablePermission('page-view', $page);
 
 
         $this->checkOwnablePermission('page-view', $page);
 

-        $page->html = $this->entityRepo->renderPage($page);
-        $sidebarTree = $this->entityRepo->getBookChildren($page->book);
-        $pageNav = $this->entityRepo->getPageNav($page->html);
+        $page->html = $this->pageRepo->renderPage($page);
+        $sidebarTree = $this->pageRepo->getBookChildren($page->book);
+        $pageNav = $this->pageRepo->getPageNav($page->html);

 
         // check if the comment's are enabled
         $commentsEnabled = !setting('app-disable-comments');
 
         // check if the comment's are enabled
         $commentsEnabled = !setting('app-disable-comments');


@@ -183,7 +189,7 @@ class PageController extends Controller
 
         Views::add($page);
         $this->setPageTitle($page->getShortName());
 
         Views::add($page);
         $this->setPageTitle($page->getShortName());

-        return view('pages/show', [
+        return view('pages.show', [

             'page' => $page,'book' => $page->book,
             'current' => $page,
             'sidebarTree' => $sidebarTree,
             'page' => $page,'book' => $page->book,
             'current' => $page,
             'sidebarTree' => $sidebarTree,


@@ -195,11 +201,11 @@ class PageController extends Controller
     /**
      * Get page from an ajax request.
      * @param int $pageId
     /**
      * Get page from an ajax request.
      * @param int $pageId

-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse

      */
     public function getPageAjax($pageId)
     {
      */
     public function getPageAjax($pageId)
     {

-        $page = $this->entityRepo->getById('page', $pageId);
+        $page = $this->pageRepo->getById('page', $pageId);

         return response()->json($page);
     }
 
         return response()->json($page);
     }
 


@@ -208,28 +214,29 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response
      * @param string $bookSlug
      * @param string $pageSlug
      * @return Response

+     * @throws NotFoundException

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

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()]));
         $page->isDraft = false;
 
         // Check for active editing
         $warnings = [];
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_editing_named', ['pageName'=>$page->getShortName()]));
         $page->isDraft = false;
 
         // Check for active editing
         $warnings = [];

-        if ($this->entityRepo->isPageEditingActive($page, 60)) {
-            $warnings[] = $this->entityRepo->getPageEditingActiveMessage($page, 60);
+        if ($this->pageRepo->isPageEditingActive($page, 60)) {
+            $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60);

         }
 
         // Check for a current draft version for this user
         }
 
         // Check for a current draft version for this user

-        if ($this->entityRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
-            $draft = $this->entityRepo->getUserPageDraft($page, $this->currentUser->id);
-            $page->name = $draft->name;
-            $page->html = $draft->html;
-            $page->markdown = $draft->markdown;
+        $userPageDraft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);
+        if ($userPageDraft !== null) {
+            $page->name = $userPageDraft->name;
+            $page->html = $userPageDraft->html;
+            $page->markdown = $userPageDraft->markdown;

             $page->isDraft = true;
             $page->isDraft = true;

-            $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);
+            $warnings [] = $this->pageRepo->getUserPageDraftMessage($userPageDraft);

         }
 
         if (count($warnings) > 0) {
         }
 
         if (count($warnings) > 0) {


@@ -237,11 +244,14 @@ class PageController extends Controller
         }
 
         $draftsEnabled = $this->signedIn;
         }
 
         $draftsEnabled = $this->signedIn;

-        return view('pages/edit', [
+        $templates = $this->pageRepo->getPageTemplates(10);
+
+        return view('pages.edit', [

             'page' => $page,
             'book' => $page->book,
             'current' => $page,
             'page' => $page,
             'book' => $page->book,
             'current' => $page,

-            'draftsEnabled' => $draftsEnabled
+            'draftsEnabled' => $draftsEnabled,
+            'templates' => $templates,

         ]);
     }
 
         ]);
     }
 


@@ -257,9 +267,9 @@ class PageController extends Controller
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);
         $this->validate($request, [
             'name' => 'required|string|max:255'
         ]);

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

-        $this->entityRepo->updatePage($page, $page->book->id, $request->all());
+        $this->pageRepo->updatePage($page, $page->book->id, $request->all());

         Activity::add($page, 'page_update', $page->book->id);
         return redirect($page->getUrl());
     }
         Activity::add($page, 'page_update', $page->book->id);
         return redirect($page->getUrl());
     }


@@ -268,11 +278,11 @@ class PageController extends Controller
      * Save a draft update as a revision.
      * @param Request $request
      * @param int $pageId
      * Save a draft update as a revision.
      * @param Request $request
      * @param int $pageId

-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse

      */
     public function saveDraft(Request $request, $pageId)
     {
      */
     public function saveDraft(Request $request, $pageId)
     {

-        $page = $this->entityRepo->getById('page', $pageId, true);
+        $page = $this->pageRepo->getById('page', $pageId, true);

         $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->signedIn) {
         $this->checkOwnablePermission('page-update', $page);
 
         if (!$this->signedIn) {


@@ -282,7 +292,7 @@ class PageController extends Controller
             ], 500);
         }
 
             ], 500);
         }
 

-        $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
+        $draft = $this->pageRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));

 
         $updateTime = $draft->updated_at->timestamp;
         return response()->json([
 
         $updateTime = $draft->updated_at->timestamp;
         return response()->json([


@@ -296,11 +306,11 @@ class PageController extends Controller
      * Redirect from a special link url which
      * uses the page id rather than the name.
      * @param int $pageId
      * Redirect from a special link url which
      * uses the page id rather than the name.
      * @param int $pageId

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      */
     public function redirectFromLink($pageId)
     {
      */
     public function redirectFromLink($pageId)
     {

-        $page = $this->entityRepo->getById('page', $pageId);
+        $page = $this->pageRepo->getById('page', $pageId);

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


@@ -308,14 +318,14 @@ class PageController extends Controller
      * Show the deletion page for the specified page.
      * @param string $bookSlug
      * @param string $pageSlug
      * Show the deletion page for the specified page.
      * @param string $bookSlug
      * @param string $pageSlug

-     * @return \Illuminate\View\View
+     * @return View

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

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));
         $this->checkOwnablePermission('page-delete', $page);
         $this->setPageTitle(trans('entities.pages_delete_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
+        return view('pages.delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);

     }
 
 
     }
 
 


@@ -323,15 +333,15 @@ class PageController extends Controller
      * Show the deletion page for the specified page.
      * @param string $bookSlug
      * @param int $pageId
      * Show the deletion page for the specified page.
      * @param string $bookSlug
      * @param int $pageId

-     * @return \Illuminate\View\View
+     * @return View

      * @throws NotFoundException
      */
     public function showDeleteDraft($bookSlug, $pageId)
     {
      * @throws NotFoundException
      */
     public function showDeleteDraft($bookSlug, $pageId)
     {

-        $page = $this->entityRepo->getById('page', $pageId, true);
+        $page = $this->pageRepo->getById('page', $pageId, true);

         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));
         $this->checkOwnablePermission('page-update', $page);
         $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
+        return view('pages.delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);

     }
 
     /**
     }
 
     /**


@@ -343,10 +353,10 @@ class PageController extends Controller
      */
     public function destroy($bookSlug, $pageSlug)
     {
      */
     public function destroy($bookSlug, $pageSlug)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $book = $page->book;
         $this->checkOwnablePermission('page-delete', $page);
         $book = $page->book;
         $this->checkOwnablePermission('page-delete', $page);

-        $this->entityRepo->destroyPage($page);
+        $this->pageRepo->destroyPage($page);

 
         Activity::addMessage('page_delete', $book->id, $page->name);
         session()->flash('success', trans('entities.pages_delete_success'));
 
         Activity::addMessage('page_delete', $book->id, $page->name);
         session()->flash('success', trans('entities.pages_delete_success'));


@@ -362,11 +372,11 @@ class PageController extends Controller
      */
     public function destroyDraft($bookSlug, $pageId)
     {
      */
     public function destroyDraft($bookSlug, $pageId)
     {

-        $page = $this->entityRepo->getById('page', $pageId, true);
+        $page = $this->pageRepo->getById('page', $pageId, true);

         $book = $page->book;
         $this->checkOwnablePermission('page-update', $page);
         session()->flash('success', trans('entities.pages_delete_draft_success'));
         $book = $page->book;
         $this->checkOwnablePermission('page-update', $page);
         session()->flash('success', trans('entities.pages_delete_draft_success'));

-        $this->entityRepo->destroyPage($page);
+        $this->pageRepo->destroyPage($page);

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


@@ -374,13 +384,14 @@ class PageController extends Controller
      * Shows the last revisions for this page.
      * @param string $bookSlug
      * @param string $pageSlug
      * Shows the last revisions for this page.
      * @param string $bookSlug
      * @param string $pageSlug

-     * @return \Illuminate\View\View
+     * @return View
+     * @throws NotFoundException

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

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));

-        return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
+        return view('pages.revisions', ['page' => $page, 'current' => $page]);

     }
 
     /**
     }
 
     /**


@@ -388,11 +399,11 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId

-     * @return \Illuminate\View\View
+     * @return View

      */
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             abort(404);
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             abort(404);


@@ -401,9 +412,10 @@ class PageController extends Controller
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
 
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
 

-        return view('pages/revision', [
+        return view('pages.revision', [

             'page' => $page,
             'book' => $page->book,
             'page' => $page,
             'book' => $page->book,

+            'diff' => null,

             'revision' => $revision
         ]);
     }
             'revision' => $revision
         ]);
     }


@@ -413,11 +425,11 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId

-     * @return \Illuminate\View\View
+     * @return View

      */
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             abort(404);
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         if ($revision === null) {
             abort(404);


@@ -430,7 +442,7 @@ class PageController extends Controller
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
 
         $page->fill($revision->toArray());
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
 

-        return view('pages/revision', [
+        return view('pages.revision', [

             'page' => $page,
             'book' => $page->book,
             'diff' => $diff,
             'page' => $page,
             'book' => $page->book,
             'diff' => $diff,


@@ -443,13 +455,13 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revisionId

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      */
     public function restoreRevision($bookSlug, $pageSlug, $revisionId)
     {
      */
     public function restoreRevision($bookSlug, $pageSlug, $revisionId)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

-        $page = $this->entityRepo->restorePageRevision($page, $page->book, $revisionId);
+        $page = $this->pageRepo->restorePageRevision($page, $page->book, $revisionId);

         Activity::add($page, 'page_restore', $page->book->id);
         return redirect($page->getUrl());
     }
         Activity::add($page, 'page_restore', $page->book->id);
         return redirect($page->getUrl());
     }


@@ -460,13 +472,13 @@ class PageController extends Controller
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revId
      * @param string $bookSlug
      * @param string $pageSlug
      * @param int $revId

+     * @return RedirectResponse|Redirector
+     *@throws BadRequestException

      * @throws NotFoundException
      * @throws NotFoundException

-     * @throws BadRequestException
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

      */
     public function destroyRevision($bookSlug, $pageSlug, $revId)
     {
      */
     public function destroyRevision($bookSlug, $pageSlug, $revId)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-delete', $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
         $this->checkOwnablePermission('page-delete', $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();


@@ -480,108 +492,28 @@ class PageController extends Controller
         // Check if its the latest revision, cannot delete latest revision.
         if (intval($currentRevision->id) === intval($revId)) {
             session()->flash('error', trans('entities.revision_cannot_delete_latest'));
         // Check if its the latest revision, cannot delete latest revision.
         if (intval($currentRevision->id) === intval($revId)) {
             session()->flash('error', trans('entities.revision_cannot_delete_latest'));

-            return response()->view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400);
+            return response()->view('pages.revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400);

         }
 
         $revision->delete();
         session()->flash('success', trans('entities.revision_delete_success'));
         }
 
         $revision->delete();
         session()->flash('success', trans('entities.revision_delete_success'));

-        return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
-    }
-
-    /**
-     * Exports a page to a PDF.
-     * https://github.com/barryvdh/laravel-dompdf
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportPdf($bookSlug, $pageSlug)
-    {
-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $page->html = $this->entityRepo->renderPage($page);
-        $pdfContent = $this->exportService->pageToPdf($page);
-        return response()->make($pdfContent, 200, [
-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.pdf'
-        ]);
-    }
-
-    /**
-     * Export a page to a self-contained HTML file.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportHtml($bookSlug, $pageSlug)
-    {
-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $page->html = $this->entityRepo->renderPage($page);
-        $containedHtml = $this->exportService->pageToContainedHtml($page);
-        return response()->make($containedHtml, 200, [
-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html'
-        ]);
-    }
-
-    /**
-     * Export a page to a simple plaintext .txt file.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return \Illuminate\Http\Response
-     */
-    public function exportPlainText($bookSlug, $pageSlug)
-    {
-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $containedHtml = $this->exportService->pageToPlainText($page);
-        return response()->make($containedHtml, 200, [
-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.txt'
-        ]);
+        return redirect($page->getUrl('/revisions'));

     }
 
     /**
      * Show a listing of recently created pages
     }
 
     /**
      * Show a listing of recently created pages

-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRecentlyCreated()
-    {
-        $pages = $this->entityRepo->getRecentlyCreatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-created'));
-        return view('pages/detailed-listing', [
-            'title' => trans('entities.recently_created_pages'),
-            'pages' => $pages
-        ]);
-    }
-
-    /**
-     * Show a listing of recently created pages
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View

      */
     public function showRecentlyUpdated()
     {
      */
     public function showRecentlyUpdated()
     {

-        $pages = $this->entityRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-updated'));
-        return view('pages/detailed-listing', [
+        // TODO - Still exist?
+        $pages = $this->pageRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(url('/pages/recently-updated'));
+        return view('pages.detailed-listing', [

             'title' => trans('entities.recently_updated_pages'),
             'pages' => $pages
         ]);
     }
 
             'title' => trans('entities.recently_updated_pages'),
             'pages' => $pages
         ]);
     }
 

-    /**
-     * Show the Restrictions view.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function showRestrict($bookSlug, $pageSlug)
-    {
-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-        $roles = $this->userRepo->getRestrictableRoles();
-        return view('pages/restrictions', [
-            'page'  => $page,
-            'roles' => $roles
-        ]);
-    }
-

     /**
      * Show the view to choose a new parent to move a page into.
      * @param string $bookSlug
     /**
      * Show the view to choose a new parent to move a page into.
      * @param string $bookSlug


@@ -591,9 +523,10 @@ class PageController extends Controller
      */
     public function showMove($bookSlug, $pageSlug)
     {
      */
     public function showMove($bookSlug, $pageSlug)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

-        return view('pages/move', [
+        $this->checkOwnablePermission('page-delete', $page);
+        return view('pages.move', [

             'book' => $page->book,
             'page' => $page
         ]);
             'book' => $page->book,
             'page' => $page
         ]);


@@ -601,16 +534,18 @@ class PageController extends Controller
 
     /**
      * Does the action of moving the location of a page
 
     /**
      * Does the action of moving the location of a page

+     * @param Request $request

      * @param string $bookSlug
      * @param string $pageSlug
      * @param string $bookSlug
      * @param string $pageSlug

-     * @param Request $request

      * @return mixed
      * @throws NotFoundException
      * @return mixed
      * @throws NotFoundException

+     * @throws Throwable

      */
      */

-    public function move($bookSlug, $pageSlug, Request $request)
+    public function move(Request $request, string $bookSlug, string $pageSlug)

     {
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('page-update', $page);
         $this->checkOwnablePermission('page-update', $page);

+        $this->checkOwnablePermission('page-delete', $page);

 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {


@@ -623,15 +558,15 @@ class PageController extends Controller
 
 
         try {
 
 
         try {

-            $parent = $this->entityRepo->getById($entityType, $entityId);
-        } catch (\Exception $e) {
+            $parent = $this->pageRepo->getById($entityType, $entityId);
+        } catch (Exception $e) {

             session()->flash(trans('entities.selected_book_chapter_not_found'));
             return redirect()->back();
         }
 
         $this->checkOwnablePermission('page-create', $parent);
 
             session()->flash(trans('entities.selected_book_chapter_not_found'));
             return redirect()->back();
         }
 
         $this->checkOwnablePermission('page-create', $parent);
 

-        $this->entityRepo->changePageParent($page, $parent);
+        $this->pageRepo->changePageParent($page, $parent);

         Activity::add($page, 'page_move', $page->book->id);
         session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
 
         Activity::add($page, 'page_move', $page->book->id);
         session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
 


@@ -647,10 +582,10 @@ class PageController extends Controller
      */
     public function showCopy($bookSlug, $pageSlug)
     {
      */
     public function showCopy($bookSlug, $pageSlug)
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('page-view', $page);

         session()->flashInput(['name' => $page->name]);
         session()->flashInput(['name' => $page->name]);

-        return view('pages/copy', [
+        return view('pages.copy', [

             'book' => $page->book,
             'page' => $page
         ]);
             'book' => $page->book,
             'page' => $page
         ]);


@@ -658,16 +593,17 @@ class PageController extends Controller
 
     /**
      * Create a copy of a page within the requested target destination.
 
     /**
      * Create a copy of a page within the requested target destination.

+     * @param Request $request

      * @param string $bookSlug
      * @param string $pageSlug
      * @param string $bookSlug
      * @param string $pageSlug

-     * @param Request $request

      * @return mixed
      * @throws NotFoundException
      * @return mixed
      * @throws NotFoundException

+     * @throws Throwable

      */
      */

-    public function copy($bookSlug, $pageSlug, Request $request)
+    public function copy(Request $request, string $bookSlug, string $pageSlug)

     {
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('page-view', $page);

 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {
 
         $entitySelection = $request->get('entity_selection', null);
         if ($entitySelection === null || $entitySelection === '') {


@@ -678,8 +614,8 @@ class PageController extends Controller
             $entityId = intval($stringExploded[1]);
 
             try {
             $entityId = intval($stringExploded[1]);
 
             try {

-                $parent = $this->entityRepo->getById($entityType, $entityId);
-            } catch (\Exception $e) {
+                $parent = $this->pageRepo->getById($entityType, $entityId);
+            } catch (Exception $e) {

                 session()->flash(trans('entities.selected_book_chapter_not_found'));
                 return redirect()->back();
             }
                 session()->flash(trans('entities.selected_book_chapter_not_found'));
                 return redirect()->back();
             }


@@ -687,7 +623,7 @@ class PageController extends Controller
 
         $this->checkOwnablePermission('page-create', $parent);
 
 
         $this->checkOwnablePermission('page-create', $parent);
 

-        $pageCopy = $this->entityRepo->copyPage($page, $parent, $request->get('name', ''));
+        $pageCopy = $this->pageRepo->copyPage($page, $parent, $request->get('name', ''));

 
         Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
         session()->flash('success', trans('entities.pages_copy_success'));
 
         Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
         session()->flash('success', trans('entities.pages_copy_success'));


@@ -695,19 +631,38 @@ class PageController extends Controller
         return redirect($pageCopy->getUrl());
     }
 
         return redirect($pageCopy->getUrl());
     }
 

+    /**
+     * Show the Permissions view.
+     * @param string $bookSlug
+     * @param string $pageSlug
+     * @return Factory|View
+     * @throws NotFoundException
+     */
+    public function showPermissions($bookSlug, $pageSlug)
+    {
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $page);
+        $roles = $this->userRepo->getRestrictableRoles();
+        return view('pages.permissions', [
+            'page'  => $page,
+            'roles' => $roles
+        ]);
+    }
+

     /**
      * Set the permissions for this page.
      * @param string $bookSlug
      * @param string $pageSlug
      * @param Request $request
     /**
      * Set the permissions for this page.
      * @param string $bookSlug
      * @param string $pageSlug
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return RedirectResponse|Redirector

      * @throws NotFoundException
      * @throws NotFoundException

+     * @throws Throwable

      */
      */

-    public function restrict($bookSlug, $pageSlug, Request $request)
+    public function permissions(Request $request, string $bookSlug, string $pageSlug)

     {
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);

         $this->checkOwnablePermission('restrictions-manage', $page);
         $this->checkOwnablePermission('restrictions-manage', $page);

-        $this->entityRepo->updateEntityPermissionsFromRequest($request, $page);
+        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);

         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }
         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }