Added ability to configure email sender name

[bookstack] / app / Services / ImageService.php

diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php
index e34b3fb2b7fb0d6a9db780badd849e6738ee7845..9755ea3072b0baa652e8d381c55e7dc2264b9635 100644 (file)
--- a/app/Services/ImageService.php
+++ b/app/Services/ImageService.php
@@ -46,6 +46,49 @@ class ImageService extends UploadService
         return $this->saveNew($imageName, $imageData, $type, $uploadedTo);
     }
 
         return $this->saveNew($imageName, $imageData, $type, $uploadedTo);
     }
 

+    /**
+     * Save a new image from a uri-encoded base64 string of data.
+     * @param string $base64Uri
+     * @param string $name
+     * @param string $type
+     * @param int $uploadedTo
+     * @return Image
+     * @throws ImageUploadException
+     */
+    public function saveNewFromBase64Uri(string $base64Uri, string $name, string $type, $uploadedTo = 0)
+    {
+        $splitData = explode(';base64,', $base64Uri);
+        if (count($splitData) < 2) {
+            throw new ImageUploadException("Invalid base64 image data provided");
+        }
+        $data = base64_decode($splitData[1]);
+        return $this->saveNew($name, $data, $type, $uploadedTo);
+    }
+
+    /**
+     * Replace the data for an image via a Base64 encoded string.
+     * @param Image $image
+     * @param string $base64Uri
+     * @return Image
+     * @throws ImageUploadException
+     */
+    public function replaceImageDataFromBase64Uri(Image $image, string $base64Uri)
+    {
+        $splitData = explode(';base64,', $base64Uri);
+        if (count($splitData) < 2) {
+            throw new ImageUploadException("Invalid base64 image data provided");
+        }
+        $data = base64_decode($splitData[1]);
+        $storage = $this->getStorage();
+
+        try {
+            $storage->put($image->path, $data);
+        } catch (Exception $e) {
+            throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $image->path]));
+        }
+
+        return $image;
+    }

 
     /**
      * Gets an image from url and saves it to the database.
 
     /**
      * Gets an image from url and saves it to the database.


@@ -59,7 +102,9 @@ class ImageService extends UploadService
     {
         $imageName = $imageName ? $imageName : basename($url);
         $imageData = file_get_contents($url);
     {
         $imageName = $imageName ? $imageName : basename($url);
         $imageData = file_get_contents($url);

-        if($imageData === false) throw new \Exception(trans('errors.cannot_get_image_from_url', ['url' => $url]));
+        if ($imageData === false) {
+            throw new \Exception(trans('errors.cannot_get_image_from_url', ['url' => $url]));
+        }

         return $this->saveNew($imageName, $imageData, $type);
     }
 
         return $this->saveNew($imageName, $imageData, $type);
     }
 


@@ -78,12 +123,12 @@ class ImageService extends UploadService
         $secureUploads = setting('app-secure-images');
         $imageName = str_replace(' ', '-', $imageName);
 
         $secureUploads = setting('app-secure-images');
         $imageName = str_replace(' ', '-', $imageName);
 

-        if ($secureUploads) $imageName = str_random(16) . '-' . $imageName;
+        if ($secureUploads) {
+            $imageName = str_random(16) . '-' . $imageName;
+        }

 
         $imagePath = '/uploads/images/' . $type . '/' . Date('Y-m-M') . '/';
 
 
         $imagePath = '/uploads/images/' . $type . '/' . Date('Y-m-M') . '/';
 

-        if ($this->isLocal()) $imagePath = '/public' . $imagePath;
-

         while ($storage->exists($imagePath . $imageName)) {
             $imageName = str_random(3) . $imageName;
         }
         while ($storage->exists($imagePath . $imageName)) {
             $imageName = str_random(3) . $imageName;
         }


@@ -96,8 +141,6 @@ class ImageService extends UploadService
             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }
 
             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }
 

-        if ($this->isLocal()) $fullPath = str_replace_first('/public', '', $fullPath);
-

         $imageDetails = [
             'name'       => $imageName,
             'path'       => $fullPath,
         $imageDetails = [
             'name'       => $imageName,
             'path'       => $fullPath,


@@ -112,8 +155,8 @@ class ImageService extends UploadService
             $imageDetails['updated_by'] = $userId;
         }
 
             $imageDetails['updated_by'] = $userId;
         }
 

-        $image = Image::forceCreate($imageDetails);
-
+        $image = (new Image());
+        $image->forceFill($imageDetails)->save();

         return $image;
     }
 
         return $image;
     }
 


@@ -124,14 +167,13 @@ class ImageService extends UploadService
      */
     protected function getPath(Image $image)
     {
      */
     protected function getPath(Image $image)
     {

-        return ($this->isLocal()) ? ('public/' . $image->path) : $image->path;
+        return $image->path;

     }
 
     /**
      * Get the thumbnail for an image.
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
     }
 
     /**
      * Get the thumbnail for an image.
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.

-     *

      * @param Image $image
      * @param int $width
      * @param int $height
      * @param Image $image
      * @param int $width
      * @param int $height


@@ -151,7 +193,6 @@ class ImageService extends UploadService
         }
 
         $storage = $this->getStorage();
         }
 
         $storage = $this->getStorage();

-

         if ($storage->exists($thumbFilePath)) {
             return $this->getPublicUrl($thumbFilePath);
         }
         if ($storage->exists($thumbFilePath)) {
             return $this->getPublicUrl($thumbFilePath);
         }


@@ -161,9 +202,8 @@ class ImageService extends UploadService
         } catch (Exception $e) {
             if ($e instanceof \ErrorException || $e instanceof NotSupportedException) {
                 throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
         } catch (Exception $e) {
             if ($e instanceof \ErrorException || $e instanceof NotSupportedException) {
                 throw new ImageUploadException(trans('errors.cannot_create_thumbs'));

-            } else {
-                throw $e;

             }
             }

+            throw $e;

         }
 
         if ($keepRatio) {
         }
 
         if ($keepRatio) {


@@ -183,10 +223,24 @@ class ImageService extends UploadService
         return $this->getPublicUrl($thumbFilePath);
     }
 
         return $this->getPublicUrl($thumbFilePath);
     }
 

+    /**
+     * Get the raw data content from an image.
+     * @param Image $image
+     * @return string
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function getImageData(Image $image)
+    {
+        $imagePath = $this->getPath($image);
+        $storage = $this->getStorage();
+        return $storage->get($imagePath);
+    }
+

     /**
      * Destroys an Image object along with its files and thumbnails.
      * @param Image $image
      * @return bool
     /**
      * Destroys an Image object along with its files and thumbnails.
      * @param Image $image
      * @return bool

+     * @throws Exception

      */
     public function destroyImage(Image $image)
     {
      */
     public function destroyImage(Image $image)
     {


@@ -205,9 +259,13 @@ class ImageService extends UploadService
 
         // Cleanup of empty folders
         foreach ($storage->directories($imageFolder) as $directory) {
 
         // Cleanup of empty folders
         foreach ($storage->directories($imageFolder) as $directory) {

-            if ($this->isFolderEmpty($directory)) $storage->deleteDirectory($directory);
+            if ($this->isFolderEmpty($directory)) {
+                $storage->deleteDirectory($directory);
+            }
+        }
+        if ($this->isFolderEmpty($imageFolder)) {
+            $storage->deleteDirectory($imageFolder);

         }
         }

-        if ($this->isFolderEmpty($imageFolder)) $storage->deleteDirectory($imageFolder);

 
         $image->delete();
         return true;
 
         $image->delete();
         return true;


@@ -252,14 +310,10 @@ class ImageService extends UploadService
                     $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
                 }
             }
                     $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
                 }
             }

-

             $this->storageUrl = $storageUrl;
         }
 
             $this->storageUrl = $storageUrl;
         }
 

-        if ($this->isLocal()) $filePath = str_replace_first('public/', '', $filePath);
-
-        return ($this->storageUrl == false ? rtrim(baseUrl(''), '/') : rtrim($this->storageUrl, '/')) . $filePath;
+        $basePath = ($this->storageUrl == false) ? baseUrl('/') : $this->storageUrl;
+        return rtrim($basePath, '/') . $filePath;

     }
     }

-
-

 }
 }