Fix the Validator::isEmail() method (see contao/core-bundle#313).

contao · Jul 23, 2015 · 976bf6e · 976bf6e
1 parent e0022b3
commit 976bf6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Resources/contao/library/Contao/Idna.php b/src/Resources/contao/library/Contao/Idna.php
@@ -79,9 +79,10 @@ public static function encodeEmail($strEmail)
 			return $strEmail; // see #6241
 		}
 
-		list($strLocal, $strHost) = explode('@', $strEmail);
+		$arrChunks = explode('@', $strEmail);
+		$strHost = array_pop($arrChunks);
 
-		return $strLocal . '@' . static::encode($strHost);
+		return implode('@', $arrChunks) . '@' . static::encode($strHost);
 	}
 
 

diff --git a/src/Resources/contao/library/Contao/Validator.php b/src/Resources/contao/library/Contao/Validator.php
@@ -153,7 +153,9 @@ public static function isDatim($varValue)
 	 */
 	public static function isEmail($varValue)
 	{
-		return preg_match('/^(\w+[!#\$%&\'\*\+\-\/=\?^_`\.\{\|\}~]*)+(?<!\.)@\w+([_\.-]*\w+)*\.[A-Za-z]{2,13}$/', \Idna::encodeEmail($varValue));
+		$email = \Idna::encodeEmail($varValue);
+
+		return filter_var($email, FILTER_VALIDATE_EMAIL) === $email;
 	}