auto fixes + some impl.

Karaka-Management · Jan 26, 2024 · cbd7fd1 · cbd7fd1
1 parent 41e7b22
commit cbd7fd1
Show file tree

Hide file tree

Showing 29 changed files with 320 additions and 300 deletions.
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
@@ -17,11 +17,11 @@
     },
     {
         "id": 1000410001,
-        "pid": "/profile/single",
+        "pid": "/profile/view",
         "type": 2,
         "subtype": 2,
         "name": "Media",
-        "uri": "{/base}/profile/single/media?{?}",
+        "uri": "{/base}/profile/view/media?{?}",
         "target": "self",
         "icon": null,
         "order": 3,

diff --git a/Admin/Installer.php b/Admin/Installer.php
@@ -28,7 +28,6 @@
 use phpOMS\System\File\Local\Directory;
 use phpOMS\System\File\Local\File;
 use phpOMS\System\File\PathException;
-use phpOMS\Uri\HttpUri;
 
 /**
  * Installer class.
@@ -174,7 +173,7 @@ private static function createReference(ApplicationAbstract $app, array $data) :
         $module = $app->moduleManager->getModuleInstance('Media');
 
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('name', $data['name'] ?? '');
@@ -211,7 +210,7 @@ private static function createCollection(ApplicationAbstract $app, array $data)
         $path = isset($data['path']) ? ($data['path']) : $data['virtualPath'] ?? '';
 
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('name', $data['name'] ?? '');
@@ -247,7 +246,7 @@ private static function createType(ApplicationAbstract $app, array $data) : arra
         $module = $app->moduleManager->get('Media');
 
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('name', $data['name'] ?? '');
@@ -275,7 +274,7 @@ private static function createType(ApplicationAbstract $app, array $data) : arra
             }
 
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('title', $l11n['title'] ?? '');
@@ -306,7 +305,7 @@ private static function uploadMedia(ApplicationAbstract $app, array $data) : arr
         $module = $app->moduleManager->get('Media');
 
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('path', empty($data['path'] ?? '') ? '' : $data['path']);
@@ -364,7 +363,7 @@ private static function uploadMedia(ApplicationAbstract $app, array $data) : arr
 
         if ($data['create_collection'] ?? false) {
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('name', (string) ($data['name'] ?? ''));

diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
@@ -29,7 +29,7 @@
             ],
         ],
     ],
-    '^.*/media/list.*$' => [
+    '^.*/media/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Media\Controller\BackendController:viewMediaList',
             'verb'       => RouteVerb::GET,
@@ -40,7 +40,7 @@
             ],
         ],
     ],
-    '^.*/media/upload.*$' => [
+    '^.*/media/upload(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Media\Controller\BackendController:viewMediaUpload',
             'verb'       => RouteVerb::GET,
@@ -51,7 +51,7 @@
             ],
         ],
     ],
-    '^.*/media/file/create.*$' => [
+    '^.*/media/file/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Media\Controller\BackendController:viewMediaFileCreate',
             'verb'       => RouteVerb::GET,
@@ -62,7 +62,7 @@
             ],
         ],
     ],
-    '^.*/media/collection/create.*$' => [
+    '^.*/media/collection/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Media\Controller\BackendController:viewMediaCollectionCreate',
             'verb'       => RouteVerb::GET,
@@ -73,9 +73,9 @@
             ],
         ],
     ],
-    '^.*/media/single.*$' => [
+    '^.*/media/view(\?.*$|$)' => [
         [
-            'dest'       => '\Modules\Media\Controller\BackendController:viewMediaSingle',
+            'dest'       => '\Modules\Media\Controller\BackendController:viewMediaView',
             'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::NAME,