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

index 630f888ed3e9dc0d16da96b622a03278b527cfb9..31ee4e970bd4952c9a9613863a723d33f7972560 100644 (file)

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

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

@@ -1,19 +1,19 @@

<?php namespace BookStack\Http\Controllers;

-use Activity;

-use BookStack\Entities\Managers\BookContents;

-use BookStack\Entities\Managers\PageContent;

-use BookStack\Entities\Managers\PageEditActivity;

-use BookStack\Entities\Page;

+use BookStack\Actions\View;

+use BookStack\Entities\Tools\BookContents;

+use BookStack\Entities\Tools\NextPreviousContentLocator;

+use BookStack\Entities\Tools\PageContent;

+use BookStack\Entities\Tools\PageEditActivity;

+use BookStack\Entities\Models\Page;

use BookStack\Entities\Repos\PageRepo;

+use BookStack\Entities\Tools\PermissionsUpdater;

use BookStack\Exceptions\NotFoundException;

-use BookStack\Exceptions\NotifyException;

use BookStack\Exceptions\PermissionsException;

use Exception;

use Illuminate\Http\Request;

use Illuminate\Validation\ValidationException;

use Throwable;

-use Views;

class PageController extends Controller

{

@@ -26,7 +26,6 @@ class PageController extends Controller

public function __construct(PageRepo $pageRepo)

{

$this->pageRepo = $pageRepo;

- parent::__construct();

}

/**

@@ -78,7 +77,7 @@ class PageController extends Controller

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

{

$draft = $this->pageRepo->getById($pageId);

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

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

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

$draftsEnabled = $this->isSignedIn();

@@ -104,10 +103,9 @@ class PageController extends Controller

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

]);

$draftPage = $this->pageRepo->getById($pageId);

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

+ $this->checkOwnablePermission('page-create', $draftPage->getParent());

$page = $this->pageRepo->publishDraft($draftPage, $request->all());

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

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

}

@@ -144,7 +142,9 @@ class PageController extends Controller

$page->load(['comments.createdBy']);

}

- Views::add($page);

+ $nextPreviousLocator = new NextPreviousContentLocator($page, $sidebarTree);

+ View::incrementFor($page);

$this->setPageTitle($page->getShortName());

return view('pages.show', [

'page' => $page,

@@ -152,7 +152,9 @@ class PageController extends Controller

'current' => $page,

'sidebarTree' => $sidebarTree,

'commentsEnabled' => $commentsEnabled,

- 'pageNav' => $pageNav

+ 'pageNav' => $pageNav,

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

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

]);

}

@@ -163,6 +165,8 @@ class PageController extends Controller

public function getPageAjax(int $pageId)

{

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

+ $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));

+ $page->addHidden(['book']);

return response()->json($page);

}

@@ -222,7 +226,6 @@ class PageController extends Controller

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

$this->pageRepo->update($page, $request->all());

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

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

}

@@ -244,8 +247,8 @@ class PageController extends Controller

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

return response()->json([

- 'status' => 'success',

- 'message' => trans('entities.pages_edit_draft_save_at'),

+ 'status' => 'success',

+ 'message' => trans('entities.pages_edit_draft_save_at'),

'timestamp' => $updateTime

]);

}

@@ -268,7 +271,7 @@ class PageController extends Controller

{

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

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

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

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

return view('pages.delete', [

'book' => $page->book,

'page' => $page,

@@ -284,7 +287,7 @@ class PageController extends Controller

{

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

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

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

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

return view('pages.delete', [

'book' => $page->book,

'page' => $page,

@@ -296,25 +299,21 @@ class PageController extends Controller

* Remove the specified page from storage.

* @throws NotFoundException

* @throws Throwable

- * @throws NotifyException

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

{

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

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

+ $parent = $page->getParent();

- $book = $page->book;

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

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

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

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

+ return redirect($parent->getUrl());

}

/**

* Remove the specified draft page from storage.

* @throws NotFoundException

- * @throws NotifyException

* @throws Throwable

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

@@ -343,9 +342,9 @@ class PageController extends Controller

->paginate(20)

->setPath(url('/pages/recently-updated'));

- return view('pages.detailed-listing', [

+ return view('common.detailed-listing-paginated', [

'title' => trans('entities.recently_updated_pages'),

- 'pages' => $pages

+ 'entities' => $pages

]);

}

@@ -383,7 +382,7 @@ class PageController extends Controller

try {

$parent = $this->pageRepo->move($page, $entitySelection);

} catch (Exception $exception) {

- if ($exception instanceof PermissionsException) {

+ if ($exception instanceof PermissionsException) {

$this->showPermissionError();

}

@@ -391,7 +390,6 @@ class PageController extends Controller

return redirect()->back();

}

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

$this->showSuccessNotification(trans('entities.pages_move_success', ['parentName' => $parent->name]));

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

}

@@ -428,7 +426,7 @@ class PageController extends Controller

try {

$pageCopy = $this->pageRepo->copy($page, $entitySelection, $newName);

} catch (Exception $exception) {

- if ($exception instanceof PermissionsException) {

+ if ($exception instanceof PermissionsException) {

$this->showPermissionError();

}

@@ -436,8 +434,6 @@ class PageController extends Controller

return redirect()->back();

}

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

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

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

}

@@ -451,7 +447,7 @@ class PageController extends Controller

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

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

return view('pages.permissions', [

- 'page' => $page,

+ 'page' => $page,

]);

}

@@ -460,14 +456,12 @@ class PageController extends Controller

* @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($bookSlug, $pageSlug);

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

- $restricted = $request->get('restricted') === 'true';

- $permissions = $request->filled('restrictions') ? collect($request->get('restrictions')) : null;

- $this->pageRepo->updatePermissions($page, $restricted, $permissions);

+ $permissionsUpdater->updateFromPermissionsForm($page, $request);

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

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