From 42683cfc896b59a72934d2389491dfd72327afe5 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 21 Jul 2022 10:31:28 +0200
Subject: [PATCH 1/5] swal per duplica preventivo

---
 modules/dashboard/edit.php     |  4 ++--
 modules/preventivi/buttons.php | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php
index 95da8363f..6c899e855 100755
--- a/modules/dashboard/edit.php
+++ b/modules/dashboard/edit.php
@@ -315,8 +315,8 @@ WHERE (SELECT COUNT(*) FROM in_interventi_tecnici WHERE in_interventi_tecnici.id
 
         
         if (checkdate($data->format('m'), $data->format('d'), $data->format('Y'))){
-        echo '
-        <option value="'.$chiave.'">'.ucfirst($testo).'</option>';
+    echo '
+            <option value="'.$chiave.'">'.ucfirst($testo).'</option>';
         }
     }
 
diff --git a/modules/preventivi/buttons.php b/modules/preventivi/buttons.php
index 7bdf99d6b..5f1078e76 100644
--- a/modules/preventivi/buttons.php
+++ b/modules/preventivi/buttons.php
@@ -20,7 +20,7 @@
 include_once __DIR__.'/../../core.php';
 
 echo '
-<button type="button" class="btn btn-primary" onclick="if( confirm(\'Duplicare questo preventivo?\') ){ $(\'#copia-preventivo\').submit(); }">
+<button type="button" class="btn btn-primary" onclick="copiaPreventivo();">
     <i class="fa fa-copy"></i> '.tr('Duplica preventivo').'
 </button>';
 
@@ -96,3 +96,22 @@ echo '
     <input type="hidden" name="backto" value="record-edit">
     <input type="hidden" name="op" value="copy">
 </form>';
+
+echo '
+<script>
+function copiaPreventivo() {
+    swal({
+        title: "'.tr('Duplicare il preventivo?').'",
+        text: "'.tr('').'",
+        type: "info",
+        showCancelButton: true,
+        confirmButtonClass: "btn btn-lg btn-primary",
+        confirmButtonText: "'.tr('Duplica').'",
+    }).then(
+        function() {
+            $("#copia-preventivo").submit();
+        },
+        function() {}
+    );
+}
+</script>';
\ No newline at end of file

From 3e73cfed756294ad1a76870ce01b9c10f44866ef Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 21 Jul 2022 12:11:04 +0200
Subject: [PATCH 2/5] swal per duplica ddt e contratti

---
 modules/contratti/buttons.php | 21 ++++++++++++++++++++-
 modules/ddt/buttons.php       | 22 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/modules/contratti/buttons.php b/modules/contratti/buttons.php
index 487cf4240..8aaf60e44 100755
--- a/modules/contratti/buttons.php
+++ b/modules/contratti/buttons.php
@@ -50,7 +50,7 @@ echo '
 
 // Duplica contratto
 echo '
-<button type="button" class="btn btn-primary" onclick="if( confirm(\''.tr('Duplicare questo contratto?').'\') ){ $(\'#copia-contratto\').submit(); }">
+<button type="button" class="btn btn-primary" onclick="copiaContratto();">
     <i class="fa fa-copy"></i> '.tr('Duplica contratto').'
 </button>';
 
@@ -59,3 +59,22 @@ echo '
     <input type="hidden" name="backto" value="record-edit">
     <input type="hidden" name="op" value="copy">
 </form>';
+
+echo '
+<script>
+function copiaContratto() {
+    swal({
+        title: "'.tr('Duplicare il contratto?').'",
+        text: "'.tr('').'",
+        type: "info",
+        showCancelButton: true,
+        confirmButtonClass: "btn btn-lg btn-primary",
+        confirmButtonText: "'.tr('Duplica').'",
+    }).then(
+        function() {
+            $("#copia-contratto").submit();
+        },
+        function() {}
+    );
+}
+</script>';
diff --git a/modules/ddt/buttons.php b/modules/ddt/buttons.php
index 37d959cdd..ea3505909 100755
--- a/modules/ddt/buttons.php
+++ b/modules/ddt/buttons.php
@@ -80,7 +80,7 @@ echo '
 
 // Duplica ddt
 echo '
-<button type="button" class="btn btn-primary" onclick="if( confirm(\''.tr('Duplicare questo ddt?').'\') ){ $(\'#copia-ddt\').submit(); }">
+<button type="button" class="btn btn-primary" onclick="copiaDdt()">
     <i class="fa fa-copy"></i> '.tr('Duplica ddt').'
 </button>';
 
@@ -89,3 +89,23 @@ echo '
     <input type="hidden" name="backto" value="record-edit">
     <input type="hidden" name="op" value="copy">
 </form>';
+
+
+echo '
+<script>
+function copiaDdt() {
+    swal({
+        title: "'.tr('Duplicare il ddt?').'",
+        text: "'.tr('').'",
+        type: "info",
+        showCancelButton: true,
+        confirmButtonClass: "btn btn-lg btn-primary",
+        confirmButtonText: "'.tr('Duplica').'",
+    }).then(
+        function() {
+            $("#copia-ddt").submit();
+        },
+        function() {}
+    );
+}
+</script>';

From 383519e92162c0024eb254caab3a73502ae5a9fe Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 21 Jul 2022 12:32:22 +0200
Subject: [PATCH 3/5] standardizzazione dei pulsanti di duplicazione

- fatture
- ddt
- contratti
- preventivi
---
 modules/contratti/buttons.php  | 29 ++---------------------------
 modules/ddt/buttons.php        | 27 +--------------------------
 modules/fatture/buttons.php    | 13 +++++++------
 modules/preventivi/buttons.php | 31 +++----------------------------
 4 files changed, 13 insertions(+), 87 deletions(-)

diff --git a/modules/contratti/buttons.php b/modules/contratti/buttons.php
index 8aaf60e44..6d8abeefd 100755
--- a/modules/contratti/buttons.php
+++ b/modules/contratti/buttons.php
@@ -50,31 +50,6 @@ echo '
 
 // Duplica contratto
 echo '
-<button type="button" class="btn btn-primary" onclick="copiaContratto();">
+<button type="button" class="btn btn-primary ask" data-title="'.tr('Duplicare questo contratto?').'" data-msg="'.tr('Clicca su tasto duplica per procedere.').'" data-op="copy" data-button="'.tr('Duplica').'" data-class="btn btn-lg btn-primary" data-backto="record-edit">
     <i class="fa fa-copy"></i> '.tr('Duplica contratto').'
-</button>';
-
-echo '
-<form action="" method="post" id="copia-contratto">
-    <input type="hidden" name="backto" value="record-edit">
-    <input type="hidden" name="op" value="copy">
-</form>';
-
-echo '
-<script>
-function copiaContratto() {
-    swal({
-        title: "'.tr('Duplicare il contratto?').'",
-        text: "'.tr('').'",
-        type: "info",
-        showCancelButton: true,
-        confirmButtonClass: "btn btn-lg btn-primary",
-        confirmButtonText: "'.tr('Duplica').'",
-    }).then(
-        function() {
-            $("#copia-contratto").submit();
-        },
-        function() {}
-    );
-}
-</script>';
+</button>';
\ No newline at end of file
diff --git a/modules/ddt/buttons.php b/modules/ddt/buttons.php
index ea3505909..be3275d1a 100755
--- a/modules/ddt/buttons.php
+++ b/modules/ddt/buttons.php
@@ -80,32 +80,7 @@ echo '
 
 // Duplica ddt
 echo '
-<button type="button" class="btn btn-primary" onclick="copiaDdt()">
+<button type="button" class="btn btn-primary ask" data-title="'.tr('Duplicare questo Ddt?').'" data-msg="'.tr('Clicca su tasto duplica per procedere.').'" data-op="copy" data-button="'.tr('Duplica').'" data-class="btn btn-lg btn-primary" data-backto="record-edit">
     <i class="fa fa-copy"></i> '.tr('Duplica ddt').'
 </button>';
 
-echo '
-<form action="" method="post" id="copia-ddt">
-    <input type="hidden" name="backto" value="record-edit">
-    <input type="hidden" name="op" value="copy">
-</form>';
-
-
-echo '
-<script>
-function copiaDdt() {
-    swal({
-        title: "'.tr('Duplicare il ddt?').'",
-        text: "'.tr('').'",
-        type: "info",
-        showCancelButton: true,
-        confirmButtonClass: "btn btn-lg btn-primary",
-        confirmButtonText: "'.tr('Duplica').'",
-    }).then(
-        function() {
-            $("#copia-ddt").submit();
-        },
-        function() {}
-    );
-}
-</script>';
diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php
index 13919c51e..9656bab8c 100755
--- a/modules/fatture/buttons.php
+++ b/modules/fatture/buttons.php
@@ -19,11 +19,6 @@
 
 include_once __DIR__.'/../../core.php';
 
-echo '
-<button type="button" class="btn btn-primary ask btn-primary" '.(empty($record['is_reversed']) ? '' : 'disabled').' data-msg="'.tr('Duplicare questa fattura?').'"  data-op="copy" data-button="'.tr('Duplica').'" data-class="btn btn-lg btn-warning" data-backto="record-edit" >
-    <i class="fa fa-copy"></i> '.tr('Duplica fattura').'
-</button>';
-
 if ($module->name == 'Fatture di vendita') {
     $attributi_visibili = $record['dati_aggiuntivi_fe'] != null || $record['stato'] == 'Bozza';
 
@@ -118,4 +113,10 @@ if (!empty($record['is_fiscale'])) {
             <i class="fa fa-folder-open"></i> '.tr('Riapri documento').'...
         </button>';
     }
-}
\ No newline at end of file
+}
+
+// Duplica fattura
+echo '
+<button type="button" class="btn btn-primary ask" '.(empty($record['is_reversed']) ? '' : 'disabled').' data-title="'.tr('Duplicare questa fattura?').'" data-msg="'.tr('Clicca su tasto duplica per procedere.').'"  data-op="copy" data-button="'.tr('Duplica').'" data-class="btn btn-lg btn-primary" data-backto="record-edit" >
+    <i class="fa fa-copy"></i> '.tr('Duplica fattura').'
+</button>';
diff --git a/modules/preventivi/buttons.php b/modules/preventivi/buttons.php
index 5f1078e76..bbe789047 100644
--- a/modules/preventivi/buttons.php
+++ b/modules/preventivi/buttons.php
@@ -19,11 +19,6 @@
 
 include_once __DIR__.'/../../core.php';
 
-echo '
-<button type="button" class="btn btn-primary" onclick="copiaPreventivo();">
-    <i class="fa fa-copy"></i> '.tr('Duplica preventivo').'
-</button>';
-
 $stati_abilitati = $dbo->fetchOne('SELECT GROUP_CONCAT(`descrizione` SEPARATOR ", ") AS stati_abilitati FROM `co_statipreventivi` WHERE `is_revisionabile` = 1 ')['stati_abilitati'];
 
 // Crea revisione
@@ -92,26 +87,6 @@ echo '
 
 // Duplica preventivo
 echo '
-<form action="" method="post" id="copia-preventivo">
-    <input type="hidden" name="backto" value="record-edit">
-    <input type="hidden" name="op" value="copy">
-</form>';
-
-echo '
-<script>
-function copiaPreventivo() {
-    swal({
-        title: "'.tr('Duplicare il preventivo?').'",
-        text: "'.tr('').'",
-        type: "info",
-        showCancelButton: true,
-        confirmButtonClass: "btn btn-lg btn-primary",
-        confirmButtonText: "'.tr('Duplica').'",
-    }).then(
-        function() {
-            $("#copia-preventivo").submit();
-        },
-        function() {}
-    );
-}
-</script>';
\ No newline at end of file
+<button type="button" class="btn ask btn-primary" data-title="'.tr('Duplicare questo preventivo?').'" data-msg="'.tr('Clicca su tasto duplica per procedere.').'" data-op="copy" data-button="'.tr('Duplica').'" data-class="btn btn-lg btn-primary" data-backto="record-edit" >
+    <i class="fa fa-copy"></i> '.tr('Duplica preventivo').'
+</button>';

From 8acfc21387dbab17077d8223f90cb1e791864bc5 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 21 Jul 2022 15:30:19 +0200
Subject: [PATCH 4/5] Sostituzione dei caratteri speciali in fase di
 generazione FE

---
 plugins/exportFE/src/Validator.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/exportFE/src/Validator.php b/plugins/exportFE/src/Validator.php
index fa74a8247..821e542a8 100755
--- a/plugins/exportFE/src/Validator.php
+++ b/plugins/exportFE/src/Validator.php
@@ -631,14 +631,7 @@ class Validator
 
             // Formattazione testo
             elseif ($info['type'] == 'string' || $info['type'] == 'normalizedString') {
-                /**
-                 * Sostituzione dei caratteri speciali del linguaggio.
-                 *
-                 * @source https://stackoverflow.com/a/3373364
-                 */
-                /*$replace_chars = ['Š' => 'S', 'š' => 's', 'Ž' => 'Z', 'ž' => 'z', 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'A', 'Ç' => 'C', 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U', 'Ý' => 'Y', 'Þ' => 'B', 'ß' => 'Ss', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a', 'æ' => 'a', 'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ð' => 'o', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ý' => 'y', 'þ' => 'b', 'ÿ' => 'y'];
-                $output = replace($output, $replace_chars);*/
-
+                
                 // Sostituzione tag e contenuti specifici per XML
                 $output = htmlspecialchars($output, ENT_NOQUOTES | ENT_XML1 | ENT_SUBSTITUTE, 'UTF-8', false);
 
@@ -649,6 +642,10 @@ class Validator
                     '…' => '...',
                     '~' => '-',
                     '®' => '',
+                    'Š' => 'S',
+                    'š' => 's',
+                    'Ž' => 'Z',
+                    'ž' => 'z',
                 ]);
 
                 //$output = self::sanitizeXML($output);

From cf896938ace8fcff4bd287b40e04f1b813a6fc18 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 21 Jul 2022 17:55:29 +0200
Subject: [PATCH 5/5] Fix #1069

---
 plugins/exportFE/src/Validator.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/exportFE/src/Validator.php b/plugins/exportFE/src/Validator.php
index 821e542a8..f13e6a8fa 100755
--- a/plugins/exportFE/src/Validator.php
+++ b/plugins/exportFE/src/Validator.php
@@ -632,9 +632,9 @@ class Validator
             // Formattazione testo
             elseif ($info['type'] == 'string' || $info['type'] == 'normalizedString') {
                 
-                // Sostituzione tag e contenuti specifici per XML
+                // Sostituzione tag e contenuti specifici per XML (non sembra essere eseguita)
                 $output = htmlspecialchars($output, ENT_NOQUOTES | ENT_XML1 | ENT_SUBSTITUTE, 'UTF-8', false);
-
+                
                 // Sostituzione per caratteri personalizzati
                 $output = replace($output, [
                     '€' => 'euro',
@@ -648,7 +648,9 @@ class Validator
                     'ž' => 'z',
                 ]);
 
-                //$output = self::sanitizeXML($output);
+                $output = str_replace(array("\r", "\n"), '', $output);
+
+                //$output = self::sanitizeXML($output);  
             }
 
             // Riduzione delle dimensioni
@@ -689,6 +691,8 @@ class Validator
     /**
      * Removes invalid characters from a UTF-8 XML string
      *
+     * @deprecated 2.4.34
+     * 
      * @param string a XML string potentially containing invalid characters
      * @return string
      */