summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-17 12:24:45 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-17 12:24:45 -0400
commit7e457dd8d9ad0e22be7dd7753bb37a611303c808 (patch)
tree241715b2ce015c3745a85982f684d43b39bb83fa
parent714bff15956565e166ce3b8b9bd08743bec8e30e (diff)
parent6e350cb9b9f5641fc553c55d43c07e1bcd9f2756 (diff)
downloadchat-7e457dd8d9ad0e22be7dd7753bb37a611303c808.tar.gz
chat-7e457dd8d9ad0e22be7dd7753bb37a611303c808.tar.bz2
chat-7e457dd8d9ad0e22be7dd7753bb37a611303c808.zip
Merge pull request #1090 from jvasallo/master
Updated Email Check Regex to handle some extra cases
-rw-r--r--web/react/utils/utils.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 561c2c4c4..38ac68d58 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -13,7 +13,8 @@ var client = require('./client.jsx');
var Autolinker = require('autolinker');
export function isEmail(email) {
- var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ //var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ var regex = /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i;
return regex.test(email);
}