' . __( 'This is the admininistration screen of the pending accounts of 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: Username and E-mail fields will be looked at.', '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)
+ *
+ * @access public
+ * @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'] ) ? $_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'];
+
+ // Create a new list of signup ids, based on those that actually exist
+ $signup_ids = array();
+ foreach ( $signups as $signup ) {
+ $signup_ids[] = $signup->signup_id;
+ }
+
+ switch ( $action ) {
+ case 'delete' :
+ $caption = __( 'delete', 'buddypress' );
+ break;
+ case 'activate' :
+ $caption = __( 'activate', 'buddypress' );
+ break;
+ case 'resend' :
+ $caption = __( 'resend activation email to', 'buddypress' ) ;
+ }
+
+
+ $url_args = array( 'page' => 'bp-signups' );
+ $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 );
+ ?>
+
+
+
+
+
+
+
+
+ - user_name ) ?> - user_email );?>
+
+
+
+
+
+
+
+
+
+
+
+ add( 'user_name', __( 'Sorry, usernames must have letters too!', 'buddypress' ) );
}
+ // Check into signups
+ $signup = BP_Core_SignUp::get_by_userlogin( $user_name );
+
// 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' ) );
}
@@ -1332,74 +1335,55 @@ 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
- ) );
- 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;
+ // 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 );
+ $meta = serialize( $usermeta );
+
+ /**
+ * Plugins may use the user_status / activation_key usermeta mechanism
+ * defining BP_SIGNUP_NOT_USER_YET to true skip this step, in case the
+ * administrator is sure this kind of plugins is not used on his config
+ * and don't want to directly create a user on sign-up.
+ */
+ if ( ! defined( 'BP_SIGNUP_NOT_USER_YET' ) ) {
+ $user_id = BP_Core_SignUp::add_backcompat( $user_login, $user_password, $user_email, $usermeta );
+
+ if ( is_wp_error( $user_id ) )
+ return $user_id;
+
+ $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' => $meta
+ );
- /***
- * 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_Core_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;
@@ -1422,53 +1406,96 @@ 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 {
- foreach( (array) $profile_field_ids as $field_id ) {
- $current_field = isset( $user['meta']["field_{$field_id}"] ) ? $user['meta']["field_{$field_id}"] : false;
+ $signup = BP_Core_SignUp::get_by_key( $key );
- if ( !empty( $current_field ) )
- xprofile_set_field_data( $field_id, $user_id, $current_field );
+ if ( empty( $signup ) )
+ return new WP_Error( 'invalid_key', __( 'Invalid activation key.', 'buddypress' ) );
- // 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 ) );
+ $meta = maybe_unserialize( $signup->meta );
+ // password is hashed again in wp_insert_user
+ $password = wp_generate_password( 12, false );
+
+ $user_id = username_exists( $signup->user_login );
+
+ if ( ! $user_id ) {
+ $user_id = wp_create_user( $signup->user_login, $password, $signup->user_email );
+ // It might be a signup set in previous versions let's check against previous way of setting activation key
+ } 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') );
- if ( empty( $user_id ) )
- return new WP_Error( 'invalid_key', __( 'Invalid activation key', 'buddypress' ) );
+ $user_already_created = true;
- // 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' ) );
+ } else {
+ $user_already_exists = true;
+ }
+
+ if ( ! $user_id )
+ return new WP_Error( 'create_user', __( 'Could not create user', 'buddypress' ), $signup );
+
+ BP_Core_SignUp::validate( $key );
+
+ if ( isset( $user_already_exists ) )
+ return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup );
+
+ $user = array( 'user_id' => $user_id, 'password' => $meta['password'], 'meta' => $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 ) ) );
// 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 d88380b..e1e4762 100644
--- bp-members/bp-members-loader.php
+++ bp-members/bp-members-loader.php
@@ -68,7 +68,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,
@@ -76,7 +76,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 4cb9f40..5cf8b8a 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