' . __( 'This is the admininistration screen for pending accounts on your site.', 'buddypress' ) . '
' .
+ '' . __( 'From the screen options, you can customize the displayed columns and the pagination of this screen.', 'buddypress' ) . '
' .
+ '' . __( 'You can reorder the list of your pending accounts by clicking on the Username, E-mail or Registered column headers.', 'buddypress' ) . '
' .
+ '' . __( 'Using the search form, you can find pending accounts more easily. The Username and E-mail fields will included in the search.', 'buddypress' ) . '
'
+ ) );
+
+ get_current_screen()->add_help_tab( array(
+ 'id' => 'bp-signups-actions',
+ 'title' => __( 'Actions', 'buddypress' ),
+ 'content' =>
+ '' . __( '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' ) . '
' .
+ '' . __( 'By clicking on a Username you will be able to activate a pending account from the confirmation screen.', 'buddypress' ) . '
' .
+ '' . __( 'Bulk actions allow you to perform these 3 actions for the selected rows.', 'buddypress' ) . '
'
+ ) );
+
+ // Help panel - sidebar links
+ get_current_screen()->set_help_sidebar(
+ '
+
+
+
+
+
+
signups_display_errors();?>
+
+
+ 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']
+ );
+
+ ?>
+
+
+
+
+
+
+
+
+ ' . __('Search results for “%s”') . '', esc_html( $usersearch ) );
+ }
+
+ ?>
+
+
+
+ views(); ?>
+
+
+
+
+
+ $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
+ );
+
+ ?>
+
+
+
+
+
+
+
+ date_sent )
+ ?>
+
+ -
+ user_name ) ?> - user_email );?>
+
+
+
+
+
+ recently_sent ) ) : ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id = $signup_id;
+ $this->populate();
+ }
+ }
+
+ /**
+ * Populate the instantiated class with data based on the signup_id provided.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+ public function populate() {
+ global $wpdb;
+
+ $signups_table = buddypress()->members->table_name_signups;
+
+ $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$signups_table} WHERE signup_id = %d AND active = 0", $this->id ) );
+
+ $this->avatar = get_avatar( $signup->user_email, 32 );
+ $this->user_login = $signup->user_login;
+ $this->user_email = $signup->user_email;
+ $this->meta = maybe_unserialize( $signup->meta );
+ $this->user_name = ! empty( $meta['field_1'] ) ? wp_unslash( $meta['field_1'] ) : '';
+ $this->registered = $signup->registered;
+ $this->activation_key = $signup->activation_key;
+ }
+
+ /** Static Methods *******************************************************/
+
+ /**
+ * Fetch signups based on parameters.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $args the argument to retrieve desired signups
+ * @return array {
+ * @type array $signups Located signups.
+ * @type int $total Total number of signups matching params.
+ * }
+ */
+ public static function get( $args = array() ) {
+ global $wpdb;
+
+ $r = bp_parse_args( $args,
+ array(
+ 'offset' => 0,
+ 'number' => 1,
+ 'usersearch' => false,
+ 'orderby' => 'signup_id',
+ 'order' => 'DESC',
+ 'include' => false,
+ 'activation_key' => '',
+ 'user_login' => '',
+ ),
+ 'bp_core_signups_get_args'
+ );
+
+ // @todo whitelist sanitization
+ if ( $r['orderby'] != 'signup_id' ) {
+ $r['orderby'] = 'user_' . $r['orderby'];
+ }
+
+ $r['orderby'] = sanitize_title( $r['orderby'] );
+
+ $sql = array();
+ $signups_table = buddypress()->members->table_name_signups;
+ $sql['select'] = "SELECT * FROM {$signups_table}";
+ $sql['where'] = array();
+ $sql['where'][] = "active = 0";
+
+ if ( empty( $r['include'] ) ) {
+ // Search terms
+ if ( ! empty( $r['usersearch'] ) ) {
+ $search_terms_clean = mysql_real_escape_string( mysql_real_escape_string( $r['usersearch'] ) );
+ $search_terms_clean = like_escape( $search_terms_clean );
+ $sql['where'][] = "( user_login LIKE '%" . $search_terms_clean . "%' OR user_email LIKE '%" . $search_terms_clean . "%' OR meta LIKE '%" . $search_terms_clean . "%' )";
+ }
+
+ // Activation key
+ if ( ! empty( $r['activation_key'] ) ) {
+ $sql['where'][] = $wpdb->prepare( "activation_key = %s", $r['activation_key'] );
+ }
+
+ // User login
+ if ( ! empty( $r['user_login'] ) ) {
+ $sql['where'][] = $wpdb->prepare( "user_login = %s", $r['user_login'] );
+ }
+
+ $sql['orderby'] = "ORDER BY {$r['orderby']}";
+ $sql['order'] = bp_esc_sql_order( $r['order'] );
+ $sql['limit'] = $wpdb->prepare( "LIMIT %d, %d", $r['offset'], $r['number'] );
+ } else {
+ $in = implode( ',', wp_parse_id_list( $r['include'] ) );
+ $sql['in'] = "AND signup_id IN ({$in})";
+ }
+
+ // Implode WHERE clauses
+ $sql['where'] = 'WHERE ' . implode( ' AND ', $sql['where'] );
+
+ $paged_signups = $wpdb->get_results( apply_filters( 'bp_members_signups_paged_query', join( ' ', $sql ), $sql, $args, $r ) );
+
+ if ( empty( $paged_signups ) ) {
+ return array( 'signups' => false, 'total' => false );
+ }
+
+ // Used to calculate a diff between now & last
+ // time an activation link has been resent
+ $now = current_time( 'timestamp', true );
+
+ foreach ( (array) $paged_signups as $key => $signup ) {
+
+ $signup->id = intval( $signup->signup_id );
+
+ $signup->meta = ! empty( $signup->meta ) ? maybe_unserialize( $signup->meta ) : false;
+
+ $signup->user_name = '';
+ if ( ! empty( $signup->meta['field_1'] ) ) {
+ $signup->user_name = wp_unslash( $signup->meta['field_1'] );
+ }
+
+ // Sent date defaults to date of registration
+ if ( ! empty( $signup->meta['sent_date'] ) ) {
+ $signup->date_sent = $signup->meta['sent_date'];
+ } else {
+ $signup->date_sent = $signup->registered;
+ }
+
+ $sent_at = mysql2date('U', $signup->date_sent );
+ $diff = $now - $sent_at;
+
+ /**
+ * add a boolean in case the last time an activation link
+ * has been sent happened less than a day ago
+ */
+ if ( $diff < 1 * DAY_IN_SECONDS ) {
+ $signup->recently_sent = true;
+ }
+
+ if ( ! empty( $signup->meta['count_sent'] ) ) {
+ $signup->count_sent = absint( $signup->meta['count_sent'] );
+ } else {
+ $signup->count_sent = 1;
+ }
+
+ $paged_signups[ $key ] = $signup;
+ }
+
+ unset( $sql['limit'] );
+ $sql['select'] = preg_replace( "/SELECT.*?FROM/", "SELECT COUNT(*) FROM", $sql['select'] );
+ $total_signups = $wpdb->get_var( apply_filters( 'bp_members_signups_count_query', join( ' ', $sql ), $sql, $args, $r ) );
+
+ return array( 'signups' => $paged_signups, 'total' => $total_signups );
+ }
+
+ /**
+ * Add a signup.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $args
+ * @return int|bool ID of newly created signup on success, false on
+ * failure.
+ */
+ public static function add( $args = array() ) {
+ global $wpdb;
+
+ $r = bp_parse_args( $args,
+ array(
+ 'domain' => '',
+ 'path' => '',
+ 'title' => '',
+ 'user_login' => '',
+ 'user_email' => '',
+ 'registered' => current_time( 'mysql', true ),
+ 'activation_key' => '',
+ 'meta' => '',
+ ),
+ 'bp_core_signups_add_args'
+ );
+
+ $r['meta'] = maybe_serialize( $r['meta'] );
+
+ $inserted = $wpdb->insert(
+ buddypress()->members->table_name_signups,
+ $r,
+ array( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )
+ );
+
+ if ( $inserted ) {
+ $retval = $wpdb->insert_id;
+ } else {
+ $retval = false;
+ }
+
+ return apply_filters( 'bp_core_signups_add', $retval );
+ }
+
+ /**
+ * Create a WP user at signup.
+ *
+ * Since BP 2.0, non-multisite configurations have stored signups in
+ * the same way as Multisite configs traditionally have: in the
+ * wp_signups table. However, because some plugins may be looking
+ * directly in the wp_users table for non-activated signups, we
+ * mirror signups there by creating "phantom" users, mimicking WP's
+ * default behavior.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param string $user_login User login string.
+ * @param string $user_password User password.
+ * @param string $user_email User email address.
+ * @param array $usermeta Metadata associated with the signup.
+ * @return int User id.
+ */
+ public static function add_backcompat( $user_login = '', $user_password = '', $user_email = '', $usermeta = array() ) {
+ global $wpdb;
+
+ $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( __('
ERROR: Couldn’t register you. Please contact the
webmaster.', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
+ return $errors;
+ }
+
+ // Update the user status to '2', ie "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 ) );
+
+ // WordPress creates these options automatically on
+ // wp_insert_user(), but we delete them so that inactive
+ // signups don't appear in various user counts.
+ delete_user_option( $user_id, 'capabilities' );
+ delete_user_option( $user_id, 'user_level' );
+
+ // 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 );
+ }
+ }
+ }
+
+ return apply_filters( 'bp_core_signups_add_backcompat', $user_id );
+ }
+
+ /**
+ * Check a user status (from wp_users) on a non-multisite config.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $user_id ID of the user being checked.
+ * @return int|bool The status if found, otherwise false.
+ */
+ public static function check_user_status( $user_id = 0 ) {
+ global $wpdb;
+
+ if ( empty( $user_id ) )
+ return false;
+
+ $user_status = $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM {$wpdb->users} WHERE ID = %d", $user_id ) );
+
+ return apply_filters( 'bp_core_signups_check_user_status', intval( $user_status ) );
+ }
+
+ /**
+ * Activate a signup.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param string $key Activation key.
+ * @return bool True on success, false on failure.
+ */
+ public static function validate( $key = '' ) {
+ global $wpdb;
+
+ if ( empty( $key ) ) {
+ return;
+ }
+
+ $activated = $wpdb->update(
+ // Signups table
+ buddypress()->members->table_name_signups,
+ array(
+ 'active' => 1,
+ 'activated' => current_time( 'mysql', true ),
+ ),
+ array(
+ 'activation_key' => $key,
+ ),
+ // Data sanitization format
+ array(
+ '%d',
+ '%s',
+ ),
+ // WHERE sanitization format
+ array(
+ '%s',
+ )
+ );
+
+ return apply_filters( 'bp_core_signups_validate', $activated );
+ }
+
+ /**
+ * How many inactive signups do we have?
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @return int the number of signups
+ */
+ public static function count_signups() {
+ global $wpdb;
+
+ $signups_table = buddypress()->members->table_name_signups;
+ $count_signups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) AS total FROM {$signups_table} WHERE active = %d", 0 ) );
+
+ return apply_filters( 'bp_core_signups_count', (int) $count_signups );
+ }
+
+ /**
+ * Update the meta for a signup.
+ *
+ * This is the way we use to "trace" the last date an activation
+ * email was sent and how many times activation was sent.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $args
+ * @return int the signup id
+ */
+ public static function update( $args = array() ) {
+ global $wpdb;
+
+ $r = bp_parse_args( $args,
+ array(
+ 'signup_id' => 0,
+ 'meta' => array(),
+ ),
+ 'bp_core_signups_update_args'
+ );
+
+ if ( empty( $r['signup_id'] ) || empty( $r['meta'] ) ) {
+ return false;
+ }
+
+ $wpdb->update(
+ // Signups table
+ buddypress()->members->table_name_signups,
+ // Data to update
+ array(
+ 'meta' => serialize( $r['meta'] ),
+ ),
+ // WHERE
+ array(
+ 'signup_id' => $r['signup_id'],
+ ),
+ // Data sanitization format
+ array(
+ '%s',
+ ),
+ // WHERE sanitization format
+ array(
+ '%d',
+ )
+ );
+
+ return apply_filters( 'bp_core_signups_update', $r['signup_id'] );
+ }
+
+ /**
+ * Resend an activation email.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $signup_ids single id or list of ids to resend
+ * @return array the results
+ */
+ public static function resend( $signup_ids = array() ) {
+ if ( empty( $signup_ids ) || ! is_array( $signup_ids ) ) {
+ return false;
+ }
+
+ $to_resend = self::get( array(
+ 'include' => $signup_ids,
+ ) );
+
+ if ( ! $signups = $to_resend['signups'] ) {
+ return false;
+ }
+
+ $result = array();
+
+ do_action( 'bp_core_signup_before_resend', $signup_ids );
+
+ foreach ( $signups as $signup ) {
+
+ $meta = $signup->meta;
+ $meta['sent_date'] = current_time( 'mysql', true );
+ $meta['count_sent'] = $signup->count_sent + 1;
+
+ // Send activation email
+ if ( is_multisite() ) {
+ wpmu_signup_user_notification( $signup->user_login, $signup->user_email, $signup->activation_key, serialize( $meta ) );
+ } else {
+
+ // Check user status before sending email
+ $user_id = email_exists( $signup->user_email );
+
+ if ( ! empty( $user_id ) && 2 != self::check_user_status( $user_id ) ) {
+ // Status is not 2, so user's account has been activated
+ $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );;
+ // repare signups table
+ self::validate( $signup->activation_key );
+ continue;
+
+ // Send the validation email
+ } else {
+ bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key );
+ }
+ }
+
+ // Update metas
+ $result['resent'][] = self::update( array(
+ 'signup_id' => $signup->signup_id,
+ 'meta' => $meta,
+ ) );
+ }
+
+ do_action( 'bp_core_signup_after_resend', $signup_ids, $result );
+
+ return apply_filters( 'bp_core_signup_resend', $result );
+ }
+
+ /**
+ * Activate a pending account.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $signup_ids Single id or list of ids to resend.
+ * @return array the results
+ */
+ public static function activate( $signup_ids = array() ) {
+ if ( empty( $signup_ids ) || ! is_array( $signup_ids ) ) {
+ return false;
+ }
+
+ $to_activate = self::get( array(
+ 'include' => $signup_ids,
+ ) );
+
+ if ( ! $signups = $to_activate['signups'] ) {
+ return false;
+ }
+
+ $result = array();
+
+ do_action( 'bp_core_signup_before_activate', $signup_ids );
+
+ foreach ( $signups as $signup ) {
+
+ $user = bp_core_activate_signup( $signup->activation_key );
+
+ if ( ! empty( $user->errors ) ) {
+
+ if ( $user_id = username_exists( $signup->user_login ) && 2 != self::check_user_status( $user_id ) ) {
+ // Status is not 2, so user's account has been activated
+ $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );
+ // repare signups table
+ self::validate( $signup->activation_key );
+
+ // we have a user id, account is not active, let's delete it
+ } else {
+ $result['errors'][ $signup->signup_id ] = array( $signup->user_login, $user->get_error_message() );
+ }
+
+ } else {
+ $result['activated'][] = $user;
+ }
+ }
+
+ do_action( 'bp_core_signup_after_activate', $signup_ids, $result );
+
+ return apply_filters( 'bp_core_signup_activate', $result );
+ }
+
+ /**
+ * Delete a pending account.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $signup_ids single id or list of ids to resend
+ * @return array the results
+ */
+ public static function delete( $signup_ids = array() ) {
+ global $wpdb;
+
+ if ( empty( $signup_ids ) || ! is_array( $signup_ids ) ) {
+ return false;
+ }
+
+ $to_delete = self::get( array(
+ 'include' => $signup_ids,
+ ) );
+
+ if ( ! $signups = $to_delete['signups'] ) {
+ return false;
+ }
+
+ $result = array();
+
+ do_action( 'bp_core_signup_before_delete', $signup_ids );
+
+ foreach ( $signups as $signup ) {
+ $user_id = username_exists( $signup->user_login );
+
+ if ( ! empty( $user_id ) && $signup->activation_key == wp_hash( $user_id ) ) {
+
+ if ( 2 != self::check_user_status( $user_id ) ) {
+ // Status is not 2, so user's account has been activated
+ $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );
+ // repare signups table
+ self::validate( $signup->activation_key );
+
+ // we have a user id, account is not active, let's delete it
+ } else {
+ bp_core_delete_account( $user_id );
+ }
+ }
+
+ if ( empty( $result['errors'][ $signup->signup_id ] ) ) {
+ $wpdb->delete(
+ // Signups table
+ buddypress()->members->table_name_signups,
+ // Where
+ array( 'signup_id' => $signup->signup_id, ),
+ // WHERE sanitization format
+ array( '%d', )
+ );
+
+ $result['deleted'][] = $signup->signup_id;
+ }
+ }
+
+ do_action( 'bp_core_signup_after_delete', $signup_ids, $result );
+
+ return apply_filters( 'bp_core_signup_delete', $result );
+ }
+}
diff --git bp-members/bp-members-functions.php bp-members/bp-members-functions.php
index faa7a92..216c429 100644
--- bp-members/bp-members-functions.php
+++ bp-members/bp-members-functions.php
@@ -1361,8 +1361,15 @@ function bp_core_validate_user_signup( $user_name, $user_email ) {
$errors->add( 'user_name', __( 'Sorry, usernames must have letters too!', 'buddypress' ) );
}
+ // 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' ) );
}
@@ -1393,74 +1400,61 @@ function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
}
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
if ( is_multisite() ) {
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
- ) );
+ // 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;
+ }
- if ( is_wp_error( $user_id ) || empty( $user_id ) ) {
- $errors->add( 'registerfail', sprintf( __('
ERROR: Couldn’t register you... please contact the
webmaster !', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
- return $errors;
+ $activation_key = wp_hash( $user_id );
+ update_user_meta( $user_id, 'activation_key', $activation_key );
}
- // 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 );
- }
- }
- }
- }
- $bp->signup->username = $user_login;
+ $args = array(
+ 'user_login' => $user_login,
+ 'user_email' => $user_email,
+ 'activation_key' => $activation_key,
+ 'meta' => $usermeta,
+ );
- /***
- * 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 );
+ BP_Signup::add( $args );
if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
}
}
+ $bp->signup->username = $user_login;
+
do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
return $user_id;
@@ -1483,54 +1477,121 @@ function bp_core_activate_signup( $key ) {
$user = wpmu_activate_signup( $key );
// If there were errors, add a message and redirect
- if ( !empty( $user->errors ) ) {
+ if ( ! empty( $user->errors ) ) {
return $user;
}
$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'] );
+ } else {
+ $signups = BP_Signup::get( array(
+ 'activation_key' => $key,
+ ) );
- foreach( (array) $profile_field_ids as $field_id ) {
- $current_field = isset( $user['meta']["field_{$field_id}"] ) ? $user['meta']["field_{$field_id}"] : false;
+ if ( empty( $signups['signups'] ) ) {
+ return new WP_Error( 'invalid_key', __( 'Invalid activation key.', 'buddypress' ) );
+ }
- if ( !empty( $current_field ) )
- xprofile_set_field_data( $field_id, $user_id, $current_field );
+ $signup = $signups['signups'][0];
- // 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 );
- }
+ 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 ) );
+ // 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;
- if ( empty( $user_id ) )
- return new WP_Error( 'invalid_key', __( 'Invalid activation key', 'buddypress' ) );
+ } else {
+ $user_already_exists = true;
+ }
+
+ if ( ! $user_id ) {
+ return new WP_Error( 'create_user', __( 'Could not create user', 'buddypress' ), $signup );
+ }
- // 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' ) );
+ // 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 );
diff --git bp-members/bp-members-loader.php bp-members/bp-members-loader.php
index 1402195..eb72d66 100644
--- bp-members/bp-members-loader.php
+++ bp-members/bp-members-loader.php
@@ -37,6 +37,7 @@ class BP_Members_Component extends BP_Component {
public function includes( $includes = array() ) {
$includes = array(
'actions',
+ 'classes',
'filters',
'screens',
'template',
@@ -68,7 +69,7 @@ class BP_Members_Component extends BP_Component {
if ( !defined( 'BP_MEMBERS_SLUG' ) )
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,
'has_directory' => true,
@@ -77,7 +78,13 @@ class BP_Members_Component extends BP_Component {
'table_name_last_activity' => bp_core_get_table_prefix() . 'bp_activity',
),
'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 ****************************************************/
diff --git bp-members/bp-members-screens.php bp-members/bp-members-screens.php
index d652985..d756ae1 100644
--- bp-members/bp-members-screens.php
+++ bp-members/bp-members-screens.php
@@ -251,11 +251,7 @@ function bp_core_screen_activation() {
bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
}
- // 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
// it and delete the signup avatar dir
diff --git tests/includes/factory.php tests/includes/factory.php
index 317e58d..7c51942 100644
--- tests/includes/factory.php
+++ tests/includes/factory.php
@@ -10,6 +10,7 @@ class BP_UnitTest_Factory extends WP_UnitTest_Factory {
$this->xprofile_group = new BP_UnitTest_Factory_For_XProfileGroup( $this );
$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 );
}
}
@@ -163,3 +164,19 @@ class BP_UnitTest_Factory_For_Notification extends WP_UnitTest_Factory_For_Thing
return new BP_Notifications_Notification( $id );
}
}
+
+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 );
+ }
+}
diff --git tests/includes/install.php tests/includes/install.php
index 218346f..cecc10f 100644
--- tests/includes/install.php
+++ tests/includes/install.php
@@ -30,6 +30,8 @@ function wp_test_bp_install( $value ) {
}
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;
$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
diff --git tests/testcases/members/class-bp-signup.php tests/testcases/members/class-bp-signup.php
new file mode 100644
index 0000000..6326d1e
--- /dev/null
+++ tests/testcases/members/class-bp-signup.php
@@ -0,0 +1,213 @@
+signup_allowed = get_site_option( 'registration' );
+ update_site_option( 'registration', 'all' );
+ } else {
+ bp_get_option( 'users_can_register' );
+ bp_update_option( 'users_can_register', 1 );
+ }
+
+ parent::setUp();
+ }
+
+ public function tearDown() {
+ if ( is_multisite() ) {
+ update_site_option( 'registration', $this->signup_allowed );
+ } else {
+ bp_update_option( 'users_can_register', $this->signup_allowed );
+ }
+
+ parent::tearDown();
+ }
+
+ /**
+ * @group add
+ */
+ public function test_add() {
+ $time = bp_core_current_time();
+ $args = array(
+ 'domain' => 'foo',
+ 'path' => 'bar',
+ 'title' => 'Foo bar',
+ 'user_login' => 'user1',
+ 'user_email' => 'user1@example.com',
+ 'registered' => $time,
+ 'activation_key' => '12345',
+ 'meta' => array(
+ 'field_1' => 'Foo Bar',
+ 'meta1' => 'meta2',
+ ),
+ );
+
+ $signup = BP_Signup::add( $args );
+ $this->assertNotEmpty( $signup );
+
+ $s = new BP_Signup( $signup );
+
+ // spot check
+ $this->assertSame( $signup, $s->id );
+ $this->assertSame( 'user1', $s->user_login );
+ $this->assertSame( '12345', $s->activation_key );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_offset() {
+ $s1 = $this->factory->signup->create();
+ $s2 = $this->factory->signup->create();
+ $s3 = $this->factory->signup->create();
+
+ $ss = BP_Signup::get( array(
+ 'offset' => 1,
+ ) );
+
+ $this->assertEquals( array( $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_number() {
+ $s1 = $this->factory->signup->create();
+ $s2 = $this->factory->signup->create();
+ $s3 = $this->factory->signup->create();
+
+ $ss = BP_Signup::get( array(
+ 'number' => 2,
+ ) );
+
+ $this->assertEquals( array( $s3, $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_usersearch() {
+ $s1 = $this->factory->signup->create( array(
+ 'user_email' => 'fghij@example.com',
+ ) );
+ $s2 = $this->factory->signup->create();
+ $s3 = $this->factory->signup->create();
+
+ $ss = BP_Signup::get( array(
+ 'usersearch' => 'ghi',
+ ) );
+
+ $this->assertEquals( array( $s1 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_orderby_email() {
+ $s1 = $this->factory->signup->create( array(
+ 'user_email' => 'fghij@example.com',
+ ) );
+ $s2 = $this->factory->signup->create( array(
+ 'user_email' => 'abcde@example.com',
+ ) );
+ $s3 = $this->factory->signup->create( array(
+ 'user_email' => 'zzzzz@example.com',
+ ) );
+
+ $ss = BP_Signup::get( array(
+ 'orderby' => 'email',
+ 'number' => 3,
+ ) );
+
+ // default order is DESC
+ $this->assertEquals( array( $s3, $s1, $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_orderby_email_asc() {
+ $s1 = $this->factory->signup->create( array(
+ 'user_email' => 'fghij@example.com',
+ ) );
+ $s2 = $this->factory->signup->create( array(
+ 'user_email' => 'abcde@example.com',
+ ) );
+ $s3 = $this->factory->signup->create( array(
+ 'user_email' => 'zzzzz@example.com',
+ ) );
+
+ $ss = BP_Signup::get( array(
+ 'orderby' => 'email',
+ 'number' => 3,
+ 'order' => 'ASC',
+ ) );
+
+ $this->assertEquals( array( $s2, $s1, $s3 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_include() {
+ $s1 = $this->factory->signup->create();
+ $s2 = $this->factory->signup->create();
+ $s3 = $this->factory->signup->create();
+
+ $ss = BP_Signup::get( array(
+ 'include' => array( $s1, $s3 ),
+ ) );
+
+ $this->assertEquals( array( $s1, $s3 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_activation_key() {
+ $s1 = $this->factory->signup->create( array(
+ 'activation_key' => 'foo',
+ ) );
+ $s2 = $this->factory->signup->create( array(
+ 'activation_key' => 'bar',
+ ) );
+ $s3 = $this->factory->signup->create( array(
+ 'activation_key' => 'baz',
+ ) );
+
+ $ss = BP_Signup::get( array(
+ 'activation_key' => 'bar',
+ ) );
+
+ $this->assertEquals( array( $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+
+ /**
+ * @group get
+ */
+ public function test_get_with_user_login() {
+ $s1 = $this->factory->signup->create( array(
+ 'user_login' => 'aaaafoo',
+ ) );
+ $s2 = $this->factory->signup->create( array(
+ 'user_login' => 'zzzzfoo',
+ ) );
+ $s3 = $this->factory->signup->create( array(
+ 'user_login' => 'jjjjfoo',
+ ) );
+
+ $ss = BP_Signup::get( array(
+ 'user_login' => 'zzzzfoo',
+ ) );
+
+ $this->assertEquals( array( $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
+ }
+}
\ No newline at end of file