French translation update

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 73619721390a7cad6956ce7d75bb599f86e7e353..736fcf4f6d2b9c41b471340762b87fb62eec0dc9 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,33 +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 Carbon\Carbon;
+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();
     }


@@ -38,23 +40,30 @@ class PageController extends Controller
      * @param string $chapterSlug
      * @return Response
      * @internal param bool $pageSlug
      * @param string $chapterSlug
      * @return Response
      * @internal param bool $pageSlug

+     * @throws NotFoundException

      */
     public function create($bookSlug, $chapterSlug = null)
     {
      */
     public function create($bookSlug, $chapterSlug = null)
     {

-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : 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;
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in
         $parent = $chapter ? $chapter : $book;
         $this->checkOwnablePermission('page-create', $parent);
 
         // Redirect to draft edit screen if signed in

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

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

-        // Otherwise show edit view
+        // Otherwise show the edit view if they're a guest

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

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

     }
 
     /**
     }
 
     /**


@@ -71,13 +80,19 @@ class PageController extends Controller
             'name' => 'required|string|max:255'
         ]);
 
             'name' => 'required|string|max:255'
         ]);
 

-        $book = $this->entityRepo->getBySlug('book', $bookSlug);
-        $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : 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;
         $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' => ''
         ]);


@@ -88,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);
-        $this->checkOwnablePermission('page-create', $draft->book);
+        $draft = $this->pageRepo->getById('page', $pageId, true);
+        $this->checkOwnablePermission('page-create', $draft->parent);

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

-        $draftsEnabled = $this->signedIn;
-        return view('pages/edit', [
+        $draftsEnabled = $this->isSignedIn();
+        $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,

         ]);
     }
 
         ]);
     }
 


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

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

 
 

-        $draftPage = $this->entityRepo->getById('page', $pageId, true);
-
-        $chapterId = intval($draftPage->chapter_id);
-        $parent = $chapterId !== 0 ? $this->entityRepo->getById('chapter', $chapterId) : $book;
+        $parent = $draftPage->parent;

         $this->checkOwnablePermission('page-create', $parent);
 
         if ($parent->isA('chapter')) {
         $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());


@@ -145,39 +161,51 @@ 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)
     {
         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);
-            if ($page === null) abort(404);
+            $page = $this->pageRepo->getPageByOldSlug($pageSlug, $bookSlug);
+            if ($page === null) {
+                throw $e;
+            }

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

-        $pageContent = $this->entityRepo->renderPage($page);
-        $sidebarTree = $this->entityRepo->getBookChildren($page->book);
-        $pageNav = $this->entityRepo->getPageNav($pageContent);
-        
+        $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');
+        if ($commentsEnabled) {
+            $page->load(['comments.createdBy']);
+        }
+

         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,
             'page' => $page,'book' => $page->book,

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

     }
 
     /**
      * 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);
     }
 


@@ -186,38 +214,44 @@ 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, user()->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) {
+            $this->showWarningNotification( implode("\n", $warnings));

         }
 
         }
 

-        if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings));
+        $draftsEnabled = $this->isSignedIn();
+        $templates = $this->pageRepo->getPageTemplates(10);

 
 

-        $draftsEnabled = $this->signedIn;
-        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,

         ]);
     }
 
         ]);
     }
 


@@ -233,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());
     }


@@ -244,28 +278,27 @@ 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);
 
         $this->checkOwnablePermission('page-update', $page);
 

-        if (!$this->signedIn) {
+        if (!$this->isSignedIn()) {

             return response()->json([
                 'status' => 'error',
                 'message' => trans('errors.guests_cannot_save_drafts'),
             ], 500);
         }
 
             return response()->json([
                 'status' => 'error',
                 'message' => trans('errors.guests_cannot_save_drafts'),
             ], 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;
 
         $updateTime = $draft->updated_at->timestamp;

-        $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;

         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' => $utcUpdateTimestamp
+            'timestamp' => $updateTime

         ]);
     }
 
         ]);
     }
 


@@ -273,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());
     }
 


@@ -285,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]);

     }
 
 
     }
 
 


@@ -300,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]);

     }
 
     /**
     }
 
     /**


@@ -320,12 +353,13 @@ 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);

-        Activity::addMessage('page_delete', $book->id, $page->name);
-        session()->flash('success', trans('entities.pages_delete_success'));
-        $this->entityRepo->destroyPage($page);
+        $this->pageRepo->destroyPage($page);
+
+        Activity::addMessage('page_delete', $page->name, $book->id);
+        $this->showSuccessNotification( trans('entities.pages_delete_success'));

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


@@ -338,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);
         $book = $page->book;
         $this->checkOwnablePermission('page-update', $page);

-        session()->flash('success', trans('entities.pages_delete_draft_success'));
-        $this->entityRepo->destroyPage($page);
+        $this->showSuccessNotification( trans('entities.pages_delete_draft_success'));
+        $this->pageRepo->destroyPage($page);

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


@@ -350,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]);

     }
 
     /**
     }
 
     /**


@@ -364,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);


@@ -376,10 +411,12 @@ 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

         ]);
     }
 
         ]);
     }
 


@@ -388,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);


@@ -405,10 +442,11 @@ 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,

+            'revision' => $revision

         ]);
     }
 
         ]);
     }
 


@@ -417,109 +455,65 @@ 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());
     }
 

-    /**
-     * 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);
-        $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.
+     * Deletes a revision using the id of the specified revision.

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

-     * @return \Illuminate\Http\Response
+     * @param int $revId
+     * @return RedirectResponse|Redirector
+     *@throws BadRequestException
+     * @throws NotFoundException

      */
      */

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

     {
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $containedHtml = $this->exportService->pageToContainedHtml($page);
-        return response()->make($containedHtml, 200, [
-            'Content-Type'        => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html'
-        ]);
-    }
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('page-delete', $page);

 
 

-    /**
-     * 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'
-        ]);
-    }
+        $revision = $page->revisions()->where('id', '=', $revId)->first();
+        if ($revision === null) {
+            throw new NotFoundException("Revision #{$revId} not found");
+        }

 
 

-    /**
-     * 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
-        ]);
+        // Get the current revision for the page
+        $currentRevision = $page->getCurrentRevision();
+
+        // Check if its the latest revision, cannot delete latest revision.
+        if (intval($currentRevision->id) === intval($revId)) {
+            $this->showErrorNotification( trans('entities.revision_cannot_delete_latest'));
+            return response()->view('pages.revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400);
+        }
+
+        $revision->delete();
+        $this->showSuccessNotification( trans('entities.revision_delete_success'));
+        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
+     * @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


@@ -529,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
         ]);


@@ -539,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 === '') {


@@ -561,38 +558,112 @@ 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();
         }
 
             session()->flash(trans('entities.selected_book_chapter_not_found'));
             return redirect()->back();
         }
 

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

         Activity::add($page, 'page_move', $page->book->id);
         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());
     }
 
     /**
 
         return redirect($page->getUrl());
     }
 
     /**

-     * Set the permissions for this page.
+     * Show the view to copy a page.

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

+     * @return mixed
+     * @throws NotFoundException
+     */
+    public function showCopy($bookSlug, $pageSlug)
+    {
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('page-view', $page);
+        session()->flashInput(['name' => $page->name]);
+        return view('pages.copy', [
+            'book' => $page->book,
+            'page' => $page
+        ]);
+    }
+
+    /**
+     * Create a copy of a page within the requested target destination.

      * @param Request $request
      * @param Request $request

-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @param string $bookSlug
+     * @param string $pageSlug
+     * @return mixed
+     * @throws NotFoundException
+     * @throws Throwable

      */
      */

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

     {
     {

-        $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $this->checkOwnablePermission('restrictions-manage', $page);
-        $this->entityRepo->updateEntityPermissionsFromRequest($request, $page);
-        session()->flash('success', trans('entities.pages_permissions_success'));
-        return redirect($page->getUrl());
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $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) {
+                $this->showErrorNotification(trans('entities.selected_book_chapter_not_found'));
+                return redirect()->back();
+            }
+        }
+
+        $this->checkOwnablePermission('page-create', $parent);
+
+        $pageCopy = $this->pageRepo->copyPage($page, $parent, $request->get('name', ''));
+
+        Activity::add($pageCopy, 'page_create', $pageCopy->book->id);
+        $this->showSuccessNotification( trans('entities.pages_copy_success'));
+
+        return redirect($pageCopy->getUrl());

     }
 
     }
 

-    public function getLastXComments($pageId)
+    /**
+     * Show the Permissions view.
+     * @param string $bookSlug
+     * @param string $pageSlug
+     * @return Factory|View
+     * @throws NotFoundException
+     */
+    public function showPermissions($bookSlug, $pageSlug)

     {
     {

-        // $this->checkOwnablePermission('page-view', $page);
+        $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
+     * @return RedirectResponse|Redirector
+     * @throws NotFoundException
+     * @throws Throwable
+     */
+    public function permissions(Request $request, string $bookSlug, string $pageSlug)
+    {
+        $page = $this->pageRepo->getBySlug($pageSlug, $bookSlug);
+        $this->checkOwnablePermission('restrictions-manage', $page);
+        $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
+        $this->showSuccessNotification( trans('entities.pages_permissions_success'));
+        return redirect($page->getUrl());
+    }

 }
 }