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

fix static analysis

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-04-09 06:03:39 +02:00
parent 3fedeacbb6
commit 19e131493d
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Controller/ApiController.php
View File

@ -416,9 +416,15 @@ final class ApiController extends Controller
} }
} }
$app?->eventManager->triggerSimilar('PRE:Module:Media-media-create', '', $media); if ($app === null) {
MediaMapper::create()->execute($media); MediaMapper::create()->execute($media);
$app?->eventManager->triggerSimilar('POST:Module:Media-media-create', '',
return $media;
}
$app->eventManager->triggerSimilar('PRE:Module:Media-media-create', '', $media);
MediaMapper::create()->execute($media);
$app->eventManager->triggerSimilar('POST:Module:Media-media-create', '',
[ [
$account, $account,
null, $media, null, $media,
@ -430,7 +436,7 @@ final class ApiController extends Controller
] ]
); );
$app?->moduleManager->get('Admin', 'Api')->createAccountModelPermission( $app->moduleManager->get('Admin', 'Api')->createAccountModelPermission(
new AccountPermission( new AccountPermission(
$account, $account,
$app->unitId, $app->unitId,
@ -573,10 +579,10 @@ final class ApiController extends Controller
/** @var Media $media */ /** @var Media $media */
$media = MediaMapper::get()->where('id', $id)->execute(); $media = MediaMapper::get()->where('id', $id)->execute();
$media->name = (string) ($request->getData('name') ?? $media->name); $media->name = $request->getDataString('name') ?? $media->name;
$media->description = (string) ($request->getData('description') ?? $media->description); $media->description = $request->getDataString('description') ?? $media->description;
$media->setPath((string) ($request->getData('path') ?? $media->getPath())); $media->setPath($request->getDataString('path') ?? $media->getPath());
$media->setVirtualPath(\urldecode((string) ($request->getData('virtualpath') ?? $media->getVirtualPath()))); $media->setVirtualPath(\urldecode($request->getDataString('virtualpath') ?? $media->getVirtualPath()));
if ($media instanceof NullMedia if ($media instanceof NullMedia
|| !$this->app->accountManager->get($request->header->account)->hasPermission( || !$this->app->accountManager->get($request->header->account)->hasPermission(
@ -593,11 +599,13 @@ final class ApiController extends Controller
if ($request->hasData('content')) { if ($request->hasData('content')) {
\file_put_contents( \file_put_contents(
$media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'), $media->isAbsolute
$request->getData('content') ? $media->getPath()
: __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'),
$request->getDataString('content') ?? ''
); );
$media->size = \strlen($request->getData('content')); $media->size = \strlen($request->getDataString('content') ?? '');
} }
return $media; return $media;
@ -642,9 +650,10 @@ final class ApiController extends Controller
} }
if (!$request->hasData('source')) { if (!$request->hasData('source')) {
/** @var \Modules\Media\Models\Media $child */
$child = MediaMapper::get() $child = MediaMapper::get()
->where('virtualPath', \dirname($request->getData('child'))) ->where('virtualPath', \dirname($request->getDataString('child') ?? ''))
->where('name', \basename($request->getData('child'))) ->where('name', \basename($request->getDataString('child') ?? ''))
->execute(); ->execute();
$request->setData('source', $child->getId()); $request->setData('source', $child->getId());
@ -808,23 +817,23 @@ final class ApiController extends Controller
$mediaCollection->addSource(new NullMedia((int) $file)); $mediaCollection->addSource(new NullMedia((int) $file));
} }
$virtualPath = \urldecode((string) ($request->getData('virtualpath') ?? '/')); $virtualPath = \urldecode($request->getDataString('virtualpath') ?? '/');
$outputDir = ''; $outputDir = '';
$basePath = __DIR__ . '/../../../Modules/Media/Files'; $basePath = __DIR__ . '/../../../Modules/Media/Files';
if (!$request->hasData('path')) { if (!$request->hasData('path')) {
$outputDir = self::createMediaPath($basePath); $outputDir = self::createMediaPath($basePath);
} else { } else {
$outputDir = $basePath . '/' . \ltrim($request->getData('path'), '\\/'); $outputDir = $basePath . '/' . \ltrim($request->getDataString('path') ?? '', '\\/');
} }
$dirPath = $outputDir . '/' . $request->getData('name'); $dirPath = $outputDir . '/' . ($request->getDataString('name') ?? '');
$outputDir = \substr($outputDir, \strlen(__DIR__ . '/../../..')); $outputDir = \substr($outputDir, \strlen(__DIR__ . '/../../..'));
$mediaCollection->setVirtualPath($virtualPath); $mediaCollection->setVirtualPath($virtualPath);
$mediaCollection->setPath($outputDir); $mediaCollection->setPath($outputDir);
if (((bool) ($request->getData('create_directory') ?? false)) if (($request->getDataBool('create_directory') ?? false)
&& !\is_dir($dirPath) && !\is_dir($dirPath)
) { ) {
\mkdir($dirPath, 0755, true); \mkdir($dirPath, 0755, true);
@ -952,8 +961,8 @@ final class ApiController extends Controller
public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$path = \urldecode($request->getDataString('path') ?? ''); $path = \urldecode($request->getDataString('path') ?? '');
$virtualPath = \urldecode((string) ($request->getData('virtualpath') ?? '/')); $virtualPath = \urldecode($request->getDataString('virtualpath') ?? '/');
$fileName = (string) ($request->getData('filename') ?? ($request->getDataString('name') ?? '')); $fileName = $request->getDataString('filename') ?? ($request->getDataString('name') ?? '');
$fileName .= \strripos($fileName, '.') === false ? '.txt' : ''; $fileName .= \strripos($fileName, '.') === false ? '.txt' : '';
$outputDir = ''; $outputDir = '';
@ -1034,7 +1043,7 @@ final class ApiController extends Controller
$media = MediaMapper::get()->where('id', (int) $request->getData('id'))->execute(); $media = MediaMapper::get()->where('id', (int) $request->getData('id'))->execute();
$filePath = $media->getAbsolutePath(); $filePath = $media->getAbsolutePath();
} else { } else {
$path = \urldecode($request->getData('path')); $path = \urldecode($request->getDataString('path') ?? '');
$media = new NullMedia(); $media = new NullMedia();
if (\is_file($filePath = __DIR__ . '/../../../' . \ltrim($path, '\\/'))) { if (\is_file($filePath = __DIR__ . '/../../../' . \ltrim($path, '\\/'))) {
@ -1079,7 +1088,7 @@ final class ApiController extends Controller
} }
} }
if (!Guard::isSafePath($filePath, $data['guard'])) { if (!Guard::isSafePath($filePath, $data['guard'] ?? '')) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
return; return;
@ -1121,7 +1130,7 @@ final class ApiController extends Controller
$response->endAllOutputBuffering(); // for large files $response->endAllOutputBuffering(); // for large files
} }
if (($type = $request->getData('type')) === null) { if (($type = $request->getDataString('type')) === null) {
$view->setTemplate('/Modules/Media/Theme/Api/render'); $view->setTemplate('/Modules/Media/Theme/Api/render');
} elseif ($type === 'html') { } elseif ($type === 'html') {
$head = new Head(); $head = new Head();
@ -1164,7 +1173,7 @@ final class ApiController extends Controller
*/ */
private function setMediaResponseHeader(Media $media, RequestAbstract $request, ResponseAbstract $response) : void private function setMediaResponseHeader(Media $media, RequestAbstract $request, ResponseAbstract $response) : void
{ {
switch ($request->getData('type') ?? \strtolower($media->extension)) { switch ($request->getDataString('type') ?? \strtolower($media->extension)) {
case 'htm': case 'htm':
case 'html': case 'html':
$response->header->set('Content-Type', MimeType::M_HTML, true); $response->header->set('Content-Type', MimeType::M_HTML, true);
@ -1298,7 +1307,10 @@ final class ApiController extends Controller
$type->name = $request->getDataString('name') ?? ''; $type->name = $request->getDataString('name') ?? '';
if ($request->hasData('title')) { if ($request->hasData('title')) {
$type->setL11n($request->getDataString('title') ?? '', $request->getData('lang') ?? $request->getLanguage()); $type->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('lang') ?? $request->getLanguage()
);
} }
return $type; return $type;

1
Controller/BackendController.php
View File

@ -266,6 +266,7 @@ final class BackendController extends Controller
$view->addData('view', $listView); $view->addData('view', $listView);
} else { } else {
if ($media->class === MediaClass::REFERENCE) { if ($media->class === MediaClass::REFERENCE) {
/** @var \Modules\Media\Models\Media $media */
$media->source = MediaMapper::get() $media->source = MediaMapper::get()
->with('createdBy') ->with('createdBy')
->with('tags') ->with('tags')