use PHP filter to validate E-Mails (matomo-org#14476)

* use PHP filter to validate E-Mails * remove failing test * only test with ASCII TLDs as others seem to fail * remove Zend_Validate_EmailAddress config and class
trdevs · Jul 14, 2019 · 0d9978b · 0d9978b
1 parent 71932a7
commit 0d9978b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 577 deletions.
diff --git a/config/global.php b/config/global.php
@@ -150,7 +150,7 @@
         if (!empty($general['login_whitelist_ip']) && is_array($general['login_whitelist_ip'])) {
             $ips = $general['login_whitelist_ip'];
         }
-        
+
         $ipsResolved = array();
 
         foreach ($ips as $ip) {
@@ -201,13 +201,6 @@
         return $transport;
     },
 
-    'Zend_Validate_EmailAddress' => function () {
-        return new \Zend_Validate_EmailAddress(array(
-            'hostname' => new \Zend_Validate_Hostname(array(
-                'tld' => false,
-            ))));
-    },
-
     'Piwik\Tracker\VisitorRecognizer' => DI\object()
         ->constructorParameter('trustCookiesOnly', DI\get('ini.Tracker.trust_visitors_cookies'))
         ->constructorParameter('visitStandardLength', DI\get('ini.Tracker.visit_standard_length'))

diff --git a/core/Piwik.php b/core/Piwik.php
@@ -649,9 +649,7 @@ public static function redirectToModule($newModule, $newAction = '', $parameters
      */
     public static function isValidEmailString($emailAddress)
     {
-        /** @var \Zend_Validate_EmailAddress $zendEmailValidator */
-        $zendEmailValidator = StaticContainer::get('Zend_Validate_EmailAddress');
-        return $zendEmailValidator->isValid($emailAddress);
+        return filter_var($emailAddress, FILTER_VALIDATE_EMAIL) !== false;
     }
 
     /**