Changeset 309

Timestamp:

Jan 31, 2008 9:26:58 AM (16 years ago)

Author:

quinn

Message:

Fixed bug in email validation regex.

Location:

trunk/lib

Files:

• Email.inc.php (modified) (1 diff)
• Prefs.inc.php (modified) (1 diff)

trunk/lib/Email.inc.php

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

trunk/lib/Prefs.inc.php

@@ -188 +188 @@
             $app->logMsg(sprintf('Setting preference %s => %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
         } else {
-            $app->logMsg(sprintf('not setting %s => %s', $key, $val), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Not setting preference %s => %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
         }
     }