Closes #69. Implemented and tested memcached.

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index c84bc803f53a50e1bdbfd12cab37af2e15b7ea68..e78ae13e4c2972067ef9ed4232f6771426ab852d 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,14 +1,18 @@
 <?php
 
 <?php
 

-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;

 
 

+use Activity;
+use BookStack\Services\ExportService;

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

-use Illuminate\Support\Str;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
-use Oxbow\Repos\PageRepo;
+use Illuminate\Support\Facades\Auth;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Views;

 
 class PageController extends Controller
 {
 
 class PageController extends Controller
 {


@@ -16,78 +20,70 @@ class PageController extends Controller
     protected $pageRepo;
     protected $bookRepo;
     protected $chapterRepo;
     protected $pageRepo;
     protected $bookRepo;
     protected $chapterRepo;

+    protected $exportService;

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

-     * @param PageRepo $pageRepo
-     * @param BookRepo $bookRepo
-     * @param ChapterRepo $chapterRepo
+     * @param PageRepo      $pageRepo
+     * @param BookRepo      $bookRepo
+     * @param ChapterRepo   $chapterRepo
+     * @param ExportService $exportService

      */
      */

-    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo)
+    public function __construct(PageRepo $pageRepo, BookRepo $bookRepo, ChapterRepo $chapterRepo, ExportService $exportService)

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

-    }
-
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return Response
-     */
-    public function index()
-    {
-        //
+        $this->exportService = $exportService;
+        parent::__construct();

     }
 
     /**
     }
 
     /**

-     * Show the form for creating a new resource.
+     * Show the form for creating a new page.

      *
      *

-     * @param $bookSlug
+     * @param      $bookSlug

      * @param bool $chapterSlug
      * @return Response
      * @internal param bool $pageSlug
      */
     public function create($bookSlug, $chapterSlug = false)
     {
      * @param bool $chapterSlug
      * @return Response
      * @internal param bool $pageSlug
      */
     public function create($bookSlug, $chapterSlug = false)
     {

+        $this->checkPermission('page-create');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
         $book = $this->bookRepo->getBySlug($bookSlug);
         $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;

+        $this->setPageTitle('Create New Page');

         return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
     }
 
     /**
         return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
     }
 
     /**

-     * Store a newly created resource in storage.
+     * Store a newly created page in storage.

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

-     * @param $bookSlug
+     * @param          $bookSlug

      * @return Response
      */
     public function store(Request $request, $bookSlug)
     {
      * @return Response
      */
     public function store(Request $request, $bookSlug)
     {

+        $this->checkPermission('page-create');

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

-            'name' => 'required|string|max:255',
-            'html' => 'required|string',
-            'parent' => 'integer|exists:pages,id'
+            'name'   => 'required|string|max:255'

         ]);
         ]);

-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $page = $this->pageRepo->newFromInput($request->all());

 
 

-        $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id);
-        $page->priority = $this->bookRepo->getNewPriority($book);
+        $input = $request->all();
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $chapterId = ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) ? $request->get('chapter') : null;
+        $input['priority'] = $this->bookRepo->getNewPriority($book);

 
 

-        if($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) {
-            $page->chapter_id = $request->get('chapter');
-        }
+        $page = $this->pageRepo->saveNew($input, $book, $chapterId);

 
 

-        $page->book_id = $book->id;
-        $page->text = strip_tags($page->html);
-        $page->save();
+        Activity::add($page, 'page_create', $book->id);

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

-     * Display the specified resource.
+     * Display the specified page.
+     * If the page is not found via the slug the
+     * revisions are searched for a match.

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


@@ -96,13 +92,23 @@ class PageController extends Controller
     public function show($bookSlug, $pageSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
     public function show($bookSlug, $pageSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        //dd($sidebarBookTree);
-        return view('pages/show', ['page' => $page, 'book' => $book]);
+
+        try {
+            $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        } catch (NotFoundHttpException $e) {
+            $page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug);
+            if ($page === null) abort(404);
+            return redirect($page->getUrl());
+        }
+
+        $sidebarTree = $this->bookRepo->getChildren($book);
+        Views::add($page);
+        $this->setPageTitle($page->getShortName());
+        return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]);

     }
 
     /**
     }
 
     /**

-     * Show the form for editing the specified resource.
+     * Show the form for editing the specified page.

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


@@ -110,27 +116,31 @@ class PageController extends Controller
      */
     public function edit($bookSlug, $pageSlug)
     {
      */
     public function edit($bookSlug, $pageSlug)
     {

+        $this->checkPermission('page-update');

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

-        return view('pages/edit', ['page' => $page, 'book' => $book]);
+        $this->setPageTitle('Editing Page ' . $page->getShortName());
+        return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]);

     }
 
     /**
     }
 
     /**

-     * Update the specified resource in storage.
+     * Update the specified page in storage.

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

-     * @param $bookSlug
-     * @param $pageSlug
+     * @param          $bookSlug
+     * @param          $pageSlug

      * @return Response
      */
     public function update(Request $request, $bookSlug, $pageSlug)
     {
      * @return Response
      */
     public function update(Request $request, $bookSlug, $pageSlug)
     {

+        $this->checkPermission('page-update');
+        $this->validate($request, [
+            'name'   => 'required|string|max:255'
+        ]);

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

-        $page->fill($request->all());
-        $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id, $page->id);
-        $page->text = strip_tags($page->html);
-        $page->save();
+        $this->pageRepo->updatePage($page, $book->id, $request->all());
+        Activity::add($page, 'page_update', $book->id);

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


@@ -147,80 +157,162 @@ class PageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Search all available pages, Across all books.
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * Show the deletion page for the specified page.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\View\View

      */
      */

-    public function searchAll(Request $request)
+    public function showDelete($bookSlug, $pageSlug)

     {
     {

-        $searchTerm = $request->get('term');
-        if(empty($searchTerm)) return redirect()->back();
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->setPageTitle('Delete Page ' . $page->getShortName());
+        return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
+    }

 
 

-        $pages = $this->pageRepo->getBySearch($searchTerm);
-        return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]);
+    /**
+     * Remove the specified page from storage.
+     *
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return Response
+     * @internal param int $id
+     */
+    public function destroy($bookSlug, $pageSlug)
+    {
+        $this->checkPermission('page-delete');
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        Activity::addMessage('page_delete', $book->id, $page->name);
+        $this->pageRepo->destroy($page);
+        return redirect($book->getUrl());

     }
 
     /**
     }
 
     /**

-     * Shows the view which allows pages to be re-ordered and sorted.
+     * Shows the last revisions for this page.

      * @param $bookSlug
      * @param $bookSlug

+     * @param $pageSlug

      * @return \Illuminate\View\View
      */
      * @return \Illuminate\View\View
      */

-    public function sortPages($bookSlug)
+    public function showRevisions($bookSlug, $pageSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        return view('pages/sort', ['book' => $book]);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $this->setPageTitle('Revisions For ' . $page->getShortName());
+        return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]);

     }
 
     /**
     }
 
     /**

-     * Saves an array of sort mapping to pages and chapters.
-     *
+     * Shows a preview of a single revision

      * @param $bookSlug
      * @param $bookSlug

-     * @param Request $request
+     * @param $pageSlug
+     * @param $revisionId
+     * @return \Illuminate\View\View
+     */
+    public function showRevision($bookSlug, $pageSlug, $revisionId)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $revision = $this->pageRepo->getRevisionById($revisionId);
+        $page->fill($revision->toArray());
+        $this->setPageTitle('Page Revision For ' . $page->getShortName());
+        return view('pages/revision', ['page' => $page, 'book' => $book]);
+    }
+
+    /**
+     * Restores a page using the content of the specified revision.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @param $revisionId

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */

-    public function savePageSort($bookSlug, Request $request)
+    public function restoreRevision($bookSlug, $pageSlug, $revisionId)

     {
     {

+        $this->checkPermission('page-update');

         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);

-        // Return if no map sent
-        if(!$request->has('sort-tree')) {
-            return redirect($book->getUrl());
-        }
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $page = $this->pageRepo->restoreRevision($page, $book, $revisionId);
+        Activity::add($page, 'page_restore', $book->id);
+        return redirect($page->getUrl());
+    }

 
 

-        // Sort pages and chapters
-        $sortMap = json_decode($request->get('sort-tree'));
-        foreach($sortMap as $index => $bookChild) {
-            $id = $bookChild->id;
-            $isPage = $bookChild->type == 'page';
-            $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id);
-            $model->priority = $index;
-            if($isPage) {
-                $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter;
-            }
-            $model->save();
-        }
-        return redirect($book->getUrl());
+    /**
+     * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper.
+     * https://github.com/barryvdh/laravel-dompdf
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\Http\Response
+     */
+    public function exportPdf($bookSlug, $pageSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $pdfContent = $this->exportService->pageToPdf($page);
+        return response()->make($pdfContent, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.pdf'
+        ]);

     }
 
     }
 

-    public function showDelete($bookSlug, $pageSlug)
+    /**
+     * Export a page to a self-contained HTML file.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\Http\Response
+     */
+    public function exportHtml($bookSlug, $pageSlug)

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);

-        return view('pages/delete', ['book' => $book, 'page' => $page]);
+        $containedHtml = $this->exportService->pageToContainedHtml($page);
+        return response()->make($containedHtml, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html'
+        ]);

     }
 
     /**
     }
 
     /**

-     * Remove the specified resource from storage.
-     *
+     * Export a page to a simple plaintext .txt file.

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

-     * @return Response
-     * @internal param int $id
+     * @return \Illuminate\Http\Response

      */
      */

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

     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);

-        $page->delete();
-        return redirect($book->getUrl());
+        $containedHtml = $this->exportService->pageToPlainText($page);
+        return response()->make($containedHtml, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.txt'
+        ]);

     }
     }

+
+    /**
+     * Show a listing of recently created pages
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showRecentlyCreated()
+    {
+        $pages = $this->pageRepo->getRecentlyCreatedPaginated(20);
+        return view('pages/detailed-listing', [
+            'title' => 'Recently Created Pages',
+            'pages' => $pages
+        ]);
+    }
+
+    /**
+     * Show a listing of recently created pages
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showRecentlyUpdated()
+    {
+        $pages = $this->pageRepo->getRecentlyUpdatedPaginated(20);
+        return view('pages/detailed-listing', [
+            'title' => 'Recently Updated Pages',
+            'pages' => $pages
+        ]);
+    }
+

 }
 }