From 086c803ca44c1187bf59539ab3d34101c8e1e6ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 16 Mar 2010 00:24:52 +0000
Subject: [PATCH] Protect double submit on long step

---
 htdocs/install/default.css      | 8 ++++++++
 htdocs/install/etape1.php       | 8 ++++----
 htdocs/install/inc.php          | 1 +
 htdocs/langs/en_US/install.lang | 2 +-
 htdocs/langs/fr_FR/install.lang | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 2f6700f47a2..dcc953ce5b6 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -190,3 +190,11 @@ font-size: 12px;
 border: 1px solid #8CACBB;
 padding: 4px 4px 4px 4px;
 }
+
+div.visible {
+    display: block;
+}
+
+div.hidden {
+    display: none;
+}
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index d38dc11ead4..ab216a93c59 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -481,12 +481,12 @@ function jsinfo()
 {
 	ok=true;
 
-	document.getElementById('nextbutton').style.display='hidden';
-	alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>');
+	//alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>');
 
+	document.getElementById('nextbutton').style.visibility="hidden";
+	document.getElementById('pleasewait').style.visibility="visible";
 
-	//return ok;
-	return false;
+	return ok;
 }
 </script>
 
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 085f403d873..7a061d2ef7b 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -315,6 +315,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='')
 		print '<div class="nextbutton" id="nextbutton"><input type="submit" value="'.$langs->trans("NextStep").' ->"';
 		if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
 		print '></div>';
+		print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br>'.$langs->trans("PleaseBePatient").'</div>';
 	}
 	if ($setuplang)
 	{
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 545babe32cb..24cadac8a45 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -139,7 +139,7 @@ IfAlreadyExistsCheckOption=If this name is correct and that database does not ex
 OpenBaseDir=PHP openbasedir parameter
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
 YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Next step may last several minutes. After clicking on validation, please wait until the next screen is shown completely before continuing.
+NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
 
 #########
 # upgrade
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 8e5a5b93edf..415134a124a 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -140,7 +140,7 @@ IfAlreadyExistsCheckOption=Si ce nom est correct et que cette base n'existe pas
 OpenBaseDir=Paramètre php openbasedir
 YouAskToCreateDatabaseSoRootRequired=Vous avez coché la case "Créer la base de données". Pour cela, le login/mot de passe du super utilisateur (en bas de formulaire) sont obligatoire.
 YouAskToCreateDatabaseUserSoRootRequired=Vous avez coché la case "Créer l'utilisateur propriétaire" de la base. Pour cela, le login/mot de passe du super utilisateur (en bas de formulaire) sont obligatoire.
-NextStepMightLastALongTime=L'étape suivante peut durer quelques minutes. Après avoir validé, merci d'attendre l'affichage complet de la page suivante pour poursuivre.
+NextStepMightLastALongTime=L'étape en cours peut durer quelques minutes. Merci d'attendre l'affichage complet de la page suivante pour poursuivre.
 
 #########
 # upgrade