diff --git a/Models/FileUploaderTrait.php b/Models/FileUploaderTrait.php index 497aa0c..db6825b 100755 --- a/Models/FileUploaderTrait.php +++ b/Models/FileUploaderTrait.php @@ -28,7 +28,6 @@ use phpOMS\Message\ResponseAbstract; */ trait FileUploaderTrait { - /** * Setup file uploader. * diff --git a/Models/Media.php b/Models/Media.php index d61916a..237eac0 100755 --- a/Models/Media.php +++ b/Models/Media.php @@ -340,7 +340,7 @@ class Media implements \JsonSerializable return $this->isAbsolute ? $this->path : \ltrim($this->path, '\\/'); } - /** + /** * @return string * * @since 1.0.0 diff --git a/Models/PathSettings.php b/Models/PathSettings.php index a537163..57cde7e 100755 --- a/Models/PathSettings.php +++ b/Models/PathSettings.php @@ -27,6 +27,8 @@ use phpOMS\Stdlib\Base\Enum; abstract class PathSettings extends Enum { public const FILE_PATH = 1; + public const RANDOM_PATH = 2; + public const COLLECTION_PATH = 3; } diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 11d6052..8959faa 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { public const MEDIA = 1; + public const COLLECTION = 2; } diff --git a/Models/UploadStatus.php b/Models/UploadStatus.php index 6fff5ce..2cc93d5 100755 --- a/Models/UploadStatus.php +++ b/Models/UploadStatus.php @@ -27,14 +27,24 @@ use phpOMS\Stdlib\Base\Enum; abstract class UploadStatus extends Enum { public const OK = 0; + public const WRONG_PARAMETERS = -1; + public const NOTHING_UPLOADED = -2; + public const UPLOAD_SIZE = -3; + public const UNKNOWN_ERROR = -4; + public const CONFIG_SIZE = -5; + public const WRONG_EXTENSION = -6; + public const NOT_UPLOADED = -7; + public const NOT_MOVABLE = -8; + public const FAILED_HASHING = -9; + public const NOT_ENCRYPTABLE = -10; } diff --git a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php index b190e20..1d5850e 100755 --- a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php +++ b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php @@ -38,7 +38,7 @@ -
+| - | = $this->getHtml('Name', 'Media') ?> - | = $this->getHtml('Type', 'Media') ?> - | = $this->getHtml('Size', 'Media') ?> - | = $this->getHtml('Creator', 'Media') ?> - | = $this->getHtml('Created', 'Media') ?> + | = $this->getHtml('Name', 'Media'); ?> + | = $this->getHtml('Type', 'Media'); ?> + | = $this->getHtml('Size', 'Media'); ?> + | = $this->getHtml('Creator', 'Media'); ?> + | = $this->getHtml('Created', 'Media'); ?> | media as $key => $value) : ++$count; $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); @@ -46,12 +46,12 @@ use phpOMS\Uri\UriFactory; } ?>|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - | = $this->printHtml($value->getName()); ?> - | = $this->printHtml($value->getExtension()); ?> - | = $this->printHtml($value->getSize()); ?> - | = $this->printHtml($value->getCreatedBy()->getName1()); ?> - | = $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> + | + | = $this->printHtml($value->getName()); ?> + | = $this->printHtml($value->getExtension()); ?> + | = $this->printHtml($value->getSize()); ?> + | = $this->printHtml($value->getCreatedBy()->getName1()); ?> + | = $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/Components/Upload/upload.tpl.php b/Theme/Backend/Components/Upload/upload.tpl.php
index cb646a5..de1e0fd 100755
--- a/Theme/Backend/Components/Upload/upload.tpl.php
+++ b/Theme/Backend/Components/Upload/upload.tpl.php
@@ -8,7 +8,7 @@
| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||