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

Timestamp:

Jun 14, 2009 10:36:48 AM (15 years ago)

Author:

quinn

Message:

updated tests to work. updated email validation regex to include quote marks around name part. changed logmsg tmp dir name to use script_filename.

File:

• trunk/lib/Email.inc.php (modified) (1 diff)

trunk/lib/Email.inc.php

@@ -69 +69 @@
     {
         // The regex used in validEmail(). Set here instead of in the default _params above so we can use the concatenation . dot.
-        // This matches an email address as complex as:
-        //      Bob John-Smith <bob&smith's/dep=sales!@smith-wick.ca.us> (Sales department)
+        // This matches a (valid) email address as complex as:
+        //      "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+|)'   // Display name
-        . '((?:[^.<>\s@",\[\]]+[^<>\s@",\[\]])*[^.<>\s@",\[\]]+)'    // Local-part
+        $this->setParam(array('regex' => '/^(?:(?:"[^"]*?"\s*|[^,@]*)(<)|(?:"[^"]*?"|[^,@]*)\s+|)'   // Display name
+        . '((?:[^.<>\s@",\[\]]+[^<>\s@",\[\]])*[^.<>\s@",\[\]]+)'       // Local-part
         . '@'                                                           // @
         . '((?:(\[)|[A-Z0-9]?)'                                         // Domain, first char