[#33948] fix email validation, allowing email with new domain name

extension. (Fixes #4135)

libraries/joomla/form/rules/email.php

@@ -24,7 +24,8 @@ class JFormRuleEmail extends JFormRule
 	 * @var    string
 	 * @since  11.1
 	 */
-	protected $regex = '^[\w.-]+(\+[\w.-]+)*@\w+[\w.-]*?\.\w{2,4}$';
+	protected $regex = '^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$';
+
 
 	/**
 	 * Method to test the email address and optionally check for uniqueness.

libraries/joomla/mail/helper.php

@@ -121,12 +121,13 @@ public static function isEmailAddress($email)
 
 		/*
 		 * Check the local address
-		 * We're a bit more conservative about what constitutes a "legal" address, that is, A-Za-z0-9!#$%&\'*+/=?^_`{|}~-
-		 * Also, the last character in local cannot be a period ('.')
+		 * We're a bit more conservative about what constitutes a "legal" address, that is, a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-
+		 * The first and last character in local cannot be a period ('.')
+		 * Also, period should not appear 2 or more times consecutively
 		 */
-		$allowed = 'A-Za-z0-9!#&*+=?_-';
+		$allowed = 'a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-';
 		$regex = "/^[$allowed][\.$allowed]{0,63}$/";
-		if (!preg_match($regex, $local) || substr($local, -1) == '.')
+		if (!preg_match($regex, $local) || substr($local, -1) == '.' || $local[0] == '.' || preg_match('/\.\./', $local))
 		{
 			return false;
 		}
@@ -147,7 +148,7 @@ public static function isEmailAddress($email)
 
 		// Check the domain
 		$domain_array = explode(".", rtrim($domain, '.'));
-		$regex = '/^[A-Za-z0-9-]{0,63}$/';
+		$regex = '/^[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/';
 		foreach ($domain_array as $domain)
 		{
 

media/system/js/validate-uncompressed.js

@@ -51,7 +51,7 @@ var JFormValidator = new Class({
 
 		this.setHandler('email',
 			function (value) {
-				regex=/^[a-zA-Z0-9._-]+(\+[a-zA-Z0-9._-]+)*@([a-zA-Z0-9.-]+\.)+[a-zA-Z0-9.-]{2,4}$/;
+				regex=/^[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 				return regex.test(value);
 			}
 		);