diff --git a/Admin/Activate.php b/Admin/Activate.php index a14c7c9..999d8cd 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin; use phpOMS\DataStorage\Database\DatabasePool; diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index 0453f5f..1a1feec 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin; use phpOMS\DataStorage\Database\DatabasePool; diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 8be9a19..4f5243c 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin\Install; use phpOMS\DataStorage\Database\DatabasePool; diff --git a/Admin/Installer.php b/Admin/Installer.php index 9a3ab32..fad0fba 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin; use phpOMS\DataStorage\Database\DatabaseType; diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 11b742a..ddd0305 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin; use phpOMS\DataStorage\Database\DatabasePool; diff --git a/Admin/Update.php b/Admin/Update.php index ea29296..98f7213 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Admin; use phpOMS\DataStorage\Database\DatabasePool; diff --git a/Controller.php b/Controller.php index a099633..4fedba9 100644 --- a/Controller.php +++ b/Controller.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media; use Modules\Media\Models\Media; @@ -149,7 +149,7 @@ class Controller extends ModuleAbstract implements WebInterface $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response)); $media = MediaMapper::get($request->getData('id')); - if($media->getExtension() === 'collection') { + if ($media->getExtension() === 'collection') { $media = CollectionMapper::get($media->getId()); } @@ -193,7 +193,7 @@ class Controller extends ModuleAbstract implements WebInterface $uploads = $this->uploadFiles($request->getFiles(), $request->getHeader()->getAccount(), $request->getData('path') ?? __DIR__ . '/../../Modules/Media/Files'); $ids = []; - foreach($uploads as $file) { + foreach ($uploads as $file) { $ids[] = $file->getId(); } @@ -260,7 +260,7 @@ class Controller extends ModuleAbstract implements WebInterface $mediaCreated = []; foreach ($status as $uFile) { - if(!is_null($created = self::createDbEntry($uFile, $account))) { + if (!is_null($created = self::createDbEntry($uFile, $account))) { $mediaCreated[] = $created; } } diff --git a/Models/Collection.php b/Models/Collection.php index 2e4deaa..8301a75 100644 --- a/Models/Collection.php +++ b/Models/Collection.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; /** diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php index 403b5ef..5c1efdf 100644 --- a/Models/CollectionMapper.php +++ b/Models/CollectionMapper.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; use Modules\Media\Models\MediaMapper; diff --git a/Models/FileUploaderTrait.php b/Models/FileUploaderTrait.php index ecb0b02..2088525 100644 --- a/Models/FileUploaderTrait.php +++ b/Models/FileUploaderTrait.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; use phpOMS\Asset\AssetType; diff --git a/Models/Media.php b/Models/Media.php index 080ebf7..d0905d4 100644 --- a/Models/Media.php +++ b/Models/Media.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; /** diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index 0b7ccea..3bf0ffb 100644 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; use phpOMS\DataStorage\Database\DataMapperAbstract; @@ -89,7 +89,7 @@ class MediaMapper extends DataMapperAbstract try { $objId = parent::create($obj, $relations); - if($objId === null || !is_scalar($objId)) { + if ($objId === null || !is_scalar($objId)) { return $objId; } } catch (\Exception $e) { diff --git a/Models/NullCollection.php b/Models/NullCollection.php index 3b32df3..6be5e7c 100644 --- a/Models/NullCollection.php +++ b/Models/NullCollection.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; /** diff --git a/Models/NullMedia.php b/Models/NullMedia.php index f8a4273..9dffbeb 100644 --- a/Models/NullMedia.php +++ b/Models/NullMedia.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; /** diff --git a/Models/UploadFile.php b/Models/UploadFile.php index 885b562..ca8b8fa 100644 --- a/Models/UploadFile.php +++ b/Models/UploadFile.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; use phpOMS\System\File\Local\Directory; @@ -163,7 +163,7 @@ class UploadFile $limit++; } while (file_exists($path . '/' . $this->fileName) && $limit < self::PATH_GENERATION_LIMIT); - if($limit >= self::PATH_GENERATION_LIMIT) { + if ($limit >= self::PATH_GENERATION_LIMIT) { throw new \Exception('No file path could be found. Potential attack!'); } } @@ -184,7 +184,7 @@ class UploadFile return $result; } - if($this->interlaced && in_array($extension, ['png', 'jpg', 'jpeg', 'gif'])) { + if ($this->interlaced && in_array($extension, ['png', 'jpg', 'jpeg', 'gif'])) { $this->interlace($extension, $dest); } @@ -197,22 +197,22 @@ class UploadFile private function interlace(string $extension, string $path) /* : void */ { - if($extension === 'png') { + if ($extension === 'png') { $img = imagecreatefrompng($path); - } elseif($extension === 'jpg' || $extension === 'jpeg') { + } elseif ($extension === 'jpg' || $extension === 'jpeg') { $img = imagecreatefromjpeg($path); } else { - $img = imagecreatefromgif($path); + $img = imagecreatefromgif ($path); } imageinterlace($img, (int) $this->interlaced); - if($extension === 'png') { + if ($extension === 'png') { imagepng($img, $path); - } elseif($extension === 'jpg' || $extension === 'jpeg') { + } elseif ($extension === 'jpg' || $extension === 'jpeg') { imagejpeg($img, $path); } else { - imagegif($img, $path); + imagegif ($img, $path); } imagedestroy($img); diff --git a/Models/UploadStatus.php b/Models/UploadStatus.php index 18d43ff..25996b3 100644 --- a/Models/UploadStatus.php +++ b/Models/UploadStatus.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Models; use phpOMS\Stdlib\Base\Enum; diff --git a/Theme/Backend/Components/Media/BaseView.php b/Theme/Backend/Components/Media/BaseView.php index c632785..dbaad05 100644 --- a/Theme/Backend/Components/Media/BaseView.php +++ b/Theme/Backend/Components/Media/BaseView.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Theme\Backend\Components\Media; diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php index ffaf209..62c0ae4 100644 --- a/Theme/Backend/Components/Media/list.tpl.php +++ b/Theme/Backend/Components/Media/list.tpl.php @@ -10,31 +10,31 @@ getHtml('Created', 'Media') ?> - media as $key => $value) : $count++; + media as $key => $value) : $count++; $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/media/single?{?}&id=' . $value->getId()); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()); - if($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; - } elseif($value->getExtension() === 'collection') { + } elseif ($value->getExtension() === 'collection') { $icon = 'folder-open-o'; } else { $icon = 'file-o'; @@ -48,7 +48,7 @@ printHtml($value->getCreatedBy()->getName1()); ?> printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> - + getHtml('Empty', 0, 0); ?> diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php index b7ea80b..5b50e73 100644 --- a/Theme/Backend/media-list.tpl.php +++ b/Theme/Backend/media-list.tpl.php @@ -40,31 +40,31 @@ echo $this->getData('nav')->render(); ?> render(); ?> - $value) : $count++; + $value) : $count++; $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/media/single?{?}&id=' . $value->getId()); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()); - if($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; - } elseif($value->getExtension() === 'collection') { + } elseif ($value->getExtension() === 'collection') { $icon = 'folder-open-o'; } else { $icon = 'file-o'; @@ -78,7 +78,7 @@ echo $this->getData('nav')->render(); ?> printHtml($value->getCreatedBy()->getName1()); ?> printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> - + getHtml('Empty', 0, 0); ?> diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index e3e98db..77f3327 100644 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -40,7 +40,7 @@ echo $this->getData('nav')->render();
- getExtension() === 'collection' && !is_file($media->getPath() . $this->request->getData('sub')) @@ -62,31 +62,31 @@ echo $this->getData('nav')->render(); getHtml('Creator') ?> getHtml('Created') ?> - getPath())) : foreach($media as $key => $value) : + getPath())) : foreach ($media as $key => $value) : $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/media/single?{?}&id=' . $value->getId()); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()); - if($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; - } elseif($value->getExtension() === 'collection') { + } elseif ($value->getExtension() === 'collection') { $icon = 'folder-open-o'; } else { $icon = 'file-o'; @@ -101,30 +101,30 @@ echo $this->getData('nav')->render(); printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> getPath() . $this->request->getData('sub')) && phpOMS\Utils\StringUtils::startsWith(str_replace('\\', '/', realpath($media->getPath() . $this->request->getData('sub'))), $media->getPath()) ? $media->getPath() . $this->request->getData('sub') : $media->getPath(); ?> $value) : + foreach ($list as $key => $value) : $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/media/single?{?}&id=' . $media->getId() . '&sub=' . substr($value, strlen($media->getPath()))); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType(!is_dir($value) ? \phpOMS\System\File\Local\File::extension($value) : 'collection'); - if($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; - } elseif($extensionType === 'collection') { + } elseif ($extensionType === 'collection') { $icon = 'folder-open-o'; } else { $icon = 'file-o'; @@ -147,7 +147,7 @@ echo $this->getData('nav')->render();
getPath() . $this->request->getData('sub')) && phpOMS\Utils\StringUtils::startsWith(str_replace('\\', '/', realpath($media->getPath() . $this->request->getData('sub'))), $media->getPath()) ? $media->getPath() . $this->request->getData('sub') : $media->getPath(); - if(\phpOMS\System\File\FileUtils::getExtensionType($media->getExtension()) === \phpOMS\System\File\ExtensionType::IMAGE || \phpOMS\System\File\FileUtils::getExtensionType(\phpOMS\System\File\Local\File::extension($path)) === \phpOMS\System\File\ExtensionType::IMAGE) : ?> + if (\phpOMS\System\File\FileUtils::getExtensionType($media->getExtension()) === \phpOMS\System\File\ExtensionType::IMAGE || \phpOMS\System\File\FileUtils::getExtensionType(\phpOMS\System\File\Local\File::extension($path)) === \phpOMS\System\File\ExtensionType::IMAGE) : ?>
@@ -155,7 +155,7 @@ echo $this->getData('nav')->render();
                     $output = file_get_contents($media->isAbsolute() ? $path : __DIR__ . '/../../../../' . $path);
                     $output = str_replace(["\r\n", "\r"], "\n", $output);
                     $output = explode("\n", $output);
-                    foreach($output as $line) : ?>printHtml($line); ?>
+                    foreach ($output as $line) : ?>printHtml($line); ?>
                     
diff --git a/Views/MediaCreateView.php b/Views/MediaCreateView.php index 6238833..2c4eff0 100644 --- a/Views/MediaCreateView.php +++ b/Views/MediaCreateView.php @@ -11,7 +11,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -declare(strict_types=1); +declare(strict_types = 1); namespace Modules\Media\Views; use phpOMS\Views\View;