Changeset 3232 for trunk/bp-core/bp-core-signup.php

Timestamp:

09/06/2010 04:24:57 PM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-core/bp-core-signup.php (modified) (9 diffs)

trunk/bp-core/bp-core-signup.php

@@ -181 +181 @@
 
             /* Make sure we include the jQuery jCrop file for image cropping */
-            add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
+            add_action( 'wp', 'bp_core_add_jquery_cropper' );
         }
     }
@@ -256 +256 @@
  */
 
+/**
+ * bp_core_flush_illegal_names()
+ *
+ * Flush illegal names by getting and setting 'illegal_names' site option
+ */
+function bp_core_flush_illegal_names() {
+    $illegal_names = get_site_option( 'illegal_names' );
+    update_site_option( 'illegal_names', $illegal_names );
+}
+
+/**
+ * bp_core_illegal_names()
+ *
+ * Filter the illegal_names site option and make sure it includes a few
+ * specific BuddyPress and Multi-site slugs
+ *
+ * @param array|string $value Illegal names from field
+ * @param array|string $oldvalue The value as it is currently
+ * @return array Merged and unique array of illegal names
+ */
+function bp_core_illegal_names( $value = '', $oldvalue = '' ) {
+
+    // Make sure $value is array
+    if ( empty( $value ) )
+        $db_illegal_names = array();
+    if ( is_array( $value ) )
+        $db_illegal_names = $value;
+    elseif ( is_string( $value ) )
+        $db_illegal_names = implode( ' ', $names );
+
+    // Add our slugs to the array and allow them to be filtered
+    $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_ACTIVITY_SLUG, BP_XPROFILE_SLUG, BP_FRIENDS_SLUG, BP_SEARCH_SLUG, BP_SETTINGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+
+    // Merge the arrays together
+    $merged_names = array_merge( (array)$filtered_illegal_names, (array)$db_illegal_names );
+
+    // Remove duplicates
+    $illegal_names = array_unique( (array)$merged_names );
+
+    return apply_filters( 'bp_core_illegal_names', $illegal_names );
+}
+add_filter( 'pre_update_site_option_illegal_names', 'bp_core_illegal_names', 10, 2 );
+
+/**
+ * bp_core_validate_user_signup()
+ *
+ * Validate a user name and email address when creating a new user.
+ *
+ * @global object $wpdb DB Layer
+ * @param string $user_name Username to validate
+ * @param string $user_email Email address to validate
+ * @return array Results of user validation including errors, if any
+ */
 function bp_core_validate_user_signup( $user_name, $user_email ) {
-    global $wpdb, $bp;
+    global $wpdb;
 
     $errors = new WP_Error();
@@ -268 +321 @@
     preg_match( "/[a-z0-9]+/", $user_name, $maybe );
 
-    $db_illegal_names = get_site_option( 'illegal_names' );
-    $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, $bp->members->slug, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
-
-    /* Safely merge our illegal names into existing site_option */
-    $common_names           = array_intersect( (array)$db_illegal_names, (array)$filtered_illegal_names );
-    $diff_names             = array_diff( (array)$db_illegal_names, (array)$filtered_illegal_names );
-    $illegal_names          = array_merge( (array)$diff_names, (array)$common_names );
-
-    update_site_option( 'illegal_names', $illegal_names );
-
-    if ( in_array( $user_name, (array)$illegal_names ) )
-        $errors->add( 'user_name', __( 'Sorry, that username is not allowed', 'buddypress' ) );
-
-    if ( !validate_username( $user_name ) || $user_name != $maybe[0] )
+    // Make sure illegal names include BuddyPress slugs and values
+    bp_core_flush_illegal_names();
+
+    if ( !validate_username( $user_name ) || in_array( $user_name, (array)$illegal_names ) || $user_name != $maybe[0] )
         $errors->add( 'user_name', __( 'Only lowercase letters and numbers allowed', 'buddypress' ) );
 
@@ -382 +425 @@
         if ( !bp_core_is_multisite() ) {
             $activation_key = wp_hash( $user_id );
-            update_usermeta( $user_id, 'activation_key', $activation_key );
+            update_user_meta( $user_id, 'activation_key', $activation_key );
             bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
         }
@@ -445 +488 @@
 
         /* Remove the activation key meta */
-        delete_usermeta( $user_id, 'activation_key' );
+        delete_user_meta( $user_id, 'activation_key' );
     }
 
@@ -452 +495 @@
 
     /* Add a last active entry */
-    update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+    update_user_meta( $user_id, 'last_activity', bp_core_current_time() );
 
     /* Set the password on multisite installs */
@@ -495 +538 @@
 
     /* Add a last active entry */
-    update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+    update_user_meta( $user_id, 'last_activity', bp_core_current_time() );
 
     /* Add the user's fullname to Xprofile */
     if ( function_exists( 'xprofile_set_field_data' ) ) {
-        $firstname = get_usermeta( $user_id, 'first_name' );
-        $lastname = ' ' . get_usermeta( $user_id, 'last_name' );
+        $firstname = get_user_meta( $user_id, 'first_name', true );
+        $lastname = ' ' . get_user_meta( $user_id, 'last_name', true );
         $name = $firstname . $lastname;
 
         if ( empty( $name ) || ' ' == $name )
-            $name = get_usermeta( $user_id, 'nickname' );
+            $name = get_user_meta( $user_id, 'nickname', true );
 
         xprofile_set_field_data( 1, $user_id, $name );
@@ -523 +566 @@
         @wp_mkdir_p( $path );
 
-    $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl = BP_AVATAR_URL . '/avatars/signups/' . $bp->signup->avatar_dir;
     $newburl = $newurl;
     $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
@@ -532 +575 @@
 function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
     $activate_url = bp_get_activation_page() ."?key=$key";
-    $activate_url = clean_url( $activate_url );
+    $activate_url = esc_url( $activate_url );
     $admin_email = get_site_option( "admin_email" );