Changeset 399

Timestamp:

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

Author:

anonymous

Message:

Updated email address validation

Location:

trunk

Files:

• lib/Email.inc.php (modified) (2 diffs)
• tests/EmailTest.php (modified) (1 diff)
• tests/_email_test_addresses.txt (modified) (2 diffs)
• tests/run_tests.sh (modified) (1 diff)

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 >

trunk/tests/EmailTest.php

@@ -113 +113 @@
             }
         }
-        $this->assertEquals(41, $gc, 'Unexpected good count.');
-        $this->assertEquals(47, $bc, 'Unexpected bad count.');
+        $this->assertEquals(45, $gc, 'Unexpected number of valid emails found.');
+        $this->assertEquals(45, $bc, 'Unexpected number of invalid emails found.');
         // echo "Good addresses: $gc\n";
         // echo "Bad addresses: $bc\n";
-//         echo join("\n", $bad);
-//         echo "\n";
+        // echo join("\n", $bad);
+        // echo "\n";
     }
 

trunk/tests/_email_test_addresses.txt

@@ -22 +22 @@
 cthornhill_94%1@yahoo.com
     "bob!#$%&'*+-/=?^_`.{|}~rice@domain.com",
-müllér@domain.com
+mÌllér@domain.com
 sarah.adams.2008@femba.ucla.edu
 dig@whap.heck.suddenly.willy.sam.digity.okay.com.org
@@ -48 +48 @@
 < asdf@domain.com>
 <asdf@domain.com >
+Mr. Asdf < asdf@domain.com>
+Mr. Asdf <asdf@domain.com >
 asdf@domain.com>
 <asdf@domain.com

trunk/tests/run_tests.sh

@@ -3 +3 @@
 # Be in the directory with all the tests.
 cd `dirname $0`;
+
+# Create database.
+mysql -e 'CREATE DATABASE IF NOT EXISTS `test`';
 
 # Run tests sequentially.