Extend /users API endpoint

[bookstack] / app / Uploads / ImageService.php

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 92c3994a71e0386a792951dac75b6ad5542b9ec7..7793aaa01ee7363f01d9b9b62215dbc65092ba4d 100644 (file)
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -106,9 +106,9 @@ class ImageService
         }
 
         try {
         }
 
         try {

-            $storage->put($fullPath, $imageData);
-            $storage->setVisibility($fullPath, 'public');
+            $storage->put($fullPath, $imageData, ['visibility' => 'public']);

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

+            \Log::error('Error when attempting image upload:' . $e->getMessage());

             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }
 
             throw new ImageUploadException(trans('errors.path_not_writable', ['filePath' => $fullPath]));
         }
 


@@ -139,7 +139,7 @@ class ImageService
         $name = str_replace(' ', '-', $name);
         $nameParts = explode('.', $name);
         $extension = array_pop($nameParts);
         $name = str_replace(' ', '-', $name);
         $nameParts = explode('.', $name);
         $extension = array_pop($nameParts);

-        $name = implode('.', $nameParts);
+        $name = implode('-', $nameParts);

         $name = Str::slug($name);
 
         if (strlen($name) === 0) {
         $name = Str::slug($name);
 
         if (strlen($name) === 0) {


@@ -190,8 +190,7 @@ class ImageService
 
         $thumbData = $this->resizeImage($storage->get($imagePath), $width, $height, $keepRatio);
 
 
         $thumbData = $this->resizeImage($storage->get($imagePath), $width, $height, $keepRatio);
 

-        $storage->put($thumbFilePath, $thumbData);
-        $storage->setVisibility($thumbFilePath, 'public');
+        $storage->put($thumbFilePath, $thumbData, ['visibility' => 'public']);

         $this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 60 * 72);
 
 
         $this->cache->put('images-' . $image->id . '-' . $thumbFilePath, $thumbFilePath, 60 * 60 * 72);