Changeset 3566

Timestamp:

02/22/2006 07:08:55 PM (21 years ago)

Author:

ryan

Message:

current user cleanup

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/comment.php (modified) (1 diff)
• wp-admin/edit-form-ajax-cat.php (modified) (1 diff)
• wp-admin/list-manipulation.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/page-new.php (modified) (1 diff)
• wp-comments-post.php (modified) (3 diffs)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/comment-functions.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/kses.php (modified) (1 diff)
• wp-includes/pluggable-functions.php (modified) (3 diffs)
• wp-includes/registration-functions.php (modified) (2 diffs)
• wp-includes/template-functions-general.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -18 +18 @@
 update_category_cache();
 
-get_currentuserinfo();
+wp_get_current_user();
 
 $posts_per_page = get_settings('posts_per_page');

trunk/wp-admin/comment.php

@@ -27 +27 @@
         require_once ('admin-header.php');
 
-        get_currentuserinfo();
-
         $comment = (int) $_GET['comment'];
 

trunk/wp-admin/edit-form-ajax-cat.php

@@ -3 +3 @@
 require_once('admin-functions.php');
 require_once('admin-db.php');
-
-get_currentuserinfo();
 
 if ( !current_user_can('manage_categories') )

trunk/wp-admin/list-manipulation.php

@@ -4 +4 @@
 require_once('admin-db.php');
 
-get_currentuserinfo();
 if ( !is_user_logged_in() )
         die('-1');

trunk/wp-admin/options.php

@@ -69 +69 @@
                                 // If home changed, write rewrite rules to new location.
                                 $wp_rewrite->flush_rules();
-                                // Get currently logged in user and password.
-                                get_currentuserinfo();
                                 // Clear cookies for old paths.
                                 wp_clearcookie();

trunk/wp-admin/page-new.php

@@ -14 +14 @@
 if ( current_user_can('edit_pages') ) {
         $action = 'post';
-        get_currentuserinfo();
-
         $post = get_default_post_to_edit();
         $post->post_type = 'page';

trunk/wp-comments-post.php

@@ -25 +25 @@
 
 // If the user is logged in
-get_currentuserinfo();
-if ( $user_ID ) :
-        $comment_author       = $wpdb->escape($user_identity);
-        $comment_author_email = $wpdb->escape($user_email);
-        $comment_author_url   = $wpdb->escape($user_url);
+$user = wp_get_current_user();
+if ( $user->ID ) :
+        $comment_author       = $wpdb->escape($user->display_name);
+        $comment_author_email = $wpdb->escape($user->user_email);
+        $comment_author_url   = $wpdb->escape($user->user_url);
 else :
         if ( get_option('comment_registration') )
@@ -37 +37 @@
 $comment_type = '';
 
-if ( get_settings('require_name_email') && !$user_ID ) {
+if ( get_settings('require_name_email') && !$user->ID ) {
         if ( 6 > strlen($comment_author_email) || '' == $comment_author )
                 die( __('Error: please fill the required fields (name, email).') );
@@ -51 +51 @@
 wp_new_comment( $commentdata );
 
-if ( !$user_ID ) :
+if ( !$user->ID ) :
         setcookie('comment_author_' . COOKIEHASH, stripslashes($comment_author), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
         setcookie('comment_author_email_' . COOKIEHASH, stripslashes($comment_author_email), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);

trunk/wp-includes/capabilities.php

@@ -396 +396 @@
 // Capability checking wrapper around the global $current_user object.
 function current_user_can($capability) {
-        global $current_user;
+        $current_user = wp_get_current_user();
 
         $args = array_slice(func_get_args(), 1);

trunk/wp-includes/classes.php

@@ -1588 +1588 @@
 
         function send_headers() {
-                global $current_user;
                 @header('X-Pingback: '. get_bloginfo('pingback_url'));
                 if ( is_user_logged_in() )
@@ -1665 +1664 @@
 
         function init() {
-                get_currentuserinfo();
+                wp_get_current_user();
         }
 

trunk/wp-includes/comment-functions.php

@@ -18 +18 @@
                 $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND ( comment_approved = '1' OR ( comment_author = '$author_db' AND comment_author_email = '$email_db' AND comment_approved = '0' ) ) ORDER BY comment_date");
         }
-
-        get_currentuserinfo();
 
         define('COMMENTS_TEMPLATE', true);

trunk/wp-includes/functions.php

@@ -304 +304 @@
 
 function get_user_option( $option, $user = 0 ) {
-        global $wpdb, $current_user;
+        global $wpdb;
 
         if ( empty($user) )
-                $user = $current_user;
+                $user = wp_get_current_user();
         else
                 $user = get_userdata($user);
@@ -1177 +1177 @@
 }
 
+// Setup global user vars.  Used by set_current_user() for back compat.
+function setup_userdata($user_id = '') {
+        global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
+
+        if ( '' == $user_id )
+                $user = wp_get_current_user();
+        else 
+                $user = new WP_User($user_id);
+
+        if ( 0 == $user->ID )
+                return;
+
+        $userdata = $user->data;
+        $user_login     = $user->user_login;
+        $user_level     = $user->user_level;
+        $user_ID        = $user->ID;
+        $user_email     = $user->user_email;
+        $user_url       = $user->user_url;
+        $user_pass_md5  = md5($user->user_pass);
+        $user_identity  = $user->display_name;
+}
+
 function is_new_day() {
         global $day, $previousday;

trunk/wp-includes/kses.php

@@ -529 +529 @@
 
 function kses_init() {
-        global $current_user;
-
         remove_filter('pre_comment_author', 'wp_filter_kses');
         remove_filter('pre_comment_content', 'wp_filter_kses');
         remove_filter('content_save_pre', 'wp_filter_post_kses');
         remove_filter('title_save_pre', 'wp_filter_kses');
-
-        if (! defined('XMLRPC_REQUEST') )
-                get_currentuserinfo();
 
         if (current_user_can('unfiltered_html') == false)

trunk/wp-includes/pluggable-functions.php

@@ -6 +6 @@
 if ( !function_exists('set_current_user') ) :
 function set_current_user($id, $name = '') {
-        global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
-
-        $current_user   = '';
-
-        $current_user   = new WP_User($id, $name);
-
-        $userdata       = get_userdatabylogin($user_login);
-
-        $user_login     = $userdata->user_login;
-        $user_level     = $userdata->user_level;
-        $user_ID        = $userdata->ID;
-        $user_email     = $userdata->user_email;
-        $user_url       = $userdata->user_url;
-        $user_pass_md5  = md5($userdata->user_pass);
-        $user_identity  = $userdata->display_name;
+        return wp_set_current_user($id, $name);
+}
+endif;
+
+if ( !function_exists('wp_set_current_user') ) :
+function wp_set_current_user($id, $name = '') {
+        global $current_user;
+
+        if ( isset($current_user) && ($id == $current_user->ID) )
+                return $current_user;
+
+        $current_user = new WP_User($id, $name);
+
+        setup_userdata($current_user->ID);
 
         do_action('set_current_user');
@@ -28 +27 @@
 endif;
 
+if ( !function_exists('current_user') ) :
+function wp_get_current_user() {
+        global $current_user;
+
+        get_currentuserinfo();
+
+        return $current_user;
+}
+endif;
 
 if ( !function_exists('get_currentuserinfo') ) :
 function get_currentuserinfo() {
-        global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
+        global $current_user;
 
         if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
                 return false;
+
+        if ( ! empty($current_user) )
+                return;
 
         if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 
                 !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
-                $current_user = new WP_User(0);
-                return false;
-        }
-        $user_login  = $_COOKIE[USER_COOKIE];
-        $userdata    = get_userdatabylogin($user_login);
-        $user_level  = $userdata->user_level;
-        $user_ID     = $userdata->ID;
-        $user_email  = $userdata->user_email;
-        $user_url    = $userdata->user_url;
-        $user_pass_md5 = md5($userdata->user_pass);
-        $user_identity = $userdata->display_name;
-
-        if ( empty($current_user) )
-                $current_user = new WP_User($user_ID);
+                wp_set_current_user(0);
+                return false;
+        }
+
+        $user_login = $_COOKIE[USER_COOKIE];
+        wp_set_current_user(0, $user_login);
 }
 endif;
@@ -202 +205 @@
 if ( !function_exists('is_user_logged_in') ) :
 function is_user_logged_in() {
-        global $current_user;
-
-        if ( $current_user->id == 0 )
-                return false;
+        $user = wp_get_current_user();
+
+        if ( $user->id == 0 )
+                return false;
+
         return true;
 }

trunk/wp-includes/registration-functions.php

@@ -102 +102 @@
 
 function wp_update_user($userdata) {
-        global $wpdb, $current_user;
+        global $wpdb;
 
         $ID = (int) $userdata['ID'];
@@ -123 +123 @@
 
         // Update the cookies if the password changed.
+        $current_user = wp_get_current_user();
         if( $current_user->id == $ID ) {
                 if ( isset($plaintext_pass) ) {

trunk/wp-includes/template-functions-general.php

@@ -28 +28 @@
 
 function wp_loginout() {
-        global $user_ID;
-        get_currentuserinfo();
-
-        if ('' == $user_ID)
+        if ( ! is_user_logged_in() )
                 $link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
         else
@@ -41 +38 @@
 
 function wp_register( $before = '<li>', $after = '</li>' ) {
-        global $user_ID;
-
-        get_currentuserinfo();
-
-        if ( '' == $user_ID && get_settings('users_can_register') )
-                $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
-        elseif ( '' == $user_ID && !get_settings('users_can_register') )
-                $link = '';
-        else
+
+        if ( ! is_user_logged_in() ) {
+                if ( get_settings('users_can_register') )
+                        $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
+                else
+                        $link = '';
+        } else {
                 $link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
+        }
 
         echo apply_filters('register', $link);