*** m_mail-ori.php	2005-06-19 09:54:07.000000000 +0200
--- m_mail.php	2005-06-19 10:13:19.000000000 +0200
*************** class m_mail {
*** 432,439 ****
        $gecos="Catch-All";
        $m="_";
      }
!     $db->query("INSERT INTO mail_users (uid,alias,path,password,sasl) VALUES ('$cuid','".$mail."_".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."','"._md5cr($pass)."','$pass');");
!     $db->query("INSERT INTO mail_users (uid,alias,path,password,sasl) VALUES ('$cuid','".$mail."@".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."','"._md5cr($pass)."','$pass');");
      $db->query("INSERT INTO mail_alias (mail,alias) VALUES ('".$mail."_".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."/Maildir/');");
  
      $f=fopen("/var/lib/squirrelmail/data/".$mail."_".$dom.".pref","wb");
--- 432,439 ----
        $gecos="Catch-All";
        $m="_";
      }
!     $db->query("INSERT INTO mail_users (uid,alias,path,password) VALUES ('$cuid','".$mail."_".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."','"._md5cr($pass)."');");
!     $db->query("INSERT INTO mail_users (uid,alias,path,password) VALUES ('$cuid','".$mail."@".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."','"._md5cr($pass)."');");
      $db->query("INSERT INTO mail_alias (mail,alias) VALUES ('".$mail."_".$dom."','/var/alternc/mail/".$m."/".$mail."_".$dom."/Maildir/');");
  
      $f=fopen("/var/lib/squirrelmail/data/".$mail."_".$dom.".pref","wb");
*************** class m_mail {
*** 461,467 ****
      $err->log("mail","_updatepop",$mail."@".$dom);
      $m=substr($mail,0,1);
      $gecos=$mail;
!     $db->query("UPDATE mail_users SET sasl='$pass', password='"._md5cr($pass)."' WHERE ( alias='". $mail."_".$dom."' OR alias='". $mail."@".$dom."' ) AND uid='$cuid';");
      exec("/bin/echo ".escapeshellarg($pass)." | /usr/sbin/saslpasswd -u postfix -p ".$mail."@".$dom);
      exec("/bin/echo ".escapeshellarg($pass)." | /usr/sbin/saslpasswd -u postfix -p ".$mail."_".$dom);
      return true;
--- 461,467 ----
      $err->log("mail","_updatepop",$mail."@".$dom);
      $m=substr($mail,0,1);
      $gecos=$mail;
!     $db->query("UPDATE mail_users SET password='"._md5cr($pass)."' WHERE ( alias='". $mail."_".$dom."' OR alias='". $mail."@".$dom."' ) AND uid='$cuid';");
      exec("/bin/echo ".escapeshellarg($pass)." | /usr/sbin/saslpasswd -u postfix -p ".$mail."@".$dom);
      exec("/bin/echo ".escapeshellarg($pass)." | /usr/sbin/saslpasswd -u postfix -p ".$mail."_".$dom);
      return true;