X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cdb1c7ef88a0054c46ba9eb040464bdea274b095..refs/pull/1026/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 221e21a99..80bbe56c1 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -5,7 +5,6 @@ use BookStack\Exceptions\NotFoundException; use BookStack\Repos\EntityRepo; use BookStack\Repos\UserRepo; use BookStack\Services\ExportService; -use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Http\Response; use Views; @@ -38,11 +37,18 @@ class PageController extends Controller * @param string $chapterSlug * @return Response * @internal param bool $pageSlug + * @throws NotFoundException */ public function create($bookSlug, $chapterSlug = null) { - $book = $this->entityRepo->getBySlug('book', $bookSlug); - $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null; + if ($chapterSlug !== null) { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $book = $chapter->book; + } else { + $chapter = null; + $book = $this->entityRepo->getBySlug('book', $bookSlug); + } + $parent = $chapter ? $chapter : $book; $this->checkOwnablePermission('page-create', $parent); @@ -52,7 +58,7 @@ class PageController extends Controller return redirect($draft->getUrl()); } - // Otherwise show edit view + // Otherwise show the edit view if they're a guest $this->setPageTitle(trans('entities.pages_new')); return view('pages/guest-create', ['parent' => $parent]); } @@ -71,8 +77,14 @@ class PageController extends Controller 'name' => 'required|string|max:255' ]); - $book = $this->entityRepo->getBySlug('book', $bookSlug); - $chapter = $chapterSlug ? $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug) : null; + if ($chapterSlug !== null) { + $chapter = $this->entityRepo->getBySlug('chapter', $chapterSlug, $bookSlug); + $book = $chapter->book; + } else { + $chapter = null; + $book = $this->entityRepo->getBySlug('book', $bookSlug); + } + $parent = $chapter ? $chapter : $book; $this->checkOwnablePermission('page-create', $parent); @@ -93,7 +105,7 @@ class PageController extends Controller public function editDraft($bookSlug, $pageId) { $draft = $this->entityRepo->getById('page', $pageId, true); - $this->checkOwnablePermission('page-create', $draft->book); + $this->checkOwnablePermission('page-create', $draft->parent); $this->setPageTitle(trans('entities.pages_edit_draft')); $draftsEnabled = $this->signedIn; @@ -119,12 +131,10 @@ class PageController extends Controller ]); $input = $request->all(); - $book = $this->entityRepo->getBySlug('book', $bookSlug); - $draftPage = $this->entityRepo->getById('page', $pageId, true); + $book = $draftPage->book; - $chapterId = intval($draftPage->chapter_id); - $parent = $chapterId !== 0 ? $this->entityRepo->getById('chapter', $chapterId) : $book; + $parent = $draftPage->parent; $this->checkOwnablePermission('page-create', $parent); if ($parent->isA('chapter')) { @@ -444,6 +454,40 @@ class PageController extends Controller return redirect($page->getUrl()); } + + /** + * Deletes a revision using the id of the specified revision. + * @param string $bookSlug + * @param string $pageSlug + * @param int $revId + * @throws NotFoundException + * @throws BadRequestException + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + */ + public function destroyRevision($bookSlug, $pageSlug, $revId) + { + $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $this->checkOwnablePermission('page-delete', $page); + + $revision = $page->revisions()->where('id', '=', $revId)->first(); + if ($revision === null) { + throw new NotFoundException("Revision #{$revId} not found"); + } + + // Get the current revision for the page + $currentRevision = $page->getCurrentRevision(); + + // Check if its the latest revision, cannot delete latest revision. + if (intval($currentRevision->id) === intval($revId)) { + session()->flash('error', trans('entities.revision_cannot_delete_latest')); + return response()->view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400); + } + + $revision->delete(); + session()->flash('success', trans('entities.revision_delete_success')); + return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]); + } + /** * Exports a page to a PDF. * https://github.com/barryvdh/laravel-dompdf @@ -456,10 +500,7 @@ class PageController extends Controller $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $page->html = $this->entityRepo->renderPage($page); $pdfContent = $this->exportService->pageToPdf($page); - return response()->make($pdfContent, 200, [ - 'Content-Type' => 'application/octet-stream', - 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.pdf' - ]); + return $this->downloadResponse($pdfContent, $pageSlug . '.pdf'); } /** @@ -473,10 +514,7 @@ class PageController extends Controller $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); $page->html = $this->entityRepo->renderPage($page); $containedHtml = $this->exportService->pageToContainedHtml($page); - return response()->make($containedHtml, 200, [ - 'Content-Type' => 'application/octet-stream', - 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html' - ]); + return $this->downloadResponse($containedHtml, $pageSlug . '.html'); } /** @@ -488,11 +526,8 @@ class PageController extends Controller public function exportPlainText($bookSlug, $pageSlug) { $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); - $containedHtml = $this->exportService->pageToPlainText($page); - return response()->make($containedHtml, 200, [ - 'Content-Type' => 'application/octet-stream', - 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.txt' - ]); + $pageText = $this->exportService->pageToPlainText($page); + return $this->downloadResponse($pageText, $pageSlug . '.txt'); } /**