<?php namespace BookStack\Http\Controllers;
use Activity;
+use BookStack\Auth\UserRepo;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\ExportService;
+use BookStack\Entities\Repos\PageRepo;
use BookStack\Exceptions\NotFoundException;
-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\UserRepo;
-use BookStack\Services\ExportService;
+use GatherContent\Htmldiff\Htmldiff;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Views;
-use GatherContent\Htmldiff\Htmldiff;
class PageController extends Controller
{
- protected $entityRepo;
+ protected $pageRepo;
protected $exportService;
protected $userRepo;
/**
* PageController constructor.
- * @param EntityRepo $entityRepo
- * @param ExportService $exportService
+ * @param \BookStack\Entities\Repos\PageRepo $pageRepo
+ * @param \BookStack\Entities\ExportService $exportService
* @param UserRepo $userRepo
*/
- public function __construct(EntityRepo $entityRepo, ExportService $exportService, UserRepo $userRepo)
+ public function __construct(PageRepo $pageRepo, ExportService $exportService, UserRepo $userRepo)
{
- $this->entityRepo = $entityRepo;
+ $this->pageRepo = $pageRepo;
$this->exportService = $exportService;
$this->userRepo = $userRepo;
parent::__construct();
public function create($bookSlug, $chapterSlug = null)
{
if ($chapterSlug !== null) {
- $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+ $chapter = $this->pageRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
$book = $chapter->book;
} else {
$chapter = null;
- $book = $this->entityRepo->getBySlug('book', $bookSlug);
+ $book = $this->pageRepo->getBySlug('book', $bookSlug);
}
$parent = $chapter ? $chapter : $book;
// Redirect to draft edit screen if signed in
if ($this->signedIn) {
- $draft = $this->entityRepo->getDraftPage($book, $chapter);
+ $draft = $this->pageRepo->getDraftPage($book, $chapter);
return redirect($draft->getUrl());
}
// Otherwise show the edit view if they're a guest
$this->setPageTitle(trans('entities.pages_new'));
- return view('pages/guest-create', ['parent' => $parent]);
+ return view('pages.guest-create', ['parent' => $parent]);
}
/**
]);
if ($chapterSlug !== null) {
- $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
+ $chapter = $this->pageRepo->getBySlug('chapter', $chapterSlug, $bookSlug);
$book = $chapter->book;
} else {
$chapter = null;
- $book = $this->entityRepo->getBySlug('book', $bookSlug);
+ $book = $this->pageRepo->getBySlug('book', $bookSlug);
}
$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' => ''
]);
*/
public function editDraft($bookSlug, $pageId)
{
- $draft = $this->entityRepo->getById('page', $pageId, true);
+ $draft = $this->pageRepo->getById('page', $pageId, true);
$this->checkOwnablePermission('page-create', $draft->parent);
$this->setPageTitle(trans('entities.pages_edit_draft'));
$draftsEnabled = $this->signedIn;
- return view('pages/edit', [
+ return view('pages.edit', [
'page' => $draft,
'book' => $draft->book,
'isDraft' => true,
]);
$input = $request->all();
- $draftPage = $this->entityRepo->getById('page', $pageId, true);
+ $draftPage = $this->pageRepo->getById('page', $pageId, true);
$book = $draftPage->book;
$parent = $draftPage->parent;
$this->checkOwnablePermission('page-create', $parent);
if ($parent->isA('chapter')) {
- $input['priority'] = $this->entityRepo->getNewChapterPriority($parent);
+ $input['priority'] = $this->pageRepo->getNewChapterPriority($parent);
} 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());
public function show($bookSlug, $pageSlug)
{
try {
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
} catch (NotFoundException $e) {
- $page = $this->entityRepo->getPageByOldSlug($pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageByOldSlug($pageSlug, $bookSlug);
if ($page === null) {
throw $e;
}
$this->checkOwnablePermission('page-view', $page);
- $page->html = $this->entityRepo->renderPage($page);
- $sidebarTree = $this->entityRepo->getBookChildren($page->book);
- $pageNav = $this->entityRepo->getPageNav($page->html);
+ $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');
Views::add($page);
$this->setPageTitle($page->getShortName());
- return view('pages/show', [
+ return view('pages.show', [
'page' => $page,'book' => $page->book,
'current' => $page,
'sidebarTree' => $sidebarTree,
*/
public function getPageAjax($pageId)
{
- $page = $this->entityRepo->getById('page', $pageId);
+ $page = $this->pageRepo->getById('page', $pageId);
return response()->json($page);
}
* @param string $bookSlug
* @param string $pageSlug
* @return Response
+ * @throws NotFoundException
*/
public function edit($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($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 = [];
- 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
- 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, $this->currentUser->id);
+ if ($userPageDraft !== null) {
+ $page->name = $userPageDraft->name;
+ $page->html = $userPageDraft->html;
+ $page->markdown = $userPageDraft->markdown;
$page->isDraft = true;
- $warnings [] = $this->entityRepo->getUserPageDraftMessage($draft);
+ $warnings [] = $this->pageRepo->getUserPageDraftMessage($userPageDraft);
}
if (count($warnings) > 0) {
}
$draftsEnabled = $this->signedIn;
- return view('pages/edit', [
+ return view('pages.edit', [
'page' => $page,
'book' => $page->book,
'current' => $page,
$this->validate($request, [
'name' => 'required|string|max:255'
]);
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$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());
}
*/
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);
if (!$this->signedIn) {
], 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;
return response()->json([
*/
public function redirectFromLink($pageId)
{
- $page = $this->entityRepo->getById('page', $pageId);
+ $page = $this->pageRepo->getById('page', $pageId);
return redirect($page->getUrl());
}
*/
public function showDelete($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($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]);
+ return view('pages.delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
}
*/
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()]));
- return view('pages/delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
+ return view('pages.delete', ['book' => $page->book, 'page' => $page, 'current' => $page]);
}
/**
*/
public function destroy($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$book = $page->book;
$this->checkOwnablePermission('page-delete', $page);
- $this->entityRepo->destroyPage($page);
+ $this->pageRepo->destroyPage($page);
Activity::addMessage('page_delete', $book->id, $page->name);
session()->flash('success', trans('entities.pages_delete_success'));
*/
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);
session()->flash('success', trans('entities.pages_delete_draft_success'));
- $this->entityRepo->destroyPage($page);
+ $this->pageRepo->destroyPage($page);
return redirect($book->getUrl());
}
* @param string $bookSlug
* @param string $pageSlug
* @return \Illuminate\View\View
+ * @throws NotFoundException
*/
public function showRevisions($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$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]);
}
/**
*/
public function showRevision($bookSlug, $pageSlug, $revisionId)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$revision = $page->revisions()->where('id', '=', $revisionId)->first();
if ($revision === null) {
abort(404);
$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' => null,
'revision' => $revision
]);
}
*/
public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$revision = $page->revisions()->where('id', '=', $revisionId)->first();
if ($revision === null) {
abort(404);
$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,
*/
public function restoreRevision($bookSlug, $pageSlug, $revisionId)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$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());
}
+
+ /**
+ * Deletes a revision using the id of the specified revision.
+ * @param string $bookSlug
+ * @param string $pageSlug
+ * @param int $revId
+ * @throws NotFoundException
+ * @throws BadRequestException
+ * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+ */
+ public function destroyRevision($bookSlug, $pageSlug, $revId)
+ {
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $this->checkOwnablePermission('page-delete', $page);
+
+ $revision = $page->revisions()->where('id', '=', $revId)->first();
+ if ($revision === null) {
+ throw new NotFoundException("Revision #{$revId} not found");
+ }
+
+ // 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)) {
+ session()->flash('error', 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'));
+ return view('pages.revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
+ }
+
/**
* Exports a page to a PDF.
* https://github.com/barryvdh/laravel-dompdf
*/
public function exportPdf($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
- $page->html = $this->entityRepo->renderPage($page);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $page->html = $this->pageRepo->renderPage($page);
$pdfContent = $this->exportService->pageToPdf($page);
- return response()->make($pdfContent, 200, [
- 'Content-Type' => 'application/octet-stream',
- 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.pdf'
- ]);
+ return $this->downloadResponse($pdfContent, $pageSlug . '.pdf');
}
/**
*/
public function exportHtml($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
- $page->html = $this->entityRepo->renderPage($page);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $page->html = $this->pageRepo->renderPage($page);
$containedHtml = $this->exportService->pageToContainedHtml($page);
- return response()->make($containedHtml, 200, [
- 'Content-Type' => 'application/octet-stream',
- 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html'
- ]);
+ return $this->downloadResponse($containedHtml, $pageSlug . '.html');
}
/**
*/
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'
- ]);
- }
-
- /**
- * 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
- ]);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $pageText = $this->exportService->pageToPlainText($page);
+ return $this->downloadResponse($pageText, $pageSlug . '.txt');
}
/**
*/
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(baseUrl('/pages/recently-updated'));
+ return view('pages.detailed-listing', [
'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
*/
public function showMove($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$this->checkOwnablePermission('page-update', $page);
- return view('pages/move', [
+ $this->checkOwnablePermission('page-delete', $page);
+ return view('pages.move', [
'book' => $page->book,
'page' => $page
]);
*/
public function move($bookSlug, $pageSlug, Request $request)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$this->checkOwnablePermission('page-update', $page);
+ $this->checkOwnablePermission('page-delete', $page);
$entitySelection = $request->get('entity_selection', null);
if ($entitySelection === null || $entitySelection === '') {
try {
- $parent = $this->entityRepo->getById($entityType, $entityId);
+ $parent = $this->pageRepo->getById($entityType, $entityId);
} catch (\Exception $e) {
session()->flash(trans('entities.selected_book_chapter_not_found'));
return redirect()->back();
$this->checkOwnablePermission('page-create', $parent);
- $this->entityRepo->changePageParent($page, $parent);
+ $this->pageRepo->changePageParent($page, $parent);
Activity::add($page, 'page_move', $page->book->id);
session()->flash('success', trans('entities.pages_move_success', ['parentName' => $parent->name]));
*/
public function showCopy($bookSlug, $pageSlug)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
- $this->checkOwnablePermission('page-update', $page);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $this->checkOwnablePermission('page-view', $page);
session()->flashInput(['name' => $page->name]);
- return view('pages/copy', [
+ return view('pages.copy', [
'book' => $page->book,
'page' => $page
]);
*/
public function copy($bookSlug, $pageSlug, Request $request)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
- $this->checkOwnablePermission('page-update', $page);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
+ $this->checkOwnablePermission('page-view', $page);
$entitySelection = $request->get('entity_selection', null);
if ($entitySelection === null || $entitySelection === '') {
$entityId = intval($stringExploded[1]);
try {
- $parent = $this->entityRepo->getById($entityType, $entityId);
+ $parent = $this->pageRepo->getById($entityType, $entityId);
} catch (\Exception $e) {
session()->flash(trans('entities.selected_book_chapter_not_found'));
return redirect()->back();
$this->checkOwnablePermission('page-create', $parent);
- $pageCopy = $this->entityRepo->copyPage($page, $parent, $request->get('name', ''));
+ $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'));
return redirect($pageCopy->getUrl());
}
+ /**
+ * Show the Permissions view.
+ * @param string $bookSlug
+ * @param string $pageSlug
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ * @throws NotFoundException
+ */
+ public function showPermissions($bookSlug, $pageSlug)
+ {
+ $page = $this->pageRepo->getPageBySlug($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 Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws NotFoundException
+ * @throws \Throwable
*/
- public function restrict($bookSlug, $pageSlug, Request $request)
+ public function permissions($bookSlug, $pageSlug, Request $request)
{
- $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
+ $page = $this->pageRepo->getPageBySlug($pageSlug, $bookSlug);
$this->checkOwnablePermission('restrictions-manage', $page);
- $this->entityRepo->updateEntityPermissionsFromRequest($request, $page);
+ $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
session()->flash('success', trans('entities.pages_permissions_success'));
return redirect($page->getUrl());
}
projects / bookstack / blobdiff