Fixes #1186 : We trim spaces when adding or editing email addresses (and aliases too)

This commit is contained in:
Benjamin Sonntag 2009-11-30 23:53:36 +00:00
parent a6a71eb04b
commit 00f6ca70d3
1 changed files with 4 additions and 4 deletions

View File

@ -290,9 +290,9 @@ class m_mail {
function put_mail_details($mail,$pop,$pass,$alias) { function put_mail_details($mail,$pop,$pass,$alias) {
global $err,$cuid,$db,$admin; global $err,$cuid,$db,$admin;
$err->log("mail","put_mail_details",$mail); $err->log("mail","put_mail_details",$mail);
$mail=strtolower($mail); $mail=trim(strtolower($mail)); // remove spaces also
$t=explode("@",$mail); $t=explode("@",$mail);
$email=$t[0]; $email=trim($t[0]); // remove spaces also
$dom=$t[1]; $dom=$t[1];
$account=array(); $account=array();
@ -312,7 +312,7 @@ class m_mail {
if (count($a)>0) { if (count($a)>0) {
reset($a); reset($a);
for ($i=0;$i<count($a);$i++){ for ($i=0;$i<count($a);$i++){
$a[$i]=trim($a[$i]); $a[$i]=trim($a[$i]); // remove spaces
if ($a[$i]){ if ($a[$i]){
if(checkmail($a[$i])>1){ if(checkmail($a[$i])>1){
$err->raise("mail",14); $err->raise("mail",14);
@ -377,7 +377,7 @@ class m_mail {
global $quota,$err,$cuid,$db,$admin; global $quota,$err,$cuid,$db,$admin;
$err->log("mail","add_mail",$dom."/".$mail); $err->log("mail","add_mail",$dom."/".$mail);
$account=array(); $account=array();
$mail=strtolower($mail); $mail=trim(strtolower($mail)); // remove spaces also
if ($pop) $pop="1"; else $pop="0"; if ($pop) $pop="1"; else $pop="0";
if ($mail) { if ($mail) {
if (!checkloginmail($mail)) { if (!checkloginmail($mail)) {