fix: correzioni login con token otp

Author: Bacca1997

modules/otp_tokens/ajax/select.php

@@ -26,7 +26,7 @@
         $query = 'SELECT zz_modules.id AS id, title AS descrizione FROM zz_modules INNER JOIN zz_modules_lang ON zz_modules.id = zz_modules_lang.id_record AND zz_modules_lang.id_lang = '.prepare(Models\Locale::getDefault()->id).' |where| ORDER BY title';
 
         $where[] = 'enabled = 1';
-        $where[] = "name IN('Anagrafiche', 'Gestione documentale')";
+        $where[] = "name IN('Anagrafiche', 'Gestione documentale', 'Impianti')";
         $where[] = "IF(options2 != '', options2!='menu', options!='menu')";
 
         foreach ($elements as $element) {
@@ -72,6 +72,18 @@
                     $search_fields[] = 'nome LIKE '.prepare('%'.$search.'%');
                 }
             }
+
+            if ($module->name == 'Impianti') {
+                $query = 'SELECT id, nome AS descrizione FROM my_impianti |where| ORDER BY nome';
+
+                foreach ($elements as $element) {
+                    $filter[] = 'id='.prepare($element);
+                }
+
+                if (!empty($search)) {
+                    $search_fields[] = 'nome LIKE '.prepare('%'.$search.'%');
+                }
+            }
         }
         break;
 }

shared_editor.php

@@ -245,6 +245,9 @@
 .token-readonly-buttons button.disabled:hover {
     opacity: 0.5;
 }
+.with-control-sidebar {
+    margin-right: 0 !important;
+}
 
 </style>
 
@@ -357,7 +360,6 @@
 echo '
 <script>
 $(document).ready(function() {
-    $("section").removeClass("with-control-sidebar");
     $(".main-sidebar").hide();
     $(".control-sidebar-button").hide();
 });

src/Modules.php

@@ -52,8 +52,10 @@ public static function getModules()
         }
 
         // Caricamento dei plugin
-        if (!self::$all_modules->first()->relationLoaded('plugins')) {
-            self::$all_modules->load('plugins');
+        if(self::$all_modules->first()){
+            if (!self::$all_modules->first()->relationLoaded('plugins')) {
+                self::$all_modules->load('plugins');
+            }
         }
 
         return self::$all_modules;

update/2_9_3.sql

@@ -154,4 +154,7 @@ UPDATE `zz_settings` INNER JOIN `zz_settings_lang` ON `zz_settings`.`id` = `zz_s
 UPDATE `zz_settings` INNER JOIN `zz_settings_lang` ON `zz_settings`.`id` = `zz_settings_lang`.`id_record` SET `zz_settings_lang`.`help` = "Variables availables: {email} {numero} {ragione_sociale} {richiesta} {descrizione} {data} {data richiesta} {data fine intervento} {id_anagrafica} {stato} {tipo}" WHERE `zz_settings`.`nome` = 'Descrizione personalizzata in fatturazione' AND `id_lang` = 2;
 
 
-UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = "IF(giacenze.stato_giacenza>0, '#CCFFCC', '#ec5353')" WHERE `zz_views`.`name` = '_bg_' AND `zz_modules`.`name` = 'Articoli';
+UPDATE `zz_views` LEFT JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` SET `query` = "IF(giacenze.stato_giacenza>0, '#CCFFCC', '#ec5353')" WHERE `zz_views`.`name` = '_bg_' AND `zz_modules`.`name` = 'Articoli';
+
+-- fix: invio via mail token otp
+ALTER TABLE `em_emails` CHANGE `created_by` `created_by` INT(11) NULL;