From 4664b779371a1497134b77c771a7d4eef2f775ec Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Tue, 27 Aug 2019 11:21:42 +0200
Subject: [PATCH] Refactor e gestione di extensions multiple su stesso filtro
---
src/Vola/UploadFile/FilesFilter.class.php | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/Vola/UploadFile/FilesFilter.class.php b/src/Vola/UploadFile/FilesFilter.class.php
index abe7cf7..c0956d4 100644
--- a/src/Vola/UploadFile/FilesFilter.class.php
+++ b/src/Vola/UploadFile/FilesFilter.class.php
@@ -4,27 +4,59 @@
* Date: 08/07/2019
*/
-class FilesFilter {
+class FilesFilter
+{
private $filtro = array();
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 != ''){
- switch(strtolower($extension)) {
- case 'gif':
- $this->filtro[] = json_decode('{"title":"Image files", "extensions":"gif"}', true);
- break;
- case 'doc':
- $this->filtro[] = json_decode('{"title":"Documenti", "extensions":"doc"}', true);
- break;
+ if ($extension != '') {
+ $titolo = $this->decodeTitolo($extension);
+ if ($titolo != null) {
+ if($this->filtro[$titolo] instanceof FilterExt){
+ $this->filtro[$titolo]->addExt($extension);
+ } else {
+ $filtro = new FilterExt($titolo, $extension);
+ $this->filtro[$titolo] = $filtro;
+ }
}
}
return $this;
}
+
+ /**
+ * Decodifico il titolo in base all'estensione.
+ * Il confronto viene eseguito in lowercase
+ * @param string $ext
+ * @return string
+ */
+ public function decodeTitolo($ext)
+ {
+ switch (strtolower($ext)) {
+ case 'gif':
+ $titolo = "Image files";
+ break;
+ case 'doc':
+ case 'txt':
+ $titolo = "Documenti";
+ break;
+ }
+
+ return $titolo;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0