Changeset 399 for trunk/lib/Email.inc.php

Timestamp:

Jun 22, 2012 2:25:43 PM (12 years ago)

Author:

anonymous

Message:

Updated email address validation

File:

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

trunk/lib/Email.inc.php

@@ -90 +90 @@
         // The regex used in validEmail(). Set here instead of in the default _params above so we can use the concatenation . dot.
         // This matches a (valid) email address as complex as:
-        //      "Jane & Bob Smith" <bob&smith's/dep=sales!@smith-wick.ca.us> (Sales department)
+        //      "Jane & Bob Smith" <bob&smith's/dep=sales!@smith-wick.ca.us > (Sales department)
         // ...and something as simple as:
         //      x@x.com
-        $this->setParam(array('regex' => '/^(?:(?:"[^"]*?"\s*|[^,@]*)(<)|(?:"[^"]*?"|[^,@]*)\s+|)'   // Display name
+        $this->setParam(array('regex' => '/^(?:(?:"[^"]*?"\s*|[^,@]*)(<\s*)|(?:"[^"]*?"|[^,@]*)\s+|)'   // Display name
         . '((?:[^.<>\s@",\[\]]+[^<>\s@",\[\]])*[^.<>\s@",\[\]]+)'       // Local-part
         . '@'                                                           // @
@@ -102 +102 @@
         . '[.-]?(?:[A-Z0-9]+[-.])*(?:[A-Z0-9]+\.)+[A-Z]{2,6}))'         // FALSE, matches domain name
         . '(?(1)'                                                       // Comment conditional for if initial < exists
-        . '(?:>\s*|>\s+\([^,@]+\)\s*)'                                  // TRUE, ensure ending >
+        . '(?:\s*>\s*|>\s+\([^,@]+\)\s*)'                                  // TRUE, ensure ending >
         . '|'
         . '(?:|\s*|\s+\([^,@]+\)\s*))$/i'));                            // FALSE ensure there is no ending >