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

clean up paths

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-29 22:30:19 +02:00
parent ae4b0ae8a6
commit 7999667463
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controller/ApiController.php
View File

@ -516,10 +516,11 @@ final class ApiController extends Controller
$virtualPath = \urldecode((string) ($request->getData('virtualpath') ?? '/')); $virtualPath = \urldecode((string) ($request->getData('virtualpath') ?? '/'));
$outputDir = ''; $outputDir = '';
$basePath = __DIR__ . '/../../../Modules/Media/Files';
if (empty($request->getData('path'))) { if (empty($request->getData('path'))) {
$outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files'); $outputDir = self::createMediaPath($basePath);
} else { } else {
$outputDir = __DIR__ . '/../../../Modules/Media/Files/' . \ltrim($request->getData('path'), '\\/'); $outputDir = $basePath . '/' . \ltrim($request->getData('path'), '\\/');
Directory::create($outputDir . '/' . $request->getData('name'), 0775, true); Directory::create($outputDir . '/' . $request->getData('name'), 0775, true);
} }
@ -655,17 +656,18 @@ final class ApiController extends Controller
$fileName .= \strripos($fileName, '.') === false ? '.txt' : ''; $fileName .= \strripos($fileName, '.') === false ? '.txt' : '';
$outputDir = ''; $outputDir = '';
$basePath = __DIR__ . '/../../../Modules/Media/Files';
if (empty($request->getData('path'))) { if (empty($request->getData('path'))) {
$outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files'); $outputDir = self::createMediaPath($basePath);
} else { } else {
if (\stripos( if (\stripos(
FileUtils::absolute(__DIR__ . '/../../../Modules/Media/Files/' . \ltrim($path, '\\/')), FileUtils::absolute($basePath . '/' . \ltrim($path, '\\/')),
FileUtils::absolute(__DIR__ . '/../../../') FileUtils::absolute(__DIR__ . '/../../../')
) !== 0 ) !== 0
) { ) {
$outputDir = self::createMediaPath(__DIR__ . '/../../../Modules/Media/Files'); $outputDir = self::createMediaPath($basePath);
} else { } else {
$outputDir = __DIR__ . '/../../../Modules/Media/Files/' . \ltrim($path, '\\/'); $outputDir = $basePath . '/' . \ltrim($path, '\\/');
} }
} }