From 39312e8b7a9b27cf106ac3e2a95eae1ef56944b1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:23 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Navigation.install.json | 4 +- Admin/Install/Navigation.php | 4 +- Admin/Installer.php | 4 +- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Settings/Theme/Backend/settings.tpl.php | 4 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiController.php | 82 +++++++++++-------- Controller/BackendController.php | 12 +-- Controller/Controller.php | 4 +- Controller/FileUploaderTrait.php | 4 +- Models/Collection.php | 4 +- Models/CollectionMapper.php | 4 +- Models/Media.php | 4 +- Models/MediaClass.php | 6 +- Models/MediaContent.php | 4 +- Models/MediaContentMapper.php | 4 +- Models/MediaMapper.php | 4 +- Models/MediaStatus.php | 6 +- Models/MediaType.php | 4 +- Models/MediaTypeL11nMapper.php | 4 +- Models/MediaTypeMapper.php | 4 +- Models/NullCollection.php | 4 +- Models/NullMedia.php | 4 +- Models/NullMediaContent.php | 4 +- Models/NullMediaType.php | 4 +- Models/NullReference.php | 4 +- Models/PathSettings.php | 4 +- Models/PermissionCategory.php | 4 +- Models/Reference.php | 4 +- Models/ReferenceMapper.php | 4 +- Models/Upload.js | 2 +- Models/UploadFile.php | 4 +- Models/UploadStatus.php | 4 +- Theme/Api/render.tpl.php | 2 +- Theme/Api/spreadsheetAsCsv.tpl.php | 2 +- Theme/Api/spreadsheetAsHtml.tpl.php | 2 +- Theme/Api/wordAsHtml.tpl.php | 2 +- .../Components/InlinePreview/BaseView.php | 4 +- .../InlinePreview/inline-preview.tpl.php | 4 +- .../Backend/Components/Media/ElementView.php | 4 +- Theme/Backend/Components/Media/ListView.php | 4 +- .../Backend/Components/Media/archive.tpl.php | 2 +- Theme/Backend/Components/Media/audio.tpl.php | 2 +- Theme/Backend/Components/Media/csv.tpl.php | 2 +- Theme/Backend/Components/Media/image.tpl.php | 2 +- .../Components/Media/invalidPassword.tpl.php | 2 +- Theme/Backend/Components/Media/json.tpl.php | 2 +- Theme/Backend/Components/Media/list.tpl.php | 6 +- .../Backend/Components/Media/markdown.tpl.php | 2 +- Theme/Backend/Components/Media/pdf.tpl.php | 2 +- .../Components/Media/powerpoint.tpl.php | 2 +- .../Components/Media/spreadsheet.tpl.php | 2 +- Theme/Backend/Components/Media/video.tpl.php | 2 +- Theme/Backend/Components/Media/word.tpl.php | 2 +- Theme/Backend/Components/Upload/BaseView.php | 4 +- Theme/Backend/Lang/Navigation.ar.lang.php | 2 +- Theme/Backend/Lang/Navigation.cs.lang.php | 2 +- Theme/Backend/Lang/Navigation.da.lang.php | 2 +- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.el.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/Navigation.es.lang.php | 2 +- Theme/Backend/Lang/Navigation.fi.lang.php | 2 +- Theme/Backend/Lang/Navigation.fr.lang.php | 2 +- Theme/Backend/Lang/Navigation.hu.lang.php | 2 +- Theme/Backend/Lang/Navigation.it.lang.php | 2 +- Theme/Backend/Lang/Navigation.ja.lang.php | 2 +- Theme/Backend/Lang/Navigation.ko.lang.php | 2 +- Theme/Backend/Lang/Navigation.no.lang.php | 2 +- Theme/Backend/Lang/Navigation.pl.lang.php | 2 +- Theme/Backend/Lang/Navigation.pt.lang.php | 2 +- Theme/Backend/Lang/Navigation.ru.lang.php | 2 +- Theme/Backend/Lang/Navigation.sv.lang.php | 2 +- Theme/Backend/Lang/Navigation.th.lang.php | 2 +- Theme/Backend/Lang/Navigation.tr.lang.php | 2 +- Theme/Backend/Lang/Navigation.uk.lang.php | 2 +- Theme/Backend/Lang/Navigation.zh.lang.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/media-collection-create.tpl.php | 4 +- Theme/Backend/media-file-create.tpl.php | 4 +- Theme/Backend/media-list.tpl.php | 26 +++--- Theme/Backend/media-single.tpl.php | 14 ++-- Theme/Backend/media-upload.tpl.php | 4 +- Theme/Backend/template-functions.php | 2 +- Views/MediaCreateView.php | 4 +- Views/MediaView.php | 4 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- .../Api/ApiControllerCollectionTrait.php | 2 +- .../Api/ApiControllerMediaTrait.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/CollectionMapperTest.php | 2 +- tests/Models/CollectionTest.php | 2 +- tests/Models/MediaMapperTest.php | 2 +- tests/Models/MediaTest.php | 2 +- tests/Models/MediaTypeTest.php | 2 +- tests/Models/NullCollectionTest.php | 2 +- tests/Models/NullMediaTest.php | 2 +- tests/Models/NullMediaTypeTest.php | 2 +- tests/Views/MediaViewTest.php | 2 +- 124 files changed, 240 insertions(+), 226 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 881db0b..5f19905 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Media", - "uri": "{/lang}/{/app}/media/list", + "uri": "{/base}/media/list", "target": "self", "icon": null, "order": 20, @@ -21,7 +21,7 @@ "type": 2, "subtype": 2, "name": "Media", - "uri": "{/lang}/{/app}/profile/single/media?{?}", + "uri": "{/base}/profile/single/media?{?}", "target": "self", "icon": null, "order": 3, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 458902d..4eea82d 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Navigation class. * * @package Modules\Media\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Installer.php b/Admin/Installer.php index e15e5ad..ef2bf2f 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -34,7 +34,7 @@ use phpOMS\Uri\HttpUri; * Installer class. * * @package Modules\Media\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 0265bb8..160e37d 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 8d70023..36a3e22 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index ca1cebe..ab49698 100755 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Auditor * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -69,7 +69,7 @@ echo $this->getData('nav')->render(); ?> $type) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/admin/module/settings?id=Media&type=' . $type->getId()); ?> + $url = UriFactory::build('{/base}/admin/module/settings?id=Media&type=' . $type->getId()); ?> getId(); ?> printHtml($type->name); ?> diff --git a/Admin/Status.php b/Admin/Status.php index 005da85..93e1d04 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract; * Status class. * * @package Modules\Media\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index a101887..4fde98f 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract; * Uninstaller class. * * @package Modules\Media\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Updater.php b/Admin/Updater.php index 40428c6..93be03d 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract; * Updater class. * * @package Modules\Media\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5d7e525..01ddbf6 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -61,7 +61,7 @@ use phpOMS\Views\View; * Media class. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -87,14 +87,14 @@ final class ApiController extends Controller fileNames: $request->getDataList('filenames'), files: $request->getFiles(), account: $request->header->account, - basePath: __DIR__ . '/../../../Modules/Media/Files' . \urldecode((string) ($request->getData('path') ?? '')), - virtualPath: \urldecode((string) ($request->getData('virtualpath') ?? '')), - password: (string) ($request->getData('password') ?? ''), - encryptionKey: (string) ($request->getData('encrypt') ?? ''), - pathSettings: (int) ($request->getData('pathsettings') ?? PathSettings::RANDOM_PATH), // IMPORTANT!!! - hasAccountRelation: (bool) ($request->getData('link_account') ?? false), - readContent: (bool) ($request->getData('parse_content') ?? false), - unit: $request->getData('unit', 'int') + basePath: __DIR__ . '/../../../Modules/Media/Files' . \urldecode($request->getDataString('path') ?? ''), + virtualPath: \urldecode($request->getDataString('virtualpath') ?? ''), + password: $request->getDataString('password') ?? '', + encryptionKey: $request->getDataString('encrypt') ?? '', + pathSettings: $request->getDataInt('pathsettings') ?? PathSettings::RANDOM_PATH, // IMPORTANT!!! + hasAccountRelation: $request->getDataBool('link_account') ?? false, + readContent: $request->getDataBool('parse_content') ?? false, + unit: $request->getDataInt('unit') ); $ids = []; @@ -591,7 +591,7 @@ final class ApiController extends Controller $media->isAbsolute = false; } - if ($request->getData('content') !== null) { + if ($request->hasData('content')) { \file_put_contents( $media->isAbsolute ? $media->getPath() : __DIR__ . '/../../../' . \ltrim($media->getPath(), '\\/'), $request->getData('content') @@ -634,8 +634,8 @@ final class ApiController extends Controller if ($parentCollectionId === 0) { /** @var Collection $parentCollection */ $parentCollection = CollectionMapper::get() - ->where('virtualPath', \dirname($request->getData('virtualpath') ?? '')) - ->where('name', \basename($request->getData('virtualpath') ?? '')) + ->where('virtualPath', \dirname($request->getDataString('virtualpath') ?? '')) + ->where('name', \basename($request->getDataString('virtualpath') ?? '')) ->execute(); $parentCollectionId = $parentCollection->getId(); @@ -675,10 +675,10 @@ final class ApiController extends Controller private function createReferenceFromRequest(RequestAbstract $request) : Reference { $mediaReference = new Reference(); - $mediaReference->name = \basename($request->getData('virtualpath')); + $mediaReference->name = \basename($request->getDataString('virtualpath') ?? '/'); $mediaReference->source = new NullMedia((int) $request->getData('source')); $mediaReference->createdBy = new NullAccount($request->header->account); - $mediaReference->setVirtualPath(\dirname($request->getData('virtualpath'))); + $mediaReference->setVirtualPath(\dirname($request->getDataString('virtualpath') ?? '/')); return $mediaReference; } @@ -704,13 +704,27 @@ final class ApiController extends Controller return []; } - // Very similar to create Reference - // Reference = it's own media element which points to another element (disadvantage = additional step) - // Collection add = directly pointing to other media element (disadvantage = we don't know if we are allowed to modify/delete) + /** + * Api method to add an element to a collection. + * + * Very similar to create Reference + * Reference = it's own media element which points to another element (disadvantage = additional step) + * Collection add = directly pointing to other media element (disadvantage = we don't know if we are allowed to modify/delete) + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return void + * + * @api + * + * @since 1.0.0 + */ public function apiCollectionAdd(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { $collection = (int) $request->getData('collection'); - $media = $request->getDataJson('media-list'); + $media = $request->getDataJson('media-list'); foreach ($media as $file) { $this->createModelRelation( @@ -784,8 +798,8 @@ final class ApiController extends Controller private function createCollectionFromRequest(RequestAbstract $request) : Collection { $mediaCollection = new Collection(); - $mediaCollection->name = (string) ($request->getData('name') ?? ''); - $mediaCollection->description = ($description = Markdown::parse($request->getData('description') ?? '')); + $mediaCollection->name = $request->getDataString('name') ?? ''; + $mediaCollection->description = ($description = Markdown::parse($request->getDataString('description') ?? '')); $mediaCollection->descriptionRaw = $description; $mediaCollection->createdBy = new NullAccount($request->header->account); @@ -937,9 +951,9 @@ final class ApiController extends Controller */ public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { - $path = \urldecode((string) ($request->getData('path') ?? '')); + $path = \urldecode($request->getDataString('path') ?? ''); $virtualPath = \urldecode((string) ($request->getData('virtualpath') ?? '/')); - $fileName = (string) ($request->getData('filename') ?? ($request->getData('name') ?? '')); + $fileName = (string) ($request->getData('filename') ?? ($request->getDataString('name') ?? '')); $fileName .= \strripos($fileName, '.') === false ? '.txt' : ''; $outputDir = ''; @@ -966,7 +980,7 @@ final class ApiController extends Controller } } - \file_put_contents($outputDir . '/' . $fileName, (string) ($request->getData('content') ?? '')); + \file_put_contents($outputDir . '/' . $fileName, $request->getDataString('content') ?? ''); $outputDir = \substr($outputDir, \strlen(__DIR__ . '/../../..')); $status = [ @@ -974,8 +988,8 @@ final class ApiController extends Controller 'status' => UploadStatus::OK, 'path' => $outputDir, 'filename' => $fileName, - 'name' => $request->getData('name') ?? '', - 'size' => \strlen((string) ($request->getData('content') ?? '')), + 'name' => $request->getDataString('name') ?? '', + 'size' => \strlen($request->getDataString('content') ?? ''), 'extension' => \substr($fileName, \strripos($fileName, '.') + 1), ], ]; @@ -988,7 +1002,7 @@ final class ApiController extends Controller $virtualPath, $request->getOrigin(), $this->app, - unit: $request->getData('unit', 'int') + unit: $request->getDataInt('unit') ); $ids[] = $created->getId(); @@ -1281,10 +1295,10 @@ final class ApiController extends Controller private function createDocTypeFromRequest(RequestAbstract $request) : MediaType { $type = new MediaType(); - $type->name = (string) ($request->getData('name') ?? ''); + $type->name = $request->getDataString('name') ?? ''; if (!empty($request->getData('title'))) { - $type->setL11n($request->getData('title'), $request->getData('lang') ?? $request->getLanguage()); + $type->setL11n($request->getDataString('title') ?? '', $request->getData('lang') ?? $request->getLanguage()); } return $type; @@ -1351,11 +1365,11 @@ final class ApiController extends Controller private function createMediaTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $l11nMediaType = new BaseStringL11n(); - $l11nMediaType->ref = (int) ($request->getData('type') ?? 0); - $l11nMediaType->content = (string) ($request->getData('title') ?? ''); - $l11nMediaType->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); + $l11nMediaType->ref = $request->getDataInt('type') ?? 0; + $l11nMediaType->content = $request->getDataString('title') ?? ''; + $l11nMediaType->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); return $l11nMediaType; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 522ead2..b0669de 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -42,7 +42,7 @@ use phpOMS\Views\View; * Media class. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore @@ -210,9 +210,9 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Media/Theme/Backend/media-single'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response)); - $id = $request->getData('id', 'int'); + $id = $request->getDataInt('id'); if ($id === 0) { - $path = \urldecode($request->getData('path')); + $path = \urldecode($request->getDataString('path') ?? ''); $media = new NullMedia(); if (\is_file(__DIR__ . '/../Files' . $path)) { $name = \explode('.', \basename($path)); @@ -257,7 +257,7 @@ final class BackendController extends Controller $view->addData('path', $collection->getVirtualPath() . '/' . $collection->name); $view->setTemplate('/Modules/Media/Theme/Backend/media-list'); } else { - $sub = $request->getData('sub') ?? ''; + $sub = $request->getDataString('sub') ?? ''; if (\is_dir($media->getPath()) && (\is_dir($media->getPath() . $sub)) ) { @@ -391,7 +391,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); - $id = $request->getData('id') ?? ''; + $id = $request->getDataString('id') ?? ''; $settings = SettingMapper::getAll()->where('module', $id)->execute(); if (!($settings instanceof NullSetting)) { diff --git a/Controller/Controller.php b/Controller/Controller.php index 6232bcd..8fbfb6d 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * Media class. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/FileUploaderTrait.php b/Controller/FileUploaderTrait.php index e530d94..319ba49 100755 --- a/Controller/FileUploaderTrait.php +++ b/Controller/FileUploaderTrait.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Controller * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Message\ResponseAbstract; * Options trait. * * @package Modules\Media\Controller - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Collection.php b/Models/Collection.php index f10a691..ab479e7 100755 --- a/Models/Collection.php +++ b/Models/Collection.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Utils\StringUtils; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php index abb151b..1be6e18 100755 --- a/Models/CollectionMapper.php +++ b/Models/CollectionMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\ReadMapper; * Mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Media.php b/Models/Media.php index 255582a..98c221c 100755 --- a/Models/Media.php +++ b/Models/Media.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use Modules\Tag\Models\Tag; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaClass.php b/Models/MediaClass.php index 593613a..892c9db 100755 --- a/Models/MediaClass.php +++ b/Models/MediaClass.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -30,7 +30,7 @@ use phpOMS\Stdlib\Base\Enum; * Used to differentiate the type/class of media * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaContent.php b/Models/MediaContent.php index bbcf754..f2ea857 100755 --- a/Models/MediaContent.php +++ b/Models/MediaContent.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaContentMapper.php b/Models/MediaContentMapper.php index 15b033f..5ab6225 100755 --- a/Models/MediaContentMapper.php +++ b/Models/MediaContentMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Media mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index 5b50a0e..e6a6088 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Mapper\ReadMapper; * Media mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaStatus.php b/Models/MediaStatus.php index b620e93..0ba9c1b 100755 --- a/Models/MediaStatus.php +++ b/Models/MediaStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -28,7 +28,7 @@ use phpOMS\Stdlib\Base\Enum; * Media status enum. * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaType.php b/Models/MediaType.php index 45954d8..a290c59 100755 --- a/Models/MediaType.php +++ b/Models/MediaType.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\ISO639x1Enum; * Media type class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaTypeL11nMapper.php b/Models/MediaTypeL11nMapper.php index 70c25fa..5d0652c 100755 --- a/Models/MediaTypeL11nMapper.php +++ b/Models/MediaTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n; * Media type l11n mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/MediaTypeMapper.php b/Models/MediaTypeMapper.php index 2dff8d5..73664e3 100755 --- a/Models/MediaTypeMapper.php +++ b/Models/MediaTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Media type mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullCollection.php b/Models/NullCollection.php index 9ea423c..81e9744 100755 --- a/Models/NullCollection.php +++ b/Models/NullCollection.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullMedia.php b/Models/NullMedia.php index 37c2bb9..5d7ff87 100755 --- a/Models/NullMedia.php +++ b/Models/NullMedia.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullMediaContent.php b/Models/NullMediaContent.php index 37d69d1..8a6beae 100755 --- a/Models/NullMediaContent.php +++ b/Models/NullMediaContent.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullMediaType.php b/Models/NullMediaType.php index 5941e6b..16594e3 100755 --- a/Models/NullMediaType.php +++ b/Models/NullMediaType.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Media type class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullReference.php b/Models/NullReference.php index d51bfd3..9512034 100755 --- a/Models/NullReference.php +++ b/Models/NullReference.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Reference class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PathSettings.php b/Models/PathSettings.php index 787d0ef..b531f98 100755 --- a/Models/PathSettings.php +++ b/Models/PathSettings.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Path settings enum. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index 4f3d4b8..7541391 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Permision state enum. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Reference.php b/Models/Reference.php index f3d4e43..f669027 100755 --- a/Models/Reference.php +++ b/Models/Reference.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Reference class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ReferenceMapper.php b/Models/ReferenceMapper.php index a41232a..756fb00 100755 --- a/Models/ReferenceMapper.php +++ b/Models/ReferenceMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace Modules\Media\Models; * Mapper class. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Upload.js b/Models/Upload.js index 87bb66f..efde851 100755 --- a/Models/Upload.js +++ b/Models/Upload.js @@ -7,7 +7,7 @@ import { RequestType } from '../../../jsOMS/Message/Request/RequestType.js'; * Media uploader. * * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @since 1.0.0 */ diff --git a/Models/UploadFile.php b/Models/UploadFile.php index 090235b..7bd5502 100755 --- a/Models/UploadFile.php +++ b/Models/UploadFile.php @@ -7,7 +7,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\System\File\Local\File; * Upload. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Models/UploadStatus.php b/Models/UploadStatus.php index e115c64..0fc6deb 100755 --- a/Models/UploadStatus.php +++ b/Models/UploadStatus.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Upload status. * * @package Modules\Media\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Theme/Api/render.tpl.php b/Theme/Api/render.tpl.php index c1f808d..fe913b5 100755 --- a/Theme/Api/render.tpl.php +++ b/Theme/Api/render.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Api/spreadsheetAsCsv.tpl.php b/Theme/Api/spreadsheetAsCsv.tpl.php index b7d233d..8d5c3f0 100755 --- a/Theme/Api/spreadsheetAsCsv.tpl.php +++ b/Theme/Api/spreadsheetAsCsv.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Api/spreadsheetAsHtml.tpl.php b/Theme/Api/spreadsheetAsHtml.tpl.php index 7b1e274..d765091 100755 --- a/Theme/Api/spreadsheetAsHtml.tpl.php +++ b/Theme/Api/spreadsheetAsHtml.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Api/wordAsHtml.tpl.php b/Theme/Api/wordAsHtml.tpl.php index 4f83bd7..5a43073 100755 --- a/Theme/Api/wordAsHtml.tpl.php +++ b/Theme/Api/wordAsHtml.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/InlinePreview/BaseView.php b/Theme/Backend/Components/InlinePreview/BaseView.php index 721b60a..041e088 100755 --- a/Theme/Backend/Components/InlinePreview/BaseView.php +++ b/Theme/Backend/Components/InlinePreview/BaseView.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php index 2a2a271..b28d136 100755 --- a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php +++ b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php @@ -5,9 +5,9 @@ { "key": 1, "listener": "click", "action": [ {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "getId(); ?>"}, - {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 2, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}, - {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, + {"key": 4, "type": "message.request", "uri": "", "method": "GET", "request_type": "json"}, {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1} ] } diff --git a/Theme/Backend/Components/Media/ElementView.php b/Theme/Backend/Components/Media/ElementView.php index 9082aac..204f173 100755 --- a/Theme/Backend/Components/Media/ElementView.php +++ b/Theme/Backend/Components/Media/ElementView.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use Modules\Media\Views\MediaView; * Component view. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/Media/ListView.php b/Theme/Backend/Components/Media/ListView.php index 4ccf202..fc2b6cb 100755 --- a/Theme/Backend/Components/Media/ListView.php +++ b/Theme/Backend/Components/Media/ListView.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Components/Media/archive.tpl.php b/Theme/Backend/Components/Media/archive.tpl.php index 35a86bf..ded3cfd 100755 --- a/Theme/Backend/Components/Media/archive.tpl.php +++ b/Theme/Backend/Components/Media/archive.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/audio.tpl.php b/Theme/Backend/Components/Media/audio.tpl.php index 62e0c35..81f228a 100755 --- a/Theme/Backend/Components/Media/audio.tpl.php +++ b/Theme/Backend/Components/Media/audio.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/csv.tpl.php b/Theme/Backend/Components/Media/csv.tpl.php index 4620745..a1ca147 100755 --- a/Theme/Backend/Components/Media/csv.tpl.php +++ b/Theme/Backend/Components/Media/csv.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/image.tpl.php b/Theme/Backend/Components/Media/image.tpl.php index 2348d58..f469047 100755 --- a/Theme/Backend/Components/Media/image.tpl.php +++ b/Theme/Backend/Components/Media/image.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/invalidPassword.tpl.php b/Theme/Backend/Components/Media/invalidPassword.tpl.php index a581fcd..1ed44af 100644 --- a/Theme/Backend/Components/Media/invalidPassword.tpl.php +++ b/Theme/Backend/Components/Media/invalidPassword.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\News * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/json.tpl.php b/Theme/Backend/Components/Media/json.tpl.php index 76d17a9..ff2b45e 100755 --- a/Theme/Backend/Components/Media/json.tpl.php +++ b/Theme/Backend/Components/Media/json.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php index 1c83333..60bd3da 100755 --- a/Theme/Backend/Components/Media/list.tpl.php +++ b/Theme/Backend/Components/Media/list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -38,7 +38,7 @@ $next = empty($this->media) getHtml('Created', 'Media'); ?> media as $key => $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/media/single?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/media/single?{?}&id=' . $value->getId()); $icon = ''; $extensionType = FileUtils::getExtensionType($value->extension); @@ -46,7 +46,7 @@ $next = empty($this->media) ?> - printHtml($value->getVirtualPath()); ?> + printHtml($value->getVirtualPath()); ?> printHtml($value->name); ?> printHtml($value->extension); ?> size; ?> diff --git a/Theme/Backend/Components/Media/markdown.tpl.php b/Theme/Backend/Components/Media/markdown.tpl.php index 9e01689..b53e6cb 100755 --- a/Theme/Backend/Components/Media/markdown.tpl.php +++ b/Theme/Backend/Components/Media/markdown.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/pdf.tpl.php b/Theme/Backend/Components/Media/pdf.tpl.php index 51c75ed..853999f 100755 --- a/Theme/Backend/Components/Media/pdf.tpl.php +++ b/Theme/Backend/Components/Media/pdf.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/powerpoint.tpl.php b/Theme/Backend/Components/Media/powerpoint.tpl.php index 4b4d657..8b68021 100755 --- a/Theme/Backend/Components/Media/powerpoint.tpl.php +++ b/Theme/Backend/Components/Media/powerpoint.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/spreadsheet.tpl.php b/Theme/Backend/Components/Media/spreadsheet.tpl.php index 69eae75..85c1c39 100755 --- a/Theme/Backend/Components/Media/spreadsheet.tpl.php +++ b/Theme/Backend/Components/Media/spreadsheet.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/video.tpl.php b/Theme/Backend/Components/Media/video.tpl.php index 3caa625..6d9628c 100755 --- a/Theme/Backend/Components/Media/video.tpl.php +++ b/Theme/Backend/Components/Media/video.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Media/word.tpl.php b/Theme/Backend/Components/Media/word.tpl.php index 633f0a4..d37d84d 100755 --- a/Theme/Backend/Components/Media/word.tpl.php +++ b/Theme/Backend/Components/Media/word.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Components/Upload/BaseView.php b/Theme/Backend/Components/Upload/BaseView.php index 1957aba..82095f8 100755 --- a/Theme/Backend/Components/Upload/BaseView.php +++ b/Theme/Backend/Components/Upload/BaseView.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Component view. * * @package Modules\Media - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index 09c5086..ff0f09f 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/Theme/Backend/Lang/Navigation.ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index 8f43a14..830155e 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/Theme/Backend/Lang/Navigation.cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index 63a8cd6..0b47bef 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/Theme/Backend/Lang/Navigation.da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index 5d4fe7a..1545976 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index 3401610..0b6e13f 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/Theme/Backend/Lang/Navigation.el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 6bf8a71..6918981 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index a76a34f..f21329a 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/Theme/Backend/Lang/Navigation.es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index c7a9923..4c66bbf 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/Theme/Backend/Lang/Navigation.fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index 2822b04..aa27ce1 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/Theme/Backend/Lang/Navigation.fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index 49aac60..c0d791b 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/Theme/Backend/Lang/Navigation.hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index 69522ba..cf1ccd1 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/Theme/Backend/Lang/Navigation.it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index 95f45c7..e1eee13 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/Theme/Backend/Lang/Navigation.ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index 42d83ea..d363896 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/Theme/Backend/Lang/Navigation.ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index a6c60b1..7d3f2a7 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/Theme/Backend/Lang/Navigation.no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index 6e8aecb..42aff27 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/Theme/Backend/Lang/Navigation.pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index 846319b..3170cf0 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/Theme/Backend/Lang/Navigation.pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index e3bb141..3a0f360 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/Theme/Backend/Lang/Navigation.ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index d9e88a7..996f0f0 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/Theme/Backend/Lang/Navigation.sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index 3d60d05..b36609e 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/Theme/Backend/Lang/Navigation.th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index c1c87b2..c0dba1d 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/Theme/Backend/Lang/Navigation.tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 8d122d5..2579cc1 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/Theme/Backend/Lang/Navigation.uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 4cff6f3..cc0e2c2 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/Theme/Backend/Lang/Navigation.zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 1fe7c57..d796c9f 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index 066bda8..0cb3cfd 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index dbae35d..e859e61 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 3b1fa1c..69f4443 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index b1ef331..31f5e52 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 49f8f40..6007a63 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 016ceca..1d33313 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 5fb1110..fa1a42a 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index d7e6d28..2d0387c 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 1387e7d..82fdd4f 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index 46e9a06..7a570df 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index e460e08..9387136 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index dbad76c..44f6246 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index f96934a..4ba06fc 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 8af510a..b1db98e 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index ce8bc20..28254a0 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 27ad060..94789b0 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 96cde87..8755596 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 91f94c7..2222800 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 898cf7c..7831d1c 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 595a8dc..b3a451f 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index 1ec322c..7f17b71 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/media-collection-create.tpl.php b/Theme/Backend/media-collection-create.tpl.php index 22bc628..fa354a9 100755 --- a/Theme/Backend/media-collection-create.tpl.php +++ b/Theme/Backend/media-collection-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn -* @license OMS License 1.0 +* @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Uri\UriFactory;
- getHtml('Back', '0', '0'); ?> + getHtml('Back', '0', '0'); ?>
diff --git a/Theme/Backend/media-file-create.tpl.php b/Theme/Backend/media-file-create.tpl.php index 5d3cbf6..10e2e2d 100755 --- a/Theme/Backend/media-file-create.tpl.php +++ b/Theme/Backend/media-file-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn -* @license OMS License 1.0 +* @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -39,7 +39,7 @@ use phpOMS\Uri\UriFactory;
- getHtml('Back'); ?> + getHtml('Back'); ?>
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php index 2ec99ca..f170a9d 100755 --- a/Theme/Backend/media-list.tpl.php +++ b/Theme/Backend/media-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -30,20 +30,20 @@ $media = $this->getData('media') ?? []; $account = $this->getData('account'); $accountDir = $account->getId() . ' ' . $account->login; -$previous = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/list?{?}&id=' . \reset($media)->getId() . '&ptype=p'; -$next = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/list?{?}&id=' . \end($media)->getId() . '&ptype=n'; +$previous = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id=' . \reset($media)->getId() . '&ptype=p'; +$next = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id=' . \end($media)->getId() . '&ptype=n'; ?>
- + getHtml('Upload'); ?> - + getHtml('CreateFile'); ?> - + getHtml('CreateCollection'); ?>
@@ -54,9 +54,9 @@ $next = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/
    -
  • +
  • -
  • +
  • /
  • > printHtml($paths[$i]); ?> @@ -166,7 +166,7 @@ $next = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/ @@ -186,8 +186,8 @@ $next = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/ ++$count; $url = $value->extension === 'collection' - ? UriFactory::build('{/lang}/{/app}/media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name) - : UriFactory::build('{/lang}/{/app}/media/single?id=' . $value->getId() + ? UriFactory::build('{/base}/media/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name) + : UriFactory::build('{/base}/media/single?id=' . $value->getId() . '&path={?path}' . ( $value->getId() === 0 ? '/' . $value->name @@ -220,7 +220,7 @@ $next = empty($media) ? '{/lang}/{/app}/media/list' : '{/lang}/{/app}/media/ $size = FileSizeType::autoFormat($value->size); echo $this->printHtml($value->extension !== 'collection' ? \number_format($size[0], 1, '.', ',') . $size[1] : ''); ?> - + printHtml($this->renderUserName( '%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''] diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index fe50832..6d1cd16 100755 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -40,9 +40,9 @@ echo $this->getData('nav')->render();
    request->getData('path') !== null) : ?> - getHtml('Back'); ?> + getHtml('Back'); ?> - getHtml('Back'); ?> + getHtml('Back'); ?>
    @@ -52,8 +52,8 @@ echo $this->getData('nav')->render();
      -
    • -
    • /
      • +
    • +
    • /
      • getData('nav')->render(); $subPath .= '/' . $paths[$i]; - $url = UriFactory::build('{/lang}/{/app}/media/list?path=' . $subPath); + $url = UriFactory::build('{/base}/media/list?path=' . $subPath); ?>
    • >printHtml($paths[$i]); ?>
      • @@ -92,7 +92,7 @@ echo $this->getData('nav')->render(); $size = FileSizeType::autoFormat($media->size); echo $this->printHtml(\number_format($size[0], 1, '.', ',') . $size[1]); ?> getHtml('Created'); ?>printHtml($media->createdAt->format('Y-m-d')); ?> - getHtml('Creator'); ?>printHtml( + getHtml('Creator'); ?>printHtml( \ltrim($media->createdBy->name2 . ', ' . $media->createdBy->name1, ', ') ); ?> getHtml('Tags'); ?> diff --git a/Theme/Backend/media-upload.tpl.php b/Theme/Backend/media-upload.tpl.php index dcab034..a69f839 100755 --- a/Theme/Backend/media-upload.tpl.php +++ b/Theme/Backend/media-upload.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Media * @copyright Dennis Eichhorn -* @license OMS License 1.0 +* @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Uri\UriFactory;
      - getHtml('Back', '0', '0'); ?> + getHtml('Back', '0', '0'); ?>
      diff --git a/Theme/Backend/template-functions.php b/Theme/Backend/template-functions.php index 4a463bb..3ee9ef7 100755 --- a/Theme/Backend/template-functions.php +++ b/Theme/Backend/template-functions.php @@ -6,7 +6,7 @@ * * @package Modules\HumanResourceManagement\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Views/MediaCreateView.php b/Views/MediaCreateView.php index 60c27b0..439af40 100755 --- a/Views/MediaCreateView.php +++ b/Views/MediaCreateView.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Views\View; * Media list view. * * @package Modules\Media\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Views/MediaView.php b/Views/MediaView.php index 794b17a..9d7054b 100755 --- a/Views/MediaView.php +++ b/Views/MediaView.php @@ -6,7 +6,7 @@ * * @package Modules\Media\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Views\View; * Media view. * * @package Modules\Media\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index ad8662d..652a8a1 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index d032623..d08f1b7 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Modules/tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace tests; * Autoloader class. * * @package tests - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php index e190c10..69ce4c8 100755 --- a/tests/Controller/Api/ApiControllerCollectionTrait.php +++ b/tests/Controller/Api/ApiControllerCollectionTrait.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php index e2b3e1e..1c77ce9 100755 --- a/tests/Controller/Api/ApiControllerMediaTrait.php +++ b/tests/Controller/Api/ApiControllerMediaTrait.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 3af6776..e3f91a4 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/CollectionMapperTest.php b/tests/Models/CollectionMapperTest.php index 482e743..4091347 100755 --- a/tests/Models/CollectionMapperTest.php +++ b/tests/Models/CollectionMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/CollectionTest.php b/tests/Models/CollectionTest.php index 8455e7d..02e391e 100755 --- a/tests/Models/CollectionTest.php +++ b/tests/Models/CollectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/MediaMapperTest.php b/tests/Models/MediaMapperTest.php index cb43b51..a327b5c 100755 --- a/tests/Models/MediaMapperTest.php +++ b/tests/Models/MediaMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/MediaTest.php b/tests/Models/MediaTest.php index 694dca1..3370461 100755 --- a/tests/Models/MediaTest.php +++ b/tests/Models/MediaTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/MediaTypeTest.php b/tests/Models/MediaTypeTest.php index 0bb33a3..c20a87d 100755 --- a/tests/Models/MediaTypeTest.php +++ b/tests/Models/MediaTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullCollectionTest.php b/tests/Models/NullCollectionTest.php index 94b99cf..b7dda0a 100755 --- a/tests/Models/NullCollectionTest.php +++ b/tests/Models/NullCollectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullMediaTest.php b/tests/Models/NullMediaTest.php index 0810535..4292cc9 100755 --- a/tests/Models/NullMediaTest.php +++ b/tests/Models/NullMediaTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Models/NullMediaTypeTest.php b/tests/Models/NullMediaTypeTest.php index 7588f59..96becb4 100755 --- a/tests/Models/NullMediaTypeTest.php +++ b/tests/Models/NullMediaTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Views/MediaViewTest.php b/tests/Views/MediaViewTest.php index ede9c3a..a8ba35a 100755 --- a/tests/Views/MediaViewTest.php +++ b/tests/Views/MediaViewTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */