Changeset 357

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.

Location:

trunk

Files:

• lib/App.inc.php (modified) (4 diffs)
• lib/Email.inc.php (modified) (1 diff)
• tests/Auth_SQLTest.php (modified) (2 diffs)
• tests/LockTest.php (modified) (2 diffs)
• tests/VersionTest.php (modified) (2 diffs)
• tests/run_tests.sh (modified) (1 diff)

trunk/lib/App.inc.php

@@ -107 +107 @@
 
         // Don't email or sms duplicate messages that happen more often than this value (in seconds).
-        'log_multiple_timeout' => 60,
+        'log_multiple_timeout' => 61,
 
         // Logging priority can be any of the following, or false to deactivate:
@@ -556 +556 @@
 
         // Create tmp files so that we don't email and sms redundantly.
-        $site_hash = md5(SITE_BASE);
+        $site_hash = md5($_SERVER['SCRIPT_NAME']);
         $temp_dir = $this->getParam('tmp_dir') . "/codebase_msgs_$site_hash/";
         $temp_file = $temp_dir . $msg_id;
@@ -567 +567 @@
             // Has this message been sent more recently than the timeout?
             if ((time() - $msg_last_sent) < $this->getParam('log_multiple_timeout')) {
-                // This message was alreay sent recently
+                // This message was already sent recently.
                 $send_notifications = false;
             } else {
-                // Timeout has expired go ahead and send notifications again
+                // Timeout has expired go ahead and send notifications again.
                 unlink($temp_file);
             }
@@ -597 +597 @@
         // NOTIFY SOMEONE
         if ($send_notifications) {
-
             // EMAIL ACTION
             if ($this->getParam('log_email_priority') && $priority <= $this->getParam('log_email_priority')) {

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

trunk/tests/Auth_SQLTest.php

@@ -44 +44 @@
                 first_name,
                 last_name,
-                email,
-                user_type
+                email
             ) VALUES (
                 'testuser',
@@ -51 +50 @@
                 'John',
                 'Doe',
-                'root@localhost',
-                'admin'
+                'root@localhost'
             )
         ");

trunk/tests/LockTest.php

@@ -46 +46 @@
                 first_name,
                 last_name,
-                email,
-                user_type
+                email
             ) VALUES (
                 'testuser',
@@ -53 +52 @@
                 'John',
                 'Doe',
-                'john@example.com',
-                'admin'
+                'john@example.com'
             )
         ");

trunk/tests/VersionTest.php

@@ -46 +46 @@
                 first_name,
                 last_name,
-                email,
-                user_type
+                email
             ) VALUES (
                 'testuser',
@@ -53 +52 @@
                 'John',
                 'Doe',
-                'john@example.com',
-                'admin'
+                'john@example.com'
             )
         ");

trunk/tests/run_tests.sh

@@ -7 +7 @@
 for foo in *Test.php; 
 do
-    /usr/local/bin/php $foo;
+    php $foo;
 done;