Fixes: #1859 Changed email validation system

cc20b293 · Côme Bernigaud · Benoit Mortier · c61fd592 · cc20b293
Commit cc20b293 authored 12 years ago by Côme Bernigaud Committed by Benoit Mortier 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 9 deletions
+9 -9
--- a/include/class_tests.inc
+++ b/include/class_tests.inc
@@ -271,18 +271,18 @@ class tests {
   *
   * \param boolean $template FALSE
   */
-  public static function is_email($address, $template= FALSE)
+  public static function is_email($address, $deprecated = FALSE)
  {
-    if ($address == ""){
+    if ($address == "") {
-      return (TRUE);
+      return TRUE;
    }
-    if ($template){
+    if (filter_var($address, FILTER_VALIDATE_EMAIL) !== FALSE) {
-      return preg_match ("/^[._a-z0-9%\+-]+@[_a-z0-9-]+(\.[a-z0-9-]+)(\.[a-z0-9-]+)*$/i",
+      return TRUE;
-          $address);
+    } elseif (filter_var($address.'.com', FILTER_VALIDATE_EMAIL) !== FALSE) {
-    } else {
+      /* this is to allow addresses like example@localhost, which are refused by some PHP version */
-      return preg_match ("/^[._a-z0-9\+-]+@[_a-z0-9-]+(\.[a-z0-9i-]+)(\.[a-z0-9-]+)*$/i",
+      return TRUE;
-          $address);
    }
+    return FALSE;
  }