Updated Swedish translation

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

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

+     * @throws NotFoundException

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


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

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

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

+        $page->html = $this->entityRepo->renderPage($page);

         $sidebarTree = $this->entityRepo->getBookChildren($page->book);
         $sidebarTree = $this->entityRepo->getBookChildren($page->book);

-        $pageNav = $this->entityRepo->getPageNav($page);
-        
+        $pageNav = $this->entityRepo->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', ['page' => $page, 'book' => $page->book,
-                                   'current' => $page, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]);
+        return view('pages/show', [
+            'page' => $page,'book' => $page->book,
+            'current' => $page,
+            'sidebarTree' => $sidebarTree,
+            'commentsEnabled' => $commentsEnabled,
+            'pageNav' => $pageNav
+        ]);

     }
 
     /**
     }
 
     /**


@@ -207,7 +222,9 @@ class PageController extends Controller
             $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);
         }
 
             $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);
         }
 

-        if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings));
+        if (count($warnings) > 0) {
+            session()->flash('warning', implode("\n", $warnings));
+        }

 
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [
 
         $draftsEnabled = $this->signedIn;
         return view('pages/edit', [


@@ -258,11 +275,10 @@ class PageController extends Controller
         $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
 
         $updateTime = $draft->updated_at->timestamp;
         $draft = $this->entityRepo->updatePageDraft($page, $request->only(['name', 'html', 'markdown']));
 
         $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

         ]);
     }
 
         ]);
     }
 


@@ -320,9 +336,10 @@ class PageController extends Controller
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $book = $page->book;
         $this->checkOwnablePermission('page-delete', $page);
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $book = $page->book;
         $this->checkOwnablePermission('page-delete', $page);

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

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

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

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


@@ -366,14 +383,18 @@ class PageController extends Controller
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId, false);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $page->fill($revision->toArray());
 
         $page->fill($revision->toArray());

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

         return view('pages/revision', [
             'page' => $page,
             'book' => $page->book,
         return view('pages/revision', [
             'page' => $page,
             'book' => $page->book,

+            'revision' => $revision

         ]);
     }
 
         ]);
     }
 


@@ -387,7 +408,10 @@ class PageController extends Controller
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;
 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;


@@ -400,6 +424,7 @@ class PageController extends Controller
             'page' => $page,
             'book' => $page->book,
             'diff' => $diff,
             'page' => $page,
             'book' => $page->book,
             'diff' => $diff,

+            'revision' => $revision

         ]);
     }
 
         ]);
     }
 


@@ -420,7 +445,7 @@ class PageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper.
+     * Exports a page to a PDF.

      * https://github.com/barryvdh/laravel-dompdf
      * @param string $bookSlug
      * @param string $pageSlug
      * https://github.com/barryvdh/laravel-dompdf
      * @param string $bookSlug
      * @param string $pageSlug


@@ -429,6 +454,7 @@ class PageController extends Controller
     public function exportPdf($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function exportPdf($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

+        $page->html = $this->entityRepo->renderPage($page);

         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',
         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -445,6 +471,7 @@ class PageController extends Controller
     public function exportHtml($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function exportHtml($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

+        $page->html = $this->entityRepo->renderPage($page);

         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',
         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -580,5 +607,4 @@ class PageController extends Controller
         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }
         session()->flash('success', trans('entities.pages_permissions_success'));
         return redirect($page->getUrl());
     }

-

 }
 }