Wordpress 2.3.2
[autoinstalls/wordpress.git] / xmlrpc.php
index 2664138baaef6502c192d59114aa19a9b68af679..00fbc384b6324a9782300efaec25bff35cc36479 100644 (file)
@@ -5,26 +5,33 @@ define('XMLRPC_REQUEST', true);
 // Some browser-embedded clients send cookies. We don't want them.
 $_COOKIE = array();
 
+// A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
+// but we can do it ourself.
+if ( !isset( $HTTP_RAW_POST_DATA ) ) {
+       $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+}
+
 # fix for mozBlog and other cases where '<?xml' isn't on the very first line
 if ( isset($HTTP_RAW_POST_DATA) )
        $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 
 include('./wp-config.php');
 
-if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
+header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
   <service>
     <engineName>WordPress</engineName>
     <engineLink>http://wordpress.org/</engineLink>
     <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
     <apis>
-      <api name="Movable Type" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
-      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
-      <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+      <api name="WordPress" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
+      <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
+      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
+      <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
     </apis>
   </service>
 </rsd>
@@ -32,6 +39,7 @@ header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
 exit;
 }
 
+include_once(ABSPATH . 'wp-admin/includes/admin.php');
 include_once(ABSPATH . WPINC . '/class-IXR.php');
 
 // Turn off all warnings and errors.
@@ -66,48 +74,61 @@ class wp_xmlrpc_server extends IXR_Server {
 
        function wp_xmlrpc_server() {
                $this->methods = array(
-                 // Blogger API
-                 'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
-                 'blogger.getUserInfo' => 'this:blogger_getUserInfo',
-                 'blogger.getPost' => 'this:blogger_getPost',
-                 'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
-                 'blogger.getTemplate' => 'this:blogger_getTemplate',
-                 'blogger.setTemplate' => 'this:blogger_setTemplate',
-                 'blogger.newPost' => 'this:blogger_newPost',
-                 'blogger.editPost' => 'this:blogger_editPost',
-                 'blogger.deletePost' => 'this:blogger_deletePost',
-
-                 // MetaWeblog API (with MT extensions to structs)
-                 'metaWeblog.newPost' => 'this:mw_newPost',
-                 'metaWeblog.editPost' => 'this:mw_editPost',
-                 'metaWeblog.getPost' => 'this:mw_getPost',
-                 'metaWeblog.getRecentPosts' => 'this:mw_getRecentPosts',
-                 'metaWeblog.getCategories' => 'this:mw_getCategories',
-                 'metaWeblog.newMediaObject' => 'this:mw_newMediaObject',
-
-                 // MetaWeblog API aliases for Blogger API
-                 // see http://www.xmlrpc.com/stories/storyReader$2460
-                 'metaWeblog.deletePost' => 'this:blogger_deletePost',
-                 'metaWeblog.getTemplate' => 'this:blogger_getTemplate',
-                 'metaWeblog.setTemplate' => 'this:blogger_setTemplate',
-                 'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
-
-                 // MovableType API
-                 'mt.getCategoryList' => 'this:mt_getCategoryList',
-                 'mt.getRecentPostTitles' => 'this:mt_getRecentPostTitles',
-                 'mt.getPostCategories' => 'this:mt_getPostCategories',
-                 'mt.setPostCategories' => 'this:mt_setPostCategories',
-                 'mt.supportedMethods' => 'this:mt_supportedMethods',
-                 'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
-                 'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
-                 'mt.publishPost' => 'this:mt_publishPost',
-
-                 // PingBack
-                 'pingback.ping' => 'this:pingback_ping',
-                 'pingback.extensions.getPingbacks' => 'this:pingback_extensions_getPingbacks',
-
-                 'demo.sayHello' => 'this:sayHello',
-                 'demo.addTwoNumbers' => 'this:addTwoNumbers'
+                       // WordPress API
+                       'wp.getPage'                    => 'this:wp_getPage',
+                       'wp.getPages'                   => 'this:wp_getPages',
+                       'wp.newPage'                    => 'this:wp_newPage',
+                       'wp.deletePage'                 => 'this:wp_deletePage',
+                       'wp.editPage'                   => 'this:wp_editPage',
+                       'wp.getPageList'                => 'this:wp_getPageList',
+                       'wp.getAuthors'                 => 'this:wp_getAuthors',
+                       'wp.getCategories'              => 'this:mw_getCategories',             // Alias
+                       'wp.newCategory'                => 'this:wp_newCategory',
+                       'wp.suggestCategories'  => 'this:wp_suggestCategories',
+                       'wp.uploadFile'                 => 'this:mw_newMediaObject',    // Alias
+
+                       // Blogger API
+                       'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
+                       'blogger.getUserInfo' => 'this:blogger_getUserInfo',
+                       'blogger.getPost' => 'this:blogger_getPost',
+                       'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
+                       'blogger.getTemplate' => 'this:blogger_getTemplate',
+                       'blogger.setTemplate' => 'this:blogger_setTemplate',
+                       'blogger.newPost' => 'this:blogger_newPost',
+                       'blogger.editPost' => 'this:blogger_editPost',
+                       'blogger.deletePost' => 'this:blogger_deletePost',
+
+                       // MetaWeblog API (with MT extensions to structs)
+                       'metaWeblog.newPost' => 'this:mw_newPost',
+                       'metaWeblog.editPost' => 'this:mw_editPost',
+                       'metaWeblog.getPost' => 'this:mw_getPost',
+                       'metaWeblog.getRecentPosts' => 'this:mw_getRecentPosts',
+                       'metaWeblog.getCategories' => 'this:mw_getCategories',
+                       'metaWeblog.newMediaObject' => 'this:mw_newMediaObject',
+
+                       // MetaWeblog API aliases for Blogger API
+                       // see http://www.xmlrpc.com/stories/storyReader$2460
+                       'metaWeblog.deletePost' => 'this:blogger_deletePost',
+                       'metaWeblog.getTemplate' => 'this:blogger_getTemplate',
+                       'metaWeblog.setTemplate' => 'this:blogger_setTemplate',
+                       'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
+
+                       // MovableType API
+                       'mt.getCategoryList' => 'this:mt_getCategoryList',
+                       'mt.getRecentPostTitles' => 'this:mt_getRecentPostTitles',
+                       'mt.getPostCategories' => 'this:mt_getPostCategories',
+                       'mt.setPostCategories' => 'this:mt_setPostCategories',
+                       'mt.supportedMethods' => 'this:mt_supportedMethods',
+                       'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
+                       'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
+                       'mt.publishPost' => 'this:mt_publishPost',
+
+                       // PingBack
+                       'pingback.ping' => 'this:pingback_ping',
+                       'pingback.extensions.getPingbacks' => 'this:pingback_extensions_getPingbacks',
+
+                       'demo.sayHello' => 'this:sayHello',
+                       'demo.addTwoNumbers' => 'this:addTwoNumbers'
                );
                $this->methods = apply_filters('xmlrpc_methods', $this->methods);
                $this->IXR_Server($this->methods);
@@ -124,27 +145,454 @@ class wp_xmlrpc_server extends IXR_Server {
        }
 
        function login_pass_ok($user_login, $user_pass) {
-         if (!user_pass_ok($user_login, $user_pass)) {
-           $this->error = new IXR_Error(403, 'Bad login/pass combination.');
-           return false;
-         }
-         return true;
+               if (!user_pass_ok($user_login, $user_pass)) {
+                       $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
+                       return false;
+               }
+               return true;
        }
 
        function escape(&$array) {
                global $wpdb;
 
-               foreach ( (array) $array as $k => $v ) {
-                       if (is_array($v)) {
-                               $this->escape($array[$k]);
-                       } else if (is_object($v)) {
-                               //skip
-                       } else {
-                               $array[$k] = $wpdb->escape($v);
+               if(!is_array($array)) {
+                       return($wpdb->escape($array));
+               }
+               else {
+                       foreach ( (array) $array as $k => $v ) {
+                               if (is_array($v)) {
+                                       $this->escape($array[$k]);
+                               } else if (is_object($v)) {
+                                       //skip
+                               } else {
+                                       $array[$k] = $wpdb->escape($v);
+                               }
+                       }
+               }
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_getPage
+        */
+       function wp_getPage($args) {
+               $this->escape($args);
+
+               $blog_id        = (int) $args[0];
+               $page_id        = (int) $args[1];
+               $username       = $args[2];
+               $password       = $args[3];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               set_current_user( 0, $username );
+               if( !current_user_can( 'edit_page', $page_id ) )
+                       return new IXR_Error( 401, __( 'Sorry, you can not edit this page.' ) );
+
+               do_action('xmlrpc_call', 'wp.getPage');
+
+               // Lookup page info.
+               $page = get_page($page_id);
+
+               // If we found the page then format the data.
+               if($page->ID && ($page->post_type == "page")) {
+                       // Get all of the page content and link.
+                       $full_page = get_extended($page->post_content);
+                       $link = post_permalink($page->ID);
+
+                       // Get info the page parent if there is one.
+                       $parent_title = "";
+                       if(!empty($page->post_parent)) {
+                               $parent = get_page($page->post_parent);
+                               $parent_title = $parent->post_title;
+                       }
+
+                       // Determine comment and ping settings.
+                       $allow_comments = ("open" == $page->comment_status) ? 1 : 0;
+                       $allow_pings = ("open" == $page->ping_status) ? 1 : 0;
+
+                       // Format page date.
+                       $page_date = mysql2date("Ymd\TH:i:s", $page->post_date);
+                       $page_date_gmt = mysql2date("Ymd\TH:i:s", $page->post_date_gmt);
+
+                       // Pull the categories info together.
+                       $categories = array();
+                       foreach(wp_get_post_categories($page->ID) as $cat_id) {
+                               $categories[] = get_cat_name($cat_id);
                        }
+
+                       // Get the author info.
+                       $author = get_userdata($page->post_author);
+
+                       $page_struct = array(
+                               "dateCreated"                   => new IXR_Date($page_date),
+                               "userid"                                => $page->post_author,
+                               "page_id"                               => $page->ID,
+                               "page_status"                   => $page->post_status,
+                               "description"                   => $full_page["main"],
+                               "title"                                 => $page->post_title,
+                               "link"                                  => $link,
+                               "permaLink"                             => $link,
+                               "categories"                    => $categories,
+                               "excerpt"                               => $page->post_excerpt,
+                               "text_more"                             => $full_page["extended"],
+                               "mt_allow_comments"             => $allow_comments,
+                               "mt_allow_pings"                => $allow_pings,
+                               "wp_slug"                               => $page->post_name,
+                               "wp_password"                   => $page->post_password,
+                               "wp_author"                             => $author->display_name,
+                               "wp_page_parent_id"             => $page->post_parent,
+                               "wp_page_parent_title"  => $parent_title,
+                               "wp_page_order"                 => $page->menu_order,
+                               "wp_author_id"                  => $author->ID,
+                               "wp_author_display_name"        => $author->display_name,
+                               "date_created_gmt"              => new IXR_Date($page_date_gmt)
+                       );
+
+                       return($page_struct);
+               }
+               // If the page doesn't exist indicate that.
+               else {
+                       return(new IXR_Error(404, __("Sorry, no such page.")));
+               }
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_getPages
+        */
+       function wp_getPages($args) {
+               $this->escape($args);
+
+               $blog_id        = (int) $args[0];
+               $username       = $args[1];
+               $password       = $args[2];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               set_current_user( 0, $username );
+               if( !current_user_can( 'edit_pages' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you can not edit pages.' ) );
+
+               do_action('xmlrpc_call', 'wp.getPages');
+
+               // Lookup info on pages.
+               $pages = get_pages();
+               $num_pages = count($pages);
+
+               // If we have pages, put together their info.
+               if($num_pages >= 1) {
+                       $pages_struct = array();
+
+                       for($i = 0; $i < $num_pages; $i++) {
+                               $page = wp_xmlrpc_server::wp_getPage(array(
+                                       $blog_id, $pages[$i]->ID, $username, $password
+                               ));
+                               $pages_struct[] = $page;
+                       }
+
+                       return($pages_struct);
+               }
+               // If no pages were found return an error.
+               else {
+                       return(array());
+               }
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_newPage
+        */
+       function wp_newPage($args) {
+               // Items not escaped here will be escaped in newPost.
+               $username       = $this->escape($args[1]);
+               $password       = $this->escape($args[2]);
+               $page           = $args[3];
+               $publish        = $args[4];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               // Set the user context and check if they are allowed
+               // to add new pages.
+               $user = set_current_user(0, $username);
+               if(!current_user_can("publish_pages")) {
+                       return(new IXR_Error(401, __("Sorry, you can not add new pages.")));
+               }
+
+               // Mark this as content for a page.
+               $args[3]["post_type"] = "page";
+
+               // Let mw_newPost do all of the heavy lifting.
+               return($this->mw_newPost($args));
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_deletePage
+        */
+       function wp_deletePage($args) {
+               $this->escape($args);
+
+               $blog_id        = (int) $args[0];
+               $username       = $args[1];
+               $password       = $args[2];
+               $page_id        = (int) $args[3];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               // Get the current page based on the page_id and
+               // make sure it is a page and not a post.
+               $actual_page = wp_get_single_post($page_id, ARRAY_A);
+               if(
+                       !$actual_page
+                       || ($actual_page["post_type"] != "page")
+               ) {
+                       return(new IXR_Error(404, __("Sorry, no such page.")));
+               }
+
+               // Set the user context and make sure they can delete pages.
+               set_current_user(0, $username);
+               if(!current_user_can("delete_page", $page_id)) {
+                       return(new IXR_Error(401, __("Sorry, you do not have the right to delete this page.")));
+               }
+
+               // Attempt to delete the page.
+               $result = wp_delete_post($page_id);
+               if(!$result) {
+                       return(new IXR_Error(500, __("Failed to delete the page.")));
+               }
+
+               return(true);
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_editPage
+        */
+       function wp_editPage($args) {
+               // Items not escaped here will be escaped in editPost.
+               $blog_id        = (int) $args[0];
+               $page_id        = (int) $this->escape($args[1]);
+               $username       = $this->escape($args[2]);
+               $password       = $this->escape($args[3]);
+               $content        = $args[4];
+               $publish        = $args[5];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               // Get the page data and make sure it is a page.
+               $actual_page = wp_get_single_post($page_id, ARRAY_A);
+               if(
+                       !$actual_page
+                       || ($actual_page["post_type"] != "page")
+               ) {
+                       return(new IXR_Error(404, __("Sorry, no such page.")));
+               }
+
+               // Set the user context and make sure they are allowed to edit pages.
+               set_current_user(0, $username);
+               if(!current_user_can("edit_page", $page_id)) {
+                       return(new IXR_Error(401, __("Sorry, you do not have the right to edit this page.")));
+               }
+
+               // Mark this as content for a page.
+               $content["post_type"] = "page";
+
+               // Arrange args in the way mw_editPost understands.
+               $args = array(
+                       $page_id,
+                       $username,
+                       $password,
+                       $content,
+                       $publish
+               );
+
+               // Let mw_editPost do all of the heavy lifting.
+               return($this->mw_editPost($args));
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_getPageList
+        */
+       function wp_getPageList($args) {
+               global $wpdb;
+
+               $this->escape($args);
+
+               $blog_id                                = (int) $args[0];
+               $username                               = $args[1];
+               $password                               = $args[2];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               set_current_user( 0, $username );
+               if( !current_user_can( 'edit_pages' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you can not edit pages.' ) );
+
+               do_action('xmlrpc_call', 'wp.getPageList');
+
+               // Get list of pages ids and titles
+               $page_list = $wpdb->get_results("
+                       SELECT ID page_id,
+                               post_title page_title,
+                               post_parent page_parent_id,
+                               post_date_gmt,
+                               post_date
+                       FROM {$wpdb->posts}
+                       WHERE post_type = 'page'
+                       ORDER BY ID
+               ");
+
+               // The date needs to be formated properly.
+               $num_pages = count($page_list);
+               for($i = 0; $i < $num_pages; $i++) {
+                       $post_date = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date);
+                       $post_date_gmt = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date_gmt);
+
+                       $page_list[$i]->dateCreated = new IXR_Date($post_date);
+                       $page_list[$i]->date_created_gmt = new IXR_Date($post_date_gmt);
+
+                       unset($page_list[$i]->post_date_gmt);
+                       unset($page_list[$i]->post_date);
+               }
+
+               return($page_list);
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_getAuthors
+        */
+       function wp_getAuthors($args) {
+
+               $this->escape($args);
+
+               $blog_id        = (int) $args[0];
+               $username       = $args[1];
+               $password       = $args[2];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               set_current_user(0, $username);
+               if(!current_user_can("edit_posts")) {
+                       return(new IXR_Error(401, __("Sorry, you can not edit posts on this blog.")));
+        }
+
+               do_action('xmlrpc_call', 'wp.getAuthors');
+
+               $authors = array();
+               foreach( (array) get_users_of_blog() as $row ) {
+                       $authors[] = array(
+                               "user_id"       => $row->user_id,
+                               "user_login"    => $row->user_login,
+                               "display_name"  => $row->display_name
+                       );
+               }
+
+               return($authors);
+       }
+
+       /**
+        * WordPress XML-RPC API
+        * wp_newCategory
+        */
+       function wp_newCategory($args) {
+               $this->escape($args);
+
+               $blog_id                                = (int) $args[0];
+               $username                               = $args[1];
+               $password                               = $args[2];
+               $category                               = $args[3];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               // Set the user context and make sure they are
+               // allowed to add a category.
+               set_current_user(0, $username);
+               if(!current_user_can("manage_categories")) {
+                       return(new IXR_Error(401, __("Sorry, you do not have the right to add a category.")));
+               }
+
+               // If no slug was provided make it empty so that
+               // WordPress will generate one.
+               if(empty($category["slug"])) {
+                       $category["slug"] = "";
                }
+
+               // If no parent_id was provided make it empty
+               // so that it will be a top level page (no parent).
+               if ( !isset($category["parent_id"]) )
+                       $category["parent_id"] = "";
+
+               // If no description was provided make it empty.
+               if(empty($category["description"])) {
+                       $category["description"] = "";
+               }
+
+               $new_category = array(
+                       "cat_name"                              => $category["name"],
+                       "category_nicename"             => $category["slug"],
+                       "category_parent"               => $category["parent_id"],
+                       "category_description"  => $category["description"]
+               );
+
+               $cat_id = wp_insert_category($new_category);
+               if(!$cat_id) {
+                       return(new IXR_Error(500, __("Sorry, the new category failed.")));
+               }
+
+               return($cat_id);
        }
 
+       /**
+        * WordPress XML-RPC API
+        * wp_suggestCategories
+        */
+       function wp_suggestCategories($args) {
+               global $wpdb;
+
+               $this->escape($args);
+
+               $blog_id                                = (int) $args[0];
+               $username                               = $args[1];
+               $password                               = $args[2];
+               $category                               = $args[3];
+               $max_results                    = (int) $args[4];
+
+               if(!$this->login_pass_ok($username, $password)) {
+                       return($this->error);
+               }
+
+               set_current_user(0, $username);
+               if( !current_user_can( 'edit_posts' ) ) 
+                       return new IXR_Error( 401, __( 'Sorry, you must be able to publish to this blog in order to view categories.' ) );
+
+               do_action('xmlrpc_call', 'wp.suggestCategories');
+
+               $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
+               $category_suggestions = get_categories($args);
+
+               return($category_suggestions);
+       }
+
+
        /* Blogger API functions
         * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/
         */
@@ -155,24 +603,24 @@ class wp_xmlrpc_server extends IXR_Server {
 
                $this->escape($args);
 
-         $user_login = $args[1];
-         $user_pass  = $args[2];
+               $user_login = $args[1];
+               $user_pass  = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         set_current_user(0, $user_login);
-         $is_admin = current_user_can('level_8');
+               set_current_user(0, $user_login);
+               $is_admin = current_user_can('level_8');
 
-         $struct = array(
-           'isAdmin'  => $is_admin,
-           'url'      => get_settings('home') . '/',
-           'blogid'   => '1',
-           'blogName' => get_settings('blogname')
-         );
+               $struct = array(
+                       'isAdmin'  => $is_admin,
+                       'url'      => get_option('home') . '/',
+                       'blogid'   => '1',
+                       'blogName' => get_option('blogname')
+               );
 
-         return array($struct);
+               return array($struct);
        }
 
 
@@ -181,25 +629,30 @@ class wp_xmlrpc_server extends IXR_Server {
 
                $this->escape($args);
 
-         $user_login = $args[1];
-         $user_pass  = $args[2];
+               $user_login = $args[1];
+               $user_pass  = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $user_data = get_userdatabylogin($user_login);
+               set_current_user( 0, $user_login );
+               if( !current_user_can( 'edit_posts' ) ) 
+                       return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) );
 
-         $struct = array(
-           'nickname'  => $user_data->nickname,
-           'userid'    => $user_data->ID,
-           'url'       => $user_data->user_url,
-           'email'     => $user_data->user_email,
-           'lastname'  => $user_data->last_name,
-           'firstname' => $user_data->first_name
-         );
+               do_action('xmlrpc_call', 'blogger.getUserInfo');
+
+               $user_data = get_userdatabylogin($user_login);
+
+               $struct = array(
+                       'nickname'  => $user_data->nickname,
+                       'userid'    => $user_data->ID,
+                       'url'       => $user_data->user_url,
+                       'lastname'  => $user_data->last_name,
+                       'firstname' => $user_data->first_name
+               );
 
-         return $struct;
+               return $struct;
        }
 
 
@@ -212,34 +665,39 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_login = $args[2];
                $user_pass  = $args[3];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
+
+               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.' ) );
 
-         $user_data = get_userdatabylogin($user_login);
-         $post_data = wp_get_single_post($post_ID, ARRAY_A);
+               do_action('xmlrpc_call', 'blogger.getPost');
 
-         $categories = implode(',', wp_get_post_cats(1, $post_ID));
+               $post_data = wp_get_single_post($post_ID, ARRAY_A);
 
-         $content  = '<title>'.stripslashes($post_data['post_title']).'</title>';
-         $content .= '<category>'.$categories.'</category>';
-         $content .= stripslashes($post_data['post_content']);
+               $categories = implode(',', wp_get_post_categories($post_ID));
 
-         $struct = array(
-           'userid'    => $post_data['post_author'],
-           'dateCreated' => new IXR_Date(mysql2date('Ymd\TH:i:s', $post_data['post_date'])),
-           'content'     => $content,
-           'postid'  => $post_data['ID']
-         );
+               $content  = '<title>'.stripslashes($post_data['post_title']).'</title>';
+               $content .= '<category>'.$categories.'</category>';
+               $content .= stripslashes($post_data['post_content']);
 
-         return $struct;
+               $struct = array(
+                       'userid'    => $post_data['post_author'],
+                       'dateCreated' => new IXR_Date(mysql2date('Ymd\TH:i:s', $post_data['post_date'])),
+                       'content'     => $content,
+                       'postid'  => $post_data['ID']
+               );
+
+               return $struct;
        }
 
 
        /* blogger.getRecentPosts ...gets recent posts */
        function blogger_getRecentPosts($args) {
 
-         global $wpdb;
+               global $wpdb;
 
                $this->escape($args);
 
@@ -248,41 +706,45 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_pass  = $args[3];
                $num_posts  = $args[4];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $posts_list = wp_get_recent_posts($num_posts);
+               $posts_list = wp_get_recent_posts($num_posts);
 
-         if (!$posts_list) {
-           $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
-           return $this->error;
-         }
+               set_current_user( 0, $user_login );
+
+               if (!$posts_list) {
+                       $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+                       return $this->error;
+               }
 
-         foreach ($posts_list as $entry) {
-         
-           $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
-           $categories = implode(',', wp_get_post_cats(1, $entry['ID']));
+               foreach ($posts_list as $entry) {
+                       if( !current_user_can( 'edit_post', $entry['ID'] ) )
+                               continue;
 
-           $content  = '<title>'.stripslashes($entry['post_title']).'</title>';
-           $content .= '<category>'.$categories.'</category>';
-           $content .= stripslashes($entry['post_content']);
+                       $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+                       $categories = implode(',', wp_get_post_categories($entry['ID']));
 
-           $struct[] = array(
-             'userid' => $entry['post_author'],
-             'dateCreated' => new IXR_Date($post_date),
-             'content' => $content,
-             'postid' => $entry['ID'],
-           );
+                       $content  = '<title>'.stripslashes($entry['post_title']).'</title>';
+                       $content .= '<category>'.$categories.'</category>';
+                       $content .= stripslashes($entry['post_content']);
 
-         }
+                       $struct[] = array(
+                               'userid' => $entry['post_author'],
+                               'dateCreated' => new IXR_Date($post_date),
+                               'content' => $content,
+                               'postid' => $entry['ID'],
+                       );
 
-         $recent_posts = array();
-         for ($j=0; $j<count($struct); $j++) {
-           array_push($recent_posts, $struct[$j]);
-         }
+               }
+
+               $recent_posts = array();
+               for ($j=0; $j<count($struct); $j++) {
+                       array_push($recent_posts, $struct[$j]);
+               }
 
-         return $recent_posts;
+               return $recent_posts;
        }
 
 
@@ -302,11 +764,11 @@ class wp_xmlrpc_server extends IXR_Server {
 
          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.');
+           return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
          }
 
-         /* warning: here we make the assumption that the weblog's URI is on the same server */
-         $filename = get_settings('home') . '/';
+         /* warning: here we make the assumption that the blog's URL is on the same server */
+         $filename = get_option('home') . '/';
          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
          $f = fopen($filename, 'r');
@@ -314,7 +776,7 @@ class wp_xmlrpc_server extends IXR_Server {
          fclose($f);
 
          /* so it is actually editable with a windows/mac client */
-         // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented.     $content = str_replace("\n", "\r\n", $content); 
+         // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented.     $content = str_replace("\n", "\r\n", $content);
 
          return $content;
        }
@@ -337,18 +799,18 @@ class wp_xmlrpc_server extends IXR_Server {
 
          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.');
+           return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
          }
 
-         /* warning: here we make the assumption that the weblog's URI is on the same server */
-         $filename = get_settings('home') . '/';
+         /* warning: here we make the assumption that the blog's URL is on the same server */
+         $filename = get_option('home') . '/';
          $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
          if ($f = fopen($filename, 'w+')) {
            fwrite($f, $content);
            fclose($f);
          } else {
-           return new IXR_Error(500, 'Either the file is not writable, or something wrong happened. The file has not been updated.');
+           return new IXR_Error(500, __('Either the file is not writable, or something wrong happened. The file has not been updated.'));
          }
 
          return true;
@@ -371,11 +833,11 @@ class wp_xmlrpc_server extends IXR_Server {
          if (!$this->login_pass_ok($user_login, $user_pass)) {
            return $this->error;
          }
-         
+
          $cap = ($publish) ? 'publish_posts' : 'edit_posts';
          $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.');
+           return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
 
          $post_status = ($publish) ? 'publish' : 'draft';
 
@@ -391,10 +853,13 @@ class wp_xmlrpc_server extends IXR_Server {
          $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
 
          $post_ID = wp_insert_post($post_data);
+         if ( is_wp_error( $post_ID ) )
+               return new IXR_Error(500, $post_ID->get_error_message());
 
          if (!$post_ID) {
-           return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.');
+           return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
          }
+         $this->attach_uploads( $post_ID, $post_content );
 
          logIO('O', "Posted ! ID: $post_ID");
 
@@ -422,19 +887,19 @@ class wp_xmlrpc_server extends IXR_Server {
          $actual_post = wp_get_single_post($post_ID,ARRAY_A);
 
          if (!$actual_post) {
-               return new IXR_Error(404, 'Sorry, no such post.');
+               return new IXR_Error(404, __('Sorry, no such post.'));
          }
 
                $this->escape($actual_post);
 
          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.');
+           return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
 
          extract($actual_post, EXTR_SKIP);
 
          if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
-               return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+               return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
 
          $post_title = xmlrpc_getposttitle($content);
          $post_category = xmlrpc_getpostcategory($content);
@@ -445,8 +910,9 @@ class wp_xmlrpc_server extends IXR_Server {
          $result = wp_update_post($postdata);
 
          if (!$result) {
-               return new IXR_Error(500, 'For some strange yet very annoying reason, this post could not be edited.');
+               return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
          }
+         $this->attach_uploads( $ID, $post_content );
 
          return true;
        }
@@ -471,17 +937,17 @@ class wp_xmlrpc_server extends IXR_Server {
          $actual_post = wp_get_single_post($post_ID,ARRAY_A);
 
          if (!$actual_post) {
-               return new IXR_Error(404, 'Sorry, no such post.');
+               return new IXR_Error(404, __('Sorry, no such post.'));
          }
 
          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.');
+           return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
 
          $result = wp_delete_post($post_ID);
 
          if (!$result) {
-               return new IXR_Error(500, 'For some strange yet very annoying reason, this post could not be deleted.');
+               return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
          }
 
          return true;
@@ -510,12 +976,67 @@ class wp_xmlrpc_server extends IXR_Server {
            return $this->error;
          }
 
+      $cap = ($publish) ? 'publish_posts' : 'edit_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.');
+         if ( !current_user_can($cap) )
+           return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
+
+               // The post_type defaults to post, but could also be page.
+               $post_type = "post";
+               if(
+                       !empty($content_struct["post_type"])
+                       && ($content_struct["post_type"] == "page")
+               ) {
+                       $post_type = "page";
+               }
+
+               // Let WordPress generate the post_name (slug) unless
+               // one has been provided.
+               $post_name = "";
+               if(isset($content_struct["wp_slug"])) {
+                       $post_name = $content_struct["wp_slug"];
+               }
+
+               // Only use a password if one was given.
+               if(isset($content_struct["wp_password"])) {
+                       $post_password = $content_struct["wp_password"];
+               }
+
+               // Only set a post parent if one was provided.
+               if(isset($content_struct["wp_page_parent_id"])) {
+                       $post_parent = $content_struct["wp_page_parent_id"];
+               }
+
+               // Only set the menu_order if it was provided.
+               if(isset($content_struct["wp_page_order"])) {
+                       $menu_order = $content_struct["wp_page_order"];
+               }
 
          $post_author = $user->ID;
 
+               // If an author id was provided then use it instead.
+               if(
+                       isset($content_struct["wp_author_id"])
+                       && ($user->ID != $content_struct["wp_author_id"])
+               ) {
+                       switch($post_type) {
+                               case "post":
+                                       if(!current_user_can("edit_others_posts")) {
+                                               return(new IXR_Error(401, __("You are not allowed to post as this user")));
+                                       }
+                                       break;
+                               case "page":
+                                       if(!current_user_can("edit_others_pages")) {
+                                               return(new IXR_Error(401, __("You are not allowed to create pages as this user")));
+                                       }
+                                       break;
+                               default:
+                                       return(new IXR_Error(401, __("Invalid post type.")));
+                                       break;
+                       }
+                       $post_author = $content_struct["wp_author_id"];
+               }
+
          $post_title = $content_struct['title'];
          $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
          $post_status = $publish ? 'publish' : 'draft';
@@ -523,13 +1044,71 @@ class wp_xmlrpc_server extends IXR_Server {
          $post_excerpt = $content_struct['mt_excerpt'];
          $post_more = $content_struct['mt_text_more'];
 
-         $comment_status = (empty($content_struct['mt_allow_comments'])) ?
-           get_settings('default_comment_status')
-           : $content_struct['mt_allow_comments'];
+               $tags_input = $content_struct['mt_keywords'];
+
+               if(isset($content_struct["mt_allow_comments"])) {
+                       if(!is_numeric($content_struct["mt_allow_comments"])) {
+                               switch($content_struct["mt_allow_comments"]) {
+                                       case "closed":
+                                               $comment_status = "closed";
+                                               break;
+                                       case "open":
+                                               $comment_status = "open";
+                                               break;
+                                       default:
+                                               $comment_status = get_option("default_comment_status");
+                                               break;
+                               }
+                       }
+                       else {
+                               switch((int) $content_struct["mt_allow_comments"]) {
+                                       case 0:
+                                               $comment_status = "closed";
+                                               break;
+                                       case 1:
+                                               $comment_status = "open";
+                                               break;
+                                       default:
+                                               $comment_status = get_option("default_comment_status");
+                                               break;
+                               }
+                       }
+               }
+               else {
+                       $comment_status = get_option("default_comment_status");
+               }
 
-         $ping_status = (empty($content_struct['mt_allow_pings'])) ?
-           get_settings('default_ping_status')
-           : $content_struct['mt_allow_pings'];
+               if(isset($content_struct["mt_allow_pings"])) {
+                       if(!is_numeric($content_struct["mt_allow_pings"])) {
+                               switch($content_struct['mt_allow_pings']) {
+                                       case "closed":
+                                               $ping_status = "closed";
+                                               break;
+                                       case "open":
+                                               $ping_status = "open";
+                                               break;
+                                       default:
+                                               $ping_status = get_option("default_ping_status");
+                                               break;
+                               }
+                       }
+                       else {
+                               switch((int) $content_struct["mt_allow_pings"]) {
+                                       case 0:
+                                               $ping_status = "closed";
+                                               break;
+                                       case 1:
+                                               $ping_status = "open";
+                                               break;
+                                       default:
+                                               $ping_status = get_option("default_ping_status");
+                                               break;
+                               }
+                       }
+               }
+               else {
+                       $ping_status = get_option("default_ping_status");
+               }
 
          if ($post_more) {
            $post_content = $post_content . "\n<!--more-->\n" . $post_more;
@@ -539,16 +1118,16 @@ class wp_xmlrpc_server extends IXR_Server {
          if ( is_array($to_ping) )
                $to_ping = implode(' ', $to_ping);
 
-         // Do some timestamp voodoo
-         $dateCreatedd = $content_struct['dateCreated'];
-         if (!empty($dateCreatedd)) {
-           $dateCreated = $dateCreatedd->getIso();
-           $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-           $post_date_gmt = iso8601_to_datetime($dateCreated, GMT);
-         } else {
-           $post_date     = current_time('mysql');
-           $post_date_gmt = current_time('mysql', 1);
-         }
+               // Do some timestamp voodoo
+               $dateCreatedd = $content_struct['dateCreated'];
+               if (!empty($dateCreatedd)) {
+                       $dateCreated = $dateCreatedd->getIso();
+                       $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
+                       $post_date_gmt = iso8601_to_datetime($dateCreated, GMT);
+               } else {
+                       $post_date = current_time('mysql');
+                       $post_date_gmt = current_time('mysql', 1);
+               }
 
          $catnames = $content_struct['categories'];
          logIO('O', 'Post cats: ' . printr($catnames,true));
@@ -559,21 +1138,38 @@ class wp_xmlrpc_server extends IXR_Server {
              $post_category[] = get_cat_ID($cat);
            }
          }
-               
+
          // We've got all the data -- post it:
-         $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping');
+         $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input');
 
          $post_ID = wp_insert_post($postdata);
+         if ( is_wp_error( $post_ID ) )
+               return new IXR_Error(500, $post_ID->get_error_message());
 
          if (!$post_ID) {
-           return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.');
+           return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
          }
 
+         $this->attach_uploads( $post_ID, $post_content );
+
          logIO('O', "Posted ! ID: $post_ID");
 
          return strval($post_ID);
        }
 
+       function attach_uploads( $post_ID, $post_content ) {
+               global $wpdb;
+
+               // find any unattached files
+               $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '-1' AND post_type = 'attachment'" );
+               if( is_array( $attachments ) ) {
+                       foreach( $attachments as $file ) {
+                               if( strpos( $post_content, $file->guid ) !== false ) {
+                                       $wpdb->query( "UPDATE {$wpdb->posts} SET post_parent = '$post_ID' WHERE ID = '{$file->ID}'" );
+                               }
+                       }
+               }
+       }
 
        /* metaweblog.editPost ...edits a post */
        function mw_editPost($args) {
@@ -592,20 +1188,143 @@ class wp_xmlrpc_server extends IXR_Server {
            return $this->error;
          }
 
-         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.');
+               $user = set_current_user(0, $user_login);
+
+               // The post_type defaults to post, but could also be page.
+               $post_type = "post";
+               if(
+                       !empty($content_struct["post_type"])
+                       && ($content_struct["post_type"] == "page")
+               ) {
+                       $post_type = "page";
+               }
+
+         // Edit page caps are checked in editPage.  Just check post here.
+         if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
+           return new IXR_Error(401, __('Sorry, you can not edit this post.'));
 
          $postdata = wp_get_single_post($post_ID, ARRAY_A);
+
+               // If there is no post data for the give post id, stop
+               // now and return an error.  Other wise a new post will be
+               // created (which was the old behavior).
+               if(empty($postdata["ID"])) {
+                       return(new IXR_Error(404, __("Invalid post id.")));
+               }
+
                $this->escape($postdata);
                extract($postdata, EXTR_SKIP);
 
+               // Let WordPress manage slug if none was provided.
+               $post_name = "";
+               if(isset($content_struct["wp_slug"])) {
+                       $post_name = $content_struct["wp_slug"];
+               }
+
+               // Only use a password if one was given.
+               if(isset($content_struct["wp_password"])) {
+                       $post_password = $content_struct["wp_password"];
+               }
+
+               // Only set a post parent if one was given.
+               if(isset($content_struct["wp_page_parent_id"])) {
+                       $post_parent = $content_struct["wp_page_parent_id"];
+               }
+
+               // Only set the menu_order if it was given.
+               if(isset($content_struct["wp_page_order"])) {
+                       $menu_order = $content_struct["wp_page_order"];
+               }
+
+               $post_author = $postdata["post_author"];
+
+               // Only set the post_author if one is set.
+               if(
+                       isset($content_struct["wp_author_id"])
+                       && ($user->ID != $content_struct["wp_author_id"])
+               ) {
+                       switch($post_type) {
+                               case "post":
+                                       if(!current_user_can("edit_others_posts")) {
+                                               return(new IXR_Error(401, __("You are not allowed to change the post author as this user.")));
+                                       }
+                                       break;
+                               case "page":
+                                       if(!current_user_can("edit_others_pages")) {
+                                               return(new IXR_Error(401, __("You are not allowed to change the page author as this user.")));
+                                       }
+                                       break;
+                               default:
+                                       return(new IXR_Error(401, __("Invalid post type.")));
+                                       break;
+                       }
+                       $post_author = $content_struct["wp_author_id"];
+               }
+
+               if(isset($content_struct["mt_allow_comments"])) {
+                       if(!is_numeric($content_struct["mt_allow_comments"])) {
+                               switch($content_struct["mt_allow_comments"]) {
+                                       case "closed":
+                                               $comment_status = "closed";
+                                               break;
+                                       case "open":
+                                               $comment_status = "open";
+                                               break;
+                                       default:
+                                               $comment_status = get_option("default_comment_status");
+                                               break;
+                               }
+                       }
+                       else {
+                               switch((int) $content_struct["mt_allow_comments"]) {
+                                       case 0:
+                                               $comment_status = "closed";
+                                               break;
+                                       case 1:
+                                               $comment_status = "open";
+                                               break;
+                                       default:
+                                               $comment_status = get_option("default_comment_status");
+                                               break;
+                               }
+                       }
+               }
+
+               if(isset($content_struct["mt_allow_pings"])) {
+                       if(!is_numeric($content_struct["mt_allow_pings"])) {
+                               switch($content_struct["mt_allow_pings"]) {
+                                       case "closed":
+                                               $ping_status = "closed";
+                                               break;
+                                       case "open":
+                                               $ping_status = "open";
+                                               break;
+                                       default:
+                                               $ping_status = get_option("default_ping_status");
+                                               break;
+                               }
+                       }
+                       else {
+                               switch((int) $content_struct["mt_allow_pings"]) {
+                                       case 0:
+                                               $ping_status = "closed";
+                                               break;
+                                       case 1:
+                                               $ping_status = "open";
+                                               break;
+                                       default:
+                                               $ping_status = get_option("default_ping_status");
+                                               break;
+                               }
+                       }
+               }
+
          $post_title = $content_struct['title'];
          $post_content = apply_filters( 'content_save_pre', $content_struct['description'] );
          $catnames = $content_struct['categories'];
 
          $post_category = array();
-               
+
          if (is_array($catnames)) {
            foreach ($catnames as $cat) {
              $post_category[] = get_cat_ID($cat);
@@ -616,9 +1335,14 @@ class wp_xmlrpc_server extends IXR_Server {
          $post_more = $content_struct['mt_text_more'];
          $post_status = $publish ? 'publish' : 'draft';
 
+         $tags_input = $content_struct['mt_keywords'];
 
-         if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
-               return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+         if ( ('publish' == $post_status) ) {
+               if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
+                       return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
+               else if ( !current_user_can('publish_posts') )
+                       return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+         }
 
          if ($post_more) {
            $post_content = $post_content . "\n<!--more-->\n" . $post_more;
@@ -627,33 +1351,26 @@ class wp_xmlrpc_server extends IXR_Server {
          $to_ping = $content_struct['mt_tb_ping_urls'];
          if ( is_array($to_ping) )
                $to_ping = implode(' ', $to_ping);
-         
-         $comment_status = (empty($content_struct['mt_allow_comments'])) ?
-           get_settings('default_comment_status')
-           : $content_struct['mt_allow_comments'];
-
-         $ping_status = (empty($content_struct['mt_allow_pings'])) ?
-           get_settings('default_ping_status')
-           : $content_struct['mt_allow_pings'];
 
          // Do some timestamp voodoo
          $dateCreatedd = $content_struct['dateCreated'];
          if (!empty($dateCreatedd)) {
            $dateCreated = $dateCreatedd->getIso();
            $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-           $post_date_gmt = iso8601_to_datetime($dateCreated, GMT);
+           $post_date_gmt = iso8601_to_datetime($dateCreated . "Z", GMT);
          } else {
            $post_date     = $postdata['post_date'];
            $post_date_gmt = $postdata['post_date_gmt'];
          }
 
          // We've got all the data -- post it:
-         $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping');
+         $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input');
 
          $result = wp_update_post($newpost);
          if (!$result) {
-           return new IXR_Error(500, 'Sorry, your entry could not be edited. Something wrong happened.');
+           return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
          }
+         $this->attach_uploads( $ID, $post_content );
 
          logIO('O',"(MW) Edited ! ID: $post_ID");
 
@@ -664,57 +1381,83 @@ class wp_xmlrpc_server extends IXR_Server {
        /* metaweblog.getPost ...returns a post */
        function mw_getPost($args) {
 
-         global $wpdb;
+               global $wpdb;
 
                $this->escape($args);
 
-         $post_ID     = (int) $args[0];
-         $user_login  = $args[1];
-         $user_pass   = $args[2];
+               $post_ID     = (int) $args[0];
+               $user_login  = $args[1];
+               $user_pass   = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $postdata = wp_get_single_post($post_ID, ARRAY_A);
+               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.' ) );
 
-         if ($postdata['post_date'] != '') {
+               do_action('xmlrpc_call', 'metaWeblog.getPost');
 
-           $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
+               $postdata = wp_get_single_post($post_ID, ARRAY_A);
 
-           $categories = array();
-           $catids = wp_get_post_cats('', $post_ID);
-           foreach($catids as $catid) {
-             $categories[] = get_cat_name($catid);
-           }
+               if ($postdata['post_date'] != '') {
+                       $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
+                       $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
 
-           $post = get_extended($postdata['post_content']);
-           $link = post_permalink($postdata['ID']);
+                       $categories = array();
+                       $catids = wp_get_post_categories($post_ID);
+                       foreach($catids as $catid) {
+                               $categories[] = get_cat_name($catid);
+                       }
 
-           $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
-           $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
+                       $tagnames = array();
+                       $tags = wp_get_post_tags( $post_ID );
+                       if ( !empty( $tags ) ) {
+                               foreach ( $tags as $tag ) {
+                                       $tagnames[] = $tag->name;
+                               }
+                               $tagnames = implode( ', ', $tagnames );
+                       } else {
+                               $tagnames = '';
+                       }
 
-           $resp = array(
-             'dateCreated' => new IXR_Date($post_date),
-             'userid' => $postdata['post_author'],
-             'postid' => $postdata['ID'],
-             'description' => $post['main'],
-             'title' => $postdata['post_title'],
-             'link' => $link,
-             'permaLink' => $link,
-// commented out because no other tool seems to use this
-//           'content' => $entry['post_content'],
-             'categories' => $categories,
-             'mt_excerpt' => $postdata['post_excerpt'],
-             'mt_text_more' => $post['extended'],
-             'mt_allow_comments' => $allow_comments,
-             'mt_allow_pings' => $allow_pings
-           );
-
-           return $resp;
-         } else {
-               return new IXR_Error(404, 'Sorry, no such post.');
-         }
+                       $post = get_extended($postdata['post_content']);
+                       $link = post_permalink($postdata['ID']);
+
+                       // Get the author info.
+                       $author = get_userdata($postdata['post_author']);
+
+                       $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
+                       $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
+
+                       $resp = array(
+                       'dateCreated' => new IXR_Date($post_date),
+                               'userid' => $postdata['post_author'],
+                               'postid' => $postdata['ID'],
+                               'description' => $post['main'],
+                               'title' => $postdata['post_title'],
+                               'link' => $link,
+                               'permaLink' => $link,
+                               // commented out because no other tool seems to use this
+                               //            'content' => $entry['post_content'],
+                               'categories' => $categories,
+                               'mt_excerpt' => $postdata['post_excerpt'],
+                               'mt_text_more' => $post['extended'],
+                               'mt_allow_comments' => $allow_comments,
+                               'mt_allow_pings' => $allow_pings,
+                               'mt_keywords' => $tagnames,
+                               'wp_slug' => $postdata['post_name'],
+                               'wp_password' => $postdata['post_password'],
+                               'wp_author_id' => $author->ID,
+                               'wp_author_display_name'        => $author->display_name,
+                               'date_created_gmt' => new IXR_Date($post_date_gmt)
+                       );
+
+                       return $resp;
+               } else {
+                       return new IXR_Error(404, __('Sorry, no such post.'));
+               }
        }
 
 
@@ -728,64 +1471,90 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_pass   = $args[2];
                $num_posts   = (int) $args[3];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $posts_list = wp_get_recent_posts($num_posts);
+               $posts_list = wp_get_recent_posts($num_posts);
 
-         if (!$posts_list) {
-           $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
-           return $this->error;
-         }
+               if (!$posts_list) {
+                       $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+                       return $this->error;
+               }
 
-         foreach ($posts_list as $entry) {
-         
-           $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
-           $categories = array();
-           $catids = wp_get_post_cats('', $entry['ID']);
-           foreach($catids as $catid) {
-             $categories[] = get_cat_name($catid);
-           }
+               set_current_user( 0, $user_login );
 
-           $post = get_extended($entry['post_content']);
-           $link = post_permalink($entry['ID']);
+               foreach ($posts_list as $entry) {
+                       if( !current_user_can( 'edit_post', $entry['ID'] ) )
+                               continue;
+
+                       $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+                       $post_date_gmt = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
+
+                       $categories = array();
+                       $catids = wp_get_post_categories($entry['ID']);
+                       foreach($catids as $catid) {
+                               $categories[] = get_cat_name($catid);
+                       }
+
+                       $tagnames = array();
+                       $tags = wp_get_post_tags( $entry['ID'] );
+                       if ( !empty( $tags ) ) {
+                               foreach ( $tags as $tag ) {
+                                       $tagnames[] = $tag->name;
+                               }
+                               $tagnames = implode( ', ', $tagnames );
+                       } else {
+                               $tagnames = '';
+                       }
+
+                       $post = get_extended($entry['post_content']);
+                       $link = post_permalink($entry['ID']);
 
-           $allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
-           $allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
+                       // Get the post author info.
+                       $author = get_userdata($entry['post_author']);
 
-           $struct[] = array(
-             'dateCreated' => new IXR_Date($post_date),
-             'userid' => $entry['post_author'],
-             'postid' => $entry['ID'],
-             'description' => $post['main'],
-             'title' => $entry['post_title'],
-             'link' => $link,
-             'permaLink' => $link,
+                       $allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
+                       $allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
+
+                       $struct[] = array(
+                               'dateCreated' => new IXR_Date($post_date),
+                               'userid' => $entry['post_author'],
+                               'postid' => $entry['ID'],
+                               'description' => $post['main'],
+                               'title' => $entry['post_title'],
+                               'link' => $link,
+                               'permaLink' => $link,
 // commented out because no other tool seems to use this
 //           'content' => $entry['post_content'],
-             'categories' => $categories,
-             'mt_excerpt' => $entry['post_excerpt'],
-             'mt_text_more' => $post['extended'],
-             'mt_allow_comments' => $allow_comments,
-             'mt_allow_pings' => $allow_pings
-           );
+                               'categories' => $categories,
+                               'mt_excerpt' => $entry['post_excerpt'],
+                               'mt_text_more' => $post['extended'],
+                               'mt_allow_comments' => $allow_comments,
+                               'mt_allow_pings' => $allow_pings,
+                               'mt_keywords' => $tagnames,
+                               'wp_slug' => $entry['post_name'],
+                               'wp_password' => $entry['post_password'],
+                               'wp_author_id' => $author->ID,
+                               'wp_author_display_name' => $author->display_name,
+                               'date_created_gmt' => new IXR_Date($post_date_gmt)
+                       );
 
-         }
+               }
 
-         $recent_posts = array();
-         for ($j=0; $j<count($struct); $j++) {
-           array_push($recent_posts, $struct[$j]);
-         }
-         
-         return $recent_posts;
+               $recent_posts = array();
+               for ($j=0; $j<count($struct); $j++) {
+                       array_push($recent_posts, $struct[$j]);
+               }
+
+               return $recent_posts;
        }
 
 
-       /* metaweblog.getCategories ...returns the list of categories on a given weblog */
+       /* metaweblog.getCategories ...returns the list of categories on a given blog */
        function mw_getCategories($args) {
 
-         global $wpdb;
+               global $wpdb;
 
                $this->escape($args);
 
@@ -793,26 +1562,32 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_login  = $args[1];
                $user_pass   = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $categories_struct = array();
+               set_current_user( 0, $user_login );
+               if( !current_user_can( 'edit_posts' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
 
-         // FIXME: can we avoid using direct SQL there?
-         if ($cats = $wpdb->get_results("SELECT cat_ID,cat_name FROM $wpdb->categories", ARRAY_A)) {
-           foreach ($cats as $cat) {
-             $struct['categoryId'] = $cat['cat_ID'];
-             $struct['description'] = $cat['cat_name'];
-             $struct['categoryName'] = $cat['cat_name'];
-             $struct['htmlUrl'] = wp_specialchars(get_category_link($cat['cat_ID']));
-             $struct['rssUrl'] = wp_specialchars(get_category_rss_link(false, $cat['cat_ID'], $cat['cat_name']));
+               do_action('xmlrpc_call', 'metaWeblog.getCategories');
 
-             $categories_struct[] = $struct;
-           }
-         }
+               $categories_struct = array();
+
+               if ( $cats = get_categories('get=all') ) {
+                       foreach ( $cats as $cat ) {
+                               $struct['categoryId'] = $cat->term_id;
+                               $struct['parentId'] = $cat->parent;
+                               $struct['description'] = $cat->name;
+                               $struct['categoryName'] = $cat->name;
+                               $struct['htmlUrl'] = wp_specialchars(get_category_link($cat->term_id));
+                               $struct['rssUrl'] = wp_specialchars(get_category_rss_link(false, $cat->term_id, $cat->name));
 
-         return $categories_struct;
+                               $categories_struct[] = $struct;
+                       }
+               }
+
+               return $categories_struct;
        }
 
 
@@ -828,7 +1603,7 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_pass   = $wpdb->escape($args[2]);
                $data        = $args[3];
 
-               $name = $data['name'];
+               $name = sanitize_file_name( $data['name'] );
                $type = $data['type'];
                $bits = $data['bits'];
 
@@ -840,17 +1615,54 @@ class wp_xmlrpc_server extends IXR_Server {
                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.');
+                       $this->error = new IXR_Error(401, __('You are not allowed to upload files to this site.'));
                        return $this->error;
                }
 
-               $upload = wp_upload_bits($name, $type, $bits);
+               if ( $upload_err = apply_filters( "pre_upload_error", false ) )
+                       return new IXR_Error(500, $upload_err);
+
+               if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
+                       // Get postmeta info on the object.
+                       $old_file = $wpdb->get_row("
+                               SELECT ID
+                               FROM {$wpdb->posts}
+                               WHERE post_title = '{$name}'
+                                       AND post_type = 'attachment'
+                       ");
+
+                       // Delete previous file.
+                       wp_delete_attachment($old_file->ID);
+
+                       // Make sure the new name is different by pre-pending the
+                       // previous post id.
+                       $filename = preg_replace("/^wpid\d+-/", "", $name);
+                       $name = "wpid{$old_file->ID}-{$filename}";
+               }
+
+               $upload = wp_upload_bits($name, $type, $bits, $overwrite);
                if ( ! empty($upload['error']) ) {
-                       logIO('O', '(MW) Could not write file '.$name);
-                       return new IXR_Error(500, 'Could not write file '.$name);
+                       $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']);
+                       logIO('O', '(MW) ' . $errorString);
+                       return new IXR_Error(500, $errorString);
                }
-               
-               return array('url' => $upload['url']);
+               // Construct the attachment array
+               // attach to post_id -1
+               $post_id = -1;
+               $attachment = array(
+                       'post_title' => $name,
+                       'post_content' => '',
+                       'post_type' => 'attachment',
+                       'post_parent' => $post_id,
+                       'post_mime_type' => $type,
+                       'guid' => $upload[ 'url' ]
+               );
+
+               // Save the data
+               $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
+               wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+
+               return apply_filters( 'wp_handle_upload', array( 'file' => $name, 'url' => $upload[ 'url' ], 'type' => $type ) );
        }
 
 
@@ -868,43 +1680,49 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_pass   = $args[2];
                $num_posts   = (int) $args[3];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $posts_list = wp_get_recent_posts($num_posts);
+               $posts_list = wp_get_recent_posts($num_posts);
 
-         if (!$posts_list) {
-           $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
-           return $this->error;
-         }
+               if (!$posts_list) {
+                       $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+                       return $this->error;
+               }
 
-         foreach ($posts_list as $entry) {
-         
-           $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+               set_current_user( 0, $user_login );
 
-           $struct[] = array(
-             'dateCreated' => new IXR_Date($post_date),
-             'userid' => $entry['post_author'],
-             'postid' => $entry['ID'],
-             'title' => $entry['post_title'],
-           );
+               foreach ($posts_list as $entry) {
+                       if( !current_user_can( 'edit_post', $entry['ID'] ) ) 
+                               continue;
 
-         }
+                       $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+                       $post_date_gmt = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
 
-         $recent_posts = array();
-         for ($j=0; $j<count($struct); $j++) {
-           array_push($recent_posts, $struct[$j]);
-         }
-         
-         return $recent_posts;
+                       $struct[] = array(
+                               'dateCreated' => new IXR_Date($post_date),
+                               'userid' => $entry['post_author'],
+                               'postid' => $entry['ID'],
+                               'title' => $entry['post_title'],
+                               'date_created_gmt' => new IXR_Date($post_date_gmt)
+                       );
+
+               }
+
+               $recent_posts = array();
+               for ($j=0; $j<count($struct); $j++) {
+                       array_push($recent_posts, $struct[$j]);
+               }
+
+               return $recent_posts;
        }
 
 
-       /* mt.getCategoryList ...returns the list of categories on a given weblog */
+       /* mt.getCategoryList ...returns the list of categories on a given blog */
        function mt_getCategoryList($args) {
 
-         global $wpdb;
+               global $wpdb;
 
                $this->escape($args);
 
@@ -912,23 +1730,28 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_login  = $args[1];
                $user_pass   = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $categories_struct = array();
+               set_current_user( 0, $user_login );
+               if( !current_user_can( 'edit_posts' ) )
+                       return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) );
 
-         // FIXME: can we avoid using direct SQL there?
-         if ($cats = $wpdb->get_results("SELECT cat_ID, cat_name FROM $wpdb->categories", ARRAY_A)) {
-           foreach ($cats as $cat) {
-             $struct['categoryId'] = $cat['cat_ID'];
-             $struct['categoryName'] = $cat['cat_name'];
+               do_action('xmlrpc_call', 'mt.getCategoryList');
 
-             $categories_struct[] = $struct;
-           }
-         }
+               $categories_struct = array();
+
+               if ( $cats = get_categories('hide_empty=0&hierarchical=0') ) {
+                       foreach ($cats as $cat) {
+                               $struct['categoryId'] = $cat->term_id;
+                               $struct['categoryName'] = $cat->name;
+
+                               $categories_struct[] = $struct;
+                       }
+               }
 
-         return $categories_struct;
+               return $categories_struct;
        }
 
 
@@ -941,24 +1764,30 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_login  = $args[1];
                $user_pass   = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         $categories = array();
-         $catids = wp_get_post_cats('', intval($post_ID));
-         // first listed category will be the primary category
-         $isPrimary = true;
-         foreach($catids as $catid) {
-           $categories[] = array(
-             'categoryName' => get_cat_name($catid),
-             'categoryId' => $catid,
-             'isPrimary' => $isPrimary
-           );
-           $isPrimary = false;
-         }
-         return $categories;
+               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.' ) );
+
+               do_action('xmlrpc_call', 'mt.getPostCategories');
+
+               $categories = array();
+               $catids = wp_get_post_categories(intval($post_ID));
+               // first listed category will be the primary category
+               $isPrimary = true;
+               foreach($catids as $catid) {
+                       $categories[] = array(
+                               'categoryName' => get_cat_name($catid),
+                               'categoryId' => (string) $catid,
+                               'isPrimary' => $isPrimary
+                       );
+                       $isPrimary = false;
+               }
+
+               return $categories;
        }
 
 
@@ -972,76 +1801,76 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_pass   = $args[2];
                $categories  = $args[3];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         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.');
+               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.'));
 
-         foreach($categories as $cat) {
-           $catids[] = $cat['categoryId'];
-         }
-       
-         wp_set_post_cats('', $post_ID, $catids);
+               foreach($categories as $cat) {
+                       $catids[] = $cat['categoryId'];
+               }
 
-         return true;
+               wp_set_post_categories($post_ID, $catids);
+
+               return true;
        }
 
 
        /* mt.supportedMethods ...returns an array of methods supported by this server */
        function mt_supportedMethods($args) {
 
-         $supported_methods = array();
-         foreach($this->methods as $key=>$value) {
-           $supported_methods[] = $key;
-         }
+               $supported_methods = array();
+               foreach($this->methods as $key=>$value) {
+                       $supported_methods[] = $key;
+               }
 
-         return $supported_methods;
+               return $supported_methods;
        }
 
 
        /* mt.supportedTextFilters ...returns an empty array because we don't
-          support per-post text filters yet */
+                support per-post text filters yet */
        function mt_supportedTextFilters($args) {
-         return array();
+               return apply_filters('xmlrpc_text_filters', array());
        }
 
 
        /* mt.getTrackbackPings ...returns trackbacks sent to a given post */
        function mt_getTrackbackPings($args) {
 
-         global $wpdb;
+               global $wpdb;
 
-         $post_ID = intval($args);
+               $post_ID = intval($args);
 
-         $actual_post = wp_get_single_post($post_ID, ARRAY_A);
+               $actual_post = wp_get_single_post($post_ID, ARRAY_A);
 
-         if (!$actual_post) {
-               return new IXR_Error(404, 'Sorry, no such post.');
-         }
+               if (!$actual_post) {
+                       return new IXR_Error(404, __('Sorry, no such post.'));
+               }
 
-         $comments = $wpdb->get_results("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = $post_ID");
+               $comments = $wpdb->get_results("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = $post_ID");
 
-         if (!$comments) {
-               return array();
-         }
+               if (!$comments) {
+                       return array();
+               }
 
-         $trackback_pings = array();
-         foreach($comments as $comment) {
-           if ( 'trackback' == $comment->comment_type ) {
-             $content = $comment->comment_content;
-             $title = substr($content, 8, (strpos($content, '</strong>') - 8));
-             $trackback_pings[] = array(
-               'pingTitle' => $title,
-               'pingURL'   => $comment->comment_author_url,
-               'pingIP'    => $comment->comment_author_IP
-             );
+               $trackback_pings = array();
+               foreach($comments as $comment) {
+                       if ( 'trackback' == $comment->comment_type ) {
+                               $content = $comment->comment_content;
+                               $title = substr($content, 8, (strpos($content, '</strong>') - 8));
+                               $trackback_pings[] = array(
+                                       'pingTitle' => $title,
+                                       'pingURL'   => $comment->comment_author_url,
+                                       'pingIP'    => $comment->comment_author_IP
+                               );
+               }
                }
-         }
 
-         return $trackback_pings;
+               return $trackback_pings;
        }
 
 
@@ -1054,26 +1883,26 @@ class wp_xmlrpc_server extends IXR_Server {
                $user_login  = $args[1];
                $user_pass   = $args[2];
 
-         if (!$this->login_pass_ok($user_login, $user_pass)) {
-           return $this->error;
-         }
+               if (!$this->login_pass_ok($user_login, $user_pass)) {
+                       return $this->error;
+               }
 
-         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.');
+               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.'));
 
-         $postdata = wp_get_single_post($post_ID,ARRAY_A);
+               $postdata = wp_get_single_post($post_ID,ARRAY_A);
 
-         $postdata['post_status'] = 'publish';
+               $postdata['post_status'] = 'publish';
 
-         // retain old cats
-         $cats = wp_get_post_cats('',$post_ID);
-         $postdata['post_category'] = $cats;
+               // retain old cats
+               $cats = wp_get_post_categories($post_ID);
+               $postdata['post_category'] = $cats;
                $this->escape($postdata);
 
-         $result = wp_update_post($postdata);
+               $result = wp_update_post($postdata);
 
-         return $result;
+               return $result;
        }
 
 
@@ -1084,7 +1913,7 @@ class wp_xmlrpc_server extends IXR_Server {
 
        /* pingback.ping gets a pingback and registers it */
        function pingback_ping($args) {
-               global $wpdb, $wp_version; 
+               global $wpdb, $wp_version;
 
                $this->escape($args);
 
@@ -1094,14 +1923,15 @@ class wp_xmlrpc_server extends IXR_Server {
                $title = '';
 
                $pagelinkedfrom = str_replace('&amp;', '&', $pagelinkedfrom);
-               $pagelinkedto   = preg_replace('#&([^amp\;])#is', '&amp;$1', $pagelinkedto);
+               $pagelinkedto = str_replace('&amp;', '&', $pagelinkedto);
+               $pagelinkedto = str_replace('&', '&amp;', $pagelinkedto);
 
                $error_code = -1;
 
                // Check if the page linked to is in our site
-               $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home')));
+               $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
                if( !$pos1 )
-                       return new IXR_Error(0, 'Is there no link to us?');
+                               return new IXR_Error(0, __('Is there no link to us?'));
 
                // let's find which post is linked to
                // FIXME: does url_to_postid() cover all these cases already?
@@ -1141,30 +1971,30 @@ class wp_xmlrpc_server extends IXR_Server {
                        }
                } else {
                        // TODO: Attempt to extract a post ID from the given URL
-                       return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+                       return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
                }
                $post_ID = (int) $post_ID;
 
 
-               logIO("O","(PB) URI='$pagelinkedto' ID='$post_ID' Found='$way'");
+               logIO("O","(PB) URL='$pagelinkedto' ID='$post_ID' Found='$way'");
 
                $post = get_post($post_ID);
 
                if ( !$post ) // Post_ID not found
-                       return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+                       return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
 
                if ( $post_ID == url_to_postid($pagelinkedfrom) )
-                       return new IXR_Error(0, 'The source URI and the target URI cannot both point to the same resource.');
+                       return new IXR_Error(0, __('The source URL and the target URL cannot both point to the same resource.'));
 
                // Check if pings are on
                if ( 'closed' == $post->ping_status )
-                       return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+                       return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
 
                // Let's check that the remote site didn't already pingback this entry
                $result = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_ID' AND comment_author_url = '$pagelinkedfrom'");
 
                if ( $wpdb->num_rows ) // We already have a Pingback from this URL
-                       return new IXR_Error(48, 'The pingback has already been registered.');
+                       return new IXR_Error(48, __('The pingback has already been registered.'));
 
                // very stupid, but gives time to the 'from' server to publish !
                sleep(1);
@@ -1172,7 +2002,7 @@ class wp_xmlrpc_server extends IXR_Server {
                // Let's check the remote site
                $linea = wp_remote_fopen( $pagelinkedfrom );
                if ( !$linea )
-                       return new IXR_Error(16, 'The source URI does not exist.');
+                       return new IXR_Error(16, __('The source URL does not exist.'));
 
                // Work around bug in strip_tags():
                $linea = str_replace('<!DOC', '<DOC', $linea);
@@ -1182,34 +2012,45 @@ class wp_xmlrpc_server extends IXR_Server {
                preg_match('|<title>([^<]*?)</title>|is', $linea, $matchtitle);
                $title = $matchtitle[1];
                if ( empty( $title ) )
-                       return new IXR_Error(32, 'We cannot find a title on that page.');
+                       return new IXR_Error(32, __('We cannot find a title on that page.'));
 
                $linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
 
                $p = explode( "\n\n", $linea );
-               
-               $sem_regexp_pb = "/(\\/|\\\|\*|\?|\+|\.|\^|\\$|\(|\)|\[|\]|\||\{|\})/";
-               $sem_regexp_fix = "\\\\$1";
-               $link = preg_replace( $sem_regexp_pb, $sem_regexp_fix, $pagelinkedfrom );
-               
-               $finished = false;
+
+               $preg_target = preg_quote($pagelinkedto);
+
                foreach ( $p as $para ) {
-                       if ( $finished )
-                               continue;
-                       if ( strstr( $para, $pagelinkedto ) ) {
-                               $context = preg_replace( "/.*<a[^>]+".$link."[^>]*>([^>]+)<\/a>.*/", "$1", $para );
-                               $excerpt = strip_tags( $para );
-                               $excerpt = trim( $excerpt );
-                               $use     = preg_quote( $context );
-                               $excerpt = preg_replace("|.*?\s(.{0,100}$use.{0,100})\s|s", "$1", $excerpt);
-                               $finished = true;
+                       if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
+                               preg_match("|<a[^>]+?".$preg_target."[^>]*>([^>]+?)</a>|", $para, $context);
+
+                               // If the URL isn't in a link context, keep looking
+                               if ( empty($context) )
+                                       continue;
+
+                               // We're going to use this fake tag to mark the context in a bit
+                               // the marker is needed in case the link text appears more than once in the paragraph
+                               $excerpt = preg_replace('|\</?wpcontext\>|', '', $para);
+
+                               // prevent really long link text
+                               if ( strlen($context[1]) > 100 )
+                                       $context[1] = substr($context[1], 0, 100) . '...';
+
+                               $marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
+                               $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
+                               $excerpt = strip_tags($excerpt, '<wpcontext>');        // strip all tags but our context marker
+                               $excerpt = trim($excerpt);
+                               $preg_marker = preg_quote($marker);
+                               $excerpt = preg_replace("|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt);
+                               $excerpt = strip_tags($excerpt); // YES, again, to remove the marker wrapper
+                               break;
                        }
                }
 
-               if ( empty($context) ) // URL pattern not found
-                       return new IXR_Error(17, 'The source URI does not contain a link to the target URI, and so cannot be used as a source.');
+               if ( empty($context) ) // Link to target not found
+                       return new IXR_Error(17, __('The source URL does not contain a link to the target URL, and so cannot be used as a source.'));
 
-               $pagelinkedfrom = preg_replace('#&([^amp\;])#is', '&amp;$1', $pagelinkedfrom);
+               $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
 
                $context = '[...] ' . wp_specialchars( $excerpt ) . ' [...]';
                $original_pagelinkedfrom = $pagelinkedfrom;
@@ -1226,16 +2067,16 @@ class wp_xmlrpc_server extends IXR_Server {
 
                $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_content', 'comment_type');
 
-               wp_new_comment($commentdata);
-               do_action('pingback_post', $wpdb->insert_id);
-               
-               return "Pingback from $pagelinkedfrom to $pagelinkedto registered. Keep the web talking! :-)";
+               $comment_ID = wp_new_comment($commentdata);
+               do_action('pingback_post', $comment_ID);
+
+               return sprintf(__('Pingback from %1$s to %2$s registered. Keep the web talking! :-)'), $pagelinkedfrom, $pagelinkedto);
        }
 
 
        /* pingback.extensions.getPingbacks returns an array of URLs
-          that pingbacked the given URL
-          specs on http://www.aquarionics.com/misc/archives/blogite/0198.html */
+       that pingbacked the given URL
+       specs on http://www.aquarionics.com/misc/archives/blogite/0198.html */
        function pingback_extensions_getPingbacks($args) {
 
                global $wpdb;
@@ -1247,14 +2088,14 @@ class wp_xmlrpc_server extends IXR_Server {
                $post_ID = url_to_postid($url);
                if (!$post_ID) {
                        // We aren't sure that the resource is available and/or pingback enabled
-                       return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
+                       return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.'));
                }
 
                $actual_post = wp_get_single_post($post_ID, ARRAY_A);
 
                if (!$actual_post) {
                        // No such post = resource not found
-                       return new IXR_Error(32, 'The specified target URI does not exist.');
+                       return new IXR_Error(32, __('The specified target URL does not exist.'));
                }
 
                $comments = $wpdb->get_results("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = $post_ID");