X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ae95d0a239cf5f7406f6af7e2b25fd5be94a8ad0..refs/pull/63/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index b59dd2446..b4ab9682b 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; parent::__construct(); } @@ -45,6 +50,7 @@ class PageController extends Controller $this->checkPermission('page-create'); $book = $this->bookRepo->getBySlug($bookSlug); $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false; + $this->setPageTitle('Create New Page'); return view('pages/create', ['book' => $book, 'chapter' => $chapter]); } @@ -59,26 +65,16 @@ class PageController extends Controller { $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' ]); - $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); + $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); - if ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) { - $page->chapter_id = $request->get('chapter'); - } + $page = $this->pageRepo->saveNew($input, $book, $chapterId); - $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); Activity::add($page, 'page_create', $book->id); return redirect($page->getUrl()); } @@ -94,7 +90,10 @@ class PageController extends Controller { $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); - return view('pages/show', ['page' => $page, 'book' => $book, 'current' => $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]); } /** @@ -109,6 +108,7 @@ class PageController extends Controller $this->checkPermission('page-update'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->setPageTitle('Editing Page ' . $page->getShortName()); return view('pages/edit', ['page' => $page, 'book' => $book, 'current' => $page]); } @@ -123,6 +123,9 @@ 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->pageRepo->updatePage($page, $book->id, $request->all()); @@ -142,64 +145,6 @@ class PageController extends Controller return redirect($page->getUrl()); } - /** - * 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. - * @param $bookSlug - * @return \Illuminate\View\View - */ - public function sortPages($bookSlug) - { - $this->checkPermission('book-update'); - $book = $this->bookRepo->getBySlug($bookSlug); - return view('pages/sort', ['book' => $book, 'current' => $book]); - } - - /** - * 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 @@ -211,6 +156,7 @@ class PageController extends Controller $this->checkPermission('page-delete'); $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); + $this->setPageTitle('Delete Page ' . $page->getShortName()); return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]); } @@ -228,8 +174,7 @@ class PageController extends Controller $book = $this->bookRepo->getBySlug($bookSlug); $page = $this->pageRepo->getBySlug($pageSlug, $book->id); Activity::addMessage('page_delete', $book->id, $page->name); - Activity::removeEntity($page); - $page->delete(); + $this->pageRepo->destroy($page); return redirect($book->getUrl()); } @@ -243,6 +188,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 +205,77 @@ 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()); + $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' + ]); + } + }