From 6bb88a40afc50b6423435ebb62fa9faf18d0464d Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 26 Oct 2012 13:56:14 +0000
Subject: [PATCH] Empeche de creer un mail vide avant le POST.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Code JS plus générique
---
 bureau/admin/js/alternc.js |  6 ++++++
 bureau/admin/mail_list.php |  2 +-
 bureau/admin/sql_list.php  | 13 +++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bureau/admin/js/alternc.js b/bureau/admin/js/alternc.js
index e50e30ab..a50e77fb 100644
--- a/bureau/admin/js/alternc.js
+++ b/bureau/admin/js/alternc.js
@@ -203,3 +203,9 @@ function menu_toggle(id) {
   $("#"+id).toggle();
 }
 
+function false_if_empty(id,err_msg) {
+  if ( $("#"+id).val() == '' ) {
+    alert(err_msg);
+    return false;
+  }
+}
diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 4c6b30a5..83c9a673 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -70,7 +70,7 @@ if ($quota->cancreate("mail")) {
 	<form method="post" action="mail_doadd.php" id="main" name="mail_create">
 		<input type="text" class="int intleft" style="text-align: right" name="mail_arg" value="<?php ehe($mail_arg); ?>" size="32" id="mail_arg" maxlength="255" /><span id="emaildom" class="int intright"><?php echo "@".$domain; ?></span>
 		<input type="hidden" name="domain_id"  value="<?php echo $domain_id;?>" />
-		<input type="submit" name="submit" class="inb" value="<?php __("Create this email address"); ?>" />
+		<input type="submit" name="submit" class="inb" value="<?php __("Create this email address"); ?>"  onClick="return false_if_empty('mail_arg', '<?php echo addslashes(_("Can't have empty mail."));?>');" />
 <?php }?>
 <span class="inb"><a href="mail_manage_catchall.php?domain_id=<?php echo $domain_id?>"><?php __("Manage Catch-all for this domain");?></a></span> 
 <?php if ($quota->cancreate("mail")) { ?>
diff --git a/bureau/admin/sql_list.php b/bureau/admin/sql_list.php
index 75b59de4..a269a325 100644
--- a/bureau/admin/sql_list.php
+++ b/bureau/admin/sql_list.php
@@ -99,21 +99,14 @@ for($i=0;$i<count($rdb);$i++) {
 </tr>
 </table>
 <br />
-<input type="submit" class="inb" name="submit" value="<?php __("Create this new MySQL database."); ?>" onClick="return mysql_error_empty_suffix();" />
+<input type="submit" class="inb" name="submit" value="<?php __("Create this new MySQL database."); ?>" onClick="return false_if_empty('dbn', '<?php echo addslashes(_("Can't have empty MySQL suffix"));?>');" />
 </form>
 <?php
 }
 }
 ?>
 <script type="text/javascript">
-document.forms['main'].pass.focus();
-document.forms['main'].setAttribute('autocomplete', 'off');
-
-function mysql_error_empty_suffix() {
-  if ( $("#dbn").val() == '' ) {
-    alert("<?php __("Error: empty database suffix.");?>");
-    return false;
-  }
-}
+//document.forms['main'].pass.focus();
+//document.forms['main'].setAttribute('autocomplete', 'off');
 </script>
 <?php include_once("foot.php"); ?>