Changeset 3430

Timestamp:

01/13/2006 07:19:09 PM (21 years ago)

Author:

ryan

Message:

Make the xmlrpc user the current user. fixes #2273

Location:

trunk

Files:

• wp-includes/kses.php (modified) (1 diff)
• wp-includes/pluggable-functions.php (modified) (2 diffs)
• xmlrpc.php (modified) (13 diffs)

trunk/wp-includes/kses.php

@@ -531 +531 @@
         global $current_user;
 
-        get_currentuserinfo(); // set $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)
                 kses_init_filters();
 }
 add_action('init', 'kses_init');
+add_action('set_current_user', 'kses_init');
 ?>

trunk/wp-includes/pluggable-functions.php

@@ -3 +3 @@
         /* These functions can be replaced via plugins.  They are loaded after
          plugins are loaded. */
+
+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;
+
+        do_action('set_current_user');
+
+        return $current_user;
+}
+endif;
 
 
@@ -8 +32 @@
 function get_currentuserinfo() {
         global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
+
+        if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
+                return false;
 
         if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 

trunk/xmlrpc.php

@@ -1 +1 @@
 <?php
+
+define('XMLRPC_REQUEST', true);
+
+// Some browser-embedded clients send cookies. We don't want them.
+$_COOKIE = array();
 
 # fix for mozBlog and other cases where '<?xml' isn't on the very first line
@@ -180 +185 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          $is_admin = $user->has_cap('level_8');
+          set_current_user(0, $user_login);
+          $is_admin = current_user_can('level_8');
 
           $struct = array(
@@ -189 +194 @@
             'blogName' => get_settings('blogname')
           );
-
+error_log(print_r($struct,1), 3, '/tmp/xmlrpc');
           return array($struct);
         }
@@ -318 +323 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_themes') ) {
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_themes') ) {
             return new IXR_Error(401, 'Sorry, this user can not edit the template.');
           }
@@ -353 +358 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_themes') ) {
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_themes') ) {
             return new IXR_Error(401, 'Sorry, this user can not edit the template.');
           }
@@ -391 +396 @@
           
           $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap($cap) )
+          $user = set_current_user(0, $user_login);
+          if ( !current_user_can($cap) )
             return new IXR_Error(401, 'Sorry, you can not post on this weblog or category.');
 
@@ -446 +450 @@
                 $this->escape($actual_post);
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_post', $post_ID) )
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you do not have the right to edit this post.');
 
@@ -490 +494 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_post', $post_ID) )
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you do not have the right to delete this post.');
 
@@ -526 +530 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('publish_posts') )
+          $user = set_current_user(0, $user_login);
+          if ( !current_user_can('publish_posts') )
             return new IXR_Error(401, 'Sorry, you can not post on this weblog or category.');
 
@@ -606 +610 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_post', $post_ID) )
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you can not edit this post.');
 
@@ -845 +849 @@
                         return $this->error;
 
-                $user = new WP_User(0, $user_login);
-
-                if ( !$user->has_cap('upload_files') ) {
+                set_current_user(0, $user_login);
+                if ( !current_user_can('upload_files') ) {
                         logIO('O', '(MW) User does not have upload_files capability');
                         $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
@@ -985 +988 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_post', $post_ID) )
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you can not edit this post.');
 
@@ -1067 +1070 @@
           }
 
-          $user = new WP_User(0, $user_login);
-          if ( !$user->has_cap('edit_post', $post_ID) )
+          set_current_user(0, $user_login);
+          if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you can not edit this post.');