Changeset 8119

Timestamp:

03/13/2014 12:58:28 AM (12 years ago)

Author:

imath

Message:

Introduce Sign Ups Management

In Users Administration Screen, a new view is now available to manage the pending accounts of a site or of the network of sites. The following actions are supported:

• Resend the activation email
• Delete the pending account
• Activate the pending account

The corresponding bulk actions are also supported. A search box is available in order to let the administrator easily find some specific pending accounts.

The registration process have also been modified so that multisite and regular configs handles it in a similar way. A mechnanism is in place to ensure plugin backward compatibility concerning the regular configs.

See #5374

props boonebgorges, imath

Fixes #4651

Location:

trunk

Files:

• bp-core/admin/bp-core-functions.php (modified) (2 diffs)
• bp-core/admin/bp-core-schema.php (modified) (2 diffs)
• bp-core/bp-core-update.php (modified) (1 diff)
• bp-members/admin/bp-members-classes.php (added)
• bp-members/bp-members-admin.php (modified) (7 diffs)
• bp-members/bp-members-classes.php (added)
• bp-members/bp-members-functions.php (modified) (6 diffs)
• bp-members/bp-members-loader.php (modified) (3 diffs)
• bp-members/bp-members-screens.php (modified) (1 diff)
• tests/includes/factory.php (modified) (2 diffs)
• tests/includes/install.php (modified) (1 diff)
• tests/testcases/members/class-bp-signup.php (added)

trunk/bp-core/admin/bp-core-functions.php

@@ -277 +277 @@
                         'name' => __( 'Register', 'buddypress' )
                 );
+
+                bp_core_maybe_install_signups();
         }
 
@@ -791 +793 @@
 <?php
 }
+
+/**
+ * Check if the signups table needs to be created.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @global $wpdb
+ */
+function bp_core_maybe_install_signups() {
+        global $wpdb;
+
+        // Multisite installations already have the signups table.
+        if ( ! empty( $wpdb->signups ) ) {
+                return;
+        }
+
+        $bp_signups = bp_core_get_table_prefix() . 'signups';
+
+        // Check for the table
+        $suppress = $wpdb->suppress_errors();
+        $table_exists = $wpdb->get_results( "DESCRIBE {$bp_signups};" );
+        $wpdb->suppress_errors( $suppress );
+
+        // Bail if the table exists
+        if ( ! empty( $table_exists ) ) {
+                return;
+        }
+
+        // Signups is not there and we need it so let's create it
+        require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-schema.php' );
+
+        bp_core_install_signups();
+}

trunk/bp-core/admin/bp-core-schema.php

@@ -51 +51 @@
         if ( !empty( $active_components['blogs'] ) )
                 bp_core_install_blog_tracking();
+
+        // Install the signups table
+        if ( bp_get_signup_allowed() )
+                bp_core_install_signups();
+
 }
 
@@ -344 +349 @@
         dbDelta( $sql );
 }
+
+/**
+ * Install the signups table.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @global $wpdb
+ * @uses wp_get_db_schema() to get WordPress ms_global schema
+ */
+function bp_core_install_signups() {
+        global $wpdb;
+
+        // Multisite installations already have the signups table
+        if ( ! empty( $wpdb->signups ) ) {
+                return;
+        }
+
+        $wpdb->signups = bp_core_get_table_prefix() . 'signups';
+
+        // Setting the charset to be sure WordPress upgrade.php is loaded
+        $charset_collate = bp_core_set_charset();
+
+        // Use WP's core CREATE TABLE query
+        $create_queries = wp_get_db_schema( 'ms_global' );
+
+        if ( ! is_array( $create_queries ) ) {
+                $create_queries = explode( ';', $create_queries );
+                $create_queries = array_filter( $create_queries );
+        }
+
+        // Filter out all the queries except wp_signups
+        foreach ( $create_queries as $key => $query ) {
+                if ( preg_match( "|CREATE TABLE ([^ ]*)|", $query, $matches ) ) {
+                        if ( $wpdb->signups != trim( $matches[1], '`' ) ) {
+                                unset( $create_queries[ $key ] );
+                        }
+                }
+        }
+
+        if ( ! empty( $create_queries ) ) {
+                dbDelta( $create_queries );
+        }
+}

trunk/bp-core/bp-core-update.php

@@ -366 +366 @@
         $wpdb->query( $sql );
 
+        /** Migrate signups data *********************************************/
+
+        if ( bp_get_signup_allowed() && ! is_multisite() ) {
+
+                if ( empty( $wpdb->signups ) ) {
+                        bp_core_install_signups();
+                }
+
+                $signups = get_users( array(
+                        'fields'       => 'all_with_meta',
+                        'meta_key'     => 'activation_key',
+                        'meta_compare' => 'EXISTS',
+                ) );
+
+                if ( empty( $signups ) ) {
+                        return;
+                }
+
+                foreach ( $signups as $signup ) {
+                        $meta = array();
+
+                        if ( bp_is_active( 'xprofile' ) ) {
+                                $meta['field_1'] = $signup->display_name;
+                        }
+
+                        $meta['password'] = $signup->user_pass;
+
+                        $user_login = preg_replace( '/\s+/', '', sanitize_user( $signup->user_login, true ) );
+                        $user_email = sanitize_email( $signup->user_email );
+
+                        $args = array(
+                                'user_login'     => $user_login,
+                                'user_email'     => $user_email,
+                                'registered'     => $signup->user_registered,
+                                'activation_key' => $signup->activation_key,
+                                'meta'           => $meta
+                        );
+
+                        BP_Signup::add( $args );
+
+                        // Deleting these options will remove signups from users count
+                        delete_user_option( $signup->ID, 'capabilities' );
+                        delete_user_option( $signup->ID, 'user_level' );
+                }
+        }
+
         /** Add BP options to the options table ******************************/
         bp_add_options();

trunk/bp-members/bp-members-admin.php

@@ -117 +117 @@
                 // BuddyPress edit user's profile url
                 $this->edit_profile_url = add_query_arg( 'page', 'bp-profile-edit', bp_get_admin_url( 'users.php' ) );
+
+                // Data specific to signups
+                $this->users_page   = '';
+                $this->signups_page = '';
+                $this->users_url    = bp_get_admin_url( 'users.php' );
+                $this->users_screen = bp_core_do_network_admin() ? 'users-network' : 'users';
         }
 
@@ -127 +133 @@
         private function setup_actions() {
 
-                /** Actions ***************************************************/
+                /** Community Profile ***************************************************/
 
                 // Add some page specific output to the <head>
@@ -141 +147 @@
                 add_action( 'edit_user_profile',        array( $this, 'profile_nav'     ),  99, 1 );
 
-
-                /** Filters ***************************************************/
-
                 // Add a row action to users listing
                 add_filter( bp_core_do_network_admin() ? 'ms_user_row_actions' : 'user_row_actions', array( $this, 'row_actions' ), 10, 2 );
 
-        }
-
-        /**
-         * Create the All Users > Edit Profile submenu.
+                /** Signups **************************************************************/
+
+                if ( bp_get_signup_allowed() ) {
+                        if ( ! is_multisite() && is_admin() ) {
+                                add_action( 'pre_user_query', array( $this, 'remove_signups_from_user_query'),  10, 1 );
+                        }
+
+                        // Reorganise the views navigation in users.php and signups page
+                        add_filter( "views_{$this->users_screen}", array( $this, 'signup_filter_view' ),    10, 1 );
+                        add_filter( 'set-screen-option',           array( $this, 'signup_screen_options' ), 10, 3 );
+                }
+        }
+
+        /**
+         * Create the All Users > Edit Profile and Signups submenus.
          *
          * @access public
@@ -160 +174 @@
 
                 // Manage user's profile
-                $hook = $this->user_page = add_users_page(
+                $hooks['user'] = $this->user_page = add_users_page(
                         __( 'Edit Profile',  'buddypress' ),
                         __( 'Edit Profile',  'buddypress' ),
@@ -168 +182 @@
                 );
 
+                $hooks['signups'] = $this->users_page = add_users_page(
+                        __( 'Manage Signups',  'buddypress' ),
+                        __( 'Manage Signups',  'buddypress' ),
+                        'bp_moderate',
+                        'bp-signups',
+                        array( &$this, 'signups_admin' )
+                );
+
                 $edit_page = 'user-edit';
+                $this->users_page = 'users';
 
                 if ( bp_core_do_network_admin() ) {
-                        $edit_page       .= '-network';
-                        $this->user_page .= '-network';
+                        $edit_page          .= '-network';
+                        $this->users_page   .= '-network';
+                        $this->user_page    .= '-network';
+                        $this->signups_page .= '-network';
                 }
 
                 $this->screen_id = array( $edit_page, $this->user_page );
 
-                add_action( "admin_head-$hook", array( $this, 'modify_admin_menu_highlight' ) );
-                add_action( "load-$hook",       array( $this, 'user_admin_load' ) );
-
-        }
+                foreach ( $hooks as $key => $hook ) {
+                        add_action( "admin_head-$hook", array( $this, 'modify_admin_menu_highlight' ) );
+                        add_action( "load-$hook",       array( $this, $key . '_admin_load' ) );
+                }
+
+        }
+
+        /**
+         * Highlight the Users menu if on Edit Profile or Signups pages.
+         *
+         * @access public
+         * @since BuddyPress (2.0.0)
+         */
+        public function modify_admin_menu_highlight() {
+                global $plugin_page, $submenu_file;
+
+                // Only Show the All users menu
+                if ( in_array( $plugin_page, array( 'bp-profile-edit', 'bp-signups' ) ) ) {
+                        $submenu_file = 'users.php';
+                }
+        }
+
+        /**
+         * Remove the Edit Profile & Signups submenu page.
+         *
+         * We add these pages in order to integrate with WP's Users panel, but
+         * we want them to show up as Views of the WP panel, not as separate
+         * subnav items under the Users menu.
+         *
+         * @access public
+         * @since BuddyPress (2.0.0)
+         */
+        public function admin_head() {
+                // Remove submenu to force using Profile Navigation
+                remove_submenu_page( 'users.php', 'bp-profile-edit' );
+
+                // Remove submenu to force using users views
+                remove_submenu_page( 'users.php', 'bp-signups' );
+        }
+
+        /** Community Profile ************************************************/
 
         /**
@@ -246 +308 @@
 
                 <?php
-        }
-
-        /**
-         * Highlight the Users menu if on Edit Profile pages.
-         *
-         * @access public
-         * @since BuddyPress (2.0.0)
-         */
-        public function modify_admin_menu_highlight() {
-                global $plugin_page, $submenu_file;
-
-                // Only Show the All users menu
-                if ( 'bp-profile-edit' ==  $plugin_page ) {
-                        $submenu_file = 'users.php';
-                }
-        }
-
-        /**
-         * Remove the Edit Profile submenu page.
-         *
-         * @access public
-         * @since BuddyPress (2.0.0)
-         */
-        public function admin_head() {
-                // Remove submenu to force using Profile Navigation
-                remove_submenu_page( 'users.php', 'bp-profile-edit' );
         }
 
@@ -691 +727 @@
                 return array_merge( $new_edit_actions, $actions );
         }
+
+        /** Signups Management ***********************************************/
+
+        /**
+         * Display the admin preferences about signups pagination.
+         *
+         * @access public
+         * @since BuddyPress (2.0.0)
+         *
+         * @param  int $value
+         * @param  string $option
+         * @param  int $new_value
+         * @return int the pagination preferences
+         */
+        public function signup_screen_options( $value = 0, $option = '', $new_value = 0 ) {
+                if ( 'users_page_bp_signups_network_per_page' != $option && 'users_page_bp_signups_per_page' != $option ) {
+                        return $value;
+                }
+
+                // Per page
+                $new_value = (int) $new_value;
+                if ( $new_value < 1 || $new_value > 999 ) {
+                        return $value;
+                }
+
+                return $new_value;
+        }
+
+        /**
+         * Make sure no signups will show in users list.
+         *
+         * This is needed to handle signups that may have not been activated
+         * before the 2.0.0 upgrade.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param  WP_User_Query $query The users query.
+         * @return WP_User_Query The users query without the signups.
+         */
+        public function remove_signups_from_user_query( $query = null ) {
+                global $wpdb;
+
+                // Bail if this is an ajax request
+                if ( defined( 'DOING_AJAX' ) )
+                        return;
+
+                if ( bp_is_update() ) {
+                        return;
+                }
+
+                if ( $this->users_page != get_current_screen()->id ) {
+                        return;
+                }
+
+                if ( ! empty( $query->query_vars['role'] ) ) {
+                        return;
+                }
+
+                $query->query_where .= " AND {$wpdb->users}.user_status != 2";
+        }
+
+        /**
+         * Filter the WP Users List Table views to include 'bp-signups'.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param  array $views WP List Table views.
+         * @return array The views with the signup view added.
+         */
+        public function signup_filter_view( $views = array() ) {
+                $class = '';
+
+                $signups = BP_Signup::count_signups();
+
+                // Remove the 'current' class from All if we're on the signups
+                // view
+                if ( $this->signups_page == get_current_screen()->id ) {
+                        $views['all'] = str_replace( 'class="current"', '', $views['all'] );
+                        $class = ' class="current"';
+                }
+
+                $views['registered'] = '<a href="' . add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) ) . '"' . $class . '>' . sprintf( _nx( 'Pending account <span class="count">(%s)</span>', 'Pending accounts <span class="count">(%s)</span>', $signups, 'signup users', 'buddypress' ), number_format_i18n( $signups ) ) . '</a>';
+
+                return $views;
+        }
+
+        /**
+         * Load the Signup WP Users List table.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param  string $class    The name of the class to use.
+         * @param  string $required The parent class.
+         * @return WP_List_Table    The List table.
+         */
+        public static function get_list_table_class( $class = '', $required = '' ) {
+                if ( empty( $class ) ) {
+                        return;
+                }
+
+                if ( ! empty( $required ) ) {
+                        require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+                        require_once( buddypress()->members->admin->admin_dir . 'bp-members-classes.php'    );
+                }
+
+                return new $class();
+        }
+
+        /**
+         * Set up the signups admin page.
+         *
+         * Loaded before the page is rendered, this function does all initial
+         * setup, including: processing form requests, registering contextual
+         * help, and setting up screen options.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @global $bp_members_signup_list_table
+         */
+        public function signups_admin_load() {
+                global $bp_members_signup_list_table;
+
+                // Build redirection URL
+                $redirect_to = remove_query_arg( array( 'action', 'error', 'updated', 'activated', 'notactivated', 'deleted', 'notdeleted', 'resent', 'notresent', 'do_delete', 'do_resend', 'do_activate', '_wpnonce', 'signup_ids' ), $_SERVER['REQUEST_URI'] );
+                $doaction = bp_admin_list_table_current_bulk_action();
+
+                // Call an action for plugins to hook in early
+                do_action( 'bp_signups_admin_load', $doaction, $_REQUEST );
+
+                // Allowed actions
+                $allowed_actions = apply_filters( 'bp_signups_admin_allowed_actions', array( 'do_delete', 'do_activate', 'do_resend' ) );
+
+                // Prepare the display of the Community Profile screen
+                if ( ! in_array( $doaction, $allowed_actions ) || -1 == $doaction ) {
+
+                        if ( bp_core_do_network_admin() ) {
+                                $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_MS_List_Table', 'ms-users' );
+                        } else {
+                                $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_List_Table', 'users' );
+                        }
+
+                        // per_page screen option
+                        add_screen_option( 'per_page', array( 'label' => _x( 'Pending Accounts', 'Pending Accounts per page (screen options)', 'buddypress' ) ) );
+
+                        get_current_screen()->add_help_tab( array(
+                                'id'      => 'bp-signups-overview',
+                                'title'   => __( 'Overview', 'buddypress' ),
+                                'content' =>
+                                '<p>' . __( 'This is the admininistration screen for pending accounts on your site.', 'buddypress' ) . '</p>' .
+                                '<p>' . __( 'From the screen options, you can customize the displayed columns and the pagination of this screen.', 'buddypress' ) . '</p>' .
+                                '<p>' . __( 'You can reorder the list of your pending accounts by clicking on the Username, E-mail or Registered column headers.', 'buddypress' ) . '</p>' .
+                                '<p>' . __( 'Using the search form, you can find pending accounts more easily. The Username and E-mail fields will be included in the search.', 'buddypress' ) . '</p>'
+                        ) );
+
+                        get_current_screen()->add_help_tab( array(
+                                'id'      => 'bp-signups-actions',
+                                'title'   => __( 'Actions', 'buddypress' ),
+                                'content' =>
+                                '<p>' . __( 'Hovering over a row in the pending accounts list will display action links that allow you to manage pending accounts. You can perform the following actions:', 'buddypress' ) . '</p>' .
+                                '<ul><li>' . __( '"Email" takes you to the confirmation screen before being able to send the activation link to the desired pending account. You can only send the activation email once per day.', 'buddypress' ) . '</li>' .
+                                '<li>' . __( '"Delete" allows you to delete a pending account from your site. You will be asked to confirm this deletion.', 'buddypress' ) . '</li></ul>' .
+                                '<p>' . __( 'By clicking on a Username you will be able to activate a pending account from the confirmation screen.', 'buddypress' ) . '</p>' .
+                                '<p>' . __( 'Bulk actions allow you to perform these 3 actions for the selected rows.', 'buddypress' ) . '</p>'
+                        ) );
+
+                        // Help panel - sidebar links
+                        get_current_screen()->set_help_sidebar(
+                                '<p><strong>' . __( 'For more information:', 'buddypress' ) . '</strong></p>' .
+                                '<p>' . __( '<a href="http://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
+                        );
+                } else {
+                        if ( ! empty( $_REQUEST['signup_ids' ] ) ) {
+                                $signups = wp_parse_id_list( $_REQUEST['signup_ids' ] );
+                        }
+
+                        // Handle resent activation links
+                        if ( 'do_resend' == $doaction ) {
+                                // nonce check
+                                check_admin_referer( 'signups_resend' );
+
+                                $resent = BP_Signup::resend( $signups );
+
+                                if ( empty( $resent ) ) {
+                                        $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
+                                } else {
+                                        $query_arg = array( 'updated' => 'resent' );
+
+                                        if ( ! empty( $resent['resent'] ) ) {
+                                                $query_arg['resent'] = count( $resent['resent'] );
+                                        }
+
+                                        if ( ! empty( $resent['errors'] ) ) {
+                                                $query_arg['notsent'] = count( $resent['errors'] );
+                                                set_transient( '_bp_admin_signups_errors', $resent['errors'], 30 );
+                                        }
+
+                                        $redirect_to = add_query_arg( $query_arg, $redirect_to );
+                                }
+
+                                bp_core_redirect( $redirect_to );
+
+                        // Handle activated accounts
+                        } else if ( 'do_activate' == $doaction ) {
+                                // nonce check
+                                check_admin_referer( 'signups_activate' );
+
+                                $activated = BP_Signup::activate( $signups );
+
+                                if ( empty( $activated ) ) {
+                                        $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
+                                } else {
+                                        $query_arg = array( 'updated' => 'activated' );
+
+                                        if ( ! empty( $activated['activated'] ) ) {
+                                                $query_arg['activated'] = count( $activated['activated'] );
+                                        }
+
+                                        if ( ! empty( $activated['errors'] ) ) {
+                                                $query_arg['notactivated'] = count( $activated['errors'] );
+                                                set_transient( '_bp_admin_signups_errors', $activated['errors'], 30 );
+                                        }
+
+                                        $redirect_to = add_query_arg( $query_arg, $redirect_to );
+                                }
+
+                                bp_core_redirect( $redirect_to );
+
+                        // Handle sign-ups delete
+                        } else if ( 'do_delete' == $doaction ) {
+                                // nonce check
+                                check_admin_referer( 'signups_delete' );
+
+                                $deleted = BP_Signup::delete( $signups );
+
+                                if ( empty( $deleted ) ) {
+                                        $redirect_to = add_query_arg( 'error', $doaction, $redirect_to );
+                                } else {
+                                        $query_arg = array( 'updated' => 'deleted' );
+
+                                        if ( ! empty( $deleted['deleted'] ) ) {
+                                                $query_arg['deleted'] = count( $deleted['deleted'] );
+                                        }
+
+                                        if ( ! empty( $deleted['errors'] ) ) {
+                                                $query_arg['notdeleted'] = count( $deleted['errors'] );
+                                                set_transient( '_bp_admin_signups_errors', $deleted['errors'], 30 );
+                                        }
+
+                                        $redirect_to = add_query_arg( $query_arg, $redirect_to );
+                                }
+
+                                bp_core_redirect( $redirect_to );
+
+                        // Plugins can update other stuff from here
+                        } else {
+                                $this->redirect = $redirect_to;
+
+                                do_action( 'bp_members_admin_update_signups', $doaction, $_REQUEST, $this->redirect );
+
+                                bp_core_redirect( $this->redirect );
+                        }
+                }
+        }
+
+        /**
+         * Display any activation errors.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        public function signups_display_errors() {
+                // Bail if no activation errors
+                if ( ! $errors = get_transient( '_bp_admin_signups_errors' ) ) {
+                        return;
+                }
+
+                foreach ( $errors as $error ) {
+                        ?>
+                        <li><?php echo esc_html( $error[0] );?>: <?php echo esc_html( $error[1] );?></li>
+                        <?php
+                }
+
+                // Delete the redirect transient
+                delete_transient( '_bp_admin_signups_errors' );
+        }
+
+        /**
+         * Signups admin page router.
+         *
+         * Depending on the context, display
+         * - the list of signups
+         * - or the delete confirmation screen
+         * - or the activate confirmation screen
+         * - or the "resend" email confirmation screen
+         *
+         * Also prepare the admin notices.
+         *
+         * @since BuddyPress (2.0.0)
+         */
+        public function signups_admin() {
+                $doaction = bp_admin_list_table_current_bulk_action();
+
+                // Prepare notices for admin
+                $notice = array();
+
+                if ( ! empty( $_REQUEST['updated'] ) ) {
+                        switch ( $_REQUEST['updated'] ) {
+                                case 'resent':
+                                        $notice = array(
+                                                'class'   => 'updated',
+                                                'message' => ''
+                                        );
+
+                                        if ( ! empty( $_REQUEST['resent'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s activation email successfully sent! ', '%s activation emails successfully sent! ',
+                                                         absint( $_REQUEST['resent'] ),
+                                                         'signup resent',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['resent'] ) )
+                                                );
+                                        }
+
+                                        if ( ! empty( $_REQUEST['notsent'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s activation email was not sent.', '%s activation emails were not sent.',
+                                                         absint( $_REQUEST['notsent'] ),
+                                                         'signup notsent',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['notsent'] ) )
+                                                );
+
+                                                if ( empty( $_REQUEST['resent'] ) ) {
+                                                        $notice['class'] = 'error';
+                                                }
+                                        }
+
+                                        break;
+
+                                case 'activated':
+                                        $notice = array(
+                                                'class'   => 'updated',
+                                                'message' => ''
+                                        );
+
+                                        if ( ! empty( $_REQUEST['activated'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s account successfully activated! ', '%s accounts successfully activated! ',
+                                                         absint( $_REQUEST['activated'] ),
+                                                         'signup resent',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['activated'] ) )
+                                                );
+                                        }
+
+                                        if ( ! empty( $_REQUEST['notactivated'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s account was not activated.', '%s accounts were not activated.',
+                                                         absint( $_REQUEST['notactivated'] ),
+                                                         'signup notsent',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['notactivated'] ) )
+                                                );
+
+                                                if ( empty( $_REQUEST['activated'] ) ) {
+                                                        $notice['class'] = 'error';
+                                                }
+                                        }
+
+                                        break;
+
+                                case 'deleted':
+                                        $notice = array(
+                                                'class'   => 'updated',
+                                                'message' => ''
+                                        );
+
+                                        if ( ! empty( $_REQUEST['deleted'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s sign-up successfully deleted!', '%s sign-ups successfully deleted!',
+                                                         absint( $_REQUEST['deleted'] ),
+                                                         'signup deleted',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['deleted'] ) )
+                                                );
+                                        }
+
+                                        if ( ! empty( $_REQUEST['notdeleted'] ) ) {
+                                                $notice['message'] .= sprintf(
+                                                        _nx( '%s sign-up was not deleted.', '%s sign-ups were not deleted.',
+                                                         absint( $_REQUEST['notdeleted'] ),
+                                                         'signup notdeleted',
+                                                         'buddypress'
+                                                        ),
+                                                        number_format_i18n( absint( $_REQUEST['notdeleted'] ) )
+                                                );
+
+                                                if ( empty( $_REQUEST['deleted'] ) ) {
+                                                        $notice['class'] = 'error';
+                                                }
+                                        }
+
+                                        break;
+                        }
+                }
+
+                // Process error messages
+                if ( ! empty( $_REQUEST['error'] ) ) {
+                        switch ( $_REQUEST['error'] ) {
+                                case 'do_resend':
+                                        $notice = array(
+                                                'class'   => 'error',
+                                                'message' => esc_html__( 'There was a problem sending the activation emails, please try again.', 'buddypress' ),
+                                        );
+                                        break;
+
+                                case 'do_activate':
+                                        $notice = array(
+                                                'class'   => 'error',
+                                                'message' => esc_html__( 'There was a problem activating accounts, please try again.', 'buddypress' ),
+                                        );
+                                        break;
+
+                                case 'do_delete':
+                                        $notice = array(
+                                                'class'   => 'error',
+                                                'message' => esc_html__( 'There was a problem deleting sign-ups, please try again.', 'buddypress' ),
+                                        );
+                                        break;
+                        }
+                }
+
+                // Display notices
+                if ( ! empty( $notice ) ) :
+                        if ( 'updated' === $notice['class'] ) : ?>
+                                <div id="message" class="<?php echo esc_attr( $notice['class'] ); ?>">
+                        <?php else: ?>
+                                <div class="<?php echo esc_attr( $notice['class'] ); ?>">
+                        <?php endif; ?>
+                                <p><?php echo $notice['message']; ?></p>
+                                <?php if ( ! empty( $_REQUEST['notactivated'] ) || ! empty( $_REQUEST['notdeleted'] ) || ! empty( $_REQUEST['notsent'] ) ) :?>
+                                        <ul><?php $this->signups_display_errors();?></ul>
+                                <?php endif ;?>
+                        </div>
+                <?php endif;
+
+                // Show the proper screen
+                switch ( $doaction ) {
+                        case 'activate' :
+                        case 'delete' :
+                        case 'resend' :
+                                $this->signups_admin_manage( $doaction );
+                                break;
+
+                        default:
+                                $this->signups_admin_index();
+                                break;
+
+                }
+        }
+
+        /**
+         * This is the list of the Pending accounts (signups).
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @global $plugin_page
+         * @global $bp_members_signup_list_table
+         */
+        public function signups_admin_index() {
+                global $plugin_page, $bp_members_signup_list_table;
+
+                $usersearch = ! empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
+
+                // Prepare the group items for display
+                $bp_members_signup_list_table->prepare_items();
+
+                $form_url = add_query_arg(
+                        array(
+                                'page' => 'bp-signups',
+                        ),
+                        bp_get_admin_url( 'users.php' )
+                );
+
+                $search_form_url = remove_query_arg(
+                        array(
+                                'action',
+                                'deleted',
+                                'notdeleted',
+                                'error',
+                                'updated',
+                                'delete',
+                                'activate',
+                                'activated',
+                                'notactivated',
+                                'resend',
+                                'resent',
+                                'notresent',
+                                'do_delete',
+                                'do_activate',
+                                'do_resend',
+                                'action2',
+                                '_wpnonce',
+                                'signup_ids'
+                        ), $_SERVER['REQUEST_URI']
+                );
+
+                ?>
+
+                <div class="wrap">
+                        <?php screen_icon( 'users' ); ?>
+                        <h2>
+                                <?php
+                                _e( 'Users', 'buddypress' );
+                                if ( current_user_can( 'create_users' ) ) { ?>
+                                        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+                                <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
+                                        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+                                <?php }
+
+                                if ( $usersearch ) {
+                                        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) );
+                                }
+
+                                ?>
+                        </h2>
+
+                        <?php // Display each signups on its own row ?>
+                        <?php $bp_members_signup_list_table->views(); ?>
+
+                        <form id="bp-signups-search-form" action="<?php echo esc_url( $search_form_url ) ;?>">
+                                <input type="hidden" name="page" value="<?php echo esc_attr( $plugin_page ); ?>" />
+                                <?php $bp_members_signup_list_table->search_box( __( 'Search Pending accounts', 'buddypress' ), 'bp-signups' ); ?>
+                        </form>
+
+                        <form id="bp-signups-form" action="<?php echo esc_url( $form_url );?>" method="post">
+                                <?php $bp_members_signup_list_table->display(); ?>
+                        </form>
+                </div>
+        <?php
+        }
+
+        /**
+         * This is the confirmation screen for actions.
+         *
+         * @since BuddyPress (2.0.0)
+         *
+         * @param string $action Delete, activate, or resend activation link.
+         */
+        public function signups_admin_manage( $action = '' ) {
+                if ( ! is_super_admin() || empty( $action ) ) {
+                        die( '-1' );
+                }
+
+                // Get the user IDs from the URL
+                $ids = false;
+                if ( ! empty( $_POST['allsignups'] ) ) {
+                        $ids = wp_parse_id_list( $_POST['allsignups'] );
+                } else if ( ! empty( $_GET['signup_id'] ) ) {
+                        $ids = absint( $_GET['signup_id'] );
+                }
+
+                if ( empty( $ids ) ) {
+                        return false;
+                }
+
+                // Query for signups, and filter out those IDs that don't
+                // correspond to an actual signup
+                $signups_query = BP_Signup::get( array(
+                        'include' => $ids,
+                ) );
+
+                $signups    = $signups_query['signups'];
+                $signup_ids = wp_list_pluck( $signups, 'signup_id' );
+
+                // Set up strings
+                switch ( $action ) {
+                        case 'delete' :
+                                $header_text = __( 'Delete Pending Accounts', 'buddypress' );
+                                $helper_text = _n( 'You are about to delete the following account:', 'You are about to delete the following accounts:', count( $signup_ids ), 'buddypress' );
+                                break;
+
+                        case 'activate' :
+                                $header_text = __( 'Activate Pending Accounts', 'buddypress' );
+                                $helper_text = _n( 'You are about to activate the following account:', 'You are about to activate the following accounts:', count( $signup_ids ), 'buddypress' );
+                                break;
+
+                        case 'resend' :
+                                $header_text = __( 'Resend Activation Emails', 'buddypress' );
+                                $helper_text = _n( 'You are about to resend an activation email to the following account:', 'You are about to resend activation emails to the following accounts:', count( $signup_ids ), 'buddypress' );
+                                break;
+                }
+
+                // These arguments are added to all URLs
+                $url_args = array( 'page' => 'bp-signups' );
+
+                // These arguments are only added when performing an action
+                $action_args = array(
+                        'action'     => 'do_' . $action,
+                        'signup_ids' => implode( ',', $signup_ids )
+                );
+
+                $cancel_url = add_query_arg( $url_args, bp_get_admin_url( 'users.php' ) );
+                $action_url = wp_nonce_url(
+                        add_query_arg(
+                                array_merge( $url_args, $action_args ),
+                                bp_get_admin_url( 'users.php' )
+                        ),
+                        'signups_' . $action
+                );
+
+                ?>
+
+                <div class="wrap">
+                        <?php screen_icon( 'users' ); ?>
+                        <h2><?php echo esc_html( $header_text ); ?></h2>
+                        <p><?php echo esc_html( $helper_text ); ?></p>
+
+                        <ol class="bp-signups-list">
+                        <?php foreach ( $signups as $signup ) :
+                                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent )
+                        ?>
+
+                                <li>
+                                        <?php echo esc_html( $signup->user_name ) ?> - <?php echo sanitize_email( $signup->user_email );?>
+
+                                        <?php if ( 'resend' == $action ) : ?>
+                                                <p class="description">
+                                                        <?php printf( esc_html__( 'Last notified: %s', 'buddypress'), $last_notified ) ;?>
+
+                                                        <?php if ( ! empty( $signup->recently_sent ) ) : ?>
+                                                                <span class="attention wp-ui-text-notification"> <?php esc_html_e( '(less than 24 hours ago)', 'buddypress' ); ?></span>
+                                                        <?php endif; ?>
+                                                </p>
+
+                                        <?php endif; ?>
+                                </li>
+
+                        <?php endforeach; ?>
+                        </ol>
+
+                        <?php if ( 'resend' != $action ) : ?>
+                                <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
+                        <?php endif ; ?>
+
+                        <a class="button-primary" href="<?php echo esc_url( $action_url ); ?>"><?php esc_html_e( 'Confirm', 'buddypress' ); ?></a>
+                        <a class="button" href="<?php echo esc_url( $cancel_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ) ?></a>
+                </div>
+
+                <?php
+        }
 }
 endif; // class_exists check
 
 // Load the BP Members admin
-add_action( 'bp_init', array( 'BP_Members_Admin','register_members_admin' ) );
+add_action( 'bp_init', array( 'BP_Members_Admin', 'register_members_admin' ) );

trunk/bp-members/bp-members-functions.php

@@ -1362 +1362 @@
                 }
 
+                // Check into signups
+                $signups = BP_Signup::get( array(
+                        'user_login' => $user_name,
+                ) );
+
+                $signup = isset( $signups['signups'] ) && ! empty( $signups['signups'][0] ) ? $signups['signups'][0] : false;
+
                 // Check if the username has been used already.
-                if ( username_exists( $user_name ) ) {
+                if ( username_exists( $user_name ) || ! empty( $signup ) ) {
                         $errors->add( 'user_name', __( 'Sorry, that username already exists!', 'buddypress' ) );
                 }
@@ -1394 +1401 @@
 
 function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
-        global $bp, $wpdb;
+        global $bp;
+
+        // We need to cast $user_id to pass to the filters
+        $user_id = false;
 
         // Multisite installs have their own install procedure
@@ -1400 +1410 @@
                 wpmu_signup_user( $user_login, $user_email, $usermeta );
 
-                // On multisite, the user id is not created until the user activates the account
-                // but we need to cast $user_id to pass to the filters
-                $user_id = false;
-
         } 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 ( is_wp_error( $user_id ) || empty( $user_id ) ) {
-                        $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), bp_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 ( bp_is_active( 'xprofile' ) ) {
-                        if ( !empty( $usermeta['profile_field_ids'] ) ) {
-                                $profile_field_ids = explode( ',', $usermeta['profile_field_ids'] );
-
-                                foreach( (array) $profile_field_ids as $field_id ) {
-                                        if ( empty( $usermeta["field_{$field_id}"] ) )
-                                                continue;
-
-                                        $current_field = $usermeta["field_{$field_id}"];
-                                        xprofile_set_field_data( $field_id, $user_id, $current_field );
-
-                                        // Save the visibility level
-                                        $visibility_level = !empty( $usermeta['field_' . $field_id . '_visibility'] ) ? $usermeta['field_' . $field_id . '_visibility'] : 'public';
-                                        xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
-                                }
+                // Format data
+                $user_login     = preg_replace( '/\s+/', '', sanitize_user( $user_login, true ) );
+                $user_email     = sanitize_email( $user_email );
+                $activation_key = substr( md5( time() . rand() . $user_email ), 0, 16 );
+
+                /**
+                 * WordPress's default behavior is to create user accounts
+                 * immediately at registration time. BuddyPress uses a system
+                 * borrowed from WordPress Multisite, where signups are stored
+                 * separately and accounts are only created at the time of
+                 * activation. For backward compatibility with plugins that may
+                 * be anticipating WP's default behavior, BP silently creates
+                 * accounts for registrations (though it does not use them). If
+                 * you know that you are not running any plugins dependent on
+                 * these pending accounts, you may want to save a little DB
+                 * clutter by defining setting the BP_SIGNUPS_SKIP_USER_CREATION
+                 * to true in your wp-config.php file.
+                 */
+                if ( ! defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) || ! BP_SIGNUPS_SKIP_USER_CREATION ) {
+                        $user_id = BP_Signup::add_backcompat( $user_login, $user_password, $user_email, $usermeta );
+
+                        if ( is_wp_error( $user_id ) ) {
+                                return $user_id;
                         }
-                }
-        }
-        $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.
-         *
-         * To disable sending activation emails you can user the filter
-         * 'bp_core_signup_send_activation_key' and return false. Note that this will only disable
-         * the email - a key will still be generated, and the account must still be activated
-         * before use.
-         */
-        if ( !is_multisite() ) {
-                $activation_key = wp_hash( $user_id );
-                update_user_meta( $user_id, 'activation_key', $activation_key );
+
+                        $activation_key = wp_hash( $user_id );
+                        update_user_meta( $user_id, 'activation_key', $activation_key );
+                }
+
+                $args = array(
+                        'user_login'     => $user_login,
+                        'user_email'     => $user_email,
+                        'activation_key' => $activation_key,
+                        'meta'           => $usermeta,
+                );
+
+                BP_Signup::add( $args );
 
                 if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
@@ -1461 +1453 @@
                 }
         }
+
+        $bp->signup->username = $user_login;
 
         do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
@@ -1484 +1478 @@
 
                 // If there were errors, add a message and redirect
-                if ( !empty( $user->errors ) ) {
+                if ( ! empty( $user->errors ) ) {
                         return $user;
                 }
@@ -1490 +1484 @@
                 $user_id = $user['user_id'];
 
-                // Set any profile data
-                if ( bp_is_active( 'xprofile' ) ) {
-                        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 = isset( $user['meta']["field_{$field_id}"] ) ? $user['meta']["field_{$field_id}"] : false;
-
-                                        if ( !empty( $current_field ) )
-                                                xprofile_set_field_data( $field_id, $user_id, $current_field );
-
-                                        // Save the visibility level
-                                        $visibility_level = !empty( $user['meta']['field_' . $field_id . '_visibility'] ) ? $user['meta']['field_' . $field_id . '_visibility'] : 'public';
-                                        xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
-                                }
+        } else {
+                $signups = BP_Signup::get( array(
+                        'activation_key' => $key,
+                ) );
+
+                if ( empty( $signups['signups'] ) ) {
+                        return new WP_Error( 'invalid_key', __( 'Invalid activation key.', 'buddypress' ) );
+                }
+
+                $signup = $signups['signups'][0];
+
+                if ( $signup->active ) {
+                        if ( empty( $signup->domain ) ) {
+                                return new WP_Error( 'already_active', __( 'The user is already active.', 'buddypress' ), $signup );
+                        } else {
+                                return new WP_Error( 'already_active', __( 'The site is already active.', 'buddypress' ), $signup );
                         }
                 }
-        } else {
-
-                // Get the user_id based on the $key
-                $user_id = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM {$wpdb->usermeta} WHERE meta_key = 'activation_key' AND 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' ) );
+
+                // password is hashed again in wp_insert_user
+                $password = wp_generate_password( 12, false );
+
+                $user_id = username_exists( $signup->user_login );
+
+                // Create the user
+                if ( ! $user_id ) {
+                        $user_id = wp_create_user( $signup->user_login, $password, $signup->user_email );
+
+                // If a user ID is found, this may be a legacy signup, or one
+                // created locally for backward compatibility. Process it.
+                } else if ( $key == wp_hash( $user_id ) ) {
+                        // 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' ) );
+                        }
+
+                        bp_delete_user_meta( $user_id, 'activation_key' );
+
+                        $member = get_userdata( $user_id );
+                        $member->set_role( get_option('default_role') );
+
+                        $user_already_created = true;
+
+                } else {
+                        $user_already_exists = true;
+                }
+
+                if ( ! $user_id ) {
+                        return new WP_Error( 'create_user', __( 'Could not create user', 'buddypress' ), $signup );
+                }
+
+                // Fetch the signup so we have the data later on
+                $signups = BP_Signup::get( array(
+                        'activation_key' => $key,
+                ) );
+
+                $signup = isset( $signups['signups'] ) && ! empty( $signups['signups'][0] ) ? $signups['signups'][0] : false;
+
+                // Activate the signup
+                BP_Signup::validate( $key );
+
+                if ( isset( $user_already_exists ) ) {
+                        return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup );
+                }
+
+                // Set up data to pass to the legacy filter
+                $user = array(
+                        'user_id'  => $user_id,
+                        'password' => $signup->meta['password'],
+                        'meta'     => $signup->meta,
+                );
 
                 // Notify the site admin of a new user registration
                 wp_new_user_notification( $user_id );
 
-                // Remove the activation key meta
-                delete_user_meta( $user_id, 'activation_key' );
+                if ( isset( $user_already_created ) ) {
+                        do_action( 'bp_core_activated_user', $user_id, $key, $user );
+                        return $user_id;
+                }
+        }
+
+        // Set any profile data
+        if ( bp_is_active( 'xprofile' ) ) {
+                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 = isset( $user['meta']["field_{$field_id}"] ) ? $user['meta']["field_{$field_id}"] : false;
+
+                                if ( !empty( $current_field ) )
+                                        xprofile_set_field_data( $field_id, $user_id, $current_field );
+
+                                // Save the visibility level
+                                $visibility_level = ! empty( $user['meta']['field_' . $field_id . '_visibility'] ) ? $user['meta']['field_' . $field_id . '_visibility'] : 'public';
+                                xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
+                        }
+                }
         }
 
         // Update the display_name
-        wp_update_user( array( 'ID' => $user_id, 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
+        wp_update_user( array(
+                'ID'           => $user_id,
+                'display_name' => bp_core_get_user_displayname( $user_id ),
+        ) );
 
         // Set the password on multisite installs
-        if ( is_multisite() && !empty( $user['meta']['password'] ) )
+        if ( ! empty( $user['meta']['password'] ) ) {
                 $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
+        }
 
         do_action( 'bp_core_activated_user', $user_id, $key, $user );

trunk/bp-members/bp-members-loader.php

@@ -38 +38 @@
                 $includes = array(
                         'actions',
+                        'classes',
                         'filters',
                         'screens',
@@ -69 +70 @@
                         define( 'BP_MEMBERS_SLUG', $this->id );
 
-                parent::setup_globals( array(
+                $members_globals = array(
                         'slug'          => BP_MEMBERS_SLUG,
                         'root_slug'     => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
@@ -78 +79 @@
                         ),
                         'search_string' => __( 'Search Members...', 'buddypress' ),
-                ) );
+                );
+
+                if ( bp_get_signup_allowed() ) {
+                        $members_globals['global_tables']['table_name_signups'] = bp_core_get_table_prefix() . 'signups';
+                }
+
+                parent::setup_globals( $members_globals );
 
                 /** Logged in user ****************************************************/

trunk/bp-members/bp-members-screens.php

@@ -252 +252 @@
                 }
 
-                // Check for an uploaded avatar and move that to the correct user folder
-                if ( is_multisite() )
-                        $hashed_key = wp_hash( $_GET['key'] );
-                else
-                        $hashed_key = wp_hash( $user );
+                $hashed_key = wp_hash( $_GET['key'] );
 
                 // Check if the avatar folder exists. If it does, move rename it, move

trunk/tests/includes/factory.php

@@ -11 +11 @@
                 $this->xprofile_field = new BP_UnitTest_Factory_For_XProfileField( $this );
                 $this->notification = new BP_UnitTest_Factory_For_Notification( $this );
+                $this->signup = new BP_UnitTest_Factory_For_Signup( $this );
         }
 }
@@ -164 +165 @@
         }
 }
+
+class BP_UnitTest_Factory_For_Signup extends WP_UnitTest_Factory_For_Thing {
+        public function __construct( $factory = null ) {
+                parent::__construct( $factory );
+        }
+
+        public function create_object( $args ) {
+                return BP_Signup::add( $args );
+        }
+
+        public function update_object( $id, $fields ) {}
+
+        public function get_object_by_id( $id ) {
+                return new BP_Signup( $id );
+        }
+}

trunk/tests/includes/install.php

@@ -31 +31 @@
 tests_add_filter( 'bp_new_install_default_components', 'wp_test_bp_install' );
 
+tests_add_filter( 'bp_get_signup_allowed', '__return_true' );
+
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;