From ab9e33b6ab8ddf8cd7fc3f534e2f48d8e9d1f235 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 26 Apr 2011 11:36:42 +0000 Subject: - Fix handling of top-level domains with more than 5 chars or unicode chars (#1487883) git-svn-id: https://svn.roundcube.net/trunk@4702 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/js') diff --git a/roundcubemail/program/js/common.js b/roundcubemail/program/js/common.js index 4d3cbfac1..00c4b001b 100644 --- a/roundcubemail/program/js/common.js +++ b/roundcubemail/program/js/common.js @@ -493,8 +493,8 @@ function rcube_check_email(input, inline) // So, e-mail address should be validated also on server side after idn_to_ascii() use //domain_literal = '\\x5b('+dtext+'|'+quoted_pair+')*\\x5d', //sub_domain = '('+atom+'|'+domain_literal+')', - // allow punycode in last domain part for ICANN test domains - domain = '([^@\\x2e]+\\x2e)+([a-z]{2,}|xn--[a-z0-9]{2,})', + // allow punycode/unicode top-level domain + domain = '([^@\\x2e]+\\x2e)+([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})', // ICANN e-mail test (http://idn.icann.org/E-mail_test) icann_domains = [ '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631', -- cgit v1.2.3