X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/58fa7679bccafd00f9a50bcd4a87e96876331b03..refs/pull/2902/head:/app/Http/Controllers/AttachmentController.php diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index be20cda93..046b8c19d 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -1,4 +1,6 @@ -pageRepo = $pageRepo; } - /** * Endpoint at which attachments are uploaded to. + * * @throws ValidationException * @throws NotFoundException */ @@ -35,7 +37,7 @@ class AttachmentController extends Controller { $this->validate($request, [ 'uploaded_to' => 'required|integer|exists:pages,id', - 'file' => 'required|file' + 'file' => 'required|file', ]); $pageId = $request->get('uploaded_to'); @@ -57,12 +59,13 @@ class AttachmentController extends Controller /** * Update an uploaded attachment. + * * @throws ValidationException */ public function uploadUpdate(Request $request, $attachmentId) { $this->validate($request, [ - 'file' => 'required|file' + 'file' => 'required|file', ]); $attachment = Attachment::query()->findOrFail($attachmentId); @@ -83,6 +86,7 @@ class AttachmentController extends Controller /** * Get the update form for an attachment. + * * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ public function getUpdateForm(string $attachmentId) @@ -104,15 +108,16 @@ class AttachmentController extends Controller { /** @var Attachment $attachment */ $attachment = Attachment::query()->findOrFail($attachmentId); + try { $this->validate($request, [ 'attachment_edit_name' => 'required|string|min:1|max:255', - 'attachment_edit_url' => 'string|min:1|max:255|safe_url' + 'attachment_edit_url' => 'string|min:1|max:255|safe_url', ]); } catch (ValidationException $exception) { return response()->view('attachments.manager-edit-form', array_merge($request->only(['attachment_edit_name', 'attachment_edit_url']), [ 'attachment' => $attachment, - 'errors' => new MessageBag($exception->errors()), + 'errors' => new MessageBag($exception->errors()), ]), 422); } @@ -132,6 +137,7 @@ class AttachmentController extends Controller /** * Attach a link to a page. + * * @throws NotFoundException */ public function attachLink(Request $request) @@ -141,8 +147,8 @@ class AttachmentController extends Controller try { $this->validate($request, [ 'attachment_link_uploaded_to' => 'required|integer|exists:pages,id', - 'attachment_link_name' => 'required|string|min:1|max:255', - 'attachment_link_url' => 'required|string|min:1|max:255|safe_url' + 'attachment_link_name' => 'required|string|min:1|max:255', + 'attachment_link_url' => 'required|string|min:1|max:255|safe_url', ]); } catch (ValidationException $exception) { return response()->view('attachments.manager-link-form', array_merge($request->only(['attachment_link_name', 'attachment_link_url']), [ @@ -172,6 +178,7 @@ class AttachmentController extends Controller { $page = $this->pageRepo->getById($pageId); $this->checkOwnablePermission('page-view', $page); + return view('attachments.manager-list', [ 'attachments' => $page->attachments->all(), ]); @@ -179,6 +186,7 @@ class AttachmentController extends Controller /** * Update the attachment sorting. + * * @throws ValidationException * @throws NotFoundException */ @@ -192,11 +200,13 @@ class AttachmentController extends Controller $attachmentOrder = $request->get('order'); $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId); + return response()->json(['message' => trans('entities.attachments_order_updated')]); } /** * Get an attachment from storage. + * * @throws FileNotFoundException * @throws NotFoundException */ @@ -204,6 +214,7 @@ class AttachmentController extends Controller { /** @var Attachment $attachment */ $attachment = Attachment::query()->findOrFail($attachmentId); + try { $page = $this->pageRepo->getById($attachment->uploaded_to); } catch (NotFoundException $exception) { @@ -222,11 +233,13 @@ class AttachmentController extends Controller if ($request->get('open') === 'true') { return $this->inlineDownloadResponse($attachmentContents, $fileName); } + return $this->downloadResponse($attachmentContents, $fileName); } /** * Delete a specific attachment in the system. + * * @throws Exception */ public function delete(string $attachmentId) @@ -235,6 +248,7 @@ class AttachmentController extends Controller $attachment = Attachment::query()->findOrFail($attachmentId); $this->checkOwnablePermission('attachment-delete', $attachment); $this->attachmentService->deleteFile($attachment); + return response()->json(['message' => trans('entities.attachments_deleted')]); } }