Fixes #2161 - using filter_var() in email validation and moved is_email_address(...

git-svn-id: http://code.elgg.org/elgg/trunk@7036 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/input.php b/engine/lib/input.php
index 17a330851bbfe1673d0b85534525fec43a502141..324b0cec4b1c9fc785190de60c877181914119d3 100644 (file)
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -106,6 +106,16 @@ function sanitise_filepath($path, $append_slash = TRUE) {
        return $path;
 }
 
+/**
+ * Validates an email address.
+ *
+ * @param string $address Email address.
+ * @return bool
+ */
+function is_email_address($address) {
+       return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
+}
+
 /**
  * Page handler for autocomplete endpoint.
  *

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 05311ab9d16d59f3378c109828d24c8160d0c249..c9add2541ae478ffe253748075a7b379d129604c 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -874,26 +874,6 @@ function elgg_user_resetpassword_page_handler($page) {
        page_draw($title, elgg_view_layout('one_column', $content));
 }
 
-/**
- * Validates an email address.
- *
- * @param string $address Email address.
- * @return bool
- */
-function is_email_address($address) {
-       // @todo Make this better!
-
-       if (strpos($address, '@')=== false) {
-               return false;
-       }
-
-       if (strpos($address, '.')=== false) {
-               return false;
-       }
-
-       return true;
-}
-
 /**
  * Simple function that will generate a random clear text password suitable for feeding into generate_user_password().
  *