added routes for zip export

[bookstack] / app / Uploads / ImageStorage.php

diff --git a/app/Uploads/ImageStorage.php b/app/Uploads/ImageStorage.php
index dc4abc0f281b6ba5fbbc6828411bd4abef40b3bb..ddaa26a9400c343b2dea6bf32dd118f1a5e79bfc 100644 (file)
--- a/app/Uploads/ImageStorage.php
+++ b/app/Uploads/ImageStorage.php
@@ -110,10 +110,20 @@ class ImageStorage
     }
 
     /**
     }
 
     /**

-     * Gets a public facing url for an image by checking relevant environment variables.
+     * Gets a public facing url for an image or location at the given path.
+     */
+    public static function getPublicUrl(string $filePath): string
+    {
+        return static::getPublicBaseUrl() . '/' . ltrim($filePath, '/');
+    }
+
+    /**
+     * Get the public base URL used for images.
+     * Will not include any path element of the image file, just the base part
+     * from where the path is then expected to start from.

      * If s3-style store is in use it will default to guessing a public bucket URL.
      */
      * If s3-style store is in use it will default to guessing a public bucket URL.
      */

-    public function getPublicUrl(string $filePath): string
+    protected static function getPublicBaseUrl(): string

     {
         $storageUrl = config('filesystems.url');
 
     {
         $storageUrl = config('filesystems.url');
 


@@ -131,6 +141,6 @@ class ImageStorage
 
         $basePath = $storageUrl ?: url('/');
 
 
         $basePath = $storageUrl ?: url('/');
 

-        return rtrim($basePath, '/') . $filePath;
+        return rtrim($basePath, '/');

     }
 }
     }
 }