diff --git a/Controller.php b/Controller.php
index 5cdefc4..af463ef 100644
--- a/Controller.php
+++ b/Controller.php
@@ -190,8 +190,8 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, $data = null)
{
$uploads = $this->uploadFiles(
- $request->getFiles(),
- $request->getHeader()->getAccount(),
+ $request->getFiles(),
+ $request->getHeader()->getAccount(),
(string) ($request->getData('path') ?? __DIR__ . '/../../Modules/Media/Files')
);
@@ -292,8 +292,8 @@ class Controller extends ModuleAbstract implements WebInterface
private static function normalizeDbPath(string $path) : string
{
- return str_replace('\\', '/',
- str_replace(realpath(__DIR__ . '/../../'), '',
+ return str_replace('\\', '/',
+ str_replace(realpath(__DIR__ . '/../../'), '',
rtrim($path, '/')
)
);
diff --git a/Models/Collection.php b/Models/Collection.php
index abc4249..f4aa2bb 100644
--- a/Models/Collection.php
+++ b/Models/Collection.php
@@ -22,7 +22,7 @@ namespace Modules\Media\Models;
* @link http://website.orange-management.de
* @since 1.0.0
*/
-class Collection extends Media implements \Iterator
+class Collection extends Media implements \Iterator
{
/**
@@ -95,27 +95,27 @@ class Collection extends Media implements \Iterator
{
}
- public function rewind()
+ public function rewind()
{
reset($this->sources);
}
- public function current()
+ public function current()
{
return current($this->sources);
}
- public function key()
+ public function key()
{
return key($this->sources);
}
- public function next()
+ public function next()
{
next($this->sources);
}
- public function valid()
+ public function valid()
{
return current($this->sources) !== false;
}
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index 5cfd0d5..7b7693f 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -195,7 +195,7 @@ class UploadFile
private function interlace(string $extension, string $path) /* : void */
{
-
+
if ($extension === 'png') {
$img = imagecreatefrompng($path);
} elseif ($extension === 'jpg' || $extension === 'jpeg') {
diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php
index 65aad09..54d4e16 100644
--- a/Theme/Backend/Components/Media/list.tpl.php
+++ b/Theme/Backend/Components/Media/list.tpl.php
@@ -11,7 +11,7 @@
media as $key => $value) : $count++;
- $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
+ $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
$icon = '';
$extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension());
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index 6d46a84..5c01dc1 100644
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
|
$value) : $count++;
- $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
+ $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
$icon = '';
$extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension());
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index 1debc4a..dad7e98 100644
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render();
$media->getExtension() === 'collection'
&& !is_file($media->getPath() . $this->request->getData('sub'))
) || (
- is_dir($media->getPath())
+ is_dir($media->getPath())
&& ($this->request->getData('sub') === null || is_dir($media->getPath() . $this->request->getData('sub')))
)
) : ?>
@@ -62,7 +62,7 @@ echo $this->getData('nav')->render();
= $this->getHtml('Created') ?>
|
getPath())) : foreach ($media as $key => $value) :
- $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
+ $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
$icon = '';
$extensionType = \phpOMS\System\File\FileUtils::getExtensionType($value->getExtension());
@@ -99,12 +99,12 @@ echo $this->getData('nav')->render();
= $this->printHtml($value->getCreatedBy()->getName1()); ?>
| = $this->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) :
- $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $media->getId() . '&sub=' . substr($value, strlen($media->getPath())));
+ $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');
-
+
if ($extensionType === \phpOMS\System\File\ExtensionType::CODE) {
$icon = 'file-code-o';
} elseif ($extensionType === \phpOMS\System\File\ExtensionType::TEXT) {
@@ -144,7 +144,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) : ?>
|