mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX: Added single quote as a valid local-part of an email address as per RFC5322. Other symbols still excluded although in the spec (from r100825)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108806 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
0df70af13d
commit
4d7429a393
@ -16,7 +16,7 @@ Behaviour.register({
|
||||
var el = _CURRENT_FORM.elements[fieldName];
|
||||
if(!el || !el.value) return true;
|
||||
|
||||
if(el.value.match(/^([a-zA-Z0-9_+\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/)) {
|
||||
if(el.value.match(/^([a-zA-Z0-9_+\-\.\x27]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/)) {
|
||||
return true;
|
||||
} else {
|
||||
validationError(el, "$error","validation");
|
||||
@ -42,7 +42,7 @@ JS;
|
||||
|
||||
function validate($validator){
|
||||
$this->value = trim($this->value);
|
||||
if($this->value && !ereg('^([a-zA-Z0-9_+\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$', $this->value)){
|
||||
if($this->value && !ereg('^([a-zA-Z0-9_+\.\-\x27]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$', $this->value)){
|
||||
$validator->validationError(
|
||||
$this->name,
|
||||
_t('EmailField.VALIDATION', "Please enter an email address."),
|
||||
|
Loading…
x
Reference in New Issue
Block a user