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

@@ -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

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;  
 
 }