LDAP: Added TLS support

[bookstack] / app / Uploads / AttachmentService.php

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 02220771aaee631e1d7bd0643d865d9196932b3e..e85901e17c7d34fae1e9967b27c119f824a708dc 100644 (file)
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -88,12 +88,8 @@ class AttachmentService extends UploadService
 
     /**
      * Save a new File attachment from a given link and name.
 
     /**
      * Save a new File attachment from a given link and name.

-     * @param string $name
-     * @param string $link
-     * @param int $page_id
-     * @return Attachment

      */
      */

-    public function saveNewFromLink($name, $link, $page_id)
+    public function saveNewFromLink(string $name, string $link, int $page_id): Attachment

     {
         $largestExistingOrder = Attachment::where('uploaded_to', '=', $page_id)->max('order');
         return Attachment::forceCreate([
     {
         $largestExistingOrder = Attachment::where('uploaded_to', '=', $page_id)->max('order');
         return Attachment::forceCreate([


@@ -123,13 +119,11 @@ class AttachmentService extends UploadService
 
     /**
      * Update the details of a file.
 
     /**
      * Update the details of a file.

-     * @param Attachment $attachment
-     * @param $requestData
-     * @return Attachment

      */
      */

-    public function updateFile(Attachment $attachment, $requestData)
+    public function updateFile(Attachment $attachment, array $requestData): Attachment

     {
         $attachment->name = $requestData['name'];
     {
         $attachment->name = $requestData['name'];

+

         if (isset($requestData['link']) && trim($requestData['link']) !== '') {
             $attachment->path = $requestData['link'];
             if (!$attachment->external) {
         if (isset($requestData['link']) && trim($requestData['link']) !== '') {
             $attachment->path = $requestData['link'];
             if (!$attachment->external) {


@@ -137,6 +131,7 @@ class AttachmentService extends UploadService
                 $attachment->external = true;
             }
         }
                 $attachment->external = true;
             }
         }

+

         $attachment->save();
         return $attachment;
     }
         $attachment->save();
         return $attachment;
     }