#871: eMail validation pattern was too strict: now fully configurable (globally and per attribute).

SVN:2.0.2[3057]
This commit is contained in:
Denis Flaven
2014-01-17 09:41:21 +00:00
parent 6cc0bf5c5a
commit 92baf53c52
2 changed files with 9 additions and 2 deletions

View File

@@ -2106,8 +2106,7 @@ class AttributeEmailAddress extends AttributeString
{
public function GetValidationPattern()
{
// return "^([0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\\w]*[0-9a-zA-Z]\\.)+[a-zA-Z]{2,9})$";
return "^[a-zA-Z0-9._&-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}$";
return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
}
public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)