Reviewed #2393, Removed image guessing and added testing

[bookstack] / app / Http / Controllers / AttachmentController.php

diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 04e89ac5d1a0db18407398aabd3689951822eee8..be20cda93de55506206f6305f5c07b414de5b6e9 100644 (file)
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -14,16 +14,14 @@ use Illuminate\Validation\ValidationException;
 class AttachmentController extends Controller
 {
     protected $attachmentService;
 class AttachmentController extends Controller
 {
     protected $attachmentService;

-    protected $attachment;

     protected $pageRepo;
 
     /**
      * AttachmentController constructor.
      */
     protected $pageRepo;
 
     /**
      * AttachmentController constructor.
      */

-    public function __construct(AttachmentService $attachmentService, Attachment $attachment, PageRepo $pageRepo)
+    public function __construct(AttachmentService $attachmentService, PageRepo $pageRepo)

     {
         $this->attachmentService = $attachmentService;
     {
         $this->attachmentService = $attachmentService;

-        $this->attachment = $attachment;

         $this->pageRepo = $pageRepo;
     }
 
         $this->pageRepo = $pageRepo;
     }
 


@@ -67,7 +65,7 @@ class AttachmentController extends Controller
             'file' => 'required|file'
         ]);
 
             'file' => 'required|file'
         ]);
 

-        $attachment = $this->attachment->newQuery()->findOrFail($attachmentId);
+        $attachment = Attachment::query()->findOrFail($attachmentId);

         $this->checkOwnablePermission('view', $attachment->page);
         $this->checkOwnablePermission('page-update', $attachment->page);
         $this->checkOwnablePermission('attachment-create', $attachment);
         $this->checkOwnablePermission('view', $attachment->page);
         $this->checkOwnablePermission('page-update', $attachment->page);
         $this->checkOwnablePermission('attachment-create', $attachment);


@@ -89,7 +87,7 @@ class AttachmentController extends Controller
      */
     public function getUpdateForm(string $attachmentId)
     {
      */
     public function getUpdateForm(string $attachmentId)
     {

-        $attachment = $this->attachment->findOrFail($attachmentId);
+        $attachment = Attachment::query()->findOrFail($attachmentId);

 
         $this->checkOwnablePermission('page-update', $attachment->page);
         $this->checkOwnablePermission('attachment-create', $attachment);
 
         $this->checkOwnablePermission('page-update', $attachment->page);
         $this->checkOwnablePermission('attachment-create', $attachment);


@@ -104,8 +102,8 @@ class AttachmentController extends Controller
      */
     public function update(Request $request, string $attachmentId)
     {
      */
     public function update(Request $request, string $attachmentId)
     {

-        $attachment = $this->attachment->newQuery()->findOrFail($attachmentId);
-
+        /** @var Attachment $attachment */
+        $attachment = Attachment::query()->findOrFail($attachmentId);

         try {
             $this->validate($request, [
                 'attachment_edit_name' => 'required|string|min:1|max:255',
         try {
             $this->validate($request, [
                 'attachment_edit_name' => 'required|string|min:1|max:255',


@@ -160,7 +158,7 @@ class AttachmentController extends Controller
 
         $attachmentName = $request->get('attachment_link_name');
         $link = $request->get('attachment_link_url');
 
         $attachmentName = $request->get('attachment_link_name');
         $link = $request->get('attachment_link_url');

-        $attachment = $this->attachmentService->saveNewFromLink($attachmentName, $link, intval($pageId));
+        $this->attachmentService->saveNewFromLink($attachmentName, $link, intval($pageId));

 
         return view('attachments.manager-link-form', [
             'pageId' => $pageId,
 
         return view('attachments.manager-link-form', [
             'pageId' => $pageId,


@@ -202,9 +200,10 @@ class AttachmentController extends Controller
      * @throws FileNotFoundException
      * @throws NotFoundException
      */
      * @throws FileNotFoundException
      * @throws NotFoundException
      */

-    public function get(string $attachmentId)
+    public function get(Request $request, string $attachmentId)

     {
     {

-        $attachment = $this->attachment->findOrFail($attachmentId);
+        /** @var Attachment $attachment */
+        $attachment = Attachment::query()->findOrFail($attachmentId);

         try {
             $page = $this->pageRepo->getById($attachment->uploaded_to);
         } catch (NotFoundException $exception) {
         try {
             $page = $this->pageRepo->getById($attachment->uploaded_to);
         } catch (NotFoundException $exception) {


@@ -217,8 +216,13 @@ class AttachmentController extends Controller
             return redirect($attachment->path);
         }
 
             return redirect($attachment->path);
         }
 

+        $fileName = $attachment->getFileName();

         $attachmentContents = $this->attachmentService->getAttachmentFromStorage($attachment);
         $attachmentContents = $this->attachmentService->getAttachmentFromStorage($attachment);

-        return $this->downloadResponse($attachmentContents, $attachment->getFileName());
+
+        if ($request->get('open') === 'true') {
+            return $this->inlineDownloadResponse($attachmentContents, $fileName);
+        }
+        return $this->downloadResponse($attachmentContents, $fileName);

     }
 
     /**
     }
 
     /**


@@ -227,7 +231,8 @@ class AttachmentController extends Controller
      */
     public function delete(string $attachmentId)
     {
      */
     public function delete(string $attachmentId)
     {

-        $attachment = $this->attachment->findOrFail($attachmentId);
+        /** @var Attachment $attachment */
+        $attachment = Attachment::query()->findOrFail($attachmentId);

         $this->checkOwnablePermission('attachment-delete', $attachment);
         $this->attachmentService->deleteFile($attachment);
         return response()->json(['message' => trans('entities.attachments_deleted')]);
         $this->checkOwnablePermission('attachment-delete', $attachment);
         $this->attachmentService->deleteFile($attachment);
         return response()->json(['message' => trans('entities.attachments_deleted')]);