Changeset 813 for trunk

Timestamp:

Mar 29, 2024 10:43:24 PM (5 weeks ago)

Author:

anonymous

Message:

Domains with multiple consecutive hyphens are valid

File:

• trunk/lib/Email.inc.php (modified) (3 diffs)

trunk/lib/Email.inc.php

@@ -113 +113 @@
         // ...and something as simple as:
         //      x@x.com
-        $this->setParam(array('regex' => '/^(?:(?:"[^"]*?"\s*|[^,@]*)(<\s*)|(?:"[^"]*?"|[^,@]*)\s+|)'   // Display name
-        . '((?:[^.<>\s@",\[\]]+[^<>\s@",\[\]])*[^.<>\s@",\[\]]+)'       // Local-part
-        . '@'                                                           // @
-        . '((?:(\[)|[a-z0-9]?)'                                         // Domain, first char
-        . '(?(4)'                                                       // Domain conditional for if first domain char is [
-        . '(?:[0-9]{1,3}\.){3}[0-9]{1,3}\]'                             // TRUE, matches IP address
-        . '|'
-        . '[.-]?(?:[a-z0-9]+[-.])*(?:[a-z0-9]+\.)+[a-z]{2,19}))'        // FALSE, matches domain name
-        . '(?(1)'                                                       // Comment conditional for if initial < exists
-        . '(?:\s*>\s*|>\s+\([^,@]+\)\s*)'                               // TRUE, ensure ending >
-        . '|'
-        . '(?:|\s*|\s+\([^,@]+\)\s*))$/i' . $app->getParam('preg_u'))); // FALSE ensure there is no ending >
+        $this->setParam(['regex' =>
+            '/^(?:(?:"[^"]*?"\s*|[^,@]*)(<\s*)|(?:"[^"]*?"|[^,@]*)\s+|)'        // Display name
+            . '((?:[^.<>\s@",\[\]]+[^<>\s@",\[\]])*[^.<>\s@",\[\]]+)'           // Local-part
+            . '@'                                                               // @
+            . '((?:(\[)|[a-z0-9]?)'                                             // Domain, first char
+            . '(?(4)'                                                           // Domain conditional for if first domain char is [
+            . '(?:[0-9]{1,3}\.){3}[0-9]{1,3}\]'                                 // TRUE, matches IP address
+            . '|'
+            . '(?:\.|-+)?(?:[a-z0-9]+(?:\.|-+)?)*(?:[a-z0-9]+\.)+[a-z]{2,19}))' // FALSE, matches domain name
+            . '(?(1)'                                                           // Comment conditional for if initial < exists
+            . '(?:\s*>\s*|>\s+\([^,@]+\)\s*)'                                   // TRUE, ensure ending >
+            . '|'
+            . '(?:|\s*|\s+\([^,@]+\)\s*))$/i' . $app->getParam('preg_u')        // FALSE ensure there is no ending >
+        ]);
 
         if (isset($params)) {
@@ -527 +529 @@
     /**
      * Validates an email address based on the recommendations in RFC 3696.
-     * Is more loose than restrictive, to allow the many valid variants of
+     * It's more loose than restrictive, to allow the many valid variants of
      * email addresses while catching the most common mistakes. Checks an array too.
      * http://www.faqs.org/rfcs/rfc822.html
@@ -556 +558 @@
             if (preg_match($this->getParam('regex'), $email, $e_parts) && mb_strlen($e_parts[2]) < 64 && mb_strlen($e_parts[3]) < 255) {
                 return true;
-            } else {
-                $app->logMsg(sprintf('Invalid email address: %s', $email), LOG_INFO, __FILE__, __LINE__);
-                return false;
-            }
+            }
+
+            $app->logMsg(sprintf('Invalid email address: %s', $email), LOG_INFO, __FILE__, __LINE__);
+            return false;
         }
     }