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

contao · Jul 23, 2015 · ad169aa · ad169aa
1 parent 70fc463
commit ad169aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.5.1 (2015-XX-XX)
 --------------------------
 
+### Fixed
+Fix the `Validator::isEmail()` method (see contao/core-bundle#313).
+
 ### Fixed
 Strip tags before auto-generating aliases (see #7857). 
 

diff --git a/system/modules/core/library/Contao/Idna.php b/system/modules/core/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/system/modules/core/library/Contao/Validator.php b/system/modules/core/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;
 	}