Wordpress 2.9-scripts

[autoinstalls/wordpress.git] / wp-includes / registration.php

diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index aee3ae149f4e0decb686f646c3e264c986fb65d5..6148bb67ebd59b3285269c9899b5c8a808566100 100644 (file)
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -164,18 +164,21 @@ function wp_insert_user($userdata) {
        if ( empty($use_ssl) )
                $use_ssl = 0;
 
-       if ( empty($jabber) )
-               $jabber = '';
-
-       if ( empty($aim) )
-               $aim = '';
-
-       if ( empty($yim) )
-               $yim = '';
-
        if ( empty($user_registered) )
                $user_registered = gmdate('Y-m-d H:i:s');
 
+       $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
+
+       if ( $user_nicename_check ) {
+               $suffix = 2;
+               while ($user_nicename_check) {
+                       $alt_user_nicename = $user_nicename . "-$suffix";
+                       $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+                       $suffix++;
+               }
+               $user_nicename = $alt_user_nicename;
+       }
+
        $data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
        $data = stripslashes_deep( $data );
 
@@ -191,20 +194,22 @@ function wp_insert_user($userdata) {
        update_usermeta( $user_id, 'last_name', $last_name);
        update_usermeta( $user_id, 'nickname', $nickname );
        update_usermeta( $user_id, 'description', $description );
-       update_usermeta( $user_id, 'jabber', $jabber );
-       update_usermeta( $user_id, 'aim', $aim );
-       update_usermeta( $user_id, 'yim', $yim );
        update_usermeta( $user_id, 'rich_editing', $rich_editing);
        update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
        update_usermeta( $user_id, 'admin_color', $admin_color);
        update_usermeta( $user_id, 'use_ssl', $use_ssl);
 
-       if ( $update && isset($role) ) {
-               $user = new WP_User($user_id);
-               $user->set_role($role);
+       foreach ( _wp_get_user_contactmethods() as $method => $name ) {
+               if ( empty($$method) )
+                       $$method = '';
+
+               update_usermeta( $user_id, $method, $$method );
        }
 
-       if ( !$update ) {
+       if ( isset($role) ) {
+               $user = new WP_User($user_id);
+               $user->set_role($role);
+       } elseif ( !$update ) {
                $user = new WP_User($user_id);
                $user->set_role(get_option('default_role'));
        }
@@ -278,7 +283,6 @@ function wp_update_user($userdata) {
  *
  * @since 2.0.0
  * @see wp_insert_user() More complete way to create a new user
- * @uses $wpdb Escapes $username and $email parameters
  *
  * @param string $username The user's username.
  * @param string $password The user's password.
@@ -286,14 +290,30 @@ function wp_update_user($userdata) {
  * @return int The new user's ID.
  */
 function wp_create_user($username, $password, $email = '') {
-       global $wpdb;
-
-       $user_login = $wpdb->escape($username);
-       $user_email = $wpdb->escape($email);
+       $user_login = esc_sql( $username );
+       $user_email = esc_sql( $email    );
        $user_pass = $password;
 
        $userdata = compact('user_login', 'user_email', 'user_pass');
        return wp_insert_user($userdata);
 }
 
+
+/**
+ * Setup the default contact methods
+ *
+ * @access private
+ * @since
+ *
+ * @return array $user_contactmethods Array of contact methods and their labels.
+ */
+function _wp_get_user_contactmethods() {
+       $user_contactmethods = array(
+               'aim' => __('AIM'),
+               'yim' => __('Yahoo IM'),
+               'jabber' => __('Jabber / Google Talk')
+       );
+       return apply_filters('user_contactmethods',$user_contactmethods);
+}
+
 ?>