Merge branch 'main' of https://github.com/claradex/nativegallery

app/Controllers/Api/Images/Upload.php

@@ -105,7 +105,7 @@ class Upload
                         'type' => 'none',
                     )
                 );
-            } else if (explode($type, '/')[0] === 'image') {
+            } else if (explode('/', $type)[0] === 'image') {
 
 
                 $exif = new EXIF($_FILES['image']['tmp_name']);

app/Controllers/MainController.php

@@ -36,9 +36,7 @@ class MainController
     }
     public static function videoRules()
     {
-      $_GLOBAL['rules'] = '/config/videoRules.html';
+       Page::set('VideoRules');
-      $_GLOBAL['title'] = 'Правила видеотеки';
-       Page::set('Rules');
     }
     public static function update()
     {

app/Services/Upload.php

@@ -38,6 +38,9 @@ class Upload
         $cstrong = True;
         $filecdn = bin2hex(openssl_random_pseudo_bytes(64, $cstrong)) . '.' . $fileext;
         $folder = $location . $filecdn;
+
+        if (strtolower (NGALLERY['root']['storage']['type']) == "s3")
+        {
             $s3 = new \Aws\S3\S3Client([
                 'region' => NGALLERY['root']['storage']['s3']['credentials']['region'],
                 'version' => NGALLERY['root']['storage']['s3']['credentials']['version'],
@@ -58,6 +61,17 @@ class Upload
             $this->size = self::human_filesize(filesize($tmpname));
             $this->name = $name;
         }
+        else
+        {
+            @mkdir ("{$_SERVER['DOCUMENT_ROOT']}/uploads/{$location}");
+            move_uploaded_file ($tmpname, "{$_SERVER['DOCUMENT_ROOT']}/uploads/{$folder}");
+
+            $this->type = $type;
+            $this->src = "/uploads/{$folder}";
+            $this->size = self::human_filesize(filesize($tmpname));
+            $this->name = $name;
+        }
+    }
     public function getType()
     {
         return $this->type;

ngallery-example.yaml

@@ -20,6 +20,10 @@ ngallery:
     websockets:
       messages: ""
     storage:
+
+      # type: 's3' - загрузка файлов в хранилище S3 (Amazon S3, Cloudflare, MinIO и т.д)
+      # type: 'server' - загрузка файлов в папку uploads (hardcode)
+
       type: 's3'
       s3:
         domains: