From 71cd2b80ecc7924f927c7aaab09220bbb56b0877 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 12 Apr 2018 22:32:07 +0200 Subject: [PATCH] Fix #140 --- Theme/Backend/media-single.tpl.php | 74 +++++++++++++++++++----------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index 2a22bd9..4f67baa 100644 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -10,6 +10,10 @@ * @version 1.0.0 * @link http://website.orange-management.de */ + +use \phpOMS\System\File\ExtensionType; +use \phpOMS\System\File\Local\File; + /** * @var \phpOMS\Views\View $this */ @@ -67,23 +71,23 @@ echo $this->getData('nav')->render(); $icon = ''; $extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()); - if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; } elseif ($value->getExtension() === 'collection') { $icon = 'folder-open-o'; @@ -103,25 +107,25 @@ echo $this->getData('nav')->render(); foreach ($list as $key => $value) : $url = \phpOMS\Uri\UriFactory::build('/{/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'); + $extensionType = \phpOMS\System\File\FileUtils::getExtensionType(!is_dir($value) ? File::extension($value) : 'collection'); - if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) { + if ($extensionType === ExtensionType::CODE) { $icon = 'file-code-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) { + } elseif ($extensionType === ExtensionType::TEXT) { $icon = 'file-text-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PRESENTATION) { + } elseif ($extensionType === ExtensionType::PRESENTATION) { $icon = 'file-powerpoint-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::PDF) { + } elseif ($extensionType === ExtensionType::PDF) { $icon = 'file-pdf-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::ARCHIVE) { + } elseif ($extensionType === ExtensionType::ARCHIVE) { $icon = 'file-zip-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::AUDIO) { + } elseif ($extensionType === ExtensionType::AUDIO) { $icon = 'file-audio-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::VIDEO) { + } elseif ($extensionType === ExtensionType::VIDEO) { $icon = 'file-video-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::IMAGE) { + } elseif ($extensionType === ExtensionType::IMAGE) { $icon = 'file-image-o'; - } elseif ($extensionType === \phpOMS\System\File\ExtensionType::SPREADSHEET) { + } elseif ($extensionType === ExtensionType::SPREADSHEET) { $icon = 'file-excel-o'; } elseif ($extensionType === 'collection') { $icon = 'folder-open-o'; @@ -132,10 +136,10 @@ echo $this->getData('nav')->render(); getPath())); ?> - - - - format('Y-m-d'); ?> + + + + format('Y-m-d'); ?> @@ -145,10 +149,27 @@ 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) : ?> -
+ $path = is_file($media->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()) === ExtensionType::IMAGE + || \phpOMS\System\File\FileUtils::getExtensionType(File::extension($path)) === ExtensionType::IMAGE) : ?> +
+ isAbsolute() ? $this->printHtml($path) : $this->printHtml($this->request->getUri()->getBase() . $path))) : ?> +
+ + + +
+ + + isAbsolute() ? $path : __DIR__ . '/../../../../' . $path)) : ?> +
+
                     isAbsolute() ? $path : __DIR__ . '/../../../../' . $path);
@@ -156,6 +177,7 @@ echo $this->getData('nav')->render();
                     $output = explode("\n", $output);
                     foreach ($output as $line) : ?>printHtml($line); ?>
                     
+