diff --git a/Controller/ApiController.php b/Controller/ApiController.php index a2d85ff..52da41e 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -634,7 +634,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateReferenceCreate($request))) { $response->data['collection_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -771,7 +771,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateCollectionCreate($request))) { $response->data['collection_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -1131,7 +1131,7 @@ final class ApiController extends Controller } $this->setMediaResponseHeader($media, $request, $response); - $view = $this->createView($media, $request, $response); + $view = $this->createView($media, $request, $response); $view->data['path'] = __DIR__ . '/../../../'; $response->set('export', $view); @@ -1148,7 +1148,7 @@ final class ApiController extends Controller $path = '../../../Temp/' . $randomName . '.' . $media->getExtension(); $absolutePath = __DIR__ . '/' . $path; - } while(!\is_file($absolutePath) && $counter < 1000); + } while (!\is_file($absolutePath) && $counter < 1000); if ($counter >= 1000) { return new NullMedia(); @@ -1182,7 +1182,7 @@ final class ApiController extends Controller */ 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; if (!\headers_sent()) { @@ -1342,7 +1342,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateMediaTypeCreate($request))) { $response->data['media_type_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -1415,7 +1415,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateMediaTypeL11nCreate($request))) { $response->data['media_type_l11n_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 8378e49..039e826 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -175,8 +175,8 @@ final class BackendController extends Controller $media = \array_merge($media, $unIndexedFiles); } - $view->data['media'] = $media; - $view->data['path'] = $path; + $view->data['media'] = $media; + $view->data['path'] = $path; $view->data['account'] = $this->app->accountManager->get($request->header->account); return $view; @@ -268,7 +268,7 @@ final class BackendController extends Controller } $view->data['account'] = $this->app->accountManager->get($request->header->account); - $view->data['media'] = $media; + $view->data['media'] = $media; return $view; } @@ -382,15 +382,15 @@ final class BackendController extends Controller */ 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); $id = $request->getDataString('id') ?? ''; - $settings = SettingMapper::getAll()->where('module', $id)->execute(); + $settings = SettingMapper::getAll()->where('module', $id)->execute(); $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->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); @@ -422,10 +422,10 @@ final class BackendController extends Controller ->where('id', (int) $request->getData('id')) ->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; - $l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute(); + $l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute(); $view->data['l11n'] = $l11n; return $view; @@ -468,7 +468,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $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; return $view; diff --git a/Models/Media.php b/Models/Media.php index 2171231..9a0d7d7 100755 --- a/Models/Media.php +++ b/Models/Media.php @@ -319,11 +319,25 @@ class Media implements \JsonSerializable return $this->isAbsolute ? $this->path : \ltrim($this->path, '\\/'); } + /** + * Get the media path + * + * @return string + * + * @since 1.0.0 + */ public function getFileName() : string { return \basename($this->path); } + /** + * Get the media path + * + * @return string + * + * @since 1.0.0 + */ public function getExtension() : string { $pos = \strrpos('.', $this->path);