Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-18 18:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update settings

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-05-01 22:07:53 +02:00
parent d4f28bc52c
commit b0f743a12b
4 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Installer.php
View File

@ -166,11 +166,7 @@ final class Installer extends InstallerAbstract
/** @var \Modules\Media\Controller\ApiController $module */ /** @var \Modules\Media\Controller\ApiController $module */
$module = $app->moduleManager->getModuleInstance('Media'); $module = $app->moduleManager->getModuleInstance('Media');
if (!isset($data['path'])) { $path = !isset($data['path']) ? ($data['virtualPath'] ?? '') : $data['path'];
$path = '/Modules/Media/Files' . ($data['virtualPath'] ?? '') . '/' . ($data['name'] ?? '');
} else {
$path = $data['path'] ?? '/Modules/Media/Files/' . ($data['name'] ?? '');
}
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
@ -267,7 +263,7 @@ final class Installer extends InstallerAbstract
$filePath = __DIR__ . '/../../..' . $file; $filePath = __DIR__ . '/../../..' . $file;
if (\is_file($filePath)) { if (\is_file($filePath)) {
File::copy($filePath, $tempPath . $file); File::copy($filePath, $tempPath . $file, true);
$request->addFile([ $request->addFile([
'size' => \filesize($tempPath . $file), 'size' => \filesize($tempPath . $file),
@ -276,10 +272,10 @@ final class Installer extends InstallerAbstract
'error' => \UPLOAD_ERR_OK, 'error' => \UPLOAD_ERR_OK,
]); ]);
} if (\is_dir($filePath)) { } if (\is_dir($filePath)) {
Directory::copy($filePath, $tempPath . $file); Directory::copy($filePath, $tempPath . \basename($filePath), true);
$iterator = new \RecursiveIteratorIterator( $iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($tempPath . $file . '/', \RecursiveDirectoryIterator::SKIP_DOTS), new \RecursiveDirectoryIterator($tempPath . \basename($filePath), \RecursiveDirectoryIterator::SKIP_DOTS),
\RecursiveIteratorIterator::SELF_FIRST \RecursiveIteratorIterator::SELF_FIRST
); );

11
Admin/Routes/Web/Backend.php
View File

@ -18,17 +18,6 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ 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=.*?$' => [ '^.*/admin/module/settings\?id=Media&type=.*?$' => [
[ [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaTypeSettings', 'dest' => '\Modules\Media\Controller\BackendController:viewMediaTypeSettings',

4
Controller/ApiController.php
View File

@ -521,7 +521,6 @@ final class ApiController extends Controller
$outputDir = self::createMediaPath($basePath); $outputDir = self::createMediaPath($basePath);
} else { } else {
$outputDir = $basePath . '/' . \ltrim($request->getData('path'), '\\/'); $outputDir = $basePath . '/' . \ltrim($request->getData('path'), '\\/');
Directory::create($outputDir . '/' . $request->getData('name'), 0775, true);
} }
$dirPath = $outputDir . '/' . $request->getData('name'); $dirPath = $outputDir . '/' . $request->getData('name');
@ -533,7 +532,8 @@ final class ApiController extends Controller
CollectionMapper::create()->execute($mediaCollection); CollectionMapper::create()->execute($mediaCollection);
if (((bool) ($request->getData('create_directory') ?? false)) if (((bool) ($request->getData('create_directory') ?? false))
&& !\is_dir($dirPath)) { && !\is_dir($dirPath)
) {
\mkdir($dirPath, 0755, true); \mkdir($dirPath, 0755, true);
} }

4
Controller/BackendController.php
View File

@ -370,11 +370,7 @@ final class BackendController extends Controller
$types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->getLanguage())->execute(); $types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->getLanguage())->execute();
$view->setData('types', $types); $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'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
} else {
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings');
}
return $view; return $view;
} }