From d5966c9e396b6d15bf079dc6378652403e0ed319 Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Tue, 27 Aug 2019 11:21:43 +0200
Subject: [PATCH] Integro le varie tipologie per la creazione del filtro
---
src/Vola/UploadFile/FilesFilter.class.php | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/src/Vola/UploadFile/FilesFilter.class.php b/src/Vola/UploadFile/FilesFilter.class.php
index 6172a18..25a1aa3 100644
--- a/src/Vola/UploadFile/FilesFilter.class.php
+++ b/src/Vola/UploadFile/FilesFilter.class.php
@@ -11,16 +11,25 @@
public function toJson()
{
- return json_encode($this->filtro);
+
+ $temp = array();
+
+ /** @var FilterExt $filtro */
+ foreach ($this->filtro as $filtro) {
+ $temp[] = $filtro->getFilterObj();
+ }
+
+ return json_encode($temp);
}
public function addExt($extension = '')
{
- if ($extension != '') {
- $titolo = $this->decodeTitolo($extension);
- if ($titolo != null) {
- $filtro = new FilterExt($titolo, $extension);
- $this->filtro[] = json_decode($filtro->getFilter());
+ $titolo = $this->decodeTitolo($extension);
+ if ($titolo != null) {
+ if ($this->filtro[$titolo] instanceof FilterExt) {
+ $this->addExtensionToFilter($titolo, $extension);
+ } else {
+ $this->createFilter($titolo, $extension);
}
}
return $this;
@@ -36,15 +45,63 @@
{
switch (strtolower($ext)) {
case 'gif':
+ case 'jpg':
+ case 'jpeg':
+ case 'png':
+ case 'wmf':
+ case 'tif':
+ case 'tiff':
$titolo = "Image files";
break;
case 'doc':
case 'txt':
+ case 'docx':
+ case 'docm':
+ case 'opsx':
+ case 'odt':
+ case 'rtf':
+ case 'pdf':
$titolo = "Documenti";
+ break;
+ case 'mp3':
+ case 'wav':
+ $titolo = "Audio files";
+ break;
+ case 'zip':
+ case 'rar':
+ case 'gz':
+ $titolo = "Zip files";
+ break;
+ case 'xls':
+ case 'xlsx':
+ case 'eml':
+ case 'msg':
+ case 'xps':
+ case 'cvs':
+ $titolo = "Excel files";
break;
}
return $titolo;
}
+ /**
+ * @param $titolo
+ * @param $extension
+ */
+ private function createFilter($titolo, $extension)
+ {
+ $filtro = new FilterExt($titolo, $extension);
+ $this->filtro[$titolo] = $filtro;
+ }
+
+ /**
+ * @param $titolo
+ * @param $extension
+ */
+ private function addExtensionToFilter($titolo, $extension)
+ {
+ $this->filtro[$titolo]->addExt($extension);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0