X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ea55b7f141a70e2d6edb209f6c48610a9c005e4e..refs/pull/110/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 006d84f6e..da9273743 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -1,15 +1,16 @@ -pageRepo = $pageRepo; $this->bookRepo = $bookRepo; $this->chapterRepo = $chapterRepo; + $this->exportService = $exportService; + $this->userRepo = $userRepo; parent::__construct(); } /** * Show the form for creating a new page. - * * @param $bookSlug * @param bool $chapterSlug * @return Response @@ -43,34 +49,60 @@ class PageController extends Controller */ public function create($bookSlug, $chapterSlug = false) { - $this->checkPermission('page-create'); $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false; - return view('pages/create', ['book' => $book, 'chapter' => $chapter]); + $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : null; + $parent = $chapter ? $chapter : $book; + $this->checkOwnablePermission('page-create', $parent); + $this->setPageTitle('Create New Page'); + + $draft = $this->pageRepo->getDraftPage($book, $chapter); + return redirect($draft->getUrl()); + } + + /** + * Show form to continue editing a draft page. + * @param $bookSlug + * @param $pageId + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function editDraft($bookSlug, $pageId) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $draft = $this->pageRepo->getById($pageId, true); + $this->checkOwnablePermission('page-create', $book); + $this->setPageTitle('Edit Page Draft'); + + return view('pages/edit', ['page' => $draft, 'book' => $book, 'isDraft' => true]); } /** - * Store a newly created page in storage. - * + * Store a new page by changing a draft into a page. * @param Request $request - * @param $bookSlug + * @param string $bookSlug * @return Response */ - public function store(Request $request, $bookSlug) + public function store(Request $request, $bookSlug, $pageId) { - $this->checkPermission('page-create'); $this->validate($request, [ - 'name' => 'required|string|max:255', - 'html' => 'required|string', - 'parent' => 'integer|exists:pages,id' + 'name' => 'required|string|max:255' ]); $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); - $page = $this->pageRepo->saveNew($input, $book, $chapterId); + $draftPage = $this->pageRepo->getById($pageId, true); + + $chapterId = $draftPage->chapter_id; + $parent = $chapterId !== 0 ? $this->chapterRepo->getById($chapterId) : $book; + $this->checkOwnablePermission('page-create', $parent); + + if ($parent->isA('chapter')) { + $input['priority'] = $this->chapterRepo->getNewPriority($parent); + } else { + $input['priority'] = $this->bookRepo->getNewPriority($parent); + } + + $page = $this->pageRepo->publishDraft($draftPage, $input); Activity::add($page, 'page_create', $book->id); return redirect($page->getUrl()); @@ -78,7 +110,8 @@ class PageController extends Controller /** * Display the specified page. - * + * If the page is not found via the slug the + * revisions are searched for a match. * @param $bookSlug * @param $pageSlug * @return Response @@ -86,29 +119,71 @@ class PageController extends Controller public function show($bookSlug, $pageSlug) { $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + + try { + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + } catch (NotFoundException $e) { + $page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug); + if ($page === null) abort(404); + return redirect($page->getUrl()); + } + + $this->checkOwnablePermission('page-view', $page); + + $sidebarTree = $this->bookRepo->getChildren($book); Views::add($page); - return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page]); + $this->setPageTitle($page->getShortName()); + return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page, 'sidebarTree' => $sidebarTree]); + } + + /** + * Get page from an ajax request. + * @param $pageId + * @return \Illuminate\Http\JsonResponse + */ + public function getPageAjax($pageId) + { + $page = $this->pageRepo->getById($pageId); + return response()->json($page); } /** * Show the form for editing the specified page. - * * @param $bookSlug * @param $pageSlug * @return Response */ public function edit($bookSlug, $pageSlug) { - $this->checkPermission('page-update'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('page-update', $page); + $this->setPageTitle('Editing Page ' . $page->getShortName()); + $page->isDraft = false; + + // Check for active editing + $warnings = []; + if ($this->pageRepo->isPageEditingActive($page, 60)) { + $warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60); + } + + // Check for a current draft version for this user + if ($this->pageRepo->hasUserGotPageDraft($page, $this->currentUser->id)) { + $draft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id); + $page->name = $draft->name; + $page->html = $draft->html; + $page->markdown = $draft->markdown; + $page->isDraft = true; + $warnings [] = $this->pageRepo->getUserPageDraftMessage($draft); + } + + if (count($warnings) > 0) session()->flash('warning', implode("\n", $warnings)); + return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]); } /** * Update the specified page in storage. - * * @param Request $request * @param $bookSlug * @param $pageSlug @@ -116,14 +191,42 @@ class PageController extends Controller */ 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); + $this->checkOwnablePermission('page-update', $page); $this->pageRepo->updatePage($page, $book->id, $request->all()); Activity::add($page, 'page_update', $book->id); return redirect($page->getUrl()); } + /** + * Save a draft update as a revision. + * @param Request $request + * @param $pageId + * @return \Illuminate\Http\JsonResponse + */ + public function saveDraft(Request $request, $pageId) + { + $page = $this->pageRepo->getById($pageId, true); + $this->checkOwnablePermission('page-update', $page); + if ($page->draft) { + $draft = $this->pageRepo->updateDraftPage($page, $request->only(['name', 'html', 'markdown'])); + } else { + $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown'])); + } + + $updateTime = $draft->updated_at->timestamp; + $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset; + return response()->json([ + 'status' => 'success', + 'message' => 'Draft saved at ', + 'timestamp' => $utcUpdateTimestamp + ]); + } + /** * Redirect from a special link url which * uses the page id rather than the name. @@ -144,15 +247,32 @@ class PageController extends Controller */ public function showDelete($bookSlug, $pageSlug) { - $this->checkPermission('page-delete'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('page-delete', $page); + $this->setPageTitle('Delete Page ' . $page->getShortName()); + return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]); + } + + + /** + * Show the deletion page for the specified page. + * @param $bookSlug + * @param $pageId + * @return \Illuminate\View\View + * @throws NotFoundException + */ + public function showDeleteDraft($bookSlug, $pageId) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getById($pageId, true); + $this->checkOwnablePermission('page-update', $page); + $this->setPageTitle('Delete Draft Page ' . $page->getShortName()); return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]); } /** * Remove the specified page from storage. - * * @param $bookSlug * @param $pageSlug * @return Response @@ -160,12 +280,29 @@ class PageController extends Controller */ public function destroy($bookSlug, $pageSlug) { - $this->checkPermission('page-delete'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('page-delete', $page); Activity::addMessage('page_delete', $book->id, $page->name); - Activity::removeEntity($page); - $page->delete(); + session()->flash('success', 'Page deleted'); + $this->pageRepo->destroy($page); + return redirect($book->getUrl()); + } + + /** + * Remove the specified draft page from storage. + * @param $bookSlug + * @param $pageId + * @return Response + * @throws NotFoundException + */ + public function destroyDraft($bookSlug, $pageId) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getById($pageId, true); + $this->checkOwnablePermission('page-update', $page); + session()->flash('success', 'Draft deleted'); + $this->pageRepo->destroy($page); return redirect($book->getUrl()); } @@ -179,6 +316,7 @@ class PageController extends Controller { $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->setPageTitle('Revisions For ' . $page->getShortName()); return view('pages/revisions', ['page' => $page, 'book' => $book, 'current' => $page]); } @@ -195,6 +333,7 @@ class PageController extends Controller $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]); } @@ -207,11 +346,125 @@ class PageController extends Controller */ public function restoreRevision($bookSlug, $pageSlug, $revisionId) { - $this->checkPermission('page-update'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('page-update', $page); $page = $this->pageRepo->restoreRevision($page, $book, $revisionId); Activity::add($page, 'page_restore', $book->id); return redirect($page->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' + ]); + } + + /** + * 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); + $containedHtml = $this->exportService->pageToContainedHtml($page); + return response()->make($containedHtml, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html' + ]); + } + + /** + * Export a page to a simple plaintext .txt file. + * @param $bookSlug + * @param $pageSlug + * @return \Illuminate\Http\Response + */ + public function exportPlainText($bookSlug, $pageSlug) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $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 + ]); + } + + /** + * Show the Restrictions view. + * @param $bookSlug + * @param $pageSlug + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function showRestrict($bookSlug, $pageSlug) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('restrictions-manage', $page); + $roles = $this->userRepo->getRestrictableRoles(); + return view('pages/restrictions', [ + 'page' => $page, + 'roles' => $roles + ]); + } + + /** + * Set the permissions for this page. + * @param $bookSlug + * @param $pageSlug + * @param Request $request + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function restrict($bookSlug, $pageSlug, Request $request) + { + $book = $this->bookRepo->getBySlug($bookSlug); + $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->checkOwnablePermission('restrictions-manage', $page); + $this->pageRepo->updateEntityPermissionsFromRequest($request, $page); + session()->flash('success', 'Page Permissions Updated'); + return redirect($page->getUrl()); + } + }