BookStack Code Mirror - bookstack/blobdiff - app/Http/Controllers/PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php

index 62a706c0df4b7ee1d2d89115273b7b01a0c2aea8..736fcf4f6d2b9c41b471340762b87fb62eec0dc9 100644 (file)

--- a/app/Http/Controllers/PageController.php

+++ b/app/Http/Controllers/PageController.php

@@ -45,18 +45,18 @@ class PageController extends Controller

public function create($bookSlug, $chapterSlug = null)

{

if ($chapterSlug !== null) {

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

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

$book = $chapter->book;

} else {

$chapter = null;

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

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

}

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

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

// Redirect to draft edit screen if signed in

- if ($this->signedIn) {

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

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

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

}

@@ -81,11 +81,11 @@ class PageController extends Controller

]);

if ($chapterSlug !== null) {

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

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

$book = $chapter->book;

} else {

$chapter = null;

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

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

}

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

@@ -111,7 +111,7 @@ class PageController extends Controller

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

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

- $draftsEnabled = $this->signedIn;

+ $draftsEnabled = $this->isSignedIn();

$templates = $this->pageRepo->getPageTemplates(10);

return view('pages.edit', [

@@ -166,7 +166,7 @@ class PageController extends Controller

public function show($bookSlug, $pageSlug)

{

try {

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

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

} catch (NotFoundException $e) {

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

if ($page === null) {

@@ -218,7 +218,7 @@ class PageController extends Controller

*/

public function edit($bookSlug, $pageSlug)

{

- $page = $this->pageRepo->getPageBySlug($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;

@@ -230,7 +230,7 @@ class PageController extends Controller

}

// Check for a current draft version for this user

- $userPageDraft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);

+ $userPageDraft = $this->pageRepo->getUserPageDraft($page, user()->id);

if ($userPageDraft !== null) {

$page->name = $userPageDraft->name;

$page->html = $userPageDraft->html;

@@ -240,10 +240,10 @@ class PageController extends Controller

}

if (count($warnings) > 0) {

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

+ $this->showWarningNotification( implode("\n", $warnings));

}

- $draftsEnabled = $this->signedIn;

+ $draftsEnabled = $this->isSignedIn();

$templates = $this->pageRepo->getPageTemplates(10);

return view('pages.edit', [

@@ -267,7 +267,7 @@ class PageController extends Controller

$this->validate($request, [

'name' => 'required|string|max:255'

]);

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

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

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

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

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

@@ -285,7 +285,7 @@ class PageController extends Controller

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

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

- if (!$this->signedIn) {

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

return response()->json([

'status' => 'error',

'message' => trans('errors.guests_cannot_save_drafts'),

@@ -322,7 +322,7 @@ class PageController extends Controller

*/

public function showDelete($bookSlug, $pageSlug)

{

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

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

$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]);

@@ -353,13 +353,13 @@ class PageController extends Controller

*/

public function destroy($bookSlug, $pageSlug)

{

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

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

$book = $page->book;

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

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

- Activity::addMessage('page_delete', $book->id, $page->name);

- session()->flash('success', trans('entities.pages_delete_success'));

+ Activity::addMessage('page_delete', $page->name, $book->id);

+ $this->showSuccessNotification( trans('entities.pages_delete_success'));

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

}

@@ -375,7 +375,7 @@ class PageController extends Controller

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

$book = $page->book;

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

- session()->flash('success', trans('entities.pages_delete_draft_success'));

+ $this->showSuccessNotification( trans('entities.pages_delete_draft_success'));

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

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

}

@@ -389,7 +389,7 @@ class PageController extends Controller

*/

public function showRevisions($bookSlug, $pageSlug)

{

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

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

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

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

}

@@ -403,7 +403,7 @@ class PageController extends Controller

*/

public function showRevision($bookSlug, $pageSlug, $revisionId)

{

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

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

$revision = $page->revisions()->where('id', '=', $revisionId)->first();

if ($revision === null) {

abort(404);

@@ -429,7 +429,7 @@ class PageController extends Controller

*/

public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)

{

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

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

$revision = $page->revisions()->where('id', '=', $revisionId)->first();

if ($revision === null) {

abort(404);

@@ -459,7 +459,7 @@ class PageController extends Controller

*/

public function restoreRevision($bookSlug, $pageSlug, $revisionId)

{

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

+ $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);

@@ -478,7 +478,7 @@ class PageController extends Controller

*/

public function destroyRevision($bookSlug, $pageSlug, $revId)

{

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

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

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

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

@@ -491,12 +491,12 @@ class PageController extends Controller

// Check if its the latest revision, cannot delete latest revision.

if (intval($currentRevision->id) === intval($revId)) {

- session()->flash('error', trans('entities.revision_cannot_delete_latest'));

+ $this->showErrorNotification( 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'));

+ $this->showSuccessNotification( trans('entities.revision_delete_success'));

return redirect($page->getUrl('/revisions'));

}

@@ -523,7 +523,7 @@ class PageController extends Controller

*/

public function showMove($bookSlug, $pageSlug)

{

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

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

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

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

return view('pages.move', [

@@ -543,7 +543,7 @@ class PageController extends Controller

*/

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

{

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

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

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

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

@@ -568,7 +568,7 @@ class PageController extends Controller

$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());

}

@@ -582,7 +582,7 @@ class PageController extends Controller

*/

public function showCopy($bookSlug, $pageSlug)

{

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

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

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

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

return view('pages.copy', [

@@ -602,7 +602,7 @@ class PageController extends Controller

*/

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

{

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

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

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

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

@@ -616,7 +616,7 @@ class PageController extends Controller

try {

$parent = $this->pageRepo->getById($entityType, $entityId);

} catch (Exception $e) {

- session()->flash(trans('entities.selected_book_chapter_not_found'));

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

return redirect()->back();

}

@@ -626,7 +626,7 @@ class PageController extends Controller

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

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

- session()->flash('success', trans('entities.pages_copy_success'));

+ $this->showSuccessNotification( trans('entities.pages_copy_success'));

return redirect($pageCopy->getUrl());

}

@@ -640,7 +640,7 @@ class PageController extends Controller

*/

public function showPermissions($bookSlug, $pageSlug)

{

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

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

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

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

return view('pages.permissions', [

@@ -660,10 +660,10 @@ class PageController extends Controller

*/

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

{

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

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

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

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

- session()->flash('success', trans('entities.pages_permissions_success'));

+ $this->showSuccessNotification( trans('entities.pages_permissions_success'));

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

}