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

automated phpcs fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-31 13:21:47 +00:00
parent 64f4920b36
commit d750f558ba
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controller/ApiController.php
View File

@ -634,7 +634,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateReferenceCreate($request))) { if (!empty($val = $this->validateReferenceCreate($request))) {
$response->data['collection_create'] = new FormValidation($val); $response->data['collection_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -771,7 +771,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateCollectionCreate($request))) { if (!empty($val = $this->validateCollectionCreate($request))) {
$response->data['collection_create'] = new FormValidation($val); $response->data['collection_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1131,7 +1131,7 @@ final class ApiController extends Controller
} }
$this->setMediaResponseHeader($media, $request, $response); $this->setMediaResponseHeader($media, $request, $response);
$view = $this->createView($media, $request, $response); $view = $this->createView($media, $request, $response);
$view->data['path'] = __DIR__ . '/../../../'; $view->data['path'] = __DIR__ . '/../../../';
$response->set('export', $view); $response->set('export', $view);
@ -1148,7 +1148,7 @@ final class ApiController extends Controller
$path = '../../../Temp/' . $randomName . '.' . $media->getExtension(); $path = '../../../Temp/' . $randomName . '.' . $media->getExtension();
$absolutePath = __DIR__ . '/' . $path; $absolutePath = __DIR__ . '/' . $path;
} while(!\is_file($absolutePath) && $counter < 1000); } while (!\is_file($absolutePath) && $counter < 1000);
if ($counter >= 1000) { if ($counter >= 1000) {
return new NullMedia(); return new NullMedia();
@ -1182,7 +1182,7 @@ final class ApiController extends Controller
*/ */
public function createView(Media $media, RequestAbstract $request, ResponseAbstract $response) : View public function createView(Media $media, RequestAbstract $request, ResponseAbstract $response) : View
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->data['media'] = $media; $view->data['media'] = $media;
if (!\headers_sent()) { if (!\headers_sent()) {
@ -1342,7 +1342,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateMediaTypeCreate($request))) { if (!empty($val = $this->validateMediaTypeCreate($request))) {
$response->data['media_type_create'] = new FormValidation($val); $response->data['media_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -1415,7 +1415,7 @@ final class ApiController extends Controller
{ {
if (!empty($val = $this->validateMediaTypeL11nCreate($request))) { if (!empty($val = $this->validateMediaTypeL11nCreate($request))) {
$response->data['media_type_l11n_create'] = new FormValidation($val); $response->data['media_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }

18
Controller/BackendController.php
View File

@ -175,8 +175,8 @@ final class BackendController extends Controller
$media = \array_merge($media, $unIndexedFiles); $media = \array_merge($media, $unIndexedFiles);
} }
$view->data['media'] = $media; $view->data['media'] = $media;
$view->data['path'] = $path; $view->data['path'] = $path;
$view->data['account'] = $this->app->accountManager->get($request->header->account); $view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view; return $view;
@ -268,7 +268,7 @@ final class BackendController extends Controller
} }
$view->data['account'] = $this->app->accountManager->get($request->header->account); $view->data['account'] = $this->app->accountManager->get($request->header->account);
$view->data['media'] = $media; $view->data['media'] = $media;
return $view; return $view;
} }
@ -382,15 +382,15 @@ final class BackendController extends Controller
*/ */
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? ''; $id = $request->getDataString('id') ?? '';
$settings = SettingMapper::getAll()->where('module', $id)->execute(); $settings = SettingMapper::getAll()->where('module', $id)->execute();
$view->data['settings'] = $settings; $view->data['settings'] = $settings;
$types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->header->l11n->language)->execute(); $types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->header->l11n->language)->execute();
$view->data['types'] = $types; $view->data['types'] = $types;
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
@ -422,10 +422,10 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response);
$view->data['type'] = $type; $view->data['type'] = $type;
$l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute(); $l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute();
$view->data['l11n'] = $l11n; $view->data['l11n'] = $l11n;
return $view; return $view;
@ -468,7 +468,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-file-create'); $view->setTemplate('/Modules/Media/Theme/Backend/media-file-create');
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['editor'] = $editor; $view->data['editor'] = $editor;
return $view; return $view;

14
Models/Media.php
View File

@ -319,11 +319,25 @@ class Media implements \JsonSerializable
return $this->isAbsolute ? $this->path : \ltrim($this->path, '\\/'); return $this->isAbsolute ? $this->path : \ltrim($this->path, '\\/');
} }
/**
* Get the media path
*
* @return string
*
* @since 1.0.0
*/
public function getFileName() : string public function getFileName() : string
{ {
return \basename($this->path); return \basename($this->path);
} }
/**
* Get the media path
*
* @return string
*
* @since 1.0.0
*/
public function getExtension() : string public function getExtension() : string
{ {
$pos = \strrpos('.', $this->path); $pos = \strrpos('.', $this->path);