X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ae95d0a239cf5f7406f6af7e2b25fd5be94a8ad0..refs/pull/118/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index b59dd2446..da9273743 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -1,15 +1,17 @@ -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 @@ -42,50 +49,69 @@ 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); - $page = $this->pageRepo->newFromInput($request->all()); - $page->slug = $this->pageRepo->findSuitableSlug($page->name, $book->id); - $page->priority = $this->bookRepo->getNewPriority($book); + $draftPage = $this->pageRepo->getById($pageId, true); + + $chapterId = $draftPage->chapter_id; + $parent = $chapterId !== 0 ? $this->chapterRepo->getById($chapterId) : $book; + $this->checkOwnablePermission('page-create', $parent); - if ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) { - $page->chapter_id = $request->get('chapter'); + if ($parent->isA('chapter')) { + $input['priority'] = $this->chapterRepo->getNewPriority($parent); + } else { + $input['priority'] = $this->bookRepo->getNewPriority($parent); } - $page->book_id = $book->id; - $page->text = strip_tags($page->html); - $page->created_by = Auth::user()->id; - $page->updated_by = Auth::user()->id; - $page->save(); - $this->pageRepo->saveRevision($page); + $page = $this->pageRepo->publishDraft($draftPage, $input); + Activity::add($page, 'page_create', $book->id); return redirect($page->getUrl()); } /** * 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 @@ -93,28 +119,71 @@ class PageController extends Controller public function show($bookSlug, $pageSlug) { $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); - return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $page]); + + 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); + $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 @@ -122,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. @@ -143,80 +240,39 @@ class PageController extends Controller } /** - * Search all available pages, Across all books. - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View - */ - public function searchAll(Request $request) - { - $searchTerm = $request->get('term'); - if (empty($searchTerm)) return redirect()->back(); - - $pages = $this->pageRepo->getBySearch($searchTerm); - return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]); - } - - /** - * Shows the view which allows pages to be re-ordered and sorted. + * Show the deletion page for the specified page. * @param $bookSlug + * @param $pageSlug * @return \Illuminate\View\View */ - public function sortPages($bookSlug) + public function showDelete($bookSlug, $pageSlug) { - $this->checkPermission('book-update'); $book = $this->bookRepo->getBySlug($bookSlug); - return view('pages/sort', ['book' => $book, 'current' => $book]); + $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]); } - /** - * Saves an array of sort mapping to pages and chapters. - * - * @param $bookSlug - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function savePageSort($bookSlug, Request $request) - { - $this->checkPermission('book-update'); - $book = $this->bookRepo->getBySlug($bookSlug); - // Return if no map sent - if (!$request->has('sort-tree')) { - return redirect($book->getUrl()); - } - - // Sort pages and chapters - $sortMap = json_decode($request->get('sort-tree')); - foreach ($sortMap as $index => $bookChild) { - $id = $bookChild->id; - $isPage = $bookChild->type == 'page'; - $model = $isPage ? $this->pageRepo->getById($id) : $this->chapterRepo->getById($id); - $model->priority = $index; - if ($isPage) { - $model->chapter_id = ($bookChild->parentChapter === false) ? 0 : $bookChild->parentChapter; - } - $model->save(); - } - Activity::add($book, 'book_sort', $book->id); - return redirect($book->getUrl()); - } /** * Show the deletion page for the specified page. * @param $bookSlug - * @param $pageSlug + * @param $pageId * @return \Illuminate\View\View + * @throws NotFoundException */ - public function showDelete($bookSlug, $pageSlug) + public function showDeleteDraft($bookSlug, $pageId) { - $this->checkPermission('page-delete'); $book = $this->bookRepo->getBySlug($bookSlug); - $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $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 @@ -224,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()); } @@ -243,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]); } @@ -259,17 +333,138 @@ 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]); } + /** + * Restores a page using the content of the specified revision. + * @param $bookSlug + * @param $pageSlug + * @param $revisionId + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ public function restoreRevision($bookSlug, $pageSlug, $revisionId) { - $this->checkPermission('page-update'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); - $revision = $this->pageRepo->getRevisionById($revisionId); - $page = $this->pageRepo->updatePage($page, $book->id, $revision->toArray()); + $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()); + } + }