Guest create page: name field autofocus

[bookstack] / app / Uploads / ImageService.php

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index ec2f6da548cc0dbd53e30e696e34c78abc9f6a0e..55c327e7a552be241748833206e40f8468d6e913 100644 (file)
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -88,16 +88,17 @@ class ImageService
     protected function getStorageDiskName(string $imageType): string
     {
         $storageType = config('filesystems.images');
     protected function getStorageDiskName(string $imageType): string
     {
         $storageType = config('filesystems.images');

+        $localSecureInUse = ($storageType === 'local_secure' || $storageType === 'local_secure_restricted');

 
         // Ensure system images (App logo) are uploaded to a public space
 
         // Ensure system images (App logo) are uploaded to a public space

-        if ($imageType === 'system' && $storageType === 'local_secure') {
-            $storageType = 'local';
+        if ($imageType === 'system' && $localSecureInUse) {
+            return 'local';

         }
 
         // Rename local_secure options to get our image specific storage driver which
         // is scoped to the relevant image directories.
         }
 
         // Rename local_secure options to get our image specific storage driver which
         // is scoped to the relevant image directories.

-        if ($storageType === 'local_secure' || $storageType === 'local_secure_restricted') {
-            $storageType = 'local_secure_images';
+        if ($localSecureInUse) {
+            return 'local_secure_images';

         }
 
         return $storageType;
         }
 
         return $storageType;


@@ -315,7 +316,7 @@ class ImageService
     {
         try {
             $thumb = $this->imageTool->make($imageData);
     {
         try {
             $thumb = $this->imageTool->make($imageData);

-        } catch (ErrorException|NotSupportedException $e) {
+        } catch (ErrorException | NotSupportedException $e) {

             throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
         }
 
             throw new ImageUploadException(trans('errors.cannot_create_thumbs'));
         }
 


@@ -561,9 +562,10 @@ class ImageService
         }
 
         // Strip thumbnail element from path if existing
         }
 
         // Strip thumbnail element from path if existing

-        $originalPathSplit = array_filter(explode('/', $path), function(string $part) {
+        $originalPathSplit = array_filter(explode('/', $path), function (string $part) {

             $resizedDir = (strpos($part, 'thumbs-') === 0 || strpos($part, 'scaled-') === 0);
             $missingExtension = strpos($part, '.') === false;
             $resizedDir = (strpos($part, 'thumbs-') === 0 || strpos($part, 'scaled-') === 0);
             $missingExtension = strpos($part, '.') === false;

+

             return !($resizedDir && $missingExtension);
         });
 
             return !($resizedDir && $missingExtension);
         });