From 898526eeb23b1a10e852c666242149f44b673fcb 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 creazione nuovo filtro o aggiunta estensione a filtro precedente
---
src/Vola/UploadFile/FilesFilter.class.php | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/Vola/UploadFile/FilesFilter.class.php b/src/Vola/UploadFile/FilesFilter.class.php
index c0956d4..4d6d962 100644
--- a/src/Vola/UploadFile/FilesFilter.class.php
+++ b/src/Vola/UploadFile/FilesFilter.class.php
@@ -12,10 +12,10 @@
public function toJson()
{
- $temp = array ();
+ $temp = array();
/** @var FilterExt $filtro */
- foreach ($this->filtro as $filtro){
+ foreach ($this->filtro as $filtro) {
$temp[] = $filtro->getFilterObj();
}
@@ -24,15 +24,12 @@
public function addExt($extension = '')
{
- 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;
- }
+ $titolo = $this->decodeTitolo($extension);
+ if ($titolo != null) {
+ if ($this->filtro[$titolo] instanceof FilterExt) {
+ $this->addExtensionToFilter($titolo, $extension);
+ } else {
+ $this->createFilter($titolo, $extension);
}
}
return $this;
@@ -59,4 +56,23 @@
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