From 7cbaa89bae8d41fc343b3cdeb583caf2b38517bf Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Tue, 30 Oct 2018 22:19:15 +0100
Subject: [PATCH] Fix minori

---
 include/init/requirements.php            |  3 ++-
 modules/aggiornamenti/edit.php           |  4 ++--
 modules/gestione_documentale/actions.php |  8 ++++----
 modules/viste/edit.php                   |  2 +-
 src/HTMLBuilder/Manager/FileManager.php  | 23 ++++++++++++++++-------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/include/init/requirements.php b/include/init/requirements.php
index 1b6660b86..536fa39fa 100644
--- a/include/init/requirements.php
+++ b/include/init/requirements.php
@@ -99,8 +99,9 @@ foreach ($settings as $name => $values) {
             $description = str_replace(['>', '<'], '', $description);
         }
 
-        $description = tr('Valore consigliato: _VALUE_', [
+        $description = tr('Valore consigliato: _VALUE_ (Valore attuale: _INI_)', [
           '_VALUE_' => $description,
+          '_INI_' => ini_get($name),
         ]);
     }
 
diff --git a/modules/aggiornamenti/edit.php b/modules/aggiornamenti/edit.php
index bb607752b..480685486 100644
--- a/modules/aggiornamenti/edit.php
+++ b/modules/aggiornamenti/edit.php
@@ -87,7 +87,7 @@ function search(button) {
         <div class="box box-success">
             <div class="box-header with-border">
                 <h3 class="box-title">
-                    '.tr('Carica un aggiornamento').' <span class="tip" title="'.tr('Form di caricamento per aggiornamenti del gestionale e innesti di moduli e plugin').'"><i class="fa fa-question-circle-o"></i></span>
+                    '.tr('Carica un aggiornamento').' <span class="tip" title="'.tr('Form di caricamento aggiornamenti del gestionale e innesti di moduli e plugin').'"><i class="fa fa-question-circle-o"></i></span>
                 </h3>
             </div>
             <div class="box-body">
@@ -110,7 +110,7 @@ function search(button) {
         <div class="box box-info">
             <div class="box-header with-border">
                 <h3 class="box-title">
-                    '.tr('Ricerca aggiornamenti').' <span class="tip" title="'.tr('Controllo automatica sulla presenza di aggiornamenti del gestionale').'"><i class="fa fa-question-circle-o"></i></span>
+                    '.tr('Ricerca aggiornamenti').' <span class="tip" title="'.tr('Controllo automatico della presenza di aggiornamenti per il gestionale').'"><i class="fa fa-question-circle-o"></i></span>
                 </h3>
             </div>
             <div class="box-body" id="update-search">
diff --git a/modules/gestione_documentale/actions.php b/modules/gestione_documentale/actions.php
index cce268d5e..3ea8b6e4d 100644
--- a/modules/gestione_documentale/actions.php
+++ b/modules/gestione_documentale/actions.php
@@ -5,8 +5,8 @@ include_once __DIR__.'/../../core.php';
 switch (post('op')) {
     case 'add':
         $dbo->insert('zz_documenti', [
-            'idcategoria' => post('nome'),
-            'nome' => post('idcategoria'),
+            'idcategoria' => post('idcategoria'),
+            'nome' => post('nome'),
             'data' => post('data'),
         ]);
         $id_record = $dbo->last_inserted_id();
@@ -17,8 +17,8 @@ switch (post('op')) {
 
     case 'update':
         $dbo->update('zz_documenti', [
-            'idcategoria' => post('nome'),
-            'nome' => post('idcategoria'),
+            'idcategoria' => post('idcategoria'),
+            'nome' => post('nome'),
             'data' => post('data'),
         ], ['id' => $id_record]);
 
diff --git a/modules/viste/edit.php b/modules/viste/edit.php
index 1d1795096..e994ebc38 100644
--- a/modules/viste/edit.php
+++ b/modules/viste/edit.php
@@ -516,7 +516,7 @@ $(document).ready(function(){
 	});
 });
 </script>';
-}
 
 // Fix apertura non corrisposta di un tag div
 echo '</div>';
+}
\ No newline at end of file
diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php
index 7af2ef889..0cff1539e 100644
--- a/src/HTMLBuilder/Manager/FileManager.php
+++ b/src/HTMLBuilder/Manager/FileManager.php
@@ -188,16 +188,25 @@ class FileManager implements ManagerInterface
 
 <script>
 $(document).ready(function(){
-    $("#'.$attachment_id.' #categoria").autocomplete({
-        source: [';
-
+    $("#'.$attachment_id.' #categoria").autocomplete({';
+        $first = true;
         foreach ($categories as $category) {
-            $result .= '
-            "'.$category['category'].'",';
-        }
+            if (!empty($category['category'])){
+                if ($first)
+                    $result .= '
+                    source: [';
 
+                $result .= '
+                "'.$category['category'].'",';
+                
+                if ($first)
+                    $result .= '
+                    ],';
+                
+                $first = false;
+            }
+        }
         $result .= '
-        ],
         minLength: 0
     }).focus(function() {
         $(this).autocomplete("search", $(this).val())