Merge pull request #51 from pebosi/master

Adding apostroph as valid email char in local part
matomo-org · Apr 6, 2013 · 35bcaca · 35bcaca · mattab · Apr 7, 2013
2 parents e043f90 + e71153c
commit 35bcaca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/Piwik.php b/core/Piwik.php
@@ -2037,7 +2037,7 @@ static public function createAccessObject()
      */
     static public function isValidEmailString($email)
     {
-        return (preg_match('/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9_.-]+\.[a-zA-Z]{2,7}$/D', $email) > 0);
+        return (preg_match("/^[a-zA-Z0-9_.+'-]+@[a-zA-Z0-9_.-]+\.[a-zA-Z]{2,7}$/D", $email) > 0);
     }
 
     /**

diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Plugins/UsersManagerTest.php
@@ -225,7 +225,6 @@ public function testAddUserWrongPassword($userLogin, $password, $email, $alias)
     public function getWrongEmailTestData()
     {
         return array(
-            array("geggeqgeqag", "geqgeagae", "ema'[email protected]", "alias"),
             array("geggeqgeqag", "geqgeagae", "@email.com", "alias"),
             array("geggeqgeqag", "geqgeagae", "[email protected]", "alias"),
             array("geggeqgeqag", "geqgeagae", "email@4.", "alias"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -2037,7 +2037,7 @@ static public function createAccessObject() @@
          */
         static public function isValidEmailString($email)
         {
-            return (preg_match('/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9_.-]+\.[a-zA-Z]{2,7}$/D', $email) > 0);
+            return (preg_match("/^[a-zA-Z0-9_.+'-]+@[a-zA-Z0-9_.-]+\.[a-zA-Z]{2,7}$/D", $email) > 0);
         }
         /**
@@ Expand Down @@