Changeset 2832 for branches/1.2/bp-core/bp-core-wpabstraction.php

Timestamp:

03/11/2010 04:52:34 PM (16 years ago)

Author:

apeatling

Message:

Fixes #2149, fixed inconsistencies between single WP and WPMU with registration and activation. Single WP users must now activate their accounts and confirm they are using a valid email.

File:

• branches/1.2/bp-core/bp-core-wpabstraction.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-wpabstraction.php

@@ -90 +90 @@
         }
 }
-
-if ( !function_exists( 'wpmu_validate_user_signup' ) ) {
-        function wpmu_validate_user_signup( $user_name, $user_email ) {
-                global $wpdb;
-
-                $errors = new WP_Error();
-
-                $user_email = sanitize_email( $user_email );
-
-                if ( empty( $user_name ) )
-                        $errors->add('user_name', __("Please enter a username"));
-
-                $maybe = array();
-                preg_match( "/[a-z0-9]+/", $user_name, $maybe );
-
-                $illegal_names = get_site_option( "illegal_names" );
-                if( is_array( $illegal_names ) == false ) {
-                        $illegal_names = array(  "www", "web", "root", "admin", "main", "invite", "administrator" );
-                        add_site_option( "illegal_names", $illegal_names );
-                }
-
-                if ( !validate_username( $user_name ) || in_array( $user_name, $illegal_names ) == true || $user_name != $maybe[0] ) {
-                    $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
-                }
-
-                if( strlen( $user_name ) < 4 ) {
-                    $errors->add('user_name',  __("Username must be at least 4 characters"));
-                }
-
-                if ( strpos( " " . $user_name, "_" ) != false )
-                        $errors->add('user_name', __("Sorry, usernames may not contain the character '_'!"));
-
-                // all numeric?
-                $match = array();
-                preg_match( '/[0-9]*/', $user_name, $match );
-                if ( $match[0] == $user_name )
-                        $errors->add('user_name', __("Sorry, usernames must have letters too!"));
-
-                if ( !is_email( $user_email ) )
-                        $errors->add('user_email', __("Please check your email address."));
-
-                $limited_email_domains = get_site_option( 'limited_email_domains' );
-                if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
-                        $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-                        if( in_array( $emaildomain, $limited_email_domains ) == false ) {
-                                $errors->add('user_email', __("Sorry, that email address is not allowed!"));
-                        }
-                }
-
-                // Check if the username has been used already.
-                if ( username_exists($user_name) )
-                        $errors->add('user_name', __("Sorry, that username already exists!"));
-
-                // Check if the email address has been used already.
-                if ( email_exists($user_email) )
-                        $errors->add('user_email', __("Sorry, that email address is already used!"));
-
-                $result = array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors);
-
-                return apply_filters('wpmu_validate_user_signup', $result);
-        }
-}