Wordpress 3.0-scripts

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

diff --git a/wp-includes/registration-functions.php b/wp-includes/registration-functions.php
index dcf81f5093825e0bcc3d7a497953bb8d2cd20ecc..d1cf72a578c0fa9922fc8d363ebdc06dea2eff7d 100644 (file)
--- a/wp-includes/registration-functions.php
+++ b/wp-includes/registration-functions.php
@@ -1,170 +1,9 @@
 <?php
-
-function username_exists( $username ) {
-       global $wpdb;
-       $username = sanitize_user( $username );
-       $user = get_userdatabylogin($username);
-       if ( $user )
-               return $user->ID;
-
-       return null;
-}
-
-function validate_username( $username ) {
-       $name = sanitize_user($username, true);
-       $valid = true;
-
-       if ( $name != $username )
-               $valid = false; 
-
-       return apply_filters('validate_username', $valid, $username);   
-}
-
-function wp_insert_user($userdata) {
-       global $wpdb;
-
-       extract($userdata);
-
-       // Are we updating or creating?
-       if ( !empty($ID) ) {
-               $ID = (int) $ID;
-               $update = true;
-       } else {
-               $update = false;
-               // Password is not hashed when creating new user.
-               $user_pass = md5($user_pass);
-       }
-       
-       $user_login = sanitize_user($user_login, true);
-       $user_login = apply_filters('pre_user_login', $user_login);
-
-       if ( empty($user_nicename) )
-               $user_nicename = sanitize_title( $user_login );
-       $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
-
-       if ( empty($user_url) )
-               $user_url = '';
-       $user_url = apply_filters('pre_user_url', $user_url);
-
-       if ( empty($user_email) )
-               $user_email = '';
-       $user_email = apply_filters('pre_user_email', $user_email);
-
-       if ( empty($display_name) )
-               $display_name = $user_login;
-       $display_name = apply_filters('pre_user_display_name', $display_name);
-
-       if ( empty($nickname) )
-               $nickname = $user_login;
-       $nickname = apply_filters('pre_user_nickname', $nickname);
-
-       if ( empty($first_name) )
-               $first_name = '';
-       $first_name = apply_filters('pre_user_first_name', $first_name);
-
-       if ( empty($last_name) )
-               $last_name = '';
-       $last_name = apply_filters('pre_user_last_name', $last_name);
-
-       if ( empty($description) )
-               $description = '';
-       $description = apply_filters('pre_user_description', $description);
-
-       if ( empty($user_registered) )
-               $user_registered = gmdate('Y-m-d H:i:s');
-
-       if ( $update ) {
-               $query = "UPDATE $wpdb->users SET user_pass='$user_pass', user_email='$user_email', user_url='$user_url', user_nicename = '$user_nicename', display_name = '$display_name' WHERE ID = '$ID'";
-               $query = apply_filters('update_user_query', $query);
-               $wpdb->query( $query );
-               $user_id = $ID;
-       } else {
-               $query = "INSERT INTO $wpdb->users 
-               (user_login, user_pass, user_email, user_url, user_registered, user_nicename, display_name)
-       VALUES 
-               ('$user_login', '$user_pass', '$user_email', '$user_url', '$user_registered', '$user_nicename', '$display_name')";
-               $query = apply_filters('create_user_query', $query);
-               $wpdb->query( $query );
-               $user_id = $wpdb->insert_id;
-       }
-       
-       update_usermeta( $user_id, 'first_name', $first_name);
-       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 );
-
-       if ($update && !empty($role)) {
-               $user = new WP_User($user_id);
-               $user->set_role($role);
-       }
-
-       if ( !$update ) {
-               $user = new WP_User($user_id);
-               $user->set_role(get_settings('default_role'));
-       }
-
-       wp_cache_delete($user_id, 'users');
-       wp_cache_delete($user_login, 'userlogins');
-       
-       if ( $update )
-               do_action('profile_update', $user_id);
-       else
-               do_action('user_register', $user_id);
-               
-       return $user_id;        
-}
-
-function wp_update_user($userdata) {
-       global $wpdb;
-
-       $ID = (int) $userdata['ID'];
-       
-       // First, get all of the original fields
-       $user = get_userdata($ID);      
-
-       // Escape data pulled from DB.
-       $user = add_magic_quotes(get_object_vars($user));
-
-       // If password is changing, hash it now.
-       if ( ! empty($userdata['user_pass']) ) {
-               $plaintext_pass = $userdata['user_pass'];
-               $userdata['user_pass'] = md5($userdata['user_pass']);
-       }
-
-       // Merge old and new fields with new fields overwriting old ones.
-       $userdata = array_merge($user, $userdata);
-       $user_id = wp_insert_user($userdata);
-
-       // Update the cookies if the password changed.  
-       $current_user = wp_get_current_user();
-       if( $current_user->id == $ID ) {
-               if ( isset($plaintext_pass) ) {
-                       wp_clearcookie();
-                       wp_setcookie($userdata['user_login'], $plaintext_pass);
-               }
-       }
-       
-       return $user_id;
-}
-
-function wp_create_user( $username, $password, $email = '') {
-       global $wpdb;
-       
-       $user_login = $wpdb->escape( $username );
-       $user_email = $wpdb->escape( $email );
-       $user_pass = $password;
-
-       $userdata = compact('user_login', 'user_email', 'user_pass');
-       return wp_insert_user($userdata);
-}
-
-
-function create_user( $username, $password, $email ) {
-       return wp_create_user( $username, $password, $email );  
-}
-
-
+/**
+ * Deprecated. Use registration.php.
+ *
+ * @package WordPress
+ */
+_deprecated_file( basename(__FILE__), '2.1', WPINC .  '/registration.php' );
+require_once(ABSPATH . WPINC .  '/registration.php');
 ?>