From b0f743a12b7e6b0c9874a74a7c6c217c94587d61 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 1 May 2022 22:07:53 +0200
Subject: [PATCH] update settings

---
 Admin/Installer.php              | 12 ++++--------
 Admin/Routes/Web/Backend.php     | 11 -----------
 Controller/ApiController.php     |  4 ++--
 Controller/BackendController.php |  6 +-----
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/Admin/Installer.php b/Admin/Installer.php
index ca899d1..f00c3e1 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -166,11 +166,7 @@ final class Installer extends InstallerAbstract
         /** @var \Modules\Media\Controller\ApiController $module */
         $module = $app->moduleManager->getModuleInstance('Media');
 
-        if (!isset($data['path'])) {
-            $path = '/Modules/Media/Files' . ($data['virtualPath'] ?? '') . '/' . ($data['name'] ?? '');
-        } else {
-            $path = $data['path'] ?? '/Modules/Media/Files/' . ($data['name'] ?? '');
-        }
+        $path = !isset($data['path']) ? ($data['virtualPath'] ?? '') : $data['path'];
 
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
@@ -267,7 +263,7 @@ final class Installer extends InstallerAbstract
             $filePath = __DIR__ . '/../../..' . $file;
 
             if (\is_file($filePath)) {
-                File::copy($filePath, $tempPath . $file);
+                File::copy($filePath, $tempPath . $file, true);
 
                 $request->addFile([
                     'size'     => \filesize($tempPath . $file),
@@ -276,10 +272,10 @@ final class Installer extends InstallerAbstract
                     'error'    => \UPLOAD_ERR_OK,
                 ]);
             } if (\is_dir($filePath)) {
-                Directory::copy($filePath, $tempPath . $file);
+                Directory::copy($filePath, $tempPath . \basename($filePath), true);
 
                 $iterator = new \RecursiveIteratorIterator(
-                    new \RecursiveDirectoryIterator($tempPath . $file . '/', \RecursiveDirectoryIterator::SKIP_DOTS),
+                    new \RecursiveDirectoryIterator($tempPath . \basename($filePath), \RecursiveDirectoryIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::SELF_FIRST
                 );
 
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 0d168f0..6fb48f2 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -18,17 +18,6 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/admin/module/settings\?id=Media$' => [
-        [
-            'dest'       => '\Modules\Media\Controller\BackendController:viewModuleSettings',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::READ,
-                'state'  => \Modules\Admin\Models\PermissionCategory::MODULE,
-            ],
-        ],
-    ],
     '^.*/admin/module/settings\?id=Media&type=.*?$' => [
         [
             'dest'       => '\Modules\Media\Controller\BackendController:viewMediaTypeSettings',
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a18ae96..5ac9636 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -521,7 +521,6 @@ final class ApiController extends Controller
             $outputDir = self::createMediaPath($basePath);
         } else {
             $outputDir = $basePath . '/' . \ltrim($request->getData('path'), '\\/');
-            Directory::create($outputDir . '/' . $request->getData('name'), 0775, true);
         }
 
         $dirPath   = $outputDir . '/' . $request->getData('name');
@@ -533,7 +532,8 @@ final class ApiController extends Controller
         CollectionMapper::create()->execute($mediaCollection);
 
         if (((bool) ($request->getData('create_directory') ?? false))
-            && !\is_dir($dirPath)) {
+            && !\is_dir($dirPath)
+        ) {
             \mkdir($dirPath, 0755, true);
         }
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 451acad..6cb9ecc 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -370,11 +370,7 @@ final class BackendController extends Controller
         $types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->getLanguage())->execute();
         $view->setData('types', $types);
 
-        if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
-            $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
-        } else {
-            $view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings');
-        }
+        $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
 
         return $view;
     }