Minor capitalisation fix for Estonian

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

diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 04e89ac5d1a0db18407398aabd3689951822eee8..56503a694fb06247f17a1f55ef3b57e9ee42ca7d 100644 (file)
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\FileUploadException;
 
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\FileUploadException;


@@ -14,22 +16,20 @@ 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;
     }
 

-

     /**
      * Endpoint at which attachments are uploaded to.
     /**
      * Endpoint at which attachments are uploaded to.

+     *

      * @throws ValidationException
      * @throws NotFoundException
      */
      * @throws ValidationException
      * @throws NotFoundException
      */


@@ -37,7 +37,7 @@ class AttachmentController extends Controller
     {
         $this->validate($request, [
             'uploaded_to' => 'required|integer|exists:pages,id',
     {
         $this->validate($request, [
             'uploaded_to' => 'required|integer|exists:pages,id',

-            'file' => 'required|file'
+            'file'        => 'required|file',

         ]);
 
         $pageId = $request->get('uploaded_to');
         ]);
 
         $pageId = $request->get('uploaded_to');


@@ -59,15 +59,16 @@ class AttachmentController extends Controller
 
     /**
      * Update an uploaded attachment.
 
     /**
      * Update an uploaded attachment.

+     *

      * @throws ValidationException
      */
     public function uploadUpdate(Request $request, $attachmentId)
     {
         $this->validate($request, [
      * @throws ValidationException
      */
     public function uploadUpdate(Request $request, $attachmentId)
     {
         $this->validate($request, [

-            '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);


@@ -85,11 +86,12 @@ class AttachmentController extends Controller
 
     /**
      * Get the update form for an attachment.
 
     /**
      * Get the update form for an attachment.

+     *

      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function getUpdateForm(string $attachmentId)
     {
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     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,23 +106,24 @@ 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',

-                '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,
             ]);
         } 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);
         }
 
             ]), 422);
         }
 

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

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

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

 
         $attachment = $this->attachmentService->updateFile($attachment, [
             'name' => $request->get('attachment_edit_name'),
 
         $attachment = $this->attachmentService->updateFile($attachment, [
             'name' => $request->get('attachment_edit_name'),


@@ -134,6 +137,7 @@ class AttachmentController extends Controller
 
     /**
      * Attach a link to a page.
 
     /**
      * Attach a link to a page.

+     *

      * @throws NotFoundException
      */
     public function attachLink(Request $request)
      * @throws NotFoundException
      */
     public function attachLink(Request $request)


@@ -143,8 +147,8 @@ class AttachmentController extends Controller
         try {
             $this->validate($request, [
                 'attachment_link_uploaded_to' => 'required|integer|exists:pages,id',
         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']), [
             ]);
         } catch (ValidationException $exception) {
             return response()->view('attachments.manager-link-form', array_merge($request->only(['attachment_link_name', 'attachment_link_url']), [


@@ -160,7 +164,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,


@@ -174,6 +178,7 @@ class AttachmentController extends Controller
     {
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-view', $page);
     {
         $page = $this->pageRepo->getById($pageId);
         $this->checkOwnablePermission('page-view', $page);

+

         return view('attachments.manager-list', [
             'attachments' => $page->attachments->all(),
         ]);
         return view('attachments.manager-list', [
             'attachments' => $page->attachments->all(),
         ]);


@@ -181,6 +186,7 @@ class AttachmentController extends Controller
 
     /**
      * Update the attachment sorting.
 
     /**
      * Update the attachment sorting.

+     *

      * @throws ValidationException
      * @throws NotFoundException
      */
      * @throws ValidationException
      * @throws NotFoundException
      */


@@ -194,17 +200,21 @@ class AttachmentController extends Controller
 
         $attachmentOrder = $request->get('order');
         $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId);
 
         $attachmentOrder = $request->get('order');
         $this->attachmentService->updateFileOrderWithinPage($attachmentOrder, $pageId);

+

         return response()->json(['message' => trans('entities.attachments_order_updated')]);
     }
 
     /**
      * Get an attachment from storage.
         return response()->json(['message' => trans('entities.attachments_order_updated')]);
     }
 
     /**
      * Get an attachment from storage.

+     *

      * @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,19 +227,28 @@ 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);

     }
 
     /**
      * Delete a specific attachment in the system.
     }
 
     /**
      * Delete a specific attachment in the system.

+     *

      * @throws Exception
      */
     public function delete(string $attachmentId)
     {
      * @throws Exception
      */
     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);
         $this->checkOwnablePermission('attachment-delete', $attachment);
         $this->attachmentService->deleteFile($attachment);

+

         return response()->json(['message' => trans('entities.attachments_deleted')]);
     }
 }
         return response()->json(['message' => trans('entities.attachments_deleted')]);
     }
 }