Added page titles to many missing app areas

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 45aa8f9347554d2de3cc2f951e3b3b19a2e533a0..3e57657da7199e6b5da0046b1c6f6008c50c932b 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,549 +1,407 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use Activity;
-use BookStack\Auth\UserRepo;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\View;
+use BookStack\Entities\Models\Page;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\PageRepo;

+use BookStack\Entities\Tools\BookContents;
+use BookStack\Entities\Tools\Cloner;
+use BookStack\Entities\Tools\NextPreviousContentLocator;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\Entities\Tools\PageEditActivity;
+use BookStack\Entities\Tools\PermissionsUpdater;

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

+use BookStack\Exceptions\PermissionsException;

 use Exception;
 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\Request;

-use Illuminate\Http\Response;
-use Illuminate\Routing\Redirector;
-use Illuminate\View\View;
+use Illuminate\Validation\ValidationException;

 use Throwable;
 use Throwable;

-use Views;

 
 class PageController extends Controller
 {
 
 class PageController extends Controller
 {

-

     protected $pageRepo;
     protected $pageRepo;

-    protected $userRepo;

 
     /**
      * PageController constructor.
 
     /**
      * PageController constructor.

-     * @param PageRepo $pageRepo
-     * @param UserRepo $userRepo

      */
      */

-    public function __construct(PageRepo $pageRepo, UserRepo $userRepo)
+    public function __construct(PageRepo $pageRepo)

     {
         $this->pageRepo = $pageRepo;
     {
         $this->pageRepo = $pageRepo;

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

     }
 
     /**
      * Show the form for creating a new page.
     }
 
     /**
      * Show the form for creating a new page.

-     * @param string $bookSlug
-     * @param string $chapterSlug
-     * @return Response
-     * @internal param bool $pageSlug
-     * @throws NotFoundException
+     *
+     * @throws Throwable

      */
      */

-    public function create($bookSlug, $chapterSlug = null)
+    public function create(string $bookSlug, string $chapterSlug = null)

     {
     {

-        if ($chapterSlug !== null) {
-            $chapter = $this->pageRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
-            $book = $chapter->book;
-        } else {
-            $chapter = null;
-            $book = $this->pageRepo->getEntityBySlug('book', $bookSlug);
-        }
-
-        $parent = $chapter ? $chapter : $book;
+        $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);

         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in

-        if ($this->signedIn) {
-            $draft = $this->pageRepo->getDraftPage($book, $chapter);
+        if ($this->isSignedIn()) {
+            $draft = $this->pageRepo->getNewDraftPage($parent);
+

             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]);
     }
 
     /**
      * Create a new page as a guest user.
         return view('pages.guest-create', ['parent' => $parent]);
     }
 
     /**
      * Create a new page as a guest user.

-     * @param Request $request
-     * @param string $bookSlug
-     * @param string|null $chapterSlug
-     * @return mixed
-     * @throws NotFoundException
+     *
+     * @throws ValidationException

      */
      */

-    public function createAsGuest(Request $request, $bookSlug, $chapterSlug = null)
+    public function createAsGuest(Request $request, string $bookSlug, string $chapterSlug = null)

     {
         $this->validate($request, [
     {
         $this->validate($request, [

-            'name' => 'required|string|max:255'
+            'name' => ['required', 'string', 'max:255'],

         ]);
 
         ]);
 

-        if ($chapterSlug !== null) {
-            $chapter = $this->pageRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
-            $book = $chapter->book;
-        } else {
-            $chapter = null;
-            $book = $this->pageRepo->getEntityBySlug('book', $bookSlug);
-        }
-
-        $parent = $chapter ? $chapter : $book;
+        $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);

         $this->checkOwnablePermission('page-create', $parent);
 
         $this->checkOwnablePermission('page-create', $parent);
 

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

             'name' => $request->get('name'),
             'name' => $request->get('name'),

-            'html' => ''
+            'html' => '',

         ]);
         ]);

+

         return redirect($page->getUrl('/edit'));
     }
 
     /**
      * Show form to continue editing a draft page.
         return redirect($page->getUrl('/edit'));
     }
 
     /**
      * Show form to continue editing a draft page.

-     * @param string $bookSlug
-     * @param int $pageId
-     * @return Factory|View
+     *
+     * @throws NotFoundException

      */
      */

-    public function editDraft($bookSlug, $pageId)
+    public function editDraft(string $bookSlug, int $pageId)

     {
     {

-        $draft = $this->pageRepo->getById('page', $pageId, true);
-        $this->checkOwnablePermission('page-create', $draft->parent);
+        $draft = $this->pageRepo->getById($pageId);
+        $this->checkOwnablePermission('page-create', $draft->getParent());

         $this->setPageTitle(trans('entities.pages_edit_draft'));
 
         $this->setPageTitle(trans('entities.pages_edit_draft'));
 

-        $draftsEnabled = $this->signedIn;
-        $templates = $this->pageRepo->getPageTemplates(10);
+        $draftsEnabled = $this->isSignedIn();
+        $templates = $this->pageRepo->getTemplates(10);

 
         return view('pages.edit', [
 
         return view('pages.edit', [

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

             'draftsEnabled' => $draftsEnabled,
             'draftsEnabled' => $draftsEnabled,

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

         ]);
     }
 
     /**
      * Store a new page by changing a draft into a page.
         ]);
     }
 
     /**
      * Store a new page by changing a draft into a page.

-     * @param  Request $request
-     * @param  string $bookSlug
-     * @param  int $pageId
-     * @return Response
+     *
+     * @throws NotFoundException
+     * @throws ValidationException

      */
      */

-    public function store(Request $request, $bookSlug, $pageId)
+    public function store(Request $request, string $bookSlug, int $pageId)

     {
         $this->validate($request, [
     {
         $this->validate($request, [

-            'name' => 'required|string|max:255'
+            'name' => ['required', 'string', 'max:255'],

         ]);
         ]);

+        $draftPage = $this->pageRepo->getById($pageId);
+        $this->checkOwnablePermission('page-create', $draftPage->getParent());

 
 

-        $input = $request->all();
-        $draftPage = $this->pageRepo->getById('page', $pageId, true);
-        $book = $draftPage->book;
-
-        $parent = $draftPage->parent;
-        $this->checkOwnablePermission('page-create', $parent);
-
-        if ($parent->isA('chapter')) {
-            $input['priority'] = $this->pageRepo->getNewChapterPriority($parent);
-        } else {
-            $input['priority'] = $this->pageRepo->getNewBookPriority($parent);
-        }
-
-        $page = $this->pageRepo->publishPageDraft($draftPage, $input);
+        $page = $this->pageRepo->publishDraft($draftPage, $request->all());

 
 

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

         return redirect($page->getUrl());
     }
 
     /**
      * Display the specified page.
      * If the page is not found via the slug the revisions are searched for a match.
         return redirect($page->getUrl());
     }
 
     /**
      * Display the specified page.
      * If the page is not found via the slug the revisions are searched for a match.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function show($bookSlug, $pageSlug)
+    public function show(string $bookSlug, string $pageSlug)

     {
         try {
     {
         try {

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

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

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

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

+

             return redirect($page->getUrl());
         }
 
         $this->checkOwnablePermission('page-view', $page);
 
             return redirect($page->getUrl());
         }
 
         $this->checkOwnablePermission('page-view', $page);
 

-        $page->html = $this->pageRepo->renderPage($page);
-        $sidebarTree = $this->pageRepo->getBookChildren($page->book);
-        $pageNav = $this->pageRepo->getPageNav($page->html);
+        $pageContent = (new PageContent($page));
+        $page->html = $pageContent->render();
+        $sidebarTree = (new BookContents($page->book))->getTree();
+        $pageNav = $pageContent->getNavigation($page->html);

 
 

-        // check if the comment's are enabled
+        // Check if page comments are enabled

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

-        Views::add($page);
+        $nextPreviousLocator = new NextPreviousContentLocator($page, $sidebarTree);
+
+        View::incrementFor($page);

         $this->setPageTitle($page->getShortName());
         $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,

             'commentsEnabled' => $commentsEnabled,
             'commentsEnabled' => $commentsEnabled,

-            'pageNav' => $pageNav
+            'pageNav'         => $pageNav,
+            'next'            => $nextPreviousLocator->getNext(),
+            'previous'        => $nextPreviousLocator->getPrevious(),

         ]);
     }
 
     /**
      * Get page from an ajax request.
         ]);
     }
 
     /**
      * Get page from an ajax request.

-     * @param int $pageId
-     * @return JsonResponse
+     *
+     * @throws NotFoundException

      */
      */

-    public function getPageAjax($pageId)
+    public function getPageAjax(int $pageId)

     {
     {

-        $page = $this->pageRepo->getById('page', $pageId);
+        $page = $this->pageRepo->getById($pageId);
+        $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));
+        $page->makeHidden(['book']);
+

         return response()->json($page);
     }
 
     /**
      * Show the form for editing the specified page.
         return response()->json($page);
     }
 
     /**
      * Show the form for editing the specified page.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function edit($bookSlug, $pageSlug)
+    public function edit(string $bookSlug, string $pageSlug)

     {
     {

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

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

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

         $page->isDraft = false;
         $page->isDraft = false;

+        $editActivity = new PageEditActivity($page);

 
         // Check for active editing
         $warnings = [];
 
         // Check for active editing
         $warnings = [];

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

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

-        $userPageDraft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);
-        if ($userPageDraft !== null) {
-            $page->name = $userPageDraft->name;
-            $page->html = $userPageDraft->html;
-            $page->markdown = $userPageDraft->markdown;
+        $userDraft = $this->pageRepo->getUserDraft($page);
+        if ($userDraft !== null) {
+            $page->forceFill($userDraft->only(['name', 'html', 'markdown']));

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

-            $warnings [] = $this->pageRepo->getUserPageDraftMessage($userPageDraft);
+            $warnings[] = $editActivity->getEditingActiveDraftMessage($userDraft);

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

-            session()->flash('warning', implode("\n", $warnings));
+            $this->showWarningNotification(implode("\n", $warnings));

         }
 
         }
 

-        $draftsEnabled = $this->signedIn;
-        $templates = $this->pageRepo->getPageTemplates(10);
+        $templates = $this->pageRepo->getTemplates(10);
+        $draftsEnabled = $this->isSignedIn();
+        $this->setPageTitle(trans('entities.pages_editing_named', ['pageName' => $page->getShortName()]));

 
         return view('pages.edit', [
 
         return view('pages.edit', [

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

             'draftsEnabled' => $draftsEnabled,
             'draftsEnabled' => $draftsEnabled,

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

         ]);
     }
 
     /**
      * Update the specified page in storage.
         ]);
     }
 
     /**
      * Update the specified page in storage.

-     * @param  Request $request
-     * @param  string $bookSlug
-     * @param  string $pageSlug
-     * @return Response
+     *
+     * @throws ValidationException
+     * @throws NotFoundException

      */
      */

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

     {
         $this->validate($request, [
     {
         $this->validate($request, [

-            'name' => 'required|string|max:255'
+            'name' => ['required', 'string', 'max:255'],

         ]);
         ]);

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

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

-        $this->pageRepo->updatePage($page, $page->book->id, $request->all());
-        Activity::add($page, 'page_update', $page->book->id);
+
+        $this->pageRepo->update($page, $request->all());
+

         return redirect($page->getUrl());
     }
 
     /**
      * Save a draft update as a revision.
         return redirect($page->getUrl());
     }
 
     /**
      * Save a draft update as a revision.

-     * @param Request $request
-     * @param int $pageId
-     * @return JsonResponse
+     *
+     * @throws NotFoundException

      */
      */

-    public function saveDraft(Request $request, $pageId)
+    public function saveDraft(Request $request, int $pageId)

     {
     {

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

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

-        if (!$this->signedIn) {
-            return response()->json([
-                'status' => 'error',
-                'message' => trans('errors.guests_cannot_save_drafts'),
-            ], 500);
+        if (!$this->isSignedIn()) {
+            return $this->jsonError(trans('errors.guests_cannot_save_drafts'), 500);

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

+        $warnings = (new PageEditActivity($page))->getWarningMessagesForDraft($draft);

 
 

-        $updateTime = $draft->updated_at->timestamp;

         return response()->json([
             'status'    => 'success',
             'message'   => trans('entities.pages_edit_draft_save_at'),
         return response()->json([
             'status'    => 'success',
             'message'   => trans('entities.pages_edit_draft_save_at'),

-            'timestamp' => $updateTime
+            'warning'   => implode("\n", $warnings),
+            'timestamp' => $draft->updated_at->timestamp,

         ]);
     }
 
     /**
         ]);
     }
 
     /**

-     * Redirect from a special link url which
-     * uses the page id rather than the name.
-     * @param int $pageId
-     * @return RedirectResponse|Redirector
+     * Redirect from a special link url which uses the page id rather than the name.
+     *
+     * @throws NotFoundException

      */
      */

-    public function redirectFromLink($pageId)
+    public function redirectFromLink(int $pageId)

     {
     {

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

         return redirect($page->getUrl());
     }
 
     /**
      * Show the deletion page for the specified page.
         return redirect($page->getUrl());
     }
 
     /**
      * Show the deletion page for the specified page.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return View
+     *
+     * @throws NotFoundException

      */
      */

-    public function showDelete($bookSlug, $pageSlug)
+    public function showDelete(string $bookSlug, string $pageSlug)

     {
     {

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

         $this->checkOwnablePermission('page-delete', $page);
         $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]);
-    }
+        $this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));

 
 

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

 
     /**
      * Show the deletion page for the specified page.
 
     /**
      * Show the deletion page for the specified page.

-     * @param string $bookSlug
-     * @param int $pageId
-     * @return View
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function showDeleteDraft($bookSlug, $pageId)
+    public function showDeleteDraft(string $bookSlug, int $pageId)

     {
     {

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

         $this->checkOwnablePermission('page-update', $page);
         $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]);
+        $this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));
+
+        return view('pages.delete', [
+            'book'    => $page->book,
+            'page'    => $page,
+            'current' => $page,
+        ]);

     }
 
     /**
      * Remove the specified page from storage.
     }
 
     /**
      * Remove the specified page from storage.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Response
-     * @internal param int $id
+     *
+     * @throws NotFoundException
+     * @throws Throwable

      */
      */

-    public function destroy($bookSlug, $pageSlug)
+    public function destroy(string $bookSlug, string $pageSlug)

     {
     {

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

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

-        $this->pageRepo->destroyPage($page);
+        $parent = $page->getParent();

 
 

-        Activity::addMessage('page_delete', $book->id, $page->name);
-        session()->flash('success', trans('entities.pages_delete_success'));
-        return redirect($book->getUrl());
+        $this->pageRepo->destroy($page);
+
+        return redirect($parent->getUrl());

     }
 
     /**
      * Remove the specified draft page from storage.
     }
 
     /**
      * Remove the specified draft page from storage.

-     * @param string $bookSlug
-     * @param int $pageId
-     * @return Response
+     *

      * @throws NotFoundException
      * @throws NotFoundException

+     * @throws Throwable

      */
      */

-    public function destroyDraft($bookSlug, $pageId)
+    public function destroyDraft(string $bookSlug, int $pageId)

     {
     {

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

         $book = $page->book;
         $book = $page->book;

+        $chapter = $page->chapter;

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

-        session()->flash('success', trans('entities.pages_delete_draft_success'));
-        $this->pageRepo->destroyPage($page);
-        return redirect($book->getUrl());
-    }

 
 

-    /**
-     * Shows the last revisions for this page.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return View
-     * @throws NotFoundException
-     */
-    public function showRevisions($bookSlug, $pageSlug)
-    {
-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
-        return view('pages.revisions', ['page' => $page, 'current' => $page]);
-    }
+        $this->pageRepo->destroy($page);

 
 

-    /**
-     * Shows a preview of a single revision
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
-     * @return View
-     */
-    public function showRevision($bookSlug, $pageSlug, $revisionId)
-    {
-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            abort(404);
-        }
-
-        $page->fill($revision->toArray());
-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
-
-        return view('pages.revision', [
-            'page' => $page,
-            'book' => $page->book,
-            'diff' => null,
-            'revision' => $revision
-        ]);
-    }
+        $this->showSuccessNotification(trans('entities.pages_delete_draft_success'));

 
 

-    /**
-     * Shows the changes of a single revision
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
-     * @return View
-     */
-    public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
-    {
-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
-        if ($revision === null) {
-            abort(404);
+        if ($chapter && userCan('view', $chapter)) {
+            return redirect($chapter->getUrl());

         }
 
         }
 

-        $prev = $revision->getPrevious();
-        $prevContent = ($prev === null) ? '' : $prev->html;
-        $diff = (new Htmldiff)->diff($prevContent, $revision->html);
-
-        $page->fill($revision->toArray());
-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
-
-        return view('pages.revision', [
-            'page' => $page,
-            'book' => $page->book,
-            'diff' => $diff,
-            'revision' => $revision
-        ]);
-    }
-
-    /**
-     * Restores a page using the content of the specified revision.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revisionId
-     * @return RedirectResponse|Redirector
-     */
-    public function restoreRevision($bookSlug, $pageSlug, $revisionId)
-    {
-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
-        $page = $this->pageRepo->restorePageRevision($page, $page->book, $revisionId);
-        Activity::add($page, 'page_restore', $page->book->id);
-        return redirect($page->getUrl());
+        return redirect($book->getUrl());

     }
 
     }
 

-

     /**
     /**

-     * Deletes a revision using the id of the specified revision.
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param int $revId
-     * @return RedirectResponse|Redirector
-     *@throws BadRequestException
-     * @throws NotFoundException
+     * Show a listing of recently created pages.

      */
      */

-    public function destroyRevision($bookSlug, $pageSlug, $revId)
+    public function showRecentlyUpdated()

     {
     {

-        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-delete', $page);
+        $pages = Page::visible()->orderBy('updated_at', 'desc')
+            ->paginate(20)
+            ->setPath(url('/pages/recently-updated'));

 
 

-        $revision = $page->revisions()->where('id', '=', $revId)->first();
-        if ($revision === null) {
-            throw new NotFoundException("Revision #{$revId} not found");
-        }
-
-        // Get the current revision for the page
-        $currentRevision = $page->getCurrentRevision();
+        $this->setPageTitle(trans('entities.recently_updated_pages'));

 
 

-        // 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);
-        }
-
-        $revision->delete();
-        session()->flash('success', trans('entities.revision_delete_success'));
-        return redirect($page->getUrl('/revisions'));
-    }
-
-    /**
-     * Show a listing of recently created pages
-     * @return Factory|View
-     */
-    public function showRecentlyUpdated()
-    {
-        // 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
+        return view('common.detailed-listing-paginated', [
+            'title'    => trans('entities.recently_updated_pages'),
+            'entities' => $pages,

         ]);
     }
 
     /**
      * Show the view to choose a new parent to move a page into.
         ]);
     }
 
     /**
      * Show the view to choose a new parent to move a page into.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return mixed
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function showMove($bookSlug, $pageSlug)
+    public function showMove(string $bookSlug, string $pageSlug)

     {
     {

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

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

+

         return view('pages.move', [
             'book' => $page->book,
         return view('pages.move', [
             'book' => $page->book,

-            'page' => $page
+            'page' => $page,

         ]);
     }
 
     /**
         ]);
     }
 
     /**

-     * Does the action of moving the location of a page
-     * @param Request $request
-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return mixed
+     * Does the action of moving the location of a page.
+     *

      * @throws NotFoundException
      * @throws Throwable
      */
     public function move(Request $request, string $bookSlug, string $pageSlug)
     {
      * @throws NotFoundException
      * @throws Throwable
      */
     public function move(Request $request, string $bookSlug, string $pageSlug)
     {

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

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


@@ -552,118 +410,99 @@ class PageController extends Controller
             return redirect($page->getUrl());
         }
 
             return redirect($page->getUrl());
         }
 

-        $stringExploded = explode(':', $entitySelection);
-        $entityType = $stringExploded[0];
-        $entityId = intval($stringExploded[1]);
+        try {
+            $parent = $this->pageRepo->move($page, $entitySelection);
+        } catch (Exception $exception) {
+            if ($exception instanceof PermissionsException) {
+                $this->showPermissionError();
+            }

 
 

+            $this->showErrorNotification(trans('errors.selected_book_chapter_not_found'));

 
 

-        try {
-            $parent = $this->pageRepo->getById($entityType, $entityId);
-        } catch (Exception $e) {
-            session()->flash(trans('entities.selected_book_chapter_not_found'));

             return redirect()->back();
         }
 
             return redirect()->back();
         }
 

-        $this->checkOwnablePermission('page-create', $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]));
+        $this->showSuccessNotification(trans('entities.pages_move_success', ['parentName' => $parent->name]));

 
         return redirect($page->getUrl());
     }
 
     /**
      * Show the view to copy a page.
 
         return redirect($page->getUrl());
     }
 
     /**
      * Show the view to copy a page.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return mixed
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function showCopy($bookSlug, $pageSlug)
+    public function showCopy(string $bookSlug, string $pageSlug)

     {
     {

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

         $this->checkOwnablePermission('page-view', $page);
         session()->flashInput(['name' => $page->name]);
         $this->checkOwnablePermission('page-view', $page);
         session()->flashInput(['name' => $page->name]);

+

         return view('pages.copy', [
             'book' => $page->book,
         return view('pages.copy', [
             'book' => $page->book,

-            'page' => $page
+            'page' => $page,

         ]);
     }
 
     /**
      * 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
-     * @return mixed
+     *

      * @throws NotFoundException
      * @throws Throwable
      */
      * @throws NotFoundException
      * @throws Throwable
      */

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

     {
     {

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

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

-        $entitySelection = $request->get('entity_selection', null);
-        if ($entitySelection === null || $entitySelection === '') {
-            $parent = $page->chapter ? $page->chapter : $page->book;
-        } else {
-            $stringExploded = explode(':', $entitySelection);
-            $entityType = $stringExploded[0];
-            $entityId = intval($stringExploded[1]);
-
-            try {
-                $parent = $this->pageRepo->getById($entityType, $entityId);
-            } catch (Exception $e) {
-                session()->flash(trans('entities.selected_book_chapter_not_found'));
-                return redirect()->back();
-            }
-        }
+        $entitySelection = $request->get('entity_selection') ?: null;
+        $newParent = $entitySelection ? $this->pageRepo->findParentByIdentifier($entitySelection) : $page->getParent();

 
 

-        $this->checkOwnablePermission('page-create', $parent);
+        if (is_null($newParent)) {
+            $this->showErrorNotification(trans('errors.selected_book_chapter_not_found'));
+
+            return redirect()->back();
+        }

 
 

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

 
 

-        Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
-        session()->flash('success', trans('entities.pages_copy_success'));
+        $newName = $request->get('name') ?: $page->name;
+        $pageCopy = $cloner->clonePage($page, $newParent, $newName);
+        $this->showSuccessNotification(trans('entities.pages_copy_success'));

 
         return redirect($pageCopy->getUrl());
     }
 
     /**
      * Show the Permissions view.
 
         return redirect($pageCopy->getUrl());
     }
 
     /**
      * Show the Permissions view.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @return Factory|View
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function showPermissions($bookSlug, $pageSlug)
+    public function showPermissions(string $bookSlug, string $pageSlug)

     {
     {

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

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

-        $roles = $this->userRepo->getRestrictableRoles();
+

         return view('pages.permissions', [
         return view('pages.permissions', [

-            'page'  => $page,
-            'roles' => $roles
+            'page' => $page,

         ]);
     }
 
     /**
      * Set the permissions for this page.
         ]);
     }
 
     /**
      * Set the permissions for this page.

-     * @param string $bookSlug
-     * @param string $pageSlug
-     * @param Request $request
-     * @return RedirectResponse|Redirector
+     *

      * @throws NotFoundException
      * @throws Throwable
      */
      * @throws NotFoundException
      * @throws Throwable
      */

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

     {
     {

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

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

-        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
-        session()->flash('success', trans('entities.pages_permissions_success'));
+
+        $permissionsUpdater->updateFromPermissionsForm($page, $request);
+
+        $this->showSuccessNotification(trans('entities.pages_permissions_success'));
+

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