FIX - strlower for email

This commit is contained in:
Anthony Berton 2022-07-28 15:13:13 +02:00
parent 7301ef6bfa
commit cfc9819e49
5 changed files with 9 additions and 8 deletions

View File

@ -670,11 +670,10 @@ class Adherent extends CommonObject
$this->town = ($this->town ? $this->town : $this->town);
$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
$this->setUpperOrLowerCase();
$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
$this->url = $this->url ?clean_url($this->url, 0) : '';
$this->setUpperOrLowerCase();
// Check parameters
if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email)) {
$langs->load("errors");

View File

@ -563,7 +563,7 @@ class Contact extends CommonObject
$this->ref_ext = trim($this->ref_ext);
$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
$this->firstname = trim($this->firstname);
$this->email = dol_strtolower(trim($this->email));
$this->email = trim($this->email);
$this->phone_pro = trim($this->phone_pro);
$this->phone_perso = trim($this->phone_perso);
$this->phone_mobile = trim($this->phone_mobile);
@ -571,7 +571,6 @@ class Contact extends CommonObject
$this->fax = trim($this->fax);
$this->zip = (empty($this->zip) ? '' : trim($this->zip));
$this->town = (empty($this->town) ? '' : trim($this->town));
$this->setUpperOrLowerCase();
$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
if (empty($this->statut)) {
$this->statut = 0;
@ -579,6 +578,7 @@ class Contact extends CommonObject
if (empty($this->civility_code) && !is_numeric($this->civility_id)) {
$this->civility_code = $this->civility_id; // For backward compatibility
}
$this->setUpperOrLowerCase();
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";

View File

@ -759,6 +759,8 @@ abstract class CommonObject
$this->address = dol_strtoupper($this->address);
$this->town = dol_strtoupper($this->town);
}
$this->email = dol_strtolower($this->email);
$this->personal_email = dol_strtolower($this->personal_email);
}
/**

View File

@ -1270,7 +1270,6 @@ class Societe extends CommonObject
$this->address = $this->address ?trim($this->address) : trim($this->address);
$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
$this->town = $this->town ?trim($this->town) : trim($this->town);
$this->setUpperOrLowerCase();
$this->state_id = trim($this->state_id);
$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
$this->phone = trim($this->phone);
@ -1279,7 +1278,7 @@ class Societe extends CommonObject
$this->fax = trim($this->fax);
$this->fax = preg_replace("/\s/", "", $this->fax);
$this->fax = preg_replace("/\./", "", $this->fax);
$this->email = dol_strtolower(trim($this->email));
$this->email = trim($this->email);
$this->url = $this->url ?clean_url($this->url, 0) : '';
$this->note_private = trim($this->note_private);
$this->note_public = trim($this->note_public);
@ -1412,7 +1411,7 @@ class Societe extends CommonObject
}
}
}
$this->setUpperOrLowerCase();
if ($result >= 0) {
dol_syslog(get_class($this)."::update verify ok or not done");

View File

@ -1864,7 +1864,6 @@ class User extends CommonObject
$this->address = trim((string) $this->address);
$this->zip = trim((string) $this->zip);
$this->town = trim((string) $this->town);
$this->setUpperOrLowerCase();
$this->state_id = ($this->state_id > 0 ? $this->state_id : 0);
$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
@ -1891,6 +1890,8 @@ class User extends CommonObject
$this->birth = empty($this->birth) ? '' : $this->birth;
$this->fk_warehouse = (int) $this->fk_warehouse;
$this->setUpperOrLowerCase();
// Check parameters
$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');