summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/common.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/program/js/common.js b/program/js/common.js
index 3a8739ba2..76ddd7269 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -491,12 +491,11 @@ function rcube_check_email(input, inline)
quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
// Use simplified domain matching, because we need to allow Unicode characters here
// So, e-mail address should be validated also on server side after idn_to_ascii() use
- sub_domain = '[^@]+',
//domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d',
//sub_domain = '('+atom+'|'+domain_literal+')',
+ domain = '([^@\\x2e]+\\x2e)+[a-z]{2,}',
word = '('+atom+'|'+quoted_string+')',
delim = '[,;\s\n]',
- domain = sub_domain+'(\\x2e'+sub_domain+')*',
local_part = word+'(\\x2e'+word+')*',
addr_spec = local_part+'\\x40'+domain,
reg1 = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');