--- /var/alternc/bureau/class/m_mail.php.orig	Thu Jun  3 11:53:47 2004
+++ /var/alternc/bureau/class/m_mail.php	Thu Jun  3 11:57:34 2004
@@ -159,7 +159,6 @@
 	if ($db->next_record()) {
 		$pass=$db->f("password");
 	}
-      }
     } else {
 	$account=$db->f("alias");
     }
@@ -220,7 +219,7 @@
    * @return boolean TRUE si le mot de passe a été changé, FALSE si une erreur s'est produite.
    */
   function change_password($mail,$pass) {
-    global $err,$db,$cuid
+    global $err,$db,$cuid;
     $err->log("mail","change_password",$mail);
     $t=explode("@",$mail);
     $email=$t[0];
@@ -364,12 +363,12 @@
     }
 
     // check that the domains is a user's one ...
-    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';")
+    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';");
     if (!$db->next_record()) {
       $err->raise("mail",6,$dom);
       return false;
     }    
-    $db->query("SELECT mail FROM mail_domain WHERE mail='".$mail."@".$dom."' AND uid='$cuid';")
+    $db->query("SELECT mail FROM mail_domain WHERE mail='".$mail."@".$dom."' AND uid='$cuid';");
     if ($db->next_record()) {
       $err->raise("mail",7,$dom);
       return false;
@@ -401,7 +400,7 @@
     $err->log("mail","del_mail",$mail);
     $mail=strtolower($mail);
 
-    $db->query("SELECT pop,mail FROM mail_domain WHERE mail='$mail' AND uid='$cuid' AND type=0;")
+    $db->query("SELECT pop,mail FROM mail_domain WHERE mail='$mail' AND uid='$cuid' AND type=0;");
     if (!$db->next_record()) {
       $err->raise("mail",3,$dom);
       return false;
@@ -507,7 +506,7 @@
     $err->error=0;
     $err->log("mail","del_dom",$dom);
 
-    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';")
+    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';");
     if (!$db->next_record()) {
       $err->raise("mail",6,$dom);
       return false;
@@ -557,7 +556,7 @@
     global $err,$cuid,$db;
     $err->log("mail","add_dom",$dom);
 
-    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';")
+    $db->query("SELECT domaine FROM domaines WHERE compte='$cuid' AND domaine='$dom';");
     if ($db->next_record()) {
       $err->raise("mail",9,$dom);
       return false;