suite des modifications majeures pour 1.0 : glossaire, ergonomie etc.

.gitattributes

@@ -272,7 +272,6 @@ bureau/class/config_real.php -text
 bureau/class/db_mysql.php -text
 bureau/class/export_account.php -text
 bureau/class/functions.php -text
-bureau/class/functions2.php -text
 bureau/class/lang_env.php -text
 bureau/class/local.php -text
 bureau/class/m_admin.php -text

bureau/admin/adm_doms.php

@@ -53,14 +53,14 @@ $c=$admin->dom_list(true,$forcecheck);
 <?php __("Here is the list of the domains installed on this server. You can remove a domain if it does not exist or does not point to our server anymore. You can also set the 'Lock' flag on a domain so that the user will not be able to change any DNS parameter or delete this domain from his account."); ?>
 </p>
 <p>
-<?php __("The domain OK column are green when the domain exists in the worldwide registry and has a proper NS,MX and IP depending on its configuration. It is red if we have serious doubts about its NS, MX or IP configuration"); ?>
+<?php __("The domain OK column are green when the domain exists in the worldwide registry and has a proper NS,MX and IP depending on its configuration. It is red if we have serious doubts about its NS, MX or IP configuration. Contact the user of this domain or a system administrator."); ?>
 </p>
 <p>
-<?php __("If you want to force the check of NS, MX, IP on domains, click the link "); ?><a href="adm_doms.php?force=1"><?php __("Show domain list with refreshed checked NS, MX, IP information"); ?></a>
+<?php __("If you want to force the check of NS, MX, IP on domains, click the link"); ?> <a href="adm_doms.php?force=1"><?php __("Show domain list with refreshed checked NS, MX, IP information"); ?></a>
 </p>
 <form method="post" action="adm_dodom.php">
 <table border="0" cellpadding="4" cellspacing="0">
-    <tr><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Member"); ?></th><th><?php __("Connect as"); ?><th><?php __("Lock"); ?></th><th><?php __("OK?"); ?></th><th><?php __("Status"); ?></th></tr>
+    <tr><th></th><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Creator"); ?></th><th><?php __("Connect as"); ?><th><?php __("OK?"); ?></th><th><?php __("Status"); ?></th></tr>
 <?php
 $col=1;
 for($i=0;$i<count($c);$i++) {
@@ -68,6 +68,9 @@ for($i=0;$i<count($c);$i++) {
 ?>
 
 <tr class="lst<?php echo $col; ?>">
+				    <td><?php if ($c[$i]["noerase"]) {
+			echo "<img src=\"icon/encrypted.png\" width=\"16\" height=\"16\" alt=\""._("Locked Domain")."\" />";
+				    } ?></td>
 <td><a href="adm_domlock.php?domain=<?php echo urlencode($c[$i][domaine]); ?>"><?php
    if ($c[$i]["noerase"]) __("Unlock"); else __("Lock");  ?></a></td>
 <td><a href="http://<?php echo $c[$i][domaine]; ?>" target="_blank"><?php echo $c[$i]["domaine"]; ?></a></td>
@@ -78,9 +81,6 @@ for($i=0;$i<count($c);$i++) {
 			<a href="adm_login.php?id=<?php echo $c[$i]["uid"];?>"><?php __("Connect as"); ?></a>
 		<?php } ?>
 </td>
-				    <td><?php if ($c[$i]["noerase"]) {
-			echo "<img src=\"icon/encrypted.png\" width=\"16\" height=\"16\" alt=\""._("Locked Domain")."\" />";
-				    } ?></td>
 <td style="background: <?php 
 				       if ($c[$i]["errno"]==0) {
 					 echo "green";

bureau/admin/dom_add.php

@@ -31,6 +31,14 @@ require_once("../class/config.php");
 
 include_once("head.php");
 
+$fields = array (
+	"newdomain"   => array ("request", "string", ""),
+	"yndns"   => array ("request", "integer", 0),
+	"newisslave"   => array ("request", "integer", 0),
+	"slavedom"   => array ("request", "string", ""),
+);
+getFields($fields);
+
 if (!isset($dns)) $dns="1";
 
 ?>
@@ -46,10 +54,10 @@ if ($error) echo "<p class=\"error\">$error</p>";
 ?>
 <form method="post" action="dom_doadd.php" id="main">
 <p>
-<label for="newdomain"><b><?php __("Domain name"); ?> :</b></label> <span class="int" id="newdomwww">www.</span><input type="text" class="int" id="newdomain" name="newdomain" value="<?php echo $newdomain ?>" size="32" maxlength="255" />
+<label for="newdomain"><b><?php __("Domain name"); ?> :</b></label> <span class="int" id="newdomwww">www.</span><input type="text" class="int" id="newdomain" name="newdomain" value="<?php ehe($newdomain); ?>" size="32" maxlength="255" />
 </p>
 <p>
-  <input type="checkbox" name="dns" class="inc" value="1" id="yndns" <?php if ($dns=="1") echo "checked=\"checked\""; ?> />&nbsp;<label for="yndns"><?php __("host my dns here"); ?></label>
+  <input type="checkbox" name="dns" class="inc" value="1" id="yndns"<?php checked($dns=="1"); ?>/>&nbsp;<label for="yndns"><?php __("host my dns here"); ?></label>
 </p>
 <?php
   $q = $quota->getquota("dom");
@@ -58,9 +66,9 @@ if ($q["u"]>0) {
 <p>
     <?php __("Do you want to point this domain to another domain already installed in your account?"); ?>
 <br />
-    <input type="radio" id="newisslave0" name="newisslave" value="0" checked="checked" /><label for="newisslave0"><?php __("No: This domain will have its own folder."); ?></label>
+   <input type="radio" id="newisslave0" name="newisslave" value="0"<?php checked($newisslave==0); ?>/><label for="newisslave0"><?php __("No: This domain will have its own folder."); ?></label>
 <br />
-    <input type="radio" id="newisslave1" name="newisslave" value="1" /><label for="newisslave1"><?php __("Yes, redirect this new domain to this one: "); ?></label> <select name="slavedom" id="slavedom" class="inl">
+   <input type="radio" id="newisslave1" name="newisslave" value="1"<?php checked($newisslave==1); ?>/><label for="newisslave1"><?php __("Yes, redirect this new domain to this one:"); ?> </label> <select name="slavedom" id="slavedom" class="inl">
  <option value=""><?php __("-- Choose a domain --"); ?></option>
 <?php
 $dl=$dom->get_domain_list();

bureau/admin/head.php

@@ -27,13 +27,15 @@
  Purpose of file: Main header of all html files
  ----------------------------------------------------------------------
 */
+if (!$charset) $charset="iso-8859-1";
+@header("Content-Type: text/html; charset=$charset");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
 <head>
 <title>Bureau</title>
 <link rel="stylesheet" href="styles/style.css" type="text/css" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
 <script type="text/javascript" src="js/alternc.js"></script>
 <script type="text/javascript" src="js/wz_dragdrop.js"></script>
 </head>

bureau/admin/js/alternc.js

@@ -109,3 +109,52 @@ function CheckAll() {
   }
 }
 
+function hide(s) {
+    if (document.all) {
+        if (document.all[s]) {
+            document.all[s].visibility="invisible";
+            eval("document.all."+s+".style.display=\"none\"");
+        }
+    } else {
+        if (document.getElementById(s)) {
+            document.getElementById(s).visibility="invisible";
+            document.getElementById(s).style.display="none";
+        }
+    }
+}
+
+/* Affiche le composant s */
+function show(s,shm) {
+    if (!shm) shm="block";
+    if (document.all) {
+        if (document.all[s]) {
+            document.all[s].visibility="visible";
+            eval("document.all."+s+".style.display=\""+shm+"\"");
+        }
+    } else {
+        if (document.getElementById(s)) {
+            document.getElementById(s).visibility="visible";
+            document.getElementById(s).style.display=shm;
+        }
+    }
+}
+/* Affiche / Cache le composant s */
+function swap(s,shm) {
+    if (document.all) {
+        if (document.all[s]) {
+            if (document.all[s].visibility=="visible") {
+                hide(s);
+            } else {
+                show(s,shm);
+            }
+        }
+    } else {
+        if (document.getElementById(s)) {
+            if (document.getElementById(s).visibility=="visible") {
+                hide(s);
+            } else {
+                show(s,shm);
+            }
+        }
+    }
+}

bureau/admin/mail_del.php

@@ -80,7 +80,7 @@ while (list($key,$val)=each($d)) {
 </p>
 
 <p>
-<?php __("Warning: Deleting a mailbox will destroy all the emails it contains! You will <b>NOT</b> be able to get it back!"); ?>
+<?php __("Warning: Deleting an email address will destroy all the messages it contains! You will <b>NOT</b> be able to get it back!"); ?>
 </p>
 
 </form>

bureau/admin/mail_edit.php

@@ -45,7 +45,7 @@ else
 {
 
 ?>
-<h3><?php printf(_("Edit a mailbox of the domain %s"),"http://$domain"); ?> : </h3>
+<h3><?php printf(_("Edit an email address of the domain %s"),"http://$domain"); ?> : </h3>
 <?php
 if ($error_edit) {
 	echo "<p class=\"error\">$error_edit</p>";
@@ -61,11 +61,24 @@ if ($error_edit) {
 <table class="tedit">
 	<tr><th colspan="2"><input type="hidden" name="email" value="<?php echo $email; ?>" />
 <input type="hidden" name="domain" value="<?php echo $domain; ?>" />
-<?php printf(_("Edit the mailbox <b>%s</b>"),$email); ?></th></tr>
+<?php printf(_("Edit the email address <b>%s</b>"),$email); ?></th></tr>
-        <tr><td><label for="ispop"><?php __("Is it a POP account?"); ?></label></td><td><input id="ispop" type="checkbox" class="inc" name="pop" value="1" <?php if ($pop=="1") echo "checked=\"checked\""; ?> /><?php if ($pop) { __("WARNING: turning POP off will DELETE the mailbox and its content"); }?></td></tr>
+								  <tr><td><label for="ispop"><?php __("Is it a POP/IMAP account?"); ?></label></td>
-	<tr><td><label for="pass"><?php __("POP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
+<td>
+<p>
+ <input type="radio" name="ispop" id="ispop0" class="inc" value="0"<?php checked($pop==0); ?> onclick="hide('ispoptbl');"><label for="ispop0"><?php __("No"); ?></label>
+ <input type="radio" name="ispop" id="ispop1" class="inc" value="1"<?php checked($pop==1); ?> onclick="show('ispoptbl');"><label for="ispop1"><?php __("Yes"); ?></label>
+</p>
+<div id="ispoptbl">
+<table class="tedit" >
+	<tr><td><label for="pass"><?php __("POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="<?php ehe($pass); ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
-	<tr><td><label for="alias"><?php __("Other recipients"); ?></label></td><td>(<?php __("One email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
+</table>
+</div>
+ <?php if ($pop) { echo  "<br />"; __("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address. This email address will become a simple redirection."); }?>
+
+</td></tr>
+
+    <tr><td><label for="alias"><?php __("Redirections<br />Other recipients:"); ?></label></td><td>(<?php __("one email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
 </table>
 <br />
 <input type="submit" class="inb" name="submit" value="<?php __("Change this mailbox"); ?>" />

bureau/admin/menu_mail.php

@@ -37,7 +37,7 @@ if ($q["t"] > 0 && $r["u"] > 0) {
 ?>
 <div class="menu-box">
 <div class="menu-title">
-<img src="images/mail.png" alt="<?php __("Mailboxes"); ?>" />&nbsp;<?php __("Mailboxes"); ?> (<?= $q["u"]; ?>/<?= $q["t"]; ?>)</div>
+<img src="images/mail.png" alt="<?php __("Email Addresses"); ?>" />&nbsp;<?php __("Email Addresses"); ?> (<?= $q["u"]; ?>/<?= $q["t"]; ?>)</div>
 <div class="menu-content" id="menu-mail">
 <ul>
 <?php

bureau/admin/sql_bck.php

@@ -86,7 +86,7 @@ if (is_array($r)) {
 	<td><input type="text" class="int" name="bck_dir" id="bck_dir" size="30" maxlength="255" value="<?php echo $r["dir"]; ?>" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" class=\"bff\" onclick=\"browseforfolder('main.bck_dir');\" value=\" <?php __("Choose a folder..."); \" />");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" class=\"bff\" onclick=\"browseforfolder('main.bck_dir');\" value=\" <?php __("Choose a folder..."); ?> \" />");
 //  -->
 </script>
 </td>

bureau/class/config.php

@@ -78,7 +78,6 @@ require_once($root."class/local.php");
 
 require_once($root."class/db_mysql.php");
 require_once($root."class/functions.php");
-require_once($root."class/functions2.php");
 require_once($root."class/variables.php");
 
 // Redirection si appel à https://(!fqdn)/

bureau/class/functions.php

@@ -412,5 +412,87 @@ 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 : 
+ * <input type="text" name="toto" value="<?php ehe($toto); ?>" />
+ * Use the charset of the current language for transcription
+ */
+function ehe($str) {
+  global $charset;
+  echo htmlspecialchars($str,ENT_COMPAT,$charset); 
+}
+
+
+/* Get the Fields of the posted form from $_REQUEST or POST or GET
+ * and check their type
+ */
+function getFields($fields, $requestOnly = false) {
+  $vars = array();
+  $methodType = array ("get", "post", "request", "files");
+  
+  foreach ($fields AS $name => $options) {
+    if (in_array($options[0], $methodType) === false)
+      die ("Illegal method type used for field " . $name . " : " . $options[0]);
+    
+    if ($requestOnly === true)
+      $method = "_REQUEST";
+    else
+      $method = "_" . strtoupper($options[0]);
+    
+    switch ($options[1]) {
+    case "integer":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? intval($GLOBALS[$method][$name]) : $options[2]);
+      break;
+    case "float":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? floatval($GLOBALS[$method][$name]) : $options[2]);
+      break;
+    case "string":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) ? trim($GLOBALS[$method][$name]) : $options[2]);
+      break;
+    case "array":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) && is_array($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+      break;
+    case "boolean":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+      break;
+    case "file":
+      $vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+      break;
+    default:
+      die ("Illegal method type used for field " . $name . " : " . $options[1]);
+    }
+  }
+  
+  // Insert into $GLOBALS. FIXME : Use stripslashes if the magic_quotes_gpc is ON !
+  foreach ($vars AS $var => $value)
+    $GLOBALS[$var] = $value;
+  
+  return $vars;
+}
+
+function printVar($array) {
+  echo "<pre style=\"border: 1px solid black; text-align: left; font-size: 9px\">\n";
+  print_r($array);
+  echo "</pre>\n";
+}
+
 
 ?>

bureau/class/functions2.php

@@ -1,69 +0,0 @@
-<?php
-
-function getFields($fields, $requestOnly = false)
-{
-	$vars = array();
-	$methodType = array ("get", "post", "request", "files");
-
-	foreach ($fields AS $name => $options)
-	{
-		if (in_array($options[0], $methodType) === false)
-			die ("Illegal method type used for field " . $name . " : " . $options[0]);
-
-		if ($requestOnly === true)
-			$method = "_REQUEST";
-		else
-			$method = "_" . strtoupper($options[0]);
-
-		switch ($options[1])
-		{
-			case "integer":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? intval($GLOBALS[$method][$name]) : $options[2]);
-				break;
-
-			case "float":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? floatval($GLOBALS[$method][$name]) : $options[2]);
-				break;
-
-			case "string":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) ? trim($GLOBALS[$method][$name]) : $options[2]);
-				break;
-
-			case "array":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) && is_array($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
-				break;
-
-			case "boolean":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
-				break;
-
-			case "file":
-
-				$vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
-				break;
-
-		   	default:
-    		    die ("Illegal method type used for field " . $name . " : " . $options[1]);
-		}
-	}
-
-	// Insert into $GLOBALS
-	foreach ($vars AS $var => $value)
-		$GLOBALS[$var] = $value;
-
-	return $vars;
-}
-
-function printVar($array)
-{
-	echo "<pre style=\"border: 1px solid black; text-align: left; font-size: 9px\">\n";
-	print_r($array);
-	echo "</pre>\n";
-}
-
-?>

bureau/class/lang_env.php

@@ -59,4 +59,8 @@ putenv("LANGUAGE=".$lang);
 setlocale(LC_ALL,$lang); 
 textdomain("alternc");
 
+if (_("") && preg_match("#charset=([A-Za-z0-9\.-]*)#",_(""),$mat)) {
+  $charset=$mat[1];
+ }
+
 ?>

bureau/class/local.php

@@ -1,7 +1,7 @@
 <?php
 
 /* Read global variables (AlternC configuration) */
-$L_VERSION="v. @@REPLACED_DURING_BUILD@@";
+$L_VERSION="v. 1.0~rc1";
 
 /* To ease the transition, we define a lookup table for old names */
 $compat = array('DEFAULT_MX'   => 'MX',

bureau/class/m_mail.php

@@ -271,6 +271,12 @@ class m_mail {
       $err->raise("mail",15);
       return false;
     }
+    // Check this password against the password policy using common API : 
+    if (is_callable(array($admin,"checkPolicy"))) {
+      if (!$admin->checkPolicy("pop",$email."@".$dom,$pass)) {
+	return false; // The error has been raised by checkPolicy()
+      }
+    }
     if (!$this->_updatepop($email,$dom,$pass)) {
       return false;
     }
@@ -357,6 +363,12 @@ class m_mail {
       }
     }
     if ($pop=="1" && $oldpop==1 && $pass!="") { /* POP Account Edition */
+      // Check this password against the password policy using common API : 
+      if (is_callable(array($admin,"checkPolicy"))) {
+	if (!$admin->checkPolicy("pop",$email."@".$dom,$pass)) {
+	  return false; // The error has been raised by checkPolicy()
+	}
+      }
       if (!$this->_updatepop($email,$dom,$pass)) {
 	return false;
       }

bureau/head.php

@@ -27,6 +27,8 @@
  Purpose of file:
  ----------------------------------------------------------------------
 */
+if (!$charset) $charset="iso-8859-1";
+@header("Content-Type: text/html; charset=$charset");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -41,4 +43,4 @@ sur serveurs mutualis
 <meta name="keywords" content="Hébergement, Logiciel d'hébergement, Altern, Lautre Net, GPL, Développement" />
 
 <link rel="stylesheet" href="/admin/styles/base.css" type="text/css" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />

bureau/locales/fr_FR/LC_MESSAGES/messages.po

@@ -424,7 +424,7 @@ msgstr "Compte verrouill
 
 #: ../admin/adm_list.php:103 ../admin/adm_list.php:135
 msgid "Connect as"
-msgstr "Connecter"
+msgstr "Connection"
 
 #: ../admin/adm_list.php:153 ../admin/adm_list.php:174
 #: ../admin/adm_list.php:199 ../admin/adm_list.php:185
@@ -1356,12 +1356,12 @@ msgstr "Ajout d'un mail sur le domaine %s"
 #: ../admin/mail_add.php:49 ../admin/mail_edit.php:58 ../admin/mail_add.php:52
 #: ../admin/mail_edit.php:65
 msgid "Is it a POP/IMAP account?"
-msgstr "Est-ce un compte POP/IMAP ?"
+msgstr "Est-ce un compte POP/IMAP ?"
 
 #: ../admin/mail_add.php:50 ../admin/mail_edit.php:59 ../admin/mail_add.php:53
 #: ../admin/mail_edit.php:66
-msgid "POP password"
+msgid "POP/IMAP password"
-msgstr "Mot de passe POP"
+msgstr "Mot de passe POP/IMAP"
 
 #: ../admin/mail_add.php:52 ../admin/mail_edit.php:61 ../admin/mail_add.php:55
 #: ../admin/mail_edit.php:68
@@ -1370,7 +1370,7 @@ msgstr "Autres destinataires"
 
 #: ../admin/mail_add.php:52 ../admin/mail_edit.php:61 ../admin/mail_add.php:55
 #: ../admin/mail_edit.php:68
-msgid "One email per line"
+msgid "one email per line"
 msgstr "un email par ligne"
 
 #: ../admin/mail_add.php:53 ../admin/mail_add.php:56
@@ -1438,17 +1438,17 @@ msgstr "Le mail <b>%s</b> a
 
 #: ../admin/mail_edit.php:41 ../admin/mail_edit.php:48
 #, php-format
-msgid "Edit a mailbox of the domain %s"
+msgid "Edit an email address of the domain %s"
-msgstr "Modification d'un email du domaine %s"
+msgstr "Modification d'une adresse email du domaine %s"
 
 #: ../admin/mail_edit.php:57 ../admin/mail_edit.php:64
 #, php-format
-msgid "Edit the mailbox <b>%s</b>"
+msgid "Edit the email address <b>%s</b>"
-msgstr "Modification du mail <b>%s</b>"
+msgstr "Modification de l'adresse email <b>%s</b>"
 
 #: ../admin/mail_edit.php:62 ../admin/mail_edit.php:69
-msgid "Change this mailbox"
+msgid "Change this email address"
-msgstr "Modifier cet email"
+msgstr "Modifier cette adresse email"
 
 #: ../admin/mail_edit.php:66 ../admin/mail_edit.php:73
 msgid "help_mail_edit"
@@ -1470,8 +1470,8 @@ msgstr ""
 #: ../admin/mail_list.php:42 ../admin/mail_list.php:60
 #: ../admin/mail_list.php:49 ../admin/mail_list.php:62
 #, php-format
-msgid "Mailbox list of the domain %s"
+msgid "Email addresses of the domain %s"
-msgstr "Liste des emails du domaine %s"
+msgstr "Liste des adresses emails du domaine %s"
 
 #: ../admin/mail_list.php:47 ../admin/mail_list.php:66
 #: ../admin/mail_list.php:54 ../admin/mail_list.php:68
@@ -1706,8 +1706,8 @@ msgstr "Comptes FTP"
 
 #: ../admin/menu_mail.php:37 ../admin/menu_mail.php:36
 #: ../admin/menu_mail.php:40
-msgid "Mailboxes"
+msgid "Email Addresses"
-msgstr "Comptes Mails"
+msgstr "Adresses email"
 
 #: ../admin/menu_mem.php:32 ../admin/menu_mem.php:31
 msgid "Settings"
@@ -2505,8 +2505,8 @@ msgstr ""
 "now."
 
 #: ../admin/mail_edit.php:58 ../admin/mail_edit.php:65
-msgid "WARNING: turning POP off will DELETE the mailbox and its content"
+msgid "WARNING: turning POP/IMAP off will DELETE the stored messages in this email address. This email address will become a simple redirection."
-msgstr ""
+msgstr "ATTENTION&nbsp;: Choisir 'Non' ici supprimera les messages stockés dans cette adresse email. L'adresse email sera transformée en simple redirection."
 
 #: ../admin/main.php:62 ../admin/main.php:61
 msgid "Latest news"
@@ -2609,11 +2609,11 @@ msgstr "Adresse Email"
 
 #: ../admin/mail_del.php:83
 msgid ""
-"Warning: Deleting a mailbox will destroy all the emails it contains! You "
+"Warning: Deleting an email address will destroy all the messages it contains! You "
 "will <b>NOT</b> be able to get it back!"
 msgstr ""
-"Attention: L'effacement d'une boite aux lettres détruit tout son contenu ! "
+"Attention: L'effacement d'une adresse email détruit tous ses messages&nbsp;! "
-"Vous ne pourrez <b>PLUS</b> retrouver les mails ainsi effacés !"
+"Vous ne pourrez <b>PLUS</b> retrouver les messages ainsi effacés&nbsp;!"
 
 #: ../admin/menu.php:36
 msgid "Home / Information"
@@ -2652,19 +2652,19 @@ msgid "Complexity"
 msgstr "Complexité"
 
 msgid "Allow Password=Login?"
-msgstr "Autorise Mot de passe=Login ?"
+msgstr "Autorise Mot de passe=Login&nbsp;?"
 
 msgid "Please choose which policy you want to apply to this password kind:"
-msgstr "Merci de choisir la politique à appliquer à ce type de mot de passe : "
+msgstr "Merci de choisir la politique à appliquer à ce type de mot de passe&nbsp;:"
 
 msgid "Minimum Password Size:"
-msgstr "Taille minimale du mot de passe :"
+msgstr "Taille minimale du mot de passe&nbsp;:"
 
 msgid "Maximum Password Size:"
-msgstr "Taille maximale du mot de passe :"
+msgstr "Taille maximale du mot de passe&nbsp;:"
 
 msgid "In how many classes of characters must be the password (at least):"
-msgstr "Dans combien de classes de caractères doit être ce mot de passe (au minimum) :"
+msgstr "Dans combien de classes de caractères doit être ce mot de passe (au minimum)&nbsp;:"
 
 msgid "Do we allow the password to be like the login?"
 msgstr "Autorise-t-on le mot de passe à ressembler au nom d'utilisateur ?"
@@ -2724,13 +2724,13 @@ msgid "Change this user's password"
 msgstr "Changer le mot de passe de cet utilisateur"
 
 msgid "Do you want to point this domain to another domain already installed in your account?"
-msgstr "Voulez-vous pointer ce domaine sur un autre déjà installé sur votre compte ?"
+msgstr "Voulez-vous pointer ce domaine sur un autre déjà installé sur votre compte&nbsp;?"
 
 msgid "No: This domain will have its own folder."
 msgstr "Non : ce domaine aura son propre dossier."
 
 msgid "Yes, redirect this new domain to this one:"
-msgstr "Oui, redirigez ce nouveau domaine vers ce domaine existant :"
+msgstr "Oui, redirigez ce nouveau domaine vers ce domaine existant&nbsp;:"
 
 msgid "-- Choose a domain --"
 msgstr "-- Choisir un nom de domaine --"
@@ -2748,10 +2748,10 @@ msgid "Choose a folder..."
 msgstr "Choisir un répertoire ..."
 
 msgid "Send one file:"
-msgstr "Envoyer un fichier:"
+msgstr "Envoyer un fichier&nbsp;:"
 
 msgid "New file or folder:"
-msgstr "Créer un fichier ou un dossier:"
+msgstr "Créer un fichier ou un répertoire&nbsp;:"
 
 msgid "Send this file"
 msgstr "Envoyer ce fichier"
@@ -2794,7 +2794,21 @@ msgid "Delete %s from this server"
 msgstr "Effacer le domaine %s de ce serveur"
 
 msgid "Folder where we will put the log file:"
-msgstr "Dossier qui accueillera vos logs :"
+msgstr "Répertoire qui accueillera vos logs :"
 
 msgid "Domain name:"
-msgstr "Nom de domaine :"
+msgstr "Nom de domaine :"
+
+msgid "The domain OK column are green when the domain exists in the worldwide registry and has a proper NS,MX and IP depending on its configuration. It is red if we have serious doubts about its NS, MX or IP configuration. Contact the user of this domain or a system administrator."
+msgstr "La colonne OK? est verte quand le domaine existe dans le registre DNS mondial et que sa configuration IP, NS et MX est correcte. Il est rouge lorsque le serveur a de sérieux doutes sur sa configuration NS, MX ou IP. Vérifiez auprès du propriétaire de ce domaine, et si besoin contactez un administrateur système."
+
+msgid "If you want to force the check of NS, MX, IP on domains, click the link"
+msgstr "Si vous voulez forcer la vérification des NS,  MX et IP des domaines, cliquez le lien"
+
+msgid "Show domain list with refreshed checked NS, MX, IP information"
+msgstr "Afficher la liste des domaines avec des informations NS, MX et IP à jour."
+
+
+msgid "Redirections<br />Other recipients:"
+msgstr "Redirections/Autres destinataires&nbsp;:"
+

debian/changelog

@@ -1,5 +1,7 @@
 alternc (1.0~rc1) stable; urgency=low
 
+  * security: now using htmlspecialchars on every form default values ... yes it's 2010 ;) 
+  * i18n: charset is now variable depending on the current language
   * new features:
     * removed the dependency on postgrey, added dnsutils (for domain checks)
     * added domain check (exists, ns, mx, ip) when listing domains in admin panel.
@@ -30,7 +32,7 @@ alternc (1.0~rc1) stable; urgency=low
   * Major patch
     * Blue desktop using only css, no frameset etc
     * Sanitizing of get/request/post parameters
-	
+
  -- Benjamin Sonntag <benjamin@alternc.org>  Sat, 12 May 2009 17:55:30 +0200
 
 alternc (0.9.9) stable; urgency=low