[Noalyss-commit] [noalyss] 21/24: Correct Cosmetic : waiting_box

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 5ebd0c6f52d7fbc8c644a55a43acff782908230e
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Jun 5 13:32:45 2022 +0200

    Correct Cosmetic : waiting_box
---
 html/js/noalyss_script.js | 6 ++++--
 include/restore.inc.php   | 2 +-
 include/upgrade.inc.php   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js
index 90b92dc3b..1e63c923a 100644
--- a/html/js/noalyss_script.js
+++ b/html/js/noalyss_script.js
@@ -3102,9 +3102,11 @@ function init_scroll()
  * @endcode
  * @param p_obj form element (object) or element id (string)
  * @param p_message message to display
+ * @param p_callback_true  callback function or null
+ * @param p_waiting if true display a waiting box
  * @returns true or false
  */
-function confirm_box(p_obj, p_message, p_callback_true)
+function confirm_box(p_obj, p_message, p_callback_true,p_waiting)
 {
     waiting_box();
     try {
@@ -3124,7 +3126,7 @@ function confirm_box(p_obj, p_message, p_callback_true)
         {
             smoke.confirm(p_message, function (e) {
                 if (e) {
-                    waiting_box();
+                    if (p_waiting){waiting_box();}
                     $(name).submit();
                 }
             });
diff --git a/include/restore.inc.php b/include/restore.inc.php
index 38456e84e..7d4aeca94 100644
--- a/include/restore.inc.php
+++ b/include/restore.inc.php
@@ -202,7 +202,7 @@ if ( isset ($_REQUEST['sa'] ))
 else
 {
     echo '<div class="content" style="width:80%;margin-left:10%">';
-    printf( '<form method="POST" action="admin-noalyss.php" 
enctype="multipart/form-data"  onsubmit="return (check_file_size(this,%s) && 
waiting_box())" >',MAX_FILE_SIZE);
+    printf( '<form method="POST" action="admin-noalyss.php" 
enctype="multipart/form-data"  onsubmit="return check_file_size(this,%s) " 
>',MAX_FILE_SIZE);
     echo HtmlInput::hidden('action','restore');
     echo HtmlInput::hidden('sa','r');
     echo '<table>';
diff --git a/include/upgrade.inc.php b/include/upgrade.inc.php
index 92af347fb..3b79dfed9 100644
--- a/include/upgrade.inc.php
+++ b/include/upgrade.inc.php
@@ -53,7 +53,7 @@ if ($sb=="database")
 echo _("Mettez vos bases de données à jour pour qu'elles correspondent à cette 
version de Noalyss");
 ?>
 </p>
-    <form method="get" id="frm_upg_all" onsubmit="return 
confirm_box('frm_upg_all', '<?php echo _('Confirmez') ?>')">
+    <form method="get" id="frm_upg_all" onsubmit="return 
confirm_box('frm_upg_all', '<?php echo _('Confirmez') ?>',false,true)">
         <input type="hidden" name="sb" value="database">
         <input type="hidden" name="sc" value="upg_all">
         <input type="hidden" name="action" value="upgrade">