X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/be4f3d62cd37c7b83eb86bbf5fffa00d20acf2ec..refs/pull/3503/head:/app/Http/Controllers/ChapterController.php diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index 1fe231a65..83b9bb692 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -1,281 +1,275 @@ -entityRepo = $entityRepo; - $this->userRepo = $userRepo; - $this->exportService = $exportService; - parent::__construct(); + $this->chapterRepo = $chapterRepo; } /** * Show the form for creating a new chapter. - * @param $bookSlug - * @return Response */ - public function create($bookSlug) + public function create(string $bookSlug) { - $book = $this->entityRepo->getBySlug('book', $bookSlug); + $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail(); $this->checkOwnablePermission('chapter-create', $book); + $this->setPageTitle(trans('entities.chapters_create')); - return view('chapters/create', ['book' => $book, 'current' => $book]); + + return view('chapters.create', ['book' => $book, 'current' => $book]); } /** * Store a newly created chapter in storage. - * @param $bookSlug - * @param Request $request - * @return Response + * + * @throws ValidationException */ - public function store($bookSlug, Request $request) + public function store(Request $request, string $bookSlug) { $this->validate($request, [ - 'name' => 'required|string|max:255' + 'name' => ['required', 'string', 'max:255'], ]); - $book = $this->entityRepo->getBySlug('book', $bookSlug); + $book = Book::visible()->where('slug', '=', $bookSlug)->firstOrFail(); $this->checkOwnablePermission('chapter-create', $book); - $input = $request->all(); - $input['priority'] = $this->entityRepo->getNewBookPriority($book); - $chapter = $this->entityRepo->createFromInput('chapter', $input, $book); - Activity::add($chapter, 'chapter_create', $book->id); + $chapter = $this->chapterRepo->create($request->all(), $book); + return redirect($chapter->getUrl()); } /** * Display the specified chapter. - * @param $bookSlug - * @param $chapterSlug - * @return Response */ - public function show($bookSlug, $chapterSlug) + public function show(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-view', $chapter); - $sidebarTree = $this->entityRepo->getBookChildren($chapter->book); - Views::add($chapter); + + $sidebarTree = (new BookContents($chapter->book))->getTree(); + $pages = $chapter->getVisiblePages(); + $nextPreviousLocator = new NextPreviousContentLocator($chapter, $sidebarTree); + View::incrementFor($chapter); + $this->setPageTitle($chapter->getShortName()); - $pages = $this->entityRepo->getChapterChildren($chapter); - return view('chapters/show', [ - 'book' => $chapter->book, - 'chapter' => $chapter, - 'current' => $chapter, + + return view('chapters.show', [ + 'book' => $chapter->book, + 'chapter' => $chapter, + 'current' => $chapter, 'sidebarTree' => $sidebarTree, - 'pages' => $pages + 'pages' => $pages, + 'next' => $nextPreviousLocator->getNext(), + 'previous' => $nextPreviousLocator->getPrevious(), ]); } /** * Show the form for editing the specified chapter. - * @param $bookSlug - * @param $chapterSlug - * @return Response */ - public function edit($bookSlug, $chapterSlug) + public function edit(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-update', $chapter); + $this->setPageTitle(trans('entities.chapters_edit_named', ['chapterName' => $chapter->getShortName()])); - return view('chapters/edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); + + return view('chapters.edit', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** * Update the specified chapter in storage. - * @param Request $request - * @param $bookSlug - * @param $chapterSlug - * @return Response - * @throws \BookStack\Exceptions\NotFoundException + * + * @throws NotFoundException */ - public function update(Request $request, $bookSlug, $chapterSlug) + public function update(Request $request, string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-update', $chapter); - $this->entityRepo->updateFromInput('chapter', $chapter, $request->all()); - Activity::add($chapter, 'chapter_update', $chapter->book->id); + $this->chapterRepo->update($chapter, $request->all()); + return redirect($chapter->getUrl()); } /** * Shows the page to confirm deletion of this chapter. - * @param $bookSlug - * @param $chapterSlug - * @return \Illuminate\View\View + * + * @throws NotFoundException */ - public function showDelete($bookSlug, $chapterSlug) + public function showDelete(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-delete', $chapter); + $this->setPageTitle(trans('entities.chapters_delete_named', ['chapterName' => $chapter->getShortName()])); - return view('chapters/delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); + + return view('chapters.delete', ['book' => $chapter->book, 'chapter' => $chapter, 'current' => $chapter]); } /** * Remove the specified chapter from storage. - * @param $bookSlug - * @param $chapterSlug - * @return Response + * + * @throws NotFoundException + * @throws Throwable */ - public function destroy($bookSlug, $chapterSlug) + public function destroy(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); - $book = $chapter->book; + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-delete', $chapter); - Activity::addMessage('chapter_delete', $book->id, $chapter->name); - $this->entityRepo->destroyChapter($chapter); - return redirect($book->getUrl()); + + $this->chapterRepo->destroy($chapter); + + return redirect($chapter->book->getUrl()); } /** * Show the page for moving a chapter. - * @param $bookSlug - * @param $chapterSlug - * @return mixed - * @throws \BookStack\Exceptions\NotFoundException + * + * @throws NotFoundException */ - public function showMove($bookSlug, $chapterSlug) + public function showMove(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->setPageTitle(trans('entities.chapters_move_named', ['chapterName' => $chapter->getShortName()])); $this->checkOwnablePermission('chapter-update', $chapter); - return view('chapters/move', [ + $this->checkOwnablePermission('chapter-delete', $chapter); + + return view('chapters.move', [ 'chapter' => $chapter, - 'book' => $chapter->book + 'book' => $chapter->book, ]); } /** * Perform the move action for a chapter. - * @param $bookSlug - * @param $chapterSlug - * @param Request $request - * @return mixed - * @throws \BookStack\Exceptions\NotFoundException + * + * @throws NotFoundException */ - public function move($bookSlug, $chapterSlug, Request $request) + public function move(Request $request, string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); $this->checkOwnablePermission('chapter-update', $chapter); + $this->checkOwnablePermission('chapter-delete', $chapter); $entitySelection = $request->get('entity_selection', null); if ($entitySelection === null || $entitySelection === '') { return redirect($chapter->getUrl()); } - $stringExploded = explode(':', $entitySelection); - $entityType = $stringExploded[0]; - $entityId = intval($stringExploded[1]); - - $parent = false; + try { + $newBook = $this->chapterRepo->move($chapter, $entitySelection); + } catch (PermissionsException $exception) { + $this->showPermissionError(); + } catch (MoveOperationException $exception) { + $this->showErrorNotification(trans('errors.selected_book_not_found')); - if ($entityType == 'book') { - $parent = $this->entityRepo->getById('book', $entityId); - } - - if ($parent === false || $parent === null) { - session()->flash('error', trans('errors.selected_book_not_found')); return redirect()->back(); } - $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])); + $this->showSuccessNotification(trans('entities.chapter_move_success', ['bookName' => $newBook->name])); return redirect($chapter->getUrl()); } /** - * Show the Restrictions view. - * @param $bookSlug - * @param $chapterSlug - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * Show the view to copy a chapter. + * + * @throws NotFoundException */ - public function showRestrict($bookSlug, $chapterSlug) + public function showCopy(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); - $this->checkOwnablePermission('restrictions-manage', $chapter); - $roles = $this->userRepo->getRestrictableRoles(); - return view('chapters/restrictions', [ + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); + $this->checkOwnablePermission('chapter-view', $chapter); + + session()->flashInput(['name' => $chapter->name]); + + return view('chapters.copy', [ + 'book' => $chapter->book, 'chapter' => $chapter, - 'roles' => $roles ]); } /** - * Set the restrictions for this chapter. - * @param $bookSlug - * @param $chapterSlug - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * Create a copy of a chapter within the requested target destination. + * + * @throws NotFoundException + * @throws Throwable */ - public function restrict($bookSlug, $chapterSlug, Request $request) + public function copy(Request $request, Cloner $cloner, string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); - $this->checkOwnablePermission('restrictions-manage', $chapter); - $this->entityRepo->updateEntityPermissionsFromRequest($request, $chapter); - session()->flash('success', trans('entities.chapters_permissions_success')); - return redirect($chapter->getUrl()); - } + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); + $this->checkOwnablePermission('chapter-view', $chapter); - /** - * 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 $this->downloadResponse($pdfContent, $chapterSlug . '.pdf'); + $entitySelection = $request->get('entity_selection') ?: null; + $newParentBook = $entitySelection ? $this->chapterRepo->findParentByIdentifier($entitySelection) : $chapter->getParent(); + + if (is_null($newParentBook)) { + $this->showErrorNotification(trans('errors.selected_book_not_found')); + + return redirect()->back(); + } + + $this->checkOwnablePermission('chapter-create', $newParentBook); + + $newName = $request->get('name') ?: $chapter->name; + $chapterCopy = $cloner->cloneChapter($chapter, $newParentBook, $newName); + $this->showSuccessNotification(trans('entities.chapters_copy_success')); + + return redirect($chapterCopy->getUrl()); } /** - * Export a chapter to a self-contained HTML file. - * @param string $bookSlug - * @param string $chapterSlug - * @return \Illuminate\Http\Response + * Show the Restrictions view. + * + * @throws NotFoundException */ - public function exportHtml($bookSlug, $chapterSlug) + public function showPermissions(string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); - $containedHtml = $this->exportService->chapterToContainedHtml($chapter); - return $this->downloadResponse($containedHtml, $chapterSlug . '.html'); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); + $this->checkOwnablePermission('restrictions-manage', $chapter); + + return view('chapters.permissions', [ + 'chapter' => $chapter, + ]); } /** - * Export a chapter to a simple plaintext .txt file. - * @param string $bookSlug - * @param string $chapterSlug - * @return \Illuminate\Http\Response + * Set the restrictions for this chapter. + * + * @throws NotFoundException */ - public function exportPlainText($bookSlug, $chapterSlug) + public function permissions(Request $request, PermissionsUpdater $permissionsUpdater, string $bookSlug, string $chapterSlug) { - $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); - $chapterText = $this->exportService->chapterToPlainText($chapter); - return $this->downloadResponse($chapterText, $chapterSlug . '.txt'); + $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug); + $this->checkOwnablePermission('restrictions-manage', $chapter); + + $permissionsUpdater->updateFromPermissionsForm($chapter, $request); + + $this->showSuccessNotification(trans('entities.chapters_permissions_success')); + + return redirect($chapter->getUrl()); } }