Changeset 2832

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.

Location:

branches/1.2

Files:

• bp-core.php (modified) (5 diffs)
• bp-core/bp-core-activation.php (deleted)
• bp-core/bp-core-filters.php (added)
• bp-core/bp-core-signup.php (modified) (8 diffs)
• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)
• bp-themes/bp-default/style.css (modified) (1 diff)

branches/1.2/bp-core.php

@@ -33 +33 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-filters.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-cssjs.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-avatars.php' );
@@ -40 +41 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
-
-/* Multisite includes built in account activation support. */
-if ( bp_core_is_multisite() )
-        require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
 
 /* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
@@ -1664 +1661 @@
         update_site_option( 'illegal_names', $new );
 }
-
-/**
- * bp_core_email_from_name_filter()
- *
- * Sets the "From" name in emails sent to the name of the site and not "WordPress"
- *
- * @package BuddyPress Core
- * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
- * @return The blog name for the root blog
- */
-function bp_core_email_from_name_filter() {
-        return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
-}
-add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
-
-
-/**
- * bp_core_email_from_name_filter()
- *
- * Sets the "From" address in emails sent
- *
- * @package BuddyPress Core
- * @global $current_site Object containing current site metadata
- * @return noreply@sitedomain email address
- */
-function bp_core_email_from_address_filter() {
-        $domain = (array) explode( '/', site_url() );
-
-        return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
-}
-add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
 
 /**
@@ -1972 +1938 @@
 
 /**
- * bp_core_filter_parent_theme()
- *
- * Remove social network parent theme from the theme list.
- *
- * @package BuddyPress Core
- */
-function bp_core_filter_parent_theme() {
-        global $wp_themes, $pagenow;
-
-        if ( is_admin() && 'themes.php' == $pagenow )
-                $wp_themes = get_themes();
-
-        unset( $wp_themes['BuddyPress Classic Parent'] );
-}
-add_filter( 'admin_menu', 'bp_core_filter_parent_theme' );
-
-/**
- * bp_core_allow_default_theme()
- *
- * On multiblog installations you must first allow themes to be activated and show
- * up on the theme selection screen. This function will let the BuddyPress bundled
- * themes show up on the root blog selection screen and bypass this step. It also
- * means that the themes won't show for selection on other blogs.
- *
- * @package BuddyPress Core
- */
-function bp_core_allow_default_theme( $themes ) {
-        global $bp, $current_blog;
-
-        if ( !is_site_admin() )
-                return $themes;
-
-        if ( $current_blog->ID == $bp->root_blog ) {
-                $themes['bp-default'] = 1;
-                $themes['bp-classic'] = 1;
-        }
-
-        return $themes;
-}
-add_filter( 'allowed_themes', 'bp_core_allow_default_theme' );
-
-/**
  * bp_core_activation_notice()
  *
@@ -2054 +1978 @@
 add_action( 'admin_notices', 'bp_core_activation_notice' );
 
-/**
- * bp_core_filter_comments()
- *
- * Filter the blog post comments array and insert BuddyPress URLs for users.
- *
- * @package BuddyPress Core
- */
-function bp_core_filter_comments( $comments, $post_id ) {
-        global $wpdb;
-
-        foreach( (array)$comments as $comment ) {
-                if ( $comment->user_id )
-                        $user_ids[] = $comment->user_id;
-        }
-
-        if ( empty( $user_ids ) )
-                return $comments;
-
-        $user_ids = implode( ',', $user_ids );
-
-        if ( !$userdata = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) )
-                return $comments;
-
-        foreach( (array)$userdata as $user )
-                $users[$user->user_id] = bp_core_get_user_domain( $user->user_id, $user->user_nicename, $user->user_login );
-
-        foreach( (array)$comments as $i => $comment ) {
-                if ( !empty( $comment->user_id ) ) {
-                        if ( !empty( $users[$comment->user_id] ) )
-                                $comments[$i]->comment_author_url = $users[$comment->user_id];
-                }
-        }
-
-        return $comments;
-}
-add_filter( 'comments_array', 'bp_core_filter_comments', 10, 2 );
-
-/**
- * bp_core_login_redirect()
- *
- * When a user logs in, always redirect them back to the previous page. NOT the admin area.
- *
- * @package BuddyPress Core
- */
-function bp_core_login_redirect( $redirect_to ) {
-        global $bp, $current_blog;
-
-        if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
-                return $redirect_to;
-
-        if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
-                return $redirect_to;
-
-        if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) )
-                return wp_get_referer();
-
-        return $bp->root_domain;
-}
-add_filter( 'login_redirect', 'bp_core_login_redirect' );
-
-
 /********************************************************************************
  * Custom Actions

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

@@ -1 +1 @@
 <?php
+
+/********************************************************************************
+ * Screen Functions
+ *
+ * Screen functions are the controllers of BuddyPress. They will execute when their
+ * specific URL is caught. They will first save or manipulate data using business
+ * functions, then pass on the user to a template file.
+ */
 
 function bp_core_screen_signup() {
@@ -11 +19 @@
                 bp_core_redirect( $bp->root_domain );
 
-        /***
-         * For backwards compatibility with the old pre 1.1 two theme system, skip this screen function
-         * if the user is using the old two theme method.
-         */
-        if ( file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
-                return false;
-
         /* If signups are disabled, just re-direct */
         if ( !bp_get_signup_allowed() )
@@ -33 +34 @@
 
                 /* Check the base account details for problems */
-                $account_details = wpmu_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
+                $account_details = bp_core_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
 
                 /* If there are errors with account details, set them for display */
@@ -74 +75 @@
 
                         if ( 'blog' == $active_signup || 'all' == $active_signup ) {
-                                $blog_details = wpmu_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
+                                $blog_details = bp_core_validate_blog_signup( $_POST['signup_blog_url'], $_POST['signup_blog_title'] );
 
                                 /* If there are errors with blog details, set them for display */
@@ -126 +127 @@
                                 $usermeta = apply_filters( 'bp_signup_usermeta', $usermeta );
 
-                                /* Finally, sign up the user and/or blog*/
+                                /* Finally, sign up the user and/or blog */
                                 if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multisite() )
-                                        wpmu_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
+                                        bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
                                 else {
                                         bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
@@ -159 +160 @@
                                 $bp->signup->avatar_dir = wp_hash( $bp->signup->key );
                         }
-                } else
-                        $bp->signup->avatar_dir = wp_hash( $bp->signup->username );
+                } else {
+                        $user_id = bp_core_get_userid( $_POST['signup_username'] );
+                        $bp->signup->avatar_dir = wp_hash( $user_id );
+                }
 
                 /* Pass the file to the avatar upload handler */
@@ -185 +188 @@
                 else
                         bp_core_add_message( __( 'Your new avatar was uploaded successfully', 'buddypress' ) );
-
-                /* If this is a single WP install, move the avatar to the user's folder since there is no activation process to move it. */
-                if ( !bp_core_is_multisite() ) {
-                        $user_id = bp_core_get_userid( $_POST['signup_username'] );
-
-                        if ( !empty( $user_id ) && file_exists( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $_POST['signup_avatar_dir'] ) ) {
-                                @rename( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $_POST['signup_avatar_dir'], BP_AVATAR_UPLOAD_PATH . '/avatars/' . $user_id );
+        }
+        bp_core_load_template( 'registration/register' );
+}
+add_action( 'wp', 'bp_core_screen_signup', 3 );
+
+function bp_core_screen_activation() {
+        global $bp, $wpdb;
+
+        if ( BP_ACTIVATION_SLUG != $bp->current_component )
+                return false;
+
+        /* Check if an activation key has been passed */
+        if ( isset( $_GET['key'] ) ) {
+
+                require_once( ABSPATH . WPINC . '/registration.php' );
+
+                /* Activate the signup */
+                $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
+
+                /* If there was errors, add a message and redirect */
+                if ( $user->errors ) {
+                        bp_core_add_message( __( 'There was an error activating your account, please try again.', 'buddypress' ), 'error' );
+                        bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
+                }
+
+                /* Check for an uploaded avatar and move that to the correct user folder */
+                if ( bp_core_is_multisite() )
+                        $hashed_key = wp_hash( $_GET['key'] );
+                else
+                        $hashed_key = wp_hash( $user );
+
+                /* Check if the avatar folder exists. If it does, move rename it, move it and delete the signup avatar dir */
+                if ( file_exists( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $hashed_key ) )
+                        @rename( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $hashed_key, BP_AVATAR_UPLOAD_PATH . '/avatars/' . $user );
+
+                bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
+
+                $bp->activation_complete = true;
+        }
+
+        if ( '' != locate_template( array( 'registration/activate' ), false ) )
+                bp_core_load_template( apply_filters( 'bp_core_template_activate', 'activate' ) );
+        else
+                bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );
+}
+add_action( 'wp', 'bp_core_screen_activation', 3 );
+
+
+/********************************************************************************
+ * Business Functions
+ *
+ * Business functions are where all the magic happens in BuddyPress. They will
+ * handle the actual saving or manipulation of information. Usually they will
+ * hand off to a database class for data access, then return
+ * true or false on success or failure.
+ */
+
+function bp_core_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', 'buddypress' ) );
+
+        $maybe = array();
+        preg_match( "/[a-z0-9]+/", $user_name, $maybe );
+
+        $db_illegal_names = get_site_option( 'illegal_names' );
+        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+
+        $illegal_names = array_merge( (array)$db_illegal_names, (array)$filtered_illegal_names );
+        update_site_option( 'illegal_names', $illegal_names );
+
+        if ( !validate_username( $user_name ) || in_array( $user_name, (array)$illegal_names ) || $user_name != $maybe[0] )
+            $errors->add( 'user_name', __( 'Only lowercase letters and numbers allowed', 'buddypress' ) );
+
+        if( strlen( $user_name ) < 4 )
+            $errors->add( 'user_name',  __( 'Username must be at least 4 characters', 'buddypress' ) );
+
+        if ( strpos( ' ' . $user_name, '_' ) != false )
+                $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character "_"!', 'buddypress' ) );
+
+        /* Is the user_name 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!', 'buddypress' ) );
+
+        if ( !is_email( $user_email ) )
+                $errors->add( 'user_email', __( 'Please check your email address.', 'buddypress' ) );
+
+        $limited_email_domains = get_site_option( 'limited_email_domains', 'buddypress' );
+
+        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 )
+                        $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!', 'buddypress' ) );
+        }
+
+        /* Check if the username has been used already. */
+        if ( username_exists( $user_name ) )
+                $errors->add( 'user_name', __( 'Sorry, that username already exists!', 'buddypress' ) );
+
+        /* 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!', 'buddypress' ) );
+
+        $result = array( 'user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors );
+
+        /* Apply WPMU legacy filter */
+        $result = apply_filters( 'wpmu_validate_user_signup', $result );
+
+        return apply_filters( 'bp_core_validate_user_signup', $result );
+}
+
+function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
+        if ( !bp_core_is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
+                return false;
+
+        return apply_filters( 'bp_core_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
+}
+
+function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
+        global $bp, $wpdb;
+
+        /* Multisite installs have their own install procedure */
+        if ( bp_core_is_multisite() ) {
+                wpmu_signup_user( $user_login, $user_email, $usermeta );
+
+        } else {
+                $errors = new WP_Error();
+
+                $user_id = wp_insert_user( array(
+                        'user_login' => $user_login,
+                        'user_pass' => $user_password,
+                        'display_name' => sanitize_title( $user_login ),
+                        'user_email' => $user_email
+                ) );
+
+                if ( !$user_id ) {
+                        $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), get_option( 'admin_email' ) ) );
+                        return $errors;
+                }
+
+                /* Update the user status to '2' which we will use as 'not activated' (0 = active, 1 = spam, 2 = not active) */
+                $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_status = 2 WHERE ID = %d", $user_id ) );
+
+                /* Set any profile data */
+                if ( function_exists( 'xprofile_set_field_data' ) ) {
+                        if ( !empty( $usermeta['profile_field_ids'] ) ) {
+                                $profile_field_ids = explode( ',', $usermeta['profile_field_ids'] );
+
+                                foreach( (array)$profile_field_ids as $field_id ) {
+                                        $current_field = $usermeta["field_{$field_id}"];
+
+                                        if ( !empty( $current_field ) )
+                                                xprofile_set_field_data( $field_id, $user_id, $current_field );
+                                }
                         }
                 }
         }
-        bp_core_load_template( 'registration/register' );
-}
-add_action( 'wp', 'bp_core_screen_signup', 3 );
-
-function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
-        global $bp;
-
-        if ( bp_core_is_multisite() )
-                return wpmu_signup_user( $user_login, $user_email, $usermeta );
-
-        $errors = new WP_Error();
-
-        $user_id = wp_insert_user( array(
-                'user_login' => $user_login,
-                'user_pass' => $user_password,
-                'display_name' => sanitize_title( $user_login ),
-                'user_email' => $user_email
-        ) );
-
-        if ( !$user_id ) {
-                $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
-                return $errors;
-        }
-
-        /* Update the user_url */
-        wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id, sanitize_title( $user_login ), $user_login ) ) );
-
-        /* Set any profile data */
-        if ( function_exists( 'xprofile_set_field_data' ) ) {
-                if ( !empty( $usermeta['profile_field_ids'] ) ) {
-                        $profile_field_ids = explode( ',', $usermeta['profile_field_ids'] );
-
-                        foreach( (array)$profile_field_ids as $field_id ) {
-                                $current_field = $usermeta["field_{$field_id}"];
-
-                                if ( !empty( $current_field ) )
-                                        xprofile_set_field_data( $field_id, $user_id, $current_field );
+        $bp->signup->username = $user_login;
+
+        /***
+         * Now generate an activation key and send an email to the user so they can activate their account
+         * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
+         */
+        if ( !bp_core_is_multisite() ) {
+                $activation_key = wp_hash( $user_id );
+                update_usermeta( $user_id, 'activation_key', $activation_key );
+                bp_core_signup_send_validation_email( $user_id, $activation_key );
+        }
+
+        do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
+
+        return $user_id;
+}
+
+function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
+        if ( !bp_core_is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
+                return false;
+
+        return apply_filters( 'bp_core_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
+}
+
+function bp_core_activate_signup( $key ) {
+        global $wpdb;
+
+        $user = false;
+
+        /* Multisite installs have their own activation routine */
+        if ( bp_core_is_multisite() ) {
+                $user = wpmu_activate_signup( $key );
+
+                /* If there was errors, add a message and redirect */
+                if ( $user->errors ) {
+                        bp_core_add_message( __( 'There was an error activating your account, please try again.', 'buddypress' ), 'error' );
+                        bp_core_redirect( $bp->root_domain . '/' . BP_ACTIVATION_SLUG );
+                }
+
+                $user_id = $user['user_id'];
+
+                /* Set any profile data */
+                if ( function_exists( 'xprofile_set_field_data' ) ) {
+                        if ( !empty( $user['meta']['profile_field_ids'] ) ) {
+                                $profile_field_ids = explode( ',', $user['meta']['profile_field_ids'] );
+
+                                foreach( (array)$profile_field_ids as $field_id ) {
+                                        $current_field = $user['meta']["field_{$field_id}"];
+
+                                        if ( !empty( $current_field ) )
+                                                xprofile_set_field_data( $field_id, $user_id, $current_field );
+                                }
                         }
                 }
-        }
+
+        } else {
+                /* Get the user_id based on the $key */
+                $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_value = %s", $key ) );
+
+                if ( empty( $user_id ) )
+                        return new WP_Error( 'invalid_key', __( 'Invalid activation key', 'buddypress' ) );
+
+                /* Change the user's status so they become active */
+                if ( !$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_status = 0 WHERE ID = %d", $user_id ) ) )
+                        return new WP_Error( 'invalid_key', __( 'Invalid activation key', 'buddypress' ) );
+
+                /* Notify the site admin of a new user registration */
+                wp_new_user_notification( $user_id );
+
+                /* Remove the activation key meta */
+                delete_usermeta( $user_id, 'activation_key' );
+        }
+
+        /* Update the user_url and display_name */
+        wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id, sanitize_title( $user_login ), $user_login ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
 
         /* Add a last active entry */
         update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
-        wp_new_user_notification( $user_id, $user_pass );
+        /* Set the password on multisite installs */
+        if ( bp_core_is_multisite() && !empty( $user['meta']['password'] ) )
+                $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
+
+        /* Delete the total member cache */
         wp_cache_delete( 'bp_total_member_count', 'bp' );
 
-        $bp->signup->username = $user_login;
-
-        do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
+        do_action( 'bp_core_activated_user', $user_id, $key, $user );
 
         return $user_id;
 }
+
+function bp_core_new_user_activity( $user ) {
+        if ( empty( $user ) || !function_exists( 'bp_activity_add' ) )
+                return false;
+
+        if ( is_array( $user ) )
+                $user_id = $user['user_id'];
+        else
+                $user_id = $user;
+
+        if ( empty( $user_id ) )
+                return false;
+
+        $userlink = bp_core_get_userlink( $user_id );
+
+        bp_activity_add( array(
+                'user_id' => $user_id,
+                'action' => apply_filters( 'bp_core_activity_registered_member_action', sprintf( __( '%s became a registered member', 'buddypress' ), $userlink ), $user_id ),
+                'component' => 'profile',
+                'type' => 'new_member'
+        ) );
+}
+add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
 
 function bp_core_map_user_registration( $user_id ) {
@@ -290 +508 @@
 }
 
+function bp_core_signup_send_validation_email( $user_id, $key ) {
+        $activate_url = bp_get_activation_page() ."?key=$key";
+        $activate_url = clean_url( $activate_url );
+        $admin_email = get_site_option( "admin_email" );
+
+        if ( empty( $admin_email ) )
+                $admin_email = 'noreply@' . $_SERVER['SERVER_NAME'];
+
+        $from_name = ( '' == get_option( 'blogname' ) ) ? 'BuddyPress' : wp_specialchars( get_option( 'blogname' ) );
+        $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
+        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url );
+        $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
+
+        /* Send the message */
+        $to = apply_filters( 'bp_core_activation_signup_user_notification_to', $user_email );
+        $subject = apply_filters( 'bp_core_activation_signup_user_notification_subject', $subject );
+        $message = apply_filters( 'bp_core_activation_signup_user_notification_message', $message );
+
+        wp_mail( $to, $subject, $message, $message_headers );
+}
+
+/* Stop user accounts logging in that have not been activated (user_status = 2) */
+function bp_core_signup_disable_inactive( $auth_obj, $username ) {
+        global $bp, $wpdb;
+
+        if ( !$user_id = bp_core_get_userid( $username ) )
+                return $auth_obj;
+
+        $user_status = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM $wpdb->users WHERE ID = %d", $user_id ) );
+
+        if ( 2 == $user_status )
+                bp_core_redirect( $bp->root_domain );
+        else
+                return $auth_obj;
+}
+add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 11, 2 );
+
 /* Kill the wp-signup.php if custom registration signup templates are present */
 function bp_core_wpsignup_redirect() {

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

@@ -1184 +1184 @@
                 extract( $r, EXTR_SKIP );
 
-                if ( !bp_core_is_multisite() && !empty( $_POST['signup_username'] ) ) {
-                        $user_id = bp_core_get_userid( $_POST['signup_username'] );
-                        return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
+                $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
+
+                if ( empty( $signup_avatar_dir ) ) {
+                        if ( empty( $bp->grav_default->user ) ) {
+                                $default_grav = 'wavatar';
+                        } else if ( 'mystery' == $bp->grav_default->user ) {
+                                $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
+                        } else {
+                                $default_grav = $bp->grav_default->user;
+                        }
+
+                        $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
+                        return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
                 } else {
-                        $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
-
-                        if ( empty( $signup_avatar_dir ) ) {
-                                if ( empty( $bp->grav_default->user ) ) {
-                                        $default_grav = 'wavatar';
-                                } else if ( 'mystery' == $bp->grav_default->user ) {
-                                        $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
-                                } else {
-                                        $default_grav = $bp->grav_default->user;
-                                }
-
-                                $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-                                return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
-                        } else {
-                                return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
-                        }
+                        return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
                 }
         }
@@ -1246 +1241 @@
 
 function bp_registration_needs_activation() {
-        return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
+        return apply_filters( 'bp_registration_needs_activation', true );
 }
 

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);
-        }
-}

branches/1.2/bp-loader.php

@@ -5 +5 @@
 Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
 Author: The BuddyPress Community
-Version: 1.2.1
+Version: 1.2.2
 Author URI: http://buddypress.org/developers/
 Site Wide Only: true
 */
 
-define( 'BP_VERSION', '1.2.1' );
+define( 'BP_VERSION', '1.2.2' );
 
 /***

branches/1.2/bp-themes/bp-default/style.css

@@ -3 +3 @@
 Theme URI: http://buddypress.org/extend/themes/
 Description: The default theme for BuddyPress.
-Version: 1.2.1
+Version: 1.2.2
 Author: BuddyPress.org
 Author URI: http://buddypress.org