Bugfix vari

lib/functions.js

@@ -706,17 +706,21 @@ function start_datatables() {
                             } else {
                                 var index = selected.indexOf("" + id);
                                 if (index > -1) {
-                                    selected = selected.splice(index + 1, 1);
+                                    delete selected[index];
                                 }
                             }
                         }
                     });
 
+                    selected = selected.filter(function (entry) {
+                        return entry != '';
+                    });
+
                     $this.data('selected', selected.join(','));
 
                     var container = $(document).find('[data-target=' + $this.attr('id') + ']');
 
-                    if (selected.length > 1) {
+                    if (selected.length > 0) {
                         container.find('.bulk-container').removeClass('disabled');
                         container.find('.bulk-container').attr('disabled', false);
                     } else {
@@ -1175,7 +1179,7 @@ function setContrast(backgroundcolor) {
 }
 
 function message(element) {
-    data = $(element).data();
+    data = $.extend({}, $(element).data());
 
     var title = globals.translations.deleteTitle;
     if (data["title"] != undefined) title = data["title"];

lib/functions.php

@@ -84,12 +84,20 @@ function deltree($path)
  */
 function copyr($source, $dest, $ignores = [])
 {
-    $path = realpath($source);
     $ignores = (array) $ignores;
-    $exclude = !empty(array_intersect([slashes($path), slashes($path.'/'), $entry], $ignores));
+    foreach ($ignores as $key => $value) {
+        $ignores[$key] = slashes($value);
+    }
+
+    $path = realpath($source);
+    $exclude = !empty(array_intersect($ignores, [slashes($path), slashes($path.'/'), $entry]));
+
+    if ($exclude) {
+        return;
+    }
 
     // Simple copy for a file
-    if (is_file($source) && !$exclude) {
+    if (is_file($source)) {
         return copy($source, $dest);
     }
 
@@ -114,11 +122,11 @@ function copyr($source, $dest, $ignores = [])
         }
 
         $path = realpath($source.'/'.$entry.'/');
-        $exclude = !empty(array_intersect([slashes($path), slashes($path.'/'), $entry], $ignores));
+        $exclude = !empty(array_intersect($ignores, [slashes($path), slashes($path.'/'), $entry]));
 
         // Deep copy directories
-        if ($dest !== $source.'/'.$entry && !$exclude) {
+        if (slashes($dest) !== slashes($source.'/'.$entry) && !$exclude) {
-            copyr($source.'/'.$entry, $dest.'/'.$entry, $exclude);
+            copyr($source.'/'.$entry, $dest.'/'.$entry, $ignores);
         }
     }
 
@@ -244,7 +252,7 @@ function do_backup()
     }
 
     // Creazione cartella temporanea
-    if (file_exists($backup_dir.$tmp_backup_dir) || @create_dir($backup_dir.$tmp_backup_dir)) {
+    if (file_exists($backup_dir.$tmp_backup_dir) || create_dir($backup_dir.$tmp_backup_dir)) {
         $do_backup = true;
     } else {
         $do_backup = false;

modules/backup/edit.php

@@ -68,7 +68,8 @@ if (file_exists($backup_dir)) {
         if (!empty($backups_zip)) {
             foreach ($backups_zip as $backup) {
                 $name = basename($backup);
-                preg_match('/^OSM backup ([0-9\-]{10}) ([0-9_]{8})\.zip$/', basename($file), $m);
+                preg_match('/^OSM backup ([0-9\-]{10}) ([0-9_]{8})\.zip$/', $name, $m);
+
                 echo '
             <div class="callout callout-info">
                 <h4>'.str_replace(['_DATE_', '_TIME_'], [Translator::dateToLocale($m[1]), date('H:i', strtotime(str_replace('_', ':', $m[2])))], tr('Backup del _DATE_ alle _TIME_')).'</h4>

modules/dashboard/ajaxreq.php

@@ -34,7 +34,7 @@ switch (get('op')) {
             {
                 "id": "'.$rs[$i]['idintervento'].'",
                 "idtecnico":"'.$rs[$i]['idtecnico'].'",
-                "title":"<b>Int. '.$rs[$i]['idintervento'].'</b>'.addslashes($rs[$i]['cliente']).'<br><b>'.tr('Tecnici').':</b> '.addslashes($rs[$i]['nome_tecnico']).'",
+                "title":"<b>Int. '.$rs[$i]['idintervento'].'</b> '.addslashes($rs[$i]['cliente']).'<br><b>'.tr('Tecnici').':</b> '.addslashes($rs[$i]['nome_tecnico']).'",
                 "start": "'.$rs[$i]['orario_inizio'].'",
                 "end": "'.$rs[$i]['orario_fine'].'",
                 "url":"'.$rootdir.'/editor.php?id_module='.Modules::getModule('Interventi')['id'].'&id_record='.$rs[$i]['idintervento'].'",

modules/dashboard/edit.php

@@ -455,7 +455,7 @@ if (!empty(get_var('Abilitare orario lavorativo'))) {
                     $('#tiny-loader').hide();
                 }
             },
-    <?php
+<?php
 if (Modules::getPermission($id_module) == 'rw') {
     ?>
             droppable: true,
@@ -517,16 +517,16 @@ if (Modules::getPermission($id_module) == 'rw') {
 					}
 				});
 			},
-            <?php
+<?php
 
 }
+?>
+			eventAfterRender: function(event, element) {
+				element.find('.fc-title').html(event.title);
+<?php
 
 if (get_var('Utilizzare i tooltip sul calendario') == '1') {
     ?>
-			eventAfterRender: function(event, element) {
-				//alert(element.find('.fc-event-title').html();
-				element.find('.fc-title').html(event.title);
-
 				$.get(globals.rootdir + "/modules/dashboard/ajaxreq.php?op=get_more_info&id="+event.id+"&timeStart="+moment(event.start).format("YYYY-MM-DD HH:mm")+"&timeEnd="+moment(event.end).format("YYYY-MM-DD HH:mm"), function(data,response){
 					if( response=="success" ){
 						data = $.trim(data);
@@ -551,12 +551,12 @@ if (get_var('Utilizzare i tooltip sul calendario') == '1') {
 							return false;
 						}
 					}
-				});
+                });
-			},
+<?php
-            <?php
 
 }
-            ?>
+?>
+			},
             events: {
 				url: globals.rootdir + "/modules/dashboard/ajaxreq.php?op=get_current_month",
                 type: 'GET',

modules/fatture/actions.php

@@ -4,7 +4,7 @@ include_once __DIR__.'/../../core.php';
 
 // Necessaria per la funzione add_movimento_magazzino
 include_once $docroot.'/modules/articoli/modutil.php';
-//var_dump(get_totale_fattura($id_record));exit();
+include_once $docroot.'/modules/interventi/modutil.php';
 
 $module = Modules::getModule($id_module);
 

modules/interventi/actions.php

@@ -528,7 +528,7 @@ switch (post('op')) {
         break;
 
     case 'firma':
-        $directory_exists = (file_exists($docroot.'/files/interventi') || @create_dir($docroot.'/files/interventi'));
+        $directory_exists = (file_exists($docroot.'/files/interventi') || create_dir($docroot.'/files/interventi'));
 
         if ($directory_exists) {
             if (post('firma_base64') != '') {

package.json

@@ -86,7 +86,7 @@
         "gulp": "gulp",
         "release-OSM": "yarn run develop-OSM && gulp release",
         "develop-OSM": "yarn install && yarn run install-OSM && yarn run assets-OSM",
-        "install-OSM": "php composer.phar install",
+        "install-OSM": "php composer.phar update",
         "assets-OSM": "yarn upgrade && yarn run build-OSM",
         "build-OSM": "gulp",
         "dump-OSM": "php composer.phar dump-autoload",

templates/fatture/body.php

@@ -156,6 +156,7 @@ if (!empty($v_iva)) {
     }
 }
 
+// % 20 -> < 19 righe
 for ($i = (floor($n_rows) % 20); $i < 15; ++$i) {
     echo '
     <tr>

templates/fatture/footer.php

@@ -1,6 +1,5 @@
 <?php
 
-
 // SCADENZE  |  TOTALI
 // TABELLA PRINCIPALE
 echo "