Updated 'Spanish Argentina' translation.

[bookstack] / app / Services / AttachmentService.php

diff --git a/app/Services/AttachmentService.php b/app/Services/AttachmentService.php
index 592d67e63b5f11ffbe8edc911dc7940a1e715373..3a6f95dcc7aa7f84d4520e32ab1e697695c2ce69 100644 (file)
--- a/app/Services/AttachmentService.php
+++ b/app/Services/AttachmentService.php
@@ -8,15 +8,31 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 class AttachmentService extends UploadService
 {
 
 class AttachmentService extends UploadService
 {
 

+    /**
+     * Get the storage that will be used for storing files.
+     * @return \Illuminate\Contracts\Filesystem\Filesystem
+     */
+    protected function getStorage()
+    {
+        $storageType = config('filesystems.default');
+
+        // Override default location if set to local public to ensure not visible.
+        if ($storageType === 'local') {
+            $storageType = 'local_secure';
+        }
+
+        return $this->fileSystem->disk($storageType);
+    }
+

     /**
      * Get an attachment from storage.
      * @param Attachment $attachment
      * @return string
     /**
      * Get an attachment from storage.
      * @param Attachment $attachment
      * @return string

+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException

      */
     public function getAttachmentFromStorage(Attachment $attachment)
     {
      */
     public function getAttachmentFromStorage(Attachment $attachment)
     {

-        $attachmentPath = $this->getStorageBasePath() . $attachment->path;
-        return $this->getStorage()->get($attachmentPath);
+        return $this->getStorage()->get($attachment->path);

     }
 
     /**
     }
 
     /**


@@ -92,16 +108,6 @@ class AttachmentService extends UploadService
         ]);
     }
 
         ]);
     }
 

-    /**
-     * Get the file storage base path, amended for storage type.
-     * This allows us to keep a generic path in the database.
-     * @return string
-     */
-    private function getStorageBasePath()
-    {
-        return $this->isLocal() ? 'storage/' : '';
-    }
-

     /**
      * Updates the file ordering for a listing of attached files.
      * @param array $attachmentList
     /**
      * Updates the file ordering for a listing of attached files.
      * @param array $attachmentList


@@ -138,6 +144,7 @@ class AttachmentService extends UploadService
     /**
      * Delete a File from the database and storage.
      * @param Attachment $attachment
     /**
      * Delete a File from the database and storage.
      * @param Attachment $attachment

+     * @throws Exception

      */
     public function deleteFile(Attachment $attachment)
     {
      */
     public function deleteFile(Attachment $attachment)
     {


@@ -157,11 +164,10 @@ class AttachmentService extends UploadService
      */
     protected function deleteFileInStorage(Attachment $attachment)
     {
      */
     protected function deleteFileInStorage(Attachment $attachment)
     {

-        $storedFilePath = $this->getStorageBasePath() . $attachment->path;

         $storage = $this->getStorage();
         $storage = $this->getStorage();

-        $dirPath = dirname($storedFilePath);
+        $dirPath = dirname($attachment->path);

 
 

-        $storage->delete($storedFilePath);
+        $storage->delete($attachment->path);

         if (count($storage->allFiles($dirPath)) === 0) {
             $storage->deleteDirectory($dirPath);
         }
         if (count($storage->allFiles($dirPath)) === 0) {
             $storage->deleteDirectory($dirPath);
         }


@@ -179,23 +185,20 @@ class AttachmentService extends UploadService
         $attachmentData = file_get_contents($uploadedFile->getRealPath());
 
         $storage = $this->getStorage();
         $attachmentData = file_get_contents($uploadedFile->getRealPath());
 
         $storage = $this->getStorage();

-        $attachmentBasePath = 'uploads/files/' . Date('Y-m-M') . '/';
-        $storageBasePath = $this->getStorageBasePath() . $attachmentBasePath;
+        $basePath = 'uploads/files/' . Date('Y-m-M') . '/';

 
         $uploadFileName = $attachmentName;
 
         $uploadFileName = $attachmentName;

-        while ($storage->exists($storageBasePath . $uploadFileName)) {
+        while ($storage->exists($basePath . $uploadFileName)) {

             $uploadFileName = str_random(3) . $uploadFileName;
         }
 
             $uploadFileName = str_random(3) . $uploadFileName;
         }
 

-        $attachmentPath = $attachmentBasePath . $uploadFileName;
-        $attachmentStoragePath = $this->getStorageBasePath() . $attachmentPath;
-
+        $attachmentPath = $basePath . $uploadFileName;

         try {
         try {

-            $storage->put($attachmentStoragePath, $attachmentData);
+            $storage->put($attachmentPath, $attachmentData);

         } catch (Exception $e) {
         } catch (Exception $e) {

-            throw new FileUploadException(trans('errors.path_not_writable', ['filePath' => $attachmentStoragePath]));
+            throw new FileUploadException(trans('errors.path_not_writable', ['filePath' => $attachmentPath]));

         }
         }

+

         return $attachmentPath;
     }
         return $attachmentPath;
     }

-
-}
\ No newline at end of file
+}