#1483826 added much longer but much more rfc 822/2822 compliant js email

validator.

1 files changed, 48 insertions, 5 deletions

diff --git a/program/js/common.js b/program/js/common.js
index 65341a758..7ac3dc807 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -263,16 +263,59 @@ function rcube_layer(id, attributes)
     }
   }
 
-
 // check if input is a valid email address
+// By Cal Henderson <cal@iamcal.com>
+// http://code.iamcal.com/php/rfc822/
 function rcube_check_email(input, inline)
   {
   if (input && window.RegExp)
     {
-    var reg_str = '([a-z0-9][-a-z0-9\.\+_&]*)\@(([-a-z0-9][\.]?)*[a-z0-9]\.[a-z]{2,9})';
-    var reg1 = inline ? new RegExp(reg_str, 'i') : new RegExp('^'+reg_str+'$', 'i');
-    var reg2 = /[\._\-]{2}/;
-    return reg1.test(input) && !reg2.test(input) ? true : false;
+    var no_ws_ctl    = "[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]";
+    var alpha        = "[\\x41-\\x5a\\x61-\\x7a]";
+    var digit        = "[\\x30-\\x39]";
+    var cr        = "\\x0d";
+    var lf        = "\\x0a";
+    var crlf        = "(" + cr + lf + ")";
+
+    var obs_char    = "[\\x00-\\x09\\x0b\\x0c\\x0e-\\x7f]";
+    var obs_text    = "("+lf+"*"+cr+"*("+obs_char+lf+"*"+cr+"*)*)";
+    var text        = "([\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f]|"+obs_text+")";
+    var obs_qp        = "(\\x5c[\\x00-\\x7f])";
+    var quoted_pair    = "(\\x5c"+text+"|"+obs_qp+")";
+
+    var wsp        = "[\\x20\\x09]";
+    var obs_fws    = "("+wsp+"+("+crlf+wsp+"+)*)";
+    var fws        = "((("+wsp+"*"+crlf+")?"+wsp+"+)|"+obs_fws+")";
+    var ctext        = "("+no_ws_ctl+"|[\\x21-\\x27\\x2A-\\x5b\\x5d-\\x7e])";
+    var ccontent    = "("+ctext+"|"+quoted_pair+")";
+    var comment    = "(\\x28("+fws+"?"+ccontent+")*"+fws+"?\\x29)";
+    var cfws        = "(("+fws+"?"+comment+")*("+fws+"?"+comment+"|"+fws+"))";
+    var cfws        = fws+"*";
+
+    var atext        = "("+alpha+"|"+digit+"|[\\x21\\x23-\\x27\\x2a\\x2b\\x2d\\x2e\\x3d\\x3f\\x5e\\x5f\\x60\\x7b-\\x7e])";
+    var atom        = "("+cfws+"?"+atext+"+"+cfws+"?)";
+
+    var qtext        = "("+no_ws_ctl+"|[\\x21\\x23-\\x5b\\x5d-\\x7e])";
+    var qcontent    = "("+qtext+"|"+quoted_pair+")";
+    var quoted_string    = "("+cfws+"?\\x22("+fws+"?"+qcontent+")*"+fws+"?\\x22"+cfws+"?)";
+    var word        = "("+atom+"|"+quoted_string+")";
+
+    var obs_local_part    = "("+word+"(\\x2e"+word+")*)";
+    var obs_domain    = "("+atom+"(\\x2e"+atom+")*)";
+
+    var dot_atom_text    = "("+atext+"+(\\x2e"+atext+"+)*)";
+    var dot_atom    = "("+cfws+"?"+dot_atom_text+cfws+"?)";
+
+    var dtext        = "("+no_ws_ctl+"|[\\x21-\\x5a\\x5e-\\x7e])";
+    var dcontent    = "("+dtext+"|"+quoted_pair+")";
+    var domain_literal    = "("+cfws+"?\\x5b("+fws+"?"+dcontent+")*"+fws+"?\\x5d"+cfws+"?)";
+
+    var local_part    = "("+dot_atom+"|"+quoted_string+"|"+obs_local_part+")";
+    var domain        = "("+dot_atom+"|"+domain_literal+"|"+obs_domain+")";
+    var addr_spec    = "("+local_part+"\\x40"+domain+")";
+
+    var reg1 = inline ? new RegExp(addr_spec, 'i') : new RegExp('^'+addr_spec+'$', 'i');
+    return reg1.test(input) ? true : false;
     }
   return false;
   }