From 572ca8fce3e9dad283e25166d45850189bdc6905 Mon Sep 17 00:00:00 2001 From: Thibault Le Meur Date: Tue, 16 Oct 2007 10:08:13 +0000 Subject: [PATCH] Fixed #1283: Unable to import .info emails (thanks to bkgray) git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/stable_plus@3382 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/tokens.php | 2 +- common.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/admin/tokens.php b/admin/tokens.php index 4e2b6f8abc5..ccb61b8df74 100644 --- a/admin/tokens.php +++ b/admin/tokens.php @@ -1448,7 +1448,7 @@ else { $line[2] = trim($line[2]); - if (!eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $line[2])) + if (!validate_email($line[2])) { $xe++; } else diff --git a/common.php b/common.php index 3ec97ec1707..91af57c645d 100644 --- a/common.php +++ b/common.php @@ -1558,7 +1558,10 @@ function validate_email($email) { // Create the syntactical validation regular expression // Validate the syntax - return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $email)) ? FALSE : TRUE; + + // see http://data.iana.org/TLD/tlds-alpha-by-domain.txt + $maxrootdomainlength = 6; + return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,".$maxrootdomainlength."}$/ix", $email)) ? FALSE : TRUE; }