X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a24f3d7d4759df6b509533daaa1c9686a074e9fe..refs/pull/806/head:/app/Http/Controllers/ChapterController.php diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index 849835185..b737afc6d 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -1,31 +1,31 @@ bookRepo = $bookRepo; - $this->chapterRepo = $chapterRepo; + $this->entityRepo = $entityRepo; $this->userRepo = $userRepo; + $this->exportService = $exportService; parent::__construct(); } @@ -36,7 +36,7 @@ class ChapterController extends Controller */ public function create($bookSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); + $book = $this->entityRepo->getBySlug('book', $bookSlug); $this->checkOwnablePermission('chapter-create', $book); $this->setPageTitle(trans('entities.chapters_create')); return view('chapters/create', ['book' => $book, 'current' => $book]); @@ -54,12 +54,12 @@ class ChapterController extends Controller 'name' => 'required|string|max:255' ]); - $book = $this->bookRepo->getBySlug($bookSlug); + $book = $this->entityRepo->getBySlug('book', $bookSlug); $this->checkOwnablePermission('chapter-create', $book); $input = $request->all(); - $input['priority'] = $this->bookRepo->getNewPriority($book); - $chapter = $this->chapterRepo->createFromInput($input, $book); + $input['priority'] = $this->entityRepo->getNewBookPriority($book); + $chapter = $this->entityRepo->createFromInput('chapter', $input, $book); Activity::add($chapter, 'chapter_create', $book->id); return redirect($chapter->getUrl()); } @@ -72,15 +72,14 @@ class ChapterController extends Controller */ public function show($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('chapter-view', $chapter); - $sidebarTree = $this->bookRepo->getChildren($book); + $sidebarTree = $this->entityRepo->getBookChildren($chapter->book); Views::add($chapter); $this->setPageTitle($chapter->getShortName()); - $pages = $this->chapterRepo->getChildren($chapter); + $pages = $this->entityRepo->getChapterChildren($chapter); return view('chapters/show', [ - 'book' => $book, + 'book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter, 'sidebarTree' => $sidebarTree, @@ -96,11 +95,10 @@ class ChapterController extends Controller */ public function edit($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('chapter-update', $chapter); $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()])); - return view('chapters/edit', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]); + return view('chapters/edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** @@ -109,19 +107,15 @@ class ChapterController extends Controller * @param $bookSlug * @param $chapterSlug * @return Response + * @throws \BookStack\Exceptions\NotFoundException */ public function update(Request $request, $bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('chapter-update', $chapter); - if ($chapter->name !== $request->get('name')) { - $chapter->slug = $this->chapterRepo->findSuitableSlug($request->get('name'), $book->id, $chapter->id); - } - $chapter->fill($request->all()); - $chapter->updated_by = user()->id; - $chapter->save(); - Activity::add($chapter, 'chapter_update', $book->id); + + $this->entityRepo->updateFromInput('chapter', $chapter, $request->all()); + Activity::add($chapter, 'chapter_update', $chapter->book->id); return redirect($chapter->getUrl()); } @@ -133,11 +127,10 @@ class ChapterController extends Controller */ public function showDelete($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('chapter-delete', $chapter); $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()])); - return view('chapters/delete', ['book' => $book, 'chapter' => $chapter, 'current' => $chapter]); + return view('chapters/delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** @@ -148,11 +141,11 @@ class ChapterController extends Controller */ public function destroy($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $book = $chapter->book; $this->checkOwnablePermission('chapter-delete', $chapter); Activity::addMessage('chapter_delete', $book->id, $chapter->name); - $this->chapterRepo->destroy($chapter); + $this->entityRepo->destroyChapter($chapter); return redirect($book->getUrl()); } @@ -163,14 +156,14 @@ class ChapterController extends Controller * @return mixed * @throws \BookStack\Exceptions\NotFoundException */ - public function showMove($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + public function showMove($bookSlug, $chapterSlug) + { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()])); $this->checkOwnablePermission('chapter-update', $chapter); return view('chapters/move', [ 'chapter' => $chapter, - 'book' => $book + 'book' => $chapter->book ]); } @@ -182,9 +175,9 @@ class ChapterController extends Controller * @return mixed * @throws \BookStack\Exceptions\NotFoundException */ - public function move($bookSlug, $chapterSlug, Request $request) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + public function move($bookSlug, $chapterSlug, Request $request) + { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('chapter-update', $chapter); $entitySelection = $request->get('entity_selection', null); @@ -199,7 +192,7 @@ class ChapterController extends Controller $parent = false; if ($entityType == 'book') { - $parent = $this->bookRepo->getById($entityId); + $parent = $this->entityRepo->getById('book', $entityId); } if ($parent === false || $parent === null) { @@ -207,7 +200,7 @@ class ChapterController extends Controller return redirect()->back(); } - $this->chapterRepo->changeBook($parent->id, $chapter, true); + $this->entityRepo->changeBook('chapter', $parent->id, $chapter, true); Activity::add($chapter, 'chapter_move', $chapter->book->id); session()->flash('success', trans('entities.chapter_move_success', ['bookName' => $parent->name])); @@ -222,8 +215,7 @@ class ChapterController extends Controller */ public function showRestrict($bookSlug, $chapterSlug) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('restrictions-manage', $chapter); $roles = $this->userRepo->getRestrictableRoles(); return view('chapters/restrictions', [ @@ -241,11 +233,58 @@ class ChapterController extends Controller */ public function restrict($bookSlug, $chapterSlug, Request $request) { - $book = $this->bookRepo->getBySlug($bookSlug); - $chapter = $this->chapterRepo->getBySlug($chapterSlug, $book->id); + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); $this->checkOwnablePermission('restrictions-manage', $chapter); - $this->chapterRepo->updateEntityPermissionsFromRequest($request, $chapter); + $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter); session()->flash('success', trans('entities.chapters_permissions_success')); return redirect($chapter->getUrl()); } + + /** + * Exports a chapter to pdf . + * @param string $bookSlug + * @param string $chapterSlug + * @return \Illuminate\Http\Response + */ + public function exportPdf($bookSlug, $chapterSlug) + { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $pdfContent = $this->exportService->chapterToPdf($chapter); + return response()->make($pdfContent, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="' . $chapterSlug . '.pdf' + ]); + } + + /** + * Export a chapter to a self-contained HTML file. + * @param string $bookSlug + * @param string $chapterSlug + * @return \Illuminate\Http\Response + */ + public function exportHtml($bookSlug, $chapterSlug) + { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $containedHtml = $this->exportService->chapterToContainedHtml($chapter); + return response()->make($containedHtml, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="' . $chapterSlug . '.html' + ]); + } + + /** + * Export a chapter to a simple plaintext .txt file. + * @param string $bookSlug + * @param string $chapterSlug + * @return \Illuminate\Http\Response + */ + public function exportPlainText($bookSlug, $chapterSlug) + { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $containedHtml = $this->exportService->chapterToPlainText($chapter); + return response()->make($containedHtml, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="' . $chapterSlug . '.txt' + ]); + } }