From d36c4f6baae03315b190da4c618d0139a8aeec47 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Thu, 29 Apr 2010 08:31:15 +0000
Subject: [PATCH] dans l'edition des domaines, on a maintenant des formulaires
 PROPRES ... et l'adresse IP n'est pas preremplie desormais (ca me pourrissait
 la vie ce truc de xxx.xxx.xxx.xxx)

---
 bureau/admin/bro_main.php                    |  6 +-
 bureau/admin/bro_pref.php                    |  9 +--
 bureau/admin/dom_edit.php                    | 59 ++++++++++++--------
 bureau/admin/dom_editdns.php                 | 27 ++++-----
 bureau/admin/dom_subdoedit.php               | 15 +++++
 bureau/admin/dom_subedit.php                 | 56 ++++++++++++++-----
 bureau/admin/hta_edit.php                    |  1 +
 bureau/admin/main.php                        |  2 +-
 bureau/admin/menu_dom.php                    |  2 +-
 bureau/admin/menu_ftp.php                    |  2 +-
 bureau/admin/sql_bck.php                     |  7 ++-
 bureau/admin/sql_getparam.php                |  6 +-
 bureau/admin/sql_list.php                    | 13 ++---
 bureau/admin/styles/style.css                |  6 +-
 bureau/class/functions.php                   | 30 +++++-----
 bureau/class/m_dom.php                       |  2 +
 bureau/locales/fr_FR/LC_MESSAGES/messages.po | 24 +++++---
 17 files changed, 170 insertions(+), 97 deletions(-)

diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 18881eb2..c7c240ba 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -336,7 +336,7 @@ echo "\">".htmlentities($c[$i]["name"])."/</a></b></td>\n";
 echo "	<td>".format_size($c[$i]["size"])."</td>";
 echo "<td>".format_date('%3$d-%2$d-%1$d %4$d:%5$d',date("Y-m-d h:i:s",$c[$i]["date"]))."<br /></td>";
 if ($p["showtype"]) {
-echo "<td>Dossier</td>";
+  echo "<td>"._("Folder")."</td>";
 }
 echo "<td>&nbsp;";
 echo "</td>\n";
@@ -531,7 +531,7 @@ else {
 </p><p>
 <span class="ina"><?php
 if ($hta->is_protected($R)) {
-echo "<a href=\"hta_edit.php?dir=".(($R)?$R:"/")."\">"._("Edit this folder's restrictions")."</a>";
+echo "<a href=\"hta_edit.php?dir=".(($R)?$R:"/")."\">"._("Edit this folder's protection")."</a>";
 }
 else {
   echo "<a href=\"hta_add.php?value=".(($R)?$R:"/")."\">"._("Protect this folder")."</a>";
@@ -545,7 +545,7 @@ else {
 </span>
 </p><p>
 <span class="ina">
-  <a href="bro_pref.php"><?php __("File browser preferences"); ?></a>
+  <a href="bro_pref.php"><?php __("Configure the file editor"); ?></a>
 </span> 
 </p>	
      <?php
diff --git a/bureau/admin/bro_pref.php b/bureau/admin/bro_pref.php
index 262de87e..2ba9f2bb 100644
--- a/bureau/admin/bro_pref.php
+++ b/bureau/admin/bro_pref.php
@@ -46,7 +46,6 @@ include_once("head.php");
 
 
 <table cellpadding="6" border="1" cellspacing="0">
-<tr><td colspan="2"><h4><?php __("File browser preferences"); ?></h4></td></tr>
 <tr><td><?php __("Horizontal window size"); ?></td><td><select class="inl" name="editsizex">
 <?php
 for($i=50;$i<=200;$i+=10) {
@@ -128,10 +127,12 @@ for($i=0;$i<count($bro->l_icons);$i++) {
 }
 ?></select></td></tr>
 
+<tr class="trbtn"><td colspan="2">
+  <input type="submit" name="submit" class="inb" value="<?php __("Change my settings"); ?>" />
+  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='bro_main.php'"/>
+
+</td></tr>
 </table>
-<p><input type="submit" name="submit" class="inb" value="<?php __("Change my settings"); ?>" /></p>
 
 </form>
-<p>&nbsp;</p>
-<a href="bro_main.php"><?php __("Back to the file browser"); ?></a>
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 40a4de8e..8927dcdf 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -32,6 +32,11 @@ include_once("head.php");
 
 $fields = array (
 	"domain"    => array ("request", "string", ""),
+	"sub"       => array ("request", "string", ""),
+	"type"      => array ("request", "integer", $dom->type_local),
+	"sub_local" => array ("request", "string",  "/"),
+	"sub_url"   => array ("request", "string", "http://"), 
+	"sub_ip"    => array ("request", "string", ""),
 );
 getFields($fields);
 
@@ -45,17 +50,21 @@ $dom->unlock();
 <script type="text/javascript">
 function dnson() {
 	// Active les composants DNS :
-	if (document.forms["dns"].mx.disabled!=null)
-		document.forms["dns"].mx.disabled=false;
-	if (document.forms["dns"].mail.disabled!=null)
-		document.forms["dns"].mail.disabled=true;
+	if (document.forms["fdns"].mx.disabled!=null)
+		document.forms["fdns"].mx.disabled=false;
+	if (document.forms["fdns"].emailon.disabled!=null)
+		document.forms["fdns"].emailon.disabled=true;
+	if (document.forms["fdns"].emailoff.disabled!=null)
+		document.forms["fdns"].emailoff.disabled=true;
 }
 function dnsoff() {
 	// Active les composants DNS :
-	if (document.forms["dns"].mx.disabled!=null)
-		document.forms["dns"].mx.disabled=true;
-	if (document.forms["dns"].mail.disabled!=null)
-		document.forms["dns"].mail.disabled=false;
+	if (document.forms["fdns"].mx.disabled!=null)
+		document.forms["fdns"].mx.disabled=true;
+	if (document.forms["fdns"].emailon.disabled!=null)
+		document.forms["fdns"].emailon.disabled=false;
+	if (document.forms["fdns"].emailoff.disabled!=null)
+		document.forms["fdns"].emailoff.disabled=false;
 }
 </script>
 <h3><?php printf(_("Editing subdomains of %s"),$domain); ?></h3>
@@ -94,16 +103,16 @@ for($i=0;$i<$r["nsub"];$i++) {
 <form action="dom_subdoedit.php" method="post" name="main" id="main">
 	<table border="0">
 		<tr>
-			<td colspan="2">
-			<input type="hidden" name="domain" value="<?php echo $r["name"]; ?>" />
+			<td>
+			<input type="hidden" name="domain" value="<?php ehe($r["name"]); ?>" />
 			<input type="hidden" name="action" value="add" />
-<?php __("Create a subdomain:"); ?>
-<input type="text" class="int" name="sub" style="text-align:right" value="" size="22" id="sub" /><span class="int" id="newsubname">.<?php echo $domain; ?></span></td>
+  <?php __("Create a subdomain:"); ?></td><td>
+<input type="text" class="int" name="sub" style="text-align:right" value="<?php ehe($sub); ?>" size="22" id="sub" /><span class="int" id="newsubname">.<?php echo $domain; ?></span></td>
 		</tr>
 		<tr>
-			<td><input type="radio" id="local" class="inc" name="type" value="<?php echo $dom->type_local; ?>" checked="checked" onclick="document.main.sub_local.focus();" />
+<td><input type="radio" id="local" class="inc" name="type" value="<?php echo $dom->type_local; ?>" <?php cbox($type==$dom->type_local); ?> onclick="document.main.sub_local.focus();" />
 				<label for="local"><?php __("Locally managed"); ?></label></td>
-			<td><input type="text" class="int" name="sub_local" id="sub_local" value="/" size="28" />
+			<td><input type="text" class="int" name="sub_local" id="sub_local" value="<?php ehe($sub_local); ?>" size="28" />
 <script type="text/javascript">
 <!--
   document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.sub_local');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
@@ -112,19 +121,19 @@ for($i=0;$i<$r["nsub"];$i++) {
 </td>
 		</tr>
 		<tr>
-			<td><input type="radio" id="url" class="inc" name="type" value="<?php echo $dom->type_url; ?>" onclick="document.main.sub_url.focus();" />
+			<td><input type="radio" id="url" class="inc" name="type" value="<?php echo $dom->type_url; ?>" <?php cbox($type==$dom->type_url); ?> onclick="document.main.sub_url.focus();" />
 				<label for="url" ><?php __("URL redirection"); ?></label></td>
-			<td><input type="text" class="int" name="sub_url" id="sub_url" value="http://" size="50" /></td>
+			<td><input type="text" class="int" name="sub_url" id="sub_url" value="<?php ehe($sub_url); ?>" size="50" /></td>
 		</tr>
 		<?php if ($r["dns"]) { // show only if dns is enabled ?>
 		<tr>
-			<td><input type="radio" id="ip" class="inc" name="type" value="<?php echo $dom->type_ip; ?>" onclick="document.main.sub_ip.focus();" />
+			<td><input type="radio" id="ip" class="inc" name="type" value="<?php echo $dom->type_ip; ?>" <?php cbox($type==$dom->type_ip); ?> onclick="document.main.sub_ip.focus();" />
 				<label for="ip"><?php __("IP redirection"); ?></label></td>
-			<td><input type="text" class="int" name="sub_ip" id="sub_ip" value="xxx.xxx.xxx.xxx" size="16" /></td>
+		<td><input type="text" class="int" name="sub_ip" id="sub_ip" value="<?php ehe($sub_ip); ?>" size="16" /> <small><?php __("(enter an IPv4 address, for example 192.168.1.2)"); ?></small></td>
 		</tr>
-		 <? } ?>
+		<? } ?>
 		<tr>
-			<td><input type="radio" id="webmail" class="inc" name="type" value="<?php echo $dom->type_webmail; ?>" />
+		<td><input type="radio" id="webmail" class="inc" name="type" value="<?php echo $dom->type_webmail; ?>" <?php cbox($type==$dom->type_webmail); ?>/>
 				<label for="webmail"><?php __("Webmail access"); ?></label></td>
 			<td>&nbsp;</td>
 		</tr>
@@ -145,12 +154,12 @@ if (!$r[noerase]) {
 
 <hr />
 <h3><?php __("DNS parameters"); ?></h3>
-<form action="dom_editdns.php?domain=<?php echo urlencode($r["name"]) ?>" method="post" id="dns">
+<form action="dom_editdns.php?domain=<?php echo urlencode($r["name"]) ?>" method="post" id="fdns" name="fdns">
 <table border="1" cellpadding="6" cellspacing="0">
 <tr><td colspan="2"><?php __("Manage the DNS on the server ?"); ?></td></tr>
 <tr>
-	<td align="center" width="65%"><label for="yesdns"><?php __("Yes"); ?></label><input type="radio" id="yesdns" class="inc" name="dns" value="1"<?php if ($r["dns"]) echo " checked=\"checked\"" ?> onclick="dnson();" /></td>
-	<td align="center" width="35%"><label for="nodns"><?php __("No"); ?></label><input type="radio" id="nodns" class="inc" name="dns" value="0"<?php if (!$r["dns"]) echo " checked=\"checked\"" ?> onclick="dnsoff();" /></td>
+								      <td align="center" width="65%"><input type="radio" id="yesdns" class="inc" name="dns" value="1"<?php cbox($r["dns"]); ?> onclick="dnson();" />&nbsp;<label for="yesdns"><?php __("Yes"); ?></label></td>
+   <td align="center" width="35%"><input type="radio" id="nodns" class="inc" name="dns" value="0"<?php cbox(!$r["dns"]); ?> onclick="dnsoff();" />&nbsp;<label for="nodns"><?php __("No"); ?></label></td>
 </tr>
 <tr>
 	<td width="65%" valign="top">
@@ -162,7 +171,9 @@ if (!$r[noerase]) {
 	<td width="35%" valign="top">
 	<p>
 	<?php __("help_dns_mail"); ?></p>
-	<select class="inl" id="email" name="email" <?php if ($r["dns"]) echo "disabled=\"disabled\""; ?>><option value="1"<?php if ($r["mail"]) echo " selected=\"selected\"";?>><?php __("Yes"); ?></option><option value="0"<?php if (!$r["mail"]) echo " selected=\"selected\"";?>><?php __("No"); ?></option></select>
+	 <input type="radio" id="emailon" class="inc" name="email" id="emailon" value="1"<?php cbox($r["mail"]); ?> <?php if ($r["dns"]) echo "disabled=\"disabled\""; ?>/><label for="emailon"><?php __("Yes"); ?></label>
+<br />
+         <input type="radio" id="emailoff" class="inc" name="email" id="emailoff" value="0"<?php cbox(!$r["mail"]); ?> <?php if ($r["dns"]) echo "disabled=\"disabled\""; ?>/><label for="emailoff"><?php __("No"); ?></label>
 	</td>
 </tr>
 <tr class="trbtn"><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Submit the changes"); ?>" /></td></tr>
diff --git a/bureau/admin/dom_editdns.php b/bureau/admin/dom_editdns.php
index f2c36b41..7e21dc38 100644
--- a/bureau/admin/dom_editdns.php
+++ b/bureau/admin/dom_editdns.php
@@ -34,25 +34,26 @@ $fields = array (
 	"domain"    => array ("request", "string", ""),
 	"dns"       => array ("request", "integer", 1),
 	"mx"        => array ("request", "string", ""),
+	"email"     => array ("request", "integer", 0),
 );
 getFields($fields);
 
 $dom->lock();
 if ($dns!="1") {
-	// On fixe mx :
-	if ($email=="1") {
-		$mx=$L_MX;
-	} else {
-		$mx="";
-	}
-}
+  // On fixe mx :
+  if ($email=="1") {
+    $mx=$L_MX;
+  } else {
+    $mx="";
+  }
+ }
 
 if (!$dom->edit_domain($domain,$dns,$mx)) {
-	$error=$err->errstr();
-	include("dom_edit.php");
-	$dom->unlock();
-	exit();
-}
+  $error=$err->errstr();
+  include("dom_edit.php");
+  $dom->unlock();
+  exit();
+ }
 $dom->unlock();
 
 ?>
@@ -64,6 +65,6 @@ $dom->unlock();
 // XXX: we assume the cron job is at every 5 minutes
   print strtr(_("The modifications will take effect at %time.  Server time is %now."), array('%now' => date('H:i:s', $t), '%time' => date('H:i:s', ($t-($t%300)+300)))); 
 ?><br />
-<a href="login.php" target="_top"><?php __("Click here to continue"); ?></a>
+<span class="ina"><a href="login.php" target="_top"><?php __("Click here to continue"); ?></a></span>
 </p>
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/dom_subdoedit.php b/bureau/admin/dom_subdoedit.php
index 7e824f61..810a00b5 100644
--- a/bureau/admin/dom_subdoedit.php
+++ b/bureau/admin/dom_subdoedit.php
@@ -29,6 +29,17 @@
 */
 require_once("../class/config.php");
 
+$fields = array (
+	"domain"    => array ("request", "string", ""),
+	"sub"       => array ("request", "string", ""),
+	"type"      => array ("request", "integer", $dom->type_local),
+	"sub_local" => array ("request", "string",  "/"),
+	"sub_url"   => array ("request", "string", "http://"), 
+	"sub_ip"    => array ("request", "string", ""),
+	"action"    => array ("request", "string", "add"),
+);
+getFields($fields);
+
 $dom->lock();
 
 switch ($type) {
@@ -49,10 +60,14 @@ $dom->unlock();
 
 if (!$r) {
   $error=$err->errstr();
+  $noread=true;
+  include("dom_subedit.php"); 
+  exit();
 } else {
   $t = time();
   // XXX: we assume the cron job is at every 5 minutes
   $error=strtr(_("The modifications will take effect at %time. Server time is %now."), array('%now' => date('H:i:s', $t), '%time' => date('H:i:s', ($t-($t%300)+300))));
+  foreach($fields as $k=>$v) unset($k);
 }
 include("dom_edit.php");
 exit;
diff --git a/bureau/admin/dom_subedit.php b/bureau/admin/dom_subedit.php
index 7e6f90e7..ea3a5d86 100644
--- a/bureau/admin/dom_subedit.php
+++ b/bureau/admin/dom_subedit.php
@@ -33,22 +33,50 @@ include_once("head.php");
 $fields = array (
 	"domain"    => array ("request", "string", ""),
 	"sub"       => array ("request", "string", ""),
+	"type"      => array ("request", "integer", $dom->type_local),
+	"sub_local" => array ("request", "string",  "/"),
+	"sub_url"   => array ("request", "string", "http://"), 
+	"sub_ip"    => array ("request", "string", ""),
+	"action"    => array ("request", "string", "add"),
 );
 getFields($fields);
 
 $dom->lock();
-if (!$r=$dom->get_sub_domain_all($domain,$sub)) {
-	$error=$err->errstr();
-}
+if (!$noread) {
+  if (!$r=$dom->get_sub_domain_all($domain,$sub)) {
+    $error=$err->errstr();
+    ?>
+      <h3><?php __("Editing subdomain"); ?> http://<?php ecif($sub,$sub."."); echo $domain; ?></h3>
+<?php
+	echo "<p class=\"error\">$error</p>";
+	include_once("foot.php");
+	exit();
+ } 
+
+$sub=$r["name"];
+$type=$r["type"];
+switch ($type) {
+ case $dom->type_local:
+   $sub_local=$r["dest"];
+   break;
+ case $dom->type_url:
+   $sub_url=$r["dest"];
+   break;
+ case $dom->type_ip:
+   $sub_ip=$r["dest"];
+   break;
+ case $dom->type_webmail:
+   break;
+ }
+ }
+
 $dom->unlock();
 
 ?>
 <h3><?php __("Editing subdomain"); ?> http://<?php ecif($sub,$sub."."); echo $domain; ?></h3>
 <?php
 	if ($error) {
-		echo "<p class=\"erroe\">$error</p>";
-		include_once("foot.php");
-		exit();
+		echo "<p class=\"error\">$error</p>";
 	}
 ?>
 <hr />
@@ -59,13 +87,13 @@ $dom->unlock();
 <form action="dom_subdoedit.php" method="post" id="main" name="main">
 	<table border="0">
 	<tr>
-		<td>	<input type="hidden" name="domain" value="<?php echo $domain ?>" />
-	<input type="hidden" name="sub" value="<?php echo $sub ?>" />
+		<td>	<input type="hidden" name="domain" value="<?php ehe($domain); ?>" />
+	<input type="hidden" name="sub" value="<?php echo ehe($sub); ?>" />
 	<input type="hidden" name="action" value="edit" />
 
 <input type="radio" id="local" class="inc" name="type" value="<?php echo $dom->type_local; ?>" <?php cbox($r["type"]==$dom->type_local); ?> onclick="document.main.sub_local.focus();" />
 			<label for="local"><?php __("Locally managed"); ?></label></td>
-		<td><input type="text" class="int" name="sub_local" id="sub_local" value="<?php ecif($r["type"]==0,$r["dest"],"/"); ?>" size="40" />
+		<td><input type="text" class="int" name="sub_local" id="sub_local" value="<?php ehe($sub_local); ?>" size="40" />
 <script type="text/javascript">
 <!--
   document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.sub_local');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
@@ -74,14 +102,14 @@ $dom->unlock();
 </td>
 	</tr>
 	<tr>
-		<td><input type="radio" id="url" class="inc" name="type" value="<?php echo $dom->type_url; ?>" <?php cbox($r["type"]==$dom->type_url); ?> onclick="document.main.sub_url.focus();" />
+		<td><input type="radio" id="url" class="inc" name="type" value="<?php echo $dom->type_url; ?>" <?php cbox($type==$dom->type_url); ?> onclick="document.main.sub_url.focus();" />
 			<label for="url"><?php __("URL redirection"); ?></label></td>
-		<td><input type="text" class="int" name="sub_url" id="sub_url" value="<?php ecif($r["type"]==1,$r["dest"],"http://"); ?>" size="50" /></td>
+		<td><input type="text" class="int" name="sub_url" id="sub_url" value="<?php ehe($sub_url); ?>" size="50" /></td>
 	</tr>
 	<tr>
-		<td><input type="radio" id="ip" class="inc" name="type" value="<?php echo $dom->type_ip; ?>" <?php cbox($r["type"]==$dom->type_ip); ?> onclick="document.main.sub_ip.focus();" />
+		<td><input type="radio" id="ip" class="inc" name="type" value="<?php echo $dom->type_ip; ?>" <?php cbox($type==$dom->type_ip); ?> onclick="document.main.sub_ip.focus();" />
 			<label for="ip"><?php __("IP redirection"); ?></label></td>
-		<td><input type="text" class="int" name="sub_ip" id="sub_ip" value="<?php ecif($r["type"]==2,$r["dest"],"xxx.xxx.xxx.xxx"); ?>" size="16" /></td>
+		<td><input type="text" class="int" name="sub_ip" id="sub_ip" value="<?php ehe($sub_ip); ?>" size="16" /> <small><?php __("(enter an IPv4 address, for example 192.168.1.2)"); ?></small></td>
 	</tr>
 	<tr>
 		<td><input type="radio" id="webmail" class="inc" name="type" value="<?php echo $dom->type_webmail; ?>" <?php cbox($r["type"]==$dom->type_webmail); ?> />
@@ -91,7 +119,7 @@ $dom->unlock();
 	<tr class="trbtn">
             <td colspan="2">
               <input type="submit" class="inb" name="submit" value="<?php __("Validate this change"); ?>" />
-              <input type="button" class="inb" name="back" value="<?php __("Cancel"); ?>" onclick="history.back();" />
+              <input type="button" class="inb" name="back" value="<?php __("Cancel"); ?>" onclick="document.location='dom_edit.php?domain=<?php ehe($domain); ?>'" />
             </td>
         </tr>
 
diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php
index 96afda84..dc036680 100644
--- a/bureau/admin/hta_edit.php
+++ b/bureau/admin/hta_edit.php
@@ -114,6 +114,7 @@ for($i=0;$i<count($r);$i++){
 </form>
 <script type="text/javascript">
 document.forms['main'].user.focus();
+document.forms['main'].setAttribute('autocomplete', 'off'); 
 </script>
 
 <?php include_once("foot.php"); ?>
\ No newline at end of file
diff --git a/bureau/admin/main.php b/bureau/admin/main.php
index 1742ab8d..1fae434d 100644
--- a/bureau/admin/main.php
+++ b/bureau/admin/main.php
@@ -100,7 +100,7 @@ $c=@mysql_fetch_array(mysql_query("SELECT * FROM membres WHERE uid='".$cuid."';"
 
 	list($totalweb)=@mysql_fetch_array(mysql_query("SELECT SUM(size) FROM size_web WHERE uid = '" . $c["uid"] . "'"));
 
-	echo "<p>Espace WEB: ";
+echo "<p>"._("WEB Space:")." ";
 	echo sprintf("%.1f", $totalweb / 1024)."&nbsp;Mo";
 	echo "</p>";
 
diff --git a/bureau/admin/menu_dom.php b/bureau/admin/menu_dom.php
index 49e24d9a..8c251846 100644
--- a/bureau/admin/menu_dom.php
+++ b/bureau/admin/menu_dom.php
@@ -41,7 +41,7 @@ if ($q["t"] > 0)
 <div class="menu-content" id="menu-dom">
 <ul>
 <?php if ($quota->cancreate("dom")) { ?>
-	<li><a href="dom_add.php"><img src="images/new.png" alt="<?php __("Add a domain"); ?>" /><?php __("Add a domain"); ?></a></li>
+     <li><a href="dom_add.php"><img src="images/new.png" alt="<?php __("Add a domain"); ?>" />&nbsp;<?php __("Add a domain"); ?></a></li>
 <?php }
 
 /* Enumeration des domaines : */
diff --git a/bureau/admin/menu_ftp.php b/bureau/admin/menu_ftp.php
index 884afe7f..58b204a7 100644
--- a/bureau/admin/menu_ftp.php
+++ b/bureau/admin/menu_ftp.php
@@ -41,7 +41,7 @@ if ($q["t"] > 0) {
 <div class="menu-content" id="menu-ftp">
 <ul>
 <?php if ($quota->cancreate("ftp")) { ?>
-<li><a href="ftp_add.php"><img src="images/new.png" alt="<?php __("Create a new ftp account"); ?>" /><?php __("Create a new ftp account"); ?></a></li>
+     <li><a href="ftp_add.php"><img src="images/new.png" alt="<?php __("Create a new ftp account"); ?>" />&nbsp;<?php __("Create a new ftp account"); ?></a></li>
 <?php } ?>
 <li><a href="ftp_list.php"><?php __("FTP accounts list"); ?></a></li>
 </ul>
diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php
index 6d74745b..c7a60a7c 100644
--- a/bureau/admin/sql_bck.php
+++ b/bureau/admin/sql_bck.php
@@ -91,9 +91,12 @@ if (is_array($r)) {
 </script>
 </td>
 </tr>
+
+<tr class="trbtn"><td colspan="2">
+  <input class="inb" type="submit" name="submit" value="<?php __("Change the SQL backup parameters"); ?>" />
+  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='sql_list.php'"/>
+</td></tr>
 </table>
-<br />
-<input class="inb" type="submit" name="submit" value="<?php __("Change the SQL backup parameters"); ?>" />
 </form>
 <?php
 	$mem->show_help("sql_bck");
diff --git a/bureau/admin/sql_getparam.php b/bureau/admin/sql_getparam.php
index 98f48c80..a97e70a0 100644
--- a/bureau/admin/sql_getparam.php
+++ b/bureau/admin/sql_getparam.php
@@ -53,7 +53,7 @@ if (!$r=$mysql->get_dblist()) {
 		<td><code><?php echo $r[0]["pass"]; ?></code></td>
 	</tr>
 	<tr>
-		<th><?php __("SQL Server"); ?></th>
+		<th><?php __("MySQL Server"); ?></th>
 		<td><code><?php echo $mysql->server; ?></code></td>
 	</tr>
 	<tr>
@@ -61,4 +61,8 @@ if (!$r=$mysql->get_dblist()) {
 		<td><code><?php echo $r[0]["db"]; ?></code></td>
 	</tr>
 </table>
+
+<p><span class="ina"><a href="sql_list.php"><?php __("Back to the MySQL database list"); ?></a></span></p>
+
+
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/sql_list.php b/bureau/admin/sql_list.php
index bbe8b766..89c4c1e7 100644
--- a/bureau/admin/sql_list.php
+++ b/bureau/admin/sql_list.php
@@ -74,14 +74,13 @@ for($i=0;$i<count($r);$i++) {
 </form>
 
 <p>&nbsp;</p>
-<p>
-<?php if ($quota->cancreate("mysql")) { ?>
- <a href="sql_add.php"><?php __("Create a new database"); ?></a><br /><br />
-<?php } ?>
-<a href="sql_passchg.php"><?php __("Change the SQL password"); ?></a><br /><br />
-<a href="sql_getparam.php"><?php __("Get the current SQL parameters"); ?></a><br /><br />
 
-</p>
+<?php if ($quota->cancreate("mysql")) { ?>
+<p>  <span class="ina"><a href="sql_add.php"><?php __("Create a new database"); ?></a></span> </p>
+<?php } ?>
+<p><span class="ina"><a href="sql_passchg.php"><?php __("Change the SQL password"); ?></a></span></p>
+<p><span class="ina"><a href="sql_getparam.php"><?php __("Get the current SQL parameters"); ?></a></span></p>
+
 
 <?php
 	} else {
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index af315bca..19b1bf2c 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -77,7 +77,7 @@ hr {
 	/* Should not be use anymore !!! */
 	border-color: blue;
 	border-width: 5px;
-	backgorund-color: #500000;
+	background-color: #500000;
 	color: white;
 }
 
@@ -414,4 +414,8 @@ input#dir, input#sub_local {
 
 .warningmsg {
     width: 500px;
+}
+
+#mx {
+    width: 300px;
 }
\ No newline at end of file
diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index dd41a14f..62850eb9 100644
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -227,10 +227,23 @@ function getuserpath($user = null) {
   return $L_ALTERNC_LOC . "/html/".substr($user,0,1)."/".$user;
 }
 
+/* ECHOes checked="checked" only if the parameter is true
+ * useful for checkboxes and radio buttons
+ */
 function cbox($test) {
   if ($test) echo (" checked=\"checked\"");
 }
 
+
+/* ECHOes selected="selected" only if the parameter is true
+ * useful for checkboxes and radio buttons
+ */
+function selected($bool) {
+  if ($bool) {
+    echo " selected=\"selected\"";
+  }
+}
+
 function ecif($test,$tr,$fa="") {
   if ($test)
     echo $tr;
@@ -412,23 +425,6 @@ function eoption($values,$cur,$info="") {
   }
 }
 
-/* ECHOes checked="checked" only if the parameter is true
- * useful for checkboxes and radio buttons
- */
-function checked($bool) {
-  if ($bool) {
-    echo " checked=\"checked\"";
-  }
-}
-
-/* ECHOes selected="selected" only if the parameter is true
- * useful for checkboxes and radio buttons
- */
-function selected($bool) {
-  if ($bool) {
-    echo " selected=\"selected\"";
-  }
-}
 
 /* Echo the HTMLSpecialChars version of a value. 
  * Must be called when pre-filling fields values in forms such as : 
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index 852eaf32..d8a039cf 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -70,6 +70,8 @@ class m_dom {
   var $type_url = "1";
   var $type_ip = "2";
   var $type_webmail = "3";
+  var $type_cname = "4"; // TODO : implement this ;) 
+  var $type_ns = "5"; // TODO : implement this ;) 
 
   var $action_insert = "0";
   var $action_update= "1";
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 457d0dea..1819077b 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -897,8 +897,8 @@ msgid "Your preferences have been updated."
 msgstr "Vos préférences ont été mises à jour."
 
 #: ../admin/bro_pref.php:45 ../admin/bro_pref.php:49
-msgid "File editor preferences"
-msgstr "Préférences du gestionnaire de fichiers"
+msgid "Configure the file editor"
+msgstr "Configurer le gestionnaire de fichiers"
 
 #: ../admin/bro_pref.php:50
 msgid "Horizontal window size"
@@ -1179,7 +1179,7 @@ msgstr ""
 #: ../admin/ftp_add.php:39 ../admin/ftp_add.php:50 ../admin/ftp_list.php:50
 #: ../admin/ftp_list.php:86 ../admin/menu_ftp.php:44
 msgid "Create a new ftp account"
-msgstr "Création d'un compte ftp"
+msgstr "Créer un compte ftp"
 
 #: ../admin/ftp_add.php:65 ../admin/ftp_add.php:66 ../admin/ftp_add.php:64
 msgid "Create this new FTP account."
@@ -1727,7 +1727,7 @@ msgstr "Accueil"
 
 #: ../admin/menu_quota.php:32 ../admin/menu_quota.php:31
 msgid "Show my quotas"
-msgstr "Afficher les quotas"
+msgstr "Quotas du compte"
 
 #: ../admin/menu_sql.php:35 ../admin/sql_users_list.php:40
 #: ../admin/menu_sql.php:34 ../admin/menu_sql.php:38
@@ -1880,7 +1880,7 @@ msgstr "Voici vos param
 #: ../admin/sql_getparam.php:56 ../admin/sql_list.php:95
 #: ../admin/sql_passchg.php:51 ../admin/sql_users_list.php:100
 msgid "SQL Server"
-msgstr "Serveur SQL"
+msgstr "Serveur MySQL"
 
 #: ../admin/sql_list.php:48 ../admin/sql_list.php:44
 msgid "help_sql_list_ok"
@@ -2777,14 +2777,14 @@ msgstr "Afficher la taille des r
 msgid "(slow)"
 msgstr "(lent)"
 
-msgid "Edit this folder's restrictions"
-msgstr "Modifier les restriction dans ce dossier"
+msgid "Edit this folder's protection"
+msgstr "Modifier la protection de ce répertoire"
 
 msgid "with a login and a password"
 msgstr "utilisant un nom d'utilisateur et un mot de passe"
 
 msgid "Download this folder"
-msgstr "Télécharger ce dossier"
+msgstr "Télécharger ce répertoire"
 
 msgid "as a %s file"
 msgstr "comme fichier %s"
@@ -2818,3 +2818,11 @@ msgstr "Redirections/Autres destinataires&nbsp;:"
 msgid "Path" 
 msgstr "Répertoire courant"
 
+msgid "Edit login and passwords"
+msgstr "Gérer les utilisateurs et mots de passe"
+
+msgid "Back to the MySQL database list"
+msgstr "Retour à la liste des bases MySQL"
+
+msgid "(enter an IPv4 address, for example 192.168.1.2)"
+msgstr "(entrez une adresse IPv4, par exemple 192.168.1.2)"