Changeset 6269 for trunk/bp-settings/bp-settings-actions.php

Timestamp:

08/29/2012 06:47:11 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes email validation in Settings component

When changing your email in the Settings component, this changeset ensures that
the new address is validated in all the crucial ways, specifically the
banned_email_domains and limited_email_domains checks on WordPress Multisite.

Fixes #4485

File:

• trunk/bp-settings/bp-settings-actions.php (modified) (1 diff)

trunk/bp-settings/bp-settings-actions.php

@@ -72 +72 @@
                 if ( $bp->displayed_user->userdata->user_email != $user_email ) {
 
-                    // Is email valid
-                    if ( !is_email( $user_email ) )
-                        $email_error = 'invalid';
-
-                    // Get blocked email domains
-                    $limited_email_domains = get_site_option( 'limited_email_domains', 'buddypress' );
-
-                    // If blocked email domains exist, see if this is one of them
-                    if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
-                        $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-
-                        if ( in_array( $emaildomain, (array) $limited_email_domains ) == false ) {
+                    // Run some tests on the email address
+                    $email_checks = bp_core_validate_email_address( $user_email );
+
+                    if ( true !== $email_checks ) {
+                        if ( isset( $email_checks['invalid'] ) ) {
+                            $email_error = 'invalid';
+                        }
+
+                        if ( isset( $email_checks['domain_banned'] ) || isset( $email_checks['domain_not_allowed'] ) ) {
                             $email_error = 'blocked';
                         }
-                    }
-
-                    // No errors, and email address doesn't match
-                    if ( ( false === $email_error ) && email_exists( $user_email ) ) {
-                        $email_error = 'taken';
+
+                        if ( isset( $email_checks['in_use'] ) ) {
+                            $email_error = 'taken';
+                        }
                     }