# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\xampp\htdocs\wordtrunk\wp-includes # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: class-wp-xmlrpc-server.php --- class-wp-xmlrpc-server.php Base (BASE) +++ class-wp-xmlrpc-server.php Locally Modified (Based On LOCAL) @@ -1,4 +1,5 @@ methods = array( // WordPress API - 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs', - '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.getTags' => 'this:wp_getTags', - 'wp.newCategory' => 'this:wp_newCategory', - 'wp.deleteCategory' => 'this:wp_deleteCategory', - 'wp.suggestCategories' => 'this:wp_suggestCategories', - 'wp.uploadFile' => 'this:mw_newMediaObject', // Alias - 'wp.getCommentCount' => 'this:wp_getCommentCount', - 'wp.getPostStatusList' => 'this:wp_getPostStatusList', - 'wp.getPageStatusList' => 'this:wp_getPageStatusList', - 'wp.getPageTemplates' => 'this:wp_getPageTemplates', - 'wp.getOptions' => 'this:wp_getOptions', - 'wp.setOptions' => 'this:wp_setOptions', - 'wp.getComment' => 'this:wp_getComment', - 'wp.getComments' => 'this:wp_getComments', - 'wp.deleteComment' => 'this:wp_deleteComment', - 'wp.editComment' => 'this:wp_editComment', - 'wp.newComment' => 'this:wp_newComment', + 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs', + '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.getTags' => 'this:wp_getTags', + 'wp.newCategory' => 'this:wp_newCategory', + 'wp.deleteCategory' => 'this:wp_deleteCategory', + 'wp.suggestCategories' => 'this:wp_suggestCategories', + 'wp.uploadFile' => 'this:mw_newMediaObject', // Alias + 'wp.getCommentCount' => 'this:wp_getCommentCount', + 'wp.getPostStatusList' => 'this:wp_getPostStatusList', + 'wp.getPageStatusList' => 'this:wp_getPageStatusList', + 'wp.getPageTemplates' => 'this:wp_getPageTemplates', + 'wp.getOptions' => 'this:wp_getOptions', + 'wp.setOptions' => 'this:wp_setOptions', + 'wp.getComment' => 'this:wp_getComment', + 'wp.getComments' => 'this:wp_getComments', + 'wp.deleteComment' => 'this:wp_deleteComment', + 'wp.editComment' => 'this:wp_editComment', + 'wp.newComment' => 'this:wp_newComment', 'wp.getCommentStatusList' => 'this:wp_getCommentStatusList', - 'wp.getMediaItem' => 'this:wp_getMediaItem', - 'wp.getMediaLibrary' => 'this:wp_getMediaLibrary', - 'wp.getPostFormats' => 'this:wp_getPostFormats', - + 'wp.getMediaItem' => 'this:wp_getMediaItem', + 'wp.getMediaLibrary' => 'this:wp_getMediaLibrary', + 'wp.getPostFormats' => 'this:wp_getPostFormats', + 'wp.deleteUser' => 'this:wp_deleteUser', // Blogger API 'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs', 'blogger.getUserInfo' => 'this:blogger_getUserInfo', @@ -75,7 +76,6 @@ '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', @@ -83,14 +83,12 @@ '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', @@ -100,16 +98,14 @@ '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->initialise_blog_option_info( ); + $this->initialise_blog_option_info(); $this->methods = apply_filters('xmlrpc_methods', $this->methods); } @@ -155,8 +151,8 @@ * @see wp_xmlrpc_server::login */ function login_pass_ok($user_login, $user_pass) { - if ( !get_option( 'enable_xmlrpc' ) ) { - $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); + if (!get_option('enable_xmlrpc')) { + $this->error = new IXR_Error(405, sprintf(__('XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php'))); return false; } @@ -177,8 +173,8 @@ * @return mixed WP_User object if authentication passed, false otherwise */ function login($username, $password) { - if ( !get_option( 'enable_xmlrpc' ) ) { - $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); + if (!get_option('enable_xmlrpc')) { + $this->error = new IXR_Error(405, sprintf(__('XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php'))); return false; } @@ -189,7 +185,7 @@ return false; } - wp_set_current_user( $user->ID ); + wp_set_current_user($user->ID); return $user; } @@ -207,10 +203,10 @@ if (!is_array($array)) { return($wpdb->escape($array)); } else { - foreach ( (array) $array as $k => $v ) { - if ( is_array($v) ) { + foreach ((array) $array as $k => $v) { + if (is_array($v)) { $this->escape($array[$k]); - } else if ( is_object($v) ) { + } else if (is_object($v)) { //skip } else { $array[$k] = $wpdb->escape($v); @@ -232,14 +228,14 @@ $custom_fields = array(); - foreach ( (array) has_meta($post_id) as $meta ) { + foreach ((array) has_meta($post_id) as $meta) { // Don't expose protected fields. - if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) ) + if (!current_user_can('edit_post_meta', $post_id, $meta['meta_key'])) continue; $custom_fields[] = array( - "id" => $meta['meta_id'], - "key" => $meta['meta_key'], + "id" => $meta['meta_id'], + "key" => $meta['meta_key'], "value" => $meta['meta_value'] ); } @@ -258,22 +254,22 @@ function set_custom_fields($post_id, $fields) { $post_id = (int) $post_id; - foreach ( (array) $fields as $meta ) { - if ( isset($meta['id']) ) { + foreach ((array) $fields as $meta) { + if (isset($meta['id'])) { $meta['id'] = (int) $meta['id']; - $pmeta = get_metadata_by_mid( 'post', $meta['id'] ); - $meta['value'] = stripslashes_deep( $meta['value'] ); - if ( isset($meta['key']) ) { - $meta['key'] = stripslashes( $meta['key'] ); - if ( $meta['key'] != $pmeta->meta_key ) + $pmeta = get_metadata_by_mid('post', $meta['id']); + $meta['value'] = stripslashes_deep($meta['value']); + if (isset($meta['key'])) { + $meta['key'] = stripslashes($meta['key']); + if ($meta['key'] != $pmeta->meta_key) continue; - if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) ) - update_metadata_by_mid( 'post', $meta['id'], $meta['value'] ); - } elseif ( current_user_can( 'delete_post_meta', $post_id, $pmeta->meta_key ) ) { - delete_metadata_by_mid( 'post', $meta['id'] ); + if (current_user_can('edit_post_meta', $post_id, $meta['key'])) + update_metadata_by_mid('post', $meta['id'], $meta['value']); + } elseif (current_user_can('delete_post_meta', $post_id, $pmeta->meta_key)) { + delete_metadata_by_mid('post', $meta['id']); } - } elseif ( current_user_can( 'add_post_meta', $post_id, stripslashes( $meta['key'] ) ) ) { - add_post_meta( $post_id, $meta['key'], $meta['value'] ); + } elseif (current_user_can('add_post_meta', $post_id, stripslashes($meta['key']))) { + add_post_meta($post_id, $meta['key'], $meta['value']); } } } @@ -285,96 +281,95 @@ * * @since 2.6.0 */ - function initialise_blog_option_info( ) { + function initialise_blog_option_info() { global $wp_version; $this->blog_options = array( // Read only options - 'software_name' => array( - 'desc' => __( 'Software Name' ), - 'readonly' => true, - 'value' => 'WordPress' + 'software_name' => array( + 'desc' => __('Software Name'), + 'readonly' => true, + 'value' => 'WordPress' ), - 'software_version' => array( - 'desc' => __( 'Software Version' ), - 'readonly' => true, - 'value' => $wp_version + 'software_version' => array( + 'desc' => __('Software Version'), + 'readonly' => true, + 'value' => $wp_version ), - 'blog_url' => array( - 'desc' => __( 'Site URL' ), - 'readonly' => true, - 'option' => 'siteurl' + 'blog_url' => array( + 'desc' => __('Site URL'), + 'readonly' => true, + 'option' => 'siteurl' ), - // Updatable options - 'time_zone' => array( - 'desc' => __( 'Time Zone' ), - 'readonly' => false, - 'option' => 'gmt_offset' + 'time_zone' => array( + 'desc' => __('Time Zone'), + 'readonly' => false, + 'option' => 'gmt_offset' ), - 'blog_title' => array( - 'desc' => __( 'Site Title' ), - 'readonly' => false, - 'option' => 'blogname' + 'blog_title' => array( + 'desc' => __('Site Title'), + 'readonly' => false, + 'option' => 'blogname' ), - 'blog_tagline' => array( - 'desc' => __( 'Site Tagline' ), - 'readonly' => false, - 'option' => 'blogdescription' + 'blog_tagline' => array( + 'desc' => __('Site Tagline'), + 'readonly' => false, + 'option' => 'blogdescription' ), - 'date_format' => array( - 'desc' => __( 'Date Format' ), - 'readonly' => false, - 'option' => 'date_format' + 'date_format' => array( + 'desc' => __('Date Format'), + 'readonly' => false, + 'option' => 'date_format' ), - 'time_format' => array( - 'desc' => __( 'Time Format' ), - 'readonly' => false, - 'option' => 'time_format' + 'time_format' => array( + 'desc' => __('Time Format'), + 'readonly' => false, + 'option' => 'time_format' ), - 'users_can_register' => array( - 'desc' => __( 'Allow new users to sign up' ), - 'readonly' => false, - 'option' => 'users_can_register' + 'users_can_register' => array( + 'desc' => __('Allow new users to sign up'), + 'readonly' => false, + 'option' => 'users_can_register' ), - 'thumbnail_size_w' => array( - 'desc' => __( 'Thumbnail Width' ), - 'readonly' => false, - 'option' => 'thumbnail_size_w' + 'thumbnail_size_w' => array( + 'desc' => __('Thumbnail Width'), + 'readonly' => false, + 'option' => 'thumbnail_size_w' ), - 'thumbnail_size_h' => array( - 'desc' => __( 'Thumbnail Height' ), - 'readonly' => false, - 'option' => 'thumbnail_size_h' + 'thumbnail_size_h' => array( + 'desc' => __('Thumbnail Height'), + 'readonly' => false, + 'option' => 'thumbnail_size_h' ), - 'thumbnail_crop' => array( - 'desc' => __( 'Crop thumbnail to exact dimensions' ), - 'readonly' => false, - 'option' => 'thumbnail_crop' + 'thumbnail_crop' => array( + 'desc' => __('Crop thumbnail to exact dimensions'), + 'readonly' => false, + 'option' => 'thumbnail_crop' ), - 'medium_size_w' => array( - 'desc' => __( 'Medium size image width' ), - 'readonly' => false, - 'option' => 'medium_size_w' + 'medium_size_w' => array( + 'desc' => __('Medium size image width'), + 'readonly' => false, + 'option' => 'medium_size_w' ), - 'medium_size_h' => array( - 'desc' => __( 'Medium size image height' ), - 'readonly' => false, - 'option' => 'medium_size_h' + 'medium_size_h' => array( + 'desc' => __('Medium size image height'), + 'readonly' => false, + 'option' => 'medium_size_h' ), - 'large_size_w' => array( - 'desc' => __( 'Large size image width' ), - 'readonly' => false, - 'option' => 'large_size_w' + 'large_size_w' => array( + 'desc' => __('Large size image width'), + 'readonly' => false, + 'option' => 'large_size_w' ), - 'large_size_h' => array( - 'desc' => __( 'Large size image height' ), - 'readonly' => false, - 'option' => 'large_size_h' + 'large_size_h' => array( + 'desc' => __('Large size image height'), + 'readonly' => false, + 'option' => 'large_size_h' ) ); - $this->blog_options = apply_filters( 'xmlrpc_blog_options', $this->blog_options ); + $this->blog_options = apply_filters('xmlrpc_blog_options', $this->blog_options); } /** @@ -392,31 +387,31 @@ * - 'blogName' * - 'xmlrpc' - url of xmlrpc endpoint */ - function wp_getUsersBlogs( $args ) { + function wp_getUsersBlogs($args) { global $current_site; // If this isn't on WPMU then just use blogger_getUsersBlogs - if ( !is_multisite() ) { - array_unshift( $args, 1 ); - return $this->blogger_getUsersBlogs( $args ); + if (!is_multisite()) { + array_unshift($args, 1); + return $this->blogger_getUsersBlogs($args); } - $this->escape( $args ); + $this->escape($args); $username = $args[0]; $password = $args[1]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - do_action( 'xmlrpc_call', 'wp.getUsersBlogs' ); + do_action('xmlrpc_call', 'wp.getUsersBlogs'); - $blogs = (array) get_blogs_of_user( $user->ID ); - $struct = array( ); + $blogs = (array) get_blogs_of_user($user->ID); + $struct = array(); - foreach ( $blogs as $blog ) { + foreach ($blogs as $blog) { // Don't include blogs that aren't hosted at this site - if ( $blog->site_id != $current_site->id ) + if ($blog->site_id != $current_site->id) continue; $blog_id = $blog->userblog_id; @@ -424,14 +419,14 @@ $is_admin = current_user_can('manage_options'); $struct[] = array( - 'isAdmin' => $is_admin, - 'url' => get_option( 'home' ) . '/', - 'blogid' => (string) $blog_id, - 'blogName' => get_option( 'blogname' ), - 'xmlrpc' => site_url( 'xmlrpc.php' ) + 'isAdmin' => $is_admin, + 'url' => get_option('home') . '/', + 'blogid' => (string) $blog_id, + 'blogName' => get_option('blogname'), + 'xmlrpc' => site_url('xmlrpc.php') ); - restore_current_blog( ); + restore_current_blog(); } return $struct; @@ -452,17 +447,17 @@ function wp_getPage($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $page_id = (int) $args[1]; - $username = $args[2]; - $password = $args[3]; + $blog_id = (int) $args[0]; + $page_id = (int) $args[1]; + $username = $args[2]; + $password = $args[3]; - if ( !$user = $this->login($username, $password) ) { + if (!$user = $this->login($username, $password)) { return $this->error; } - if ( !current_user_can( 'edit_page', $page_id ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit this page.' ) ); + if (!current_user_can('edit_page', $page_id)) + return new IXR_Error(401, __('Sorry, you cannot edit this page.')); do_action('xmlrpc_call', 'wp.getPage'); @@ -470,14 +465,14 @@ $page = get_page($page_id); // If we found the page then format the data. - if ( $page->ID && ($page->post_type == 'page') ) { + 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) ) { + if (!empty($page->post_parent)) { $parent = get_page($page->post_parent); $parent_title = $parent->post_title; } @@ -491,47 +486,47 @@ $page_date_gmt = mysql2date('Ymd\TH:i:s', $page->post_date_gmt, false); // For drafts use the GMT version of the date - if ( $page->post_status == 'draft' ) - $page_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $page->post_date ), 'Ymd\TH:i:s' ); + if ($page->post_status == 'draft') + $page_date_gmt = get_gmt_from_date(mysql2date('Y-m-d H:i:s', $page->post_date), 'Ymd\TH:i:s'); // Pull the categories info together. $categories = array(); - foreach ( wp_get_post_categories($page->ID) as $cat_id ) { + 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_template = get_post_meta( $page->ID, '_wp_page_template', true ); - if ( empty( $page_template ) ) + $page_template = get_post_meta($page->ID, '_wp_page_template', true); + if (empty($page_template)) $page_template = 'default'; $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' => (string) $author->ID, - 'wp_author_display_name' => $author->display_name, - 'date_created_gmt' => new IXR_Date($page_date_gmt), - 'custom_fields' => $this->get_custom_fields($page_id), - 'wp_page_template' => $page_template + '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' => (string) $author->ID, + 'wp_author_display_name' => $author->display_name, + 'date_created_gmt' => new IXR_Date($page_date_gmt), + 'custom_fields' => $this->get_custom_fields($page_id), + 'wp_page_template' => $page_template ); return($page_struct); @@ -557,27 +552,27 @@ function wp_getPages($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $num_pages = isset($args[3]) ? (int) $args[3] : 10; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $num_pages = isset($args[3]) ? (int) $args[3] : 10; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_pages' ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) ); + if (!current_user_can('edit_pages')) + return new IXR_Error(401, __('Sorry, you cannot edit pages.')); do_action('xmlrpc_call', 'wp.getPages'); - $pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) ); + $pages = get_posts(array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages)); $num_pages = count($pages); // If we have pages, put together their info. - if ( $num_pages >= 1 ) { + if ($num_pages >= 1) { $pages_struct = array(); - for ( $i = 0; $i < $num_pages; $i++ ) { + for ($i = 0; $i < $num_pages; $i++) { $page = wp_xmlrpc_server::wp_getPage(array( $blog_id, $pages[$i]->ID, $username, $password )); @@ -602,18 +597,18 @@ */ 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]; + $username = $this->escape($args[1]); + $password = $this->escape($args[2]); + $page = $args[3]; + $publish = $args[4]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'wp.newPage'); // Make sure the user is allowed to add new pages. - if ( !current_user_can('publish_pages') ) + if (!current_user_can('publish_pages')) return(new IXR_Error(401, __('Sorry, you cannot add new pages.'))); // Mark this as content for a page. @@ -634,12 +629,12 @@ function wp_deletePage($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $page_id = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $page_id = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'wp.deletePage'); @@ -647,16 +642,16 @@ // 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') ) + if (!$actual_page || ($actual_page['post_type'] != 'page')) return(new IXR_Error(404, __('Sorry, no such page.'))); // Make sure the user can delete pages. - if ( !current_user_can('delete_page', $page_id) ) + 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 ) + if (!$result) return(new IXR_Error(500, __('Failed to delete the page.'))); return(true); @@ -672,25 +667,25 @@ */ 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]; + $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 ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'wp.editPage'); // 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') ) + if (!$actual_page || ($actual_page['post_type'] != 'page')) return(new IXR_Error(404, __('Sorry, no such page.'))); // Make sure the user is allowed to edit pages. - if ( !current_user_can('edit_page', $page_id) ) + 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. @@ -722,15 +717,15 @@ $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_pages' ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit pages.' ) ); + if (!current_user_can('edit_pages')) + return new IXR_Error(401, __('Sorry, you cannot edit pages.')); do_action('xmlrpc_call', 'wp.getPageList'); @@ -749,7 +744,7 @@ // The date needs to be formatted properly. $num_pages = count($page_list); - for ( $i = 0; $i < $num_pages; $i++ ) { + for ($i = 0; $i < $num_pages; $i++) { $post_date = mysql2date('Ymd\TH:i:s', $page_list[$i]->post_date, false); $post_date_gmt = mysql2date('Ymd\TH:i:s', $page_list[$i]->post_date_gmt, false); @@ -757,9 +752,9 @@ $page_list[$i]->date_created_gmt = new IXR_Date($post_date_gmt); // For drafts use the GMT version of the date - if ( $page_list[$i]->post_status == 'draft' ) { - $page_list[$i]->date_created_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $page_list[$i]->post_date ), 'Ymd\TH:i:s' ); - $page_list[$i]->date_created_gmt = new IXR_Date( $page_list[$i]->date_created_gmt ); + if ($page_list[$i]->post_status == 'draft') { + $page_list[$i]->date_created_gmt = get_gmt_from_date(mysql2date('Y-m-d H:i:s', $page_list[$i]->post_date), 'Ymd\TH:i:s'); + $page_list[$i]->date_created_gmt = new IXR_Date($page_list[$i]->date_created_gmt); } unset($page_list[$i]->post_date_gmt); @@ -782,24 +777,24 @@ $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can('edit_posts') ) + if (!current_user_can('edit_posts')) return(new IXR_Error(401, __('Sorry, you cannot edit posts on this site.'))); do_action('xmlrpc_call', 'wp.getAuthors'); $authors = array(); - foreach ( get_users( array( 'fields' => array('ID','user_login','display_name') ) ) as $user ) { + foreach (get_users(array('fields' => array('ID', 'user_login', 'display_name'))) as $user) { $authors[] = array( - 'user_id' => $user->ID, - 'user_login' => $user->user_login, - 'display_name' => $user->display_name + 'user_id' => $user->ID, + 'user_login' => $user->user_login, + 'display_name' => $user->display_name ); } @@ -814,31 +809,31 @@ * @param array $args Method parameters. * @return array */ - function wp_getTags( $args ) { - $this->escape( $args ); + function wp_getTags($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view tags.')); - do_action( 'xmlrpc_call', 'wp.getKeywords' ); + do_action('xmlrpc_call', 'wp.getKeywords'); - $tags = array( ); + $tags = array(); - if ( $all_tags = get_tags() ) { - foreach( (array) $all_tags as $tag ) { - $struct['tag_id'] = $tag->term_id; - $struct['name'] = $tag->name; - $struct['count'] = $tag->count; - $struct['slug'] = $tag->slug; - $struct['html_url'] = esc_html( get_tag_link( $tag->term_id ) ); - $struct['rss_url'] = esc_html( get_tag_feed_link( $tag->term_id ) ); + if ($all_tags = get_tags()) { + foreach ((array) $all_tags as $tag) { + $struct['tag_id'] = $tag->term_id; + $struct['name'] = $tag->name; + $struct['count'] = $tag->count; + $struct['slug'] = $tag->slug; + $struct['html_url'] = esc_html(get_tag_link($tag->term_id)); + $struct['rss_url'] = esc_html(get_tag_feed_link($tag->term_id)); $tags[] = $struct; } @@ -858,48 +853,48 @@ function wp_newCategory($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $category = $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $category = $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'wp.newCategory'); // Make sure the user is allowed to add a category. - if ( !current_user_can('manage_categories') ) + 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']) ) + 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']) ) + if (!isset($category['parent_id'])) $category['parent_id'] = ''; // If no description was provided make it empty. - if ( empty($category["description"]) ) + 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_name' => $category['name'], + 'category_nicename' => $category['slug'], + 'category_parent' => $category['parent_id'], + 'category_description' => $category['description'] ); $cat_id = wp_insert_category($new_category, true); - if ( is_wp_error( $cat_id ) ) { - if ( 'term_exists' == $cat_id->get_error_code() ) + if (is_wp_error($cat_id)) { + if ('term_exists' == $cat_id->get_error_code()) return (int) $cat_id->get_error_data(); else return(new IXR_Error(500, __('Sorry, the new category failed.'))); - } elseif ( ! $cat_id ) { + } elseif (!$cat_id) { return(new IXR_Error(500, __('Sorry, the new category failed.'))); } @@ -917,20 +912,20 @@ function wp_deleteCategory($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $category_id = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $category_id = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'wp.deleteCategory'); - if ( !current_user_can('manage_categories') ) - return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) ); + if (!current_user_can('manage_categories')) + return new IXR_Error(401, __('Sorry, you do not have the right to delete a category.')); - return wp_delete_term( $category_id, 'category' ); + return wp_delete_term($category_id, 'category'); } /** @@ -944,26 +939,26 @@ function wp_suggestCategories($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $category = $args[3]; - $max_results = (int) $args[4]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $category = $args[3]; + $max_results = (int) $args[4]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(401, __('Sorry, you must be able to edit posts to this site in order to view categories.')); do_action('xmlrpc_call', 'wp.suggestCategories'); $category_suggestions = array(); $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category); - foreach ( (array) get_categories($args) as $cat ) { + foreach ((array) get_categories($args) as $cat) { $category_suggestions[] = array( - 'category_id' => $cat->term_id, - 'category_name' => $cat->name + 'category_id' => $cat->term_id, + 'category_name' => $cat->name ); } @@ -981,31 +976,31 @@ function wp_getComment($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $comment_id = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $comment_id = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); + if (!current_user_can('moderate_comments')) + return new IXR_Error(403, __('You are not allowed to moderate comments on this site.')); do_action('xmlrpc_call', 'wp.getComment'); - if ( ! $comment = get_comment($comment_id) ) - return new IXR_Error( 404, __( 'Invalid comment ID.' ) ); + if (!$comment = get_comment($comment_id)) + return new IXR_Error(404, __('Invalid comment ID.')); // Format page date. $comment_date = mysql2date('Ymd\TH:i:s', $comment->comment_date, false); $comment_date_gmt = mysql2date('Ymd\TH:i:s', $comment->comment_date_gmt, false); - if ( '0' == $comment->comment_approved ) + if ('0' == $comment->comment_approved) $comment_status = 'hold'; - else if ( 'spam' == $comment->comment_approved ) + else if ('spam' == $comment->comment_approved) $comment_status = 'spam'; - else if ( '1' == $comment->comment_approved ) + else if ('1' == $comment->comment_approved) $comment_status = 'approve'; else $comment_status = $comment->comment_approved; @@ -1013,20 +1008,20 @@ $link = get_comment_link($comment); $comment_struct = array( - 'date_created_gmt' => new IXR_Date($comment_date_gmt), - 'user_id' => $comment->user_id, - 'comment_id' => $comment->comment_ID, - 'parent' => $comment->comment_parent, - 'status' => $comment_status, - 'content' => $comment->comment_content, - 'link' => $link, - 'post_id' => $comment->comment_post_ID, - 'post_title' => get_the_title($comment->comment_post_ID), - 'author' => $comment->comment_author, - 'author_url' => $comment->comment_author_url, - 'author_email' => $comment->comment_author_email, - 'author_ip' => $comment->comment_author_IP, - 'type' => $comment->comment_type, + 'date_created_gmt' => new IXR_Date($comment_date_gmt), + 'user_id' => $comment->user_id, + 'comment_id' => $comment->comment_ID, + 'parent' => $comment->comment_parent, + 'status' => $comment_status, + 'content' => $comment->comment_content, + 'link' => $link, + 'post_id' => $comment->comment_post_ID, + 'post_title' => get_the_title($comment->comment_post_ID), + 'author' => $comment->comment_author, + 'author_url' => $comment->comment_author_url, + 'author_email' => $comment->comment_author_email, + 'author_ip' => $comment->comment_author_IP, + 'type' => $comment->comment_type, ); return $comment_struct; @@ -1055,46 +1050,46 @@ $raw_args = $args; $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $struct = $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $struct = $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit comments.' ) ); + if (!current_user_can('moderate_comments')) + return new IXR_Error(401, __('Sorry, you cannot edit comments.')); do_action('xmlrpc_call', 'wp.getComments'); - if ( isset($struct['status']) ) + if (isset($struct['status'])) $status = $struct['status']; else $status = ''; $post_id = ''; - if ( isset($struct['post_id']) ) + if (isset($struct['post_id'])) $post_id = absint($struct['post_id']); $offset = 0; - if ( isset($struct['offset']) ) + if (isset($struct['offset'])) $offset = absint($struct['offset']); $number = 10; - if ( isset($struct['number']) ) + if (isset($struct['number'])) $number = absint($struct['number']); - $comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) ); + $comments = get_comments(array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number)); $num_comments = count($comments); - if ( ! $num_comments ) + if (!$num_comments) return array(); $comments_struct = array(); // FIXME: we already have the comments, why query them again? - for ( $i = 0; $i < $num_comments; $i++ ) { + for ($i = 0; $i < $num_comments; $i++) { $comment = wp_xmlrpc_server::wp_getComment(array( $raw_args[0], $raw_args[1], $raw_args[2], $comments[$i]->comment_ID, )); @@ -1123,22 +1118,22 @@ function wp_deleteComment($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $comment_ID = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $comment_ID = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); + if (!current_user_can('moderate_comments')) + return new IXR_Error(403, __('You are not allowed to moderate comments on this site.')); - if ( ! get_comment($comment_ID) ) - return new IXR_Error( 404, __( 'Invalid comment ID.' ) ); + if (!get_comment($comment_ID)) + return new IXR_Error(404, __('Invalid comment ID.')); - if ( !current_user_can( 'edit_comment', $comment_ID ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); + if (!current_user_can('edit_comment', $comment_ID)) + return new IXR_Error(403, __('You are not allowed to moderate comments on this site.')); do_action('xmlrpc_call', 'wp.deleteComment'); @@ -1172,62 +1167,62 @@ function wp_editComment($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $comment_ID = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $comment_ID = (int) $args[3]; $content_struct = $args[4]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); + if (!current_user_can('moderate_comments')) + return new IXR_Error(403, __('You are not allowed to moderate comments on this site.')); - if ( ! get_comment($comment_ID) ) - return new IXR_Error( 404, __( 'Invalid comment ID.' ) ); + if (!get_comment($comment_ID)) + return new IXR_Error(404, __('Invalid comment ID.')); - if ( !current_user_can( 'edit_comment', $comment_ID ) ) - return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) ); + if (!current_user_can('edit_comment', $comment_ID)) + return new IXR_Error(403, __('You are not allowed to moderate comments on this site.')); do_action('xmlrpc_call', 'wp.editComment'); - if ( isset($content_struct['status']) ) { + if (isset($content_struct['status'])) { $statuses = get_comment_statuses(); $statuses = array_keys($statuses); - if ( ! in_array($content_struct['status'], $statuses) ) - return new IXR_Error( 401, __( 'Invalid comment status.' ) ); + if (!in_array($content_struct['status'], $statuses)) + return new IXR_Error(401, __('Invalid comment status.')); $comment_approved = $content_struct['status']; } // Do some timestamp voodoo - if ( !empty( $content_struct['date_created_gmt'] ) ) { - $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force + if (!empty($content_struct['date_created_gmt'])) { + $dateCreated = str_replace('Z', '', $content_struct['date_created_gmt']->getIso()) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated)); $comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT'); } - if ( isset($content_struct['content']) ) + if (isset($content_struct['content'])) $comment_content = $content_struct['content']; - if ( isset($content_struct['author']) ) + if (isset($content_struct['author'])) $comment_author = $content_struct['author']; - if ( isset($content_struct['author_url']) ) + if (isset($content_struct['author_url'])) $comment_author_url = $content_struct['author_url']; - if ( isset($content_struct['author_email']) ) + if (isset($content_struct['author_email'])) $comment_author_email = $content_struct['author_email']; // We've got all the data -- post it: $comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url'); $result = wp_update_comment($comment); - if ( is_wp_error( $result ) ) + if (is_wp_error($result)) return new IXR_Error(500, $result->get_error_message()); - if ( !$result ) + if (!$result) return new IXR_Error(500, __('Sorry, the comment could not be edited. Something wrong happened.')); return true; @@ -1246,70 +1241,70 @@ $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $post = $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $post = $args[3]; $content_struct = $args[4]; $allow_anon = apply_filters('xmlrpc_allow_anonymous_comments', false); $user = $this->login($username, $password); - if ( !$user ) { + if (!$user) { $logged_in = false; - if ( $allow_anon && get_option('comment_registration') ) - return new IXR_Error( 403, __( 'You must be registered to comment' ) ); - else if ( !$allow_anon ) + if ($allow_anon && get_option('comment_registration')) + return new IXR_Error(403, __('You must be registered to comment')); + else if (!$allow_anon) return $this->error; } else { $logged_in = true; } - if ( is_numeric($post) ) + if (is_numeric($post)) $post_id = absint($post); else $post_id = url_to_postid($post); - if ( ! $post_id ) - return new IXR_Error( 404, __( 'Invalid post ID.' ) ); + if (!$post_id) + return new IXR_Error(404, __('Invalid post ID.')); - if ( ! get_post($post_id) ) - return new IXR_Error( 404, __( 'Invalid post ID.' ) ); + if (!get_post($post_id)) + return new IXR_Error(404, __('Invalid post ID.')); $comment['comment_post_ID'] = $post_id; - if ( $logged_in ) { - $comment['comment_author'] = $wpdb->escape( $user->display_name ); - $comment['comment_author_email'] = $wpdb->escape( $user->user_email ); - $comment['comment_author_url'] = $wpdb->escape( $user->user_url ); + if ($logged_in) { + $comment['comment_author'] = $wpdb->escape($user->display_name); + $comment['comment_author_email'] = $wpdb->escape($user->user_email); + $comment['comment_author_url'] = $wpdb->escape($user->user_url); $comment['user_ID'] = $user->ID; } else { $comment['comment_author'] = ''; - if ( isset($content_struct['author']) ) + if (isset($content_struct['author'])) $comment['comment_author'] = $content_struct['author']; $comment['comment_author_email'] = ''; - if ( isset($content_struct['author_email']) ) + if (isset($content_struct['author_email'])) $comment['comment_author_email'] = $content_struct['author_email']; $comment['comment_author_url'] = ''; - if ( isset($content_struct['author_url']) ) + if (isset($content_struct['author_url'])) $comment['comment_author_url'] = $content_struct['author_url']; $comment['user_ID'] = 0; - if ( get_option('require_name_email') ) { - if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) - return new IXR_Error( 403, __( 'Comment author name and email are required' ) ); - elseif ( !is_email($comment['comment_author_email']) ) - return new IXR_Error( 403, __( 'A valid email address is required' ) ); + if (get_option('require_name_email')) { + if (6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author']) + return new IXR_Error(403, __('Comment author name and email are required')); + elseif (!is_email($comment['comment_author_email'])) + return new IXR_Error(403, __('A valid email address is required')); } } $comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0; - $comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null; + $comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null; do_action('xmlrpc_call', 'wp.newComment'); @@ -1325,21 +1320,21 @@ * @return array */ function wp_getCommentStatusList($args) { - $this->escape( $args ); + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'moderate_comments' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); + if (!current_user_can('moderate_comments')) + return new IXR_Error(403, __('You are not allowed access to details about this site.')); do_action('xmlrpc_call', 'wp.getCommentStatusList'); - return get_comment_statuses( ); + return get_comment_statuses(); } /** @@ -1350,23 +1345,23 @@ * @param array $args Method parameters. * @return array */ - function wp_getCommentCount( $args ) { + function wp_getCommentCount($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $post_id = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $post_id = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about comments.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(403, __('You are not allowed access to details about comments.')); do_action('xmlrpc_call', 'wp.getCommentCount'); - $count = wp_count_comments( $post_id ); + $count = wp_count_comments($post_id); return array( 'approved' => $count->approved, 'awaiting_moderation' => $count->moderated, @@ -1383,22 +1378,22 @@ * @param array $args Method parameters. * @return array */ - function wp_getPostStatusList( $args ) { - $this->escape( $args ); + function wp_getPostStatusList($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(403, __('You are not allowed access to details about this site.')); do_action('xmlrpc_call', 'wp.getPostStatusList'); - return get_post_statuses( ); + return get_post_statuses(); } /** @@ -1409,22 +1404,22 @@ * @param array $args Method parameters. * @return array */ - function wp_getPageStatusList( $args ) { - $this->escape( $args ); + function wp_getPageStatusList($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_pages' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); + if (!current_user_can('edit_pages')) + return new IXR_Error(403, __('You are not allowed access to details about this site.')); do_action('xmlrpc_call', 'wp.getPageStatusList'); - return get_page_statuses( ); + return get_page_statuses(); } /** @@ -1435,20 +1430,20 @@ * @param array $args Method parameters. * @return array */ - function wp_getPageTemplates( $args ) { - $this->escape( $args ); + function wp_getPageTemplates($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_pages' ) ) - return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) ); + if (!current_user_can('edit_pages')) + return new IXR_Error(403, __('You are not allowed access to details about this site.')); - $templates = get_page_templates( ); + $templates = get_page_templates(); $templates['Default'] = 'default'; return $templates; @@ -1462,19 +1457,19 @@ * @param array $args Method parameters. * @return array */ - function wp_getOptions( $args ) { - $this->escape( $args ); + function wp_getOptions($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $options = isset( $args[3] ) ? (array) $args[3] : array(); + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $options = isset($args[3]) ? (array) $args[3] : array(); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; // If no specific options where asked for, return all of them - if ( count( $options ) == 0 ) + if (count($options) == 0) $options = array_keys($this->blog_options); return $this->_getOptions($options); @@ -1489,13 +1484,13 @@ * @return array */ function _getOptions($options) { - $data = array( ); - foreach ( $options as $option ) { - if ( array_key_exists( $option, $this->blog_options ) ) { + $data = array(); + foreach ($options as $option) { + if (array_key_exists($option, $this->blog_options)) { $data[$option] = $this->blog_options[$option]; //Is the value static or dynamic? - if ( isset( $data[$option]['option'] ) ) { - $data[$option]['value'] = get_option( $data[$option]['option'] ); + if (isset($data[$option]['option'])) { + $data[$option]['value'] = get_option($data[$option]['option']); unset($data[$option]['option']); } } @@ -1512,29 +1507,29 @@ * @param array $args Method parameters. * @return unknown */ - function wp_setOptions( $args ) { - $this->escape( $args ); + function wp_setOptions($args) { + $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $options = (array) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $options = (array) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'manage_options' ) ) - return new IXR_Error( 403, __( 'You are not allowed to update options.' ) ); + if (!current_user_can('manage_options')) + return new IXR_Error(403, __('You are not allowed to update options.')); - foreach ( $options as $o_name => $o_value ) { + foreach ($options as $o_name => $o_value) { $option_names[] = $o_name; - if ( !array_key_exists( $o_name, $this->blog_options ) ) + if (!array_key_exists($o_name, $this->blog_options)) continue; - if ( $this->blog_options[$o_name]['readonly'] == true ) + if ($this->blog_options[$o_name]['readonly'] == true) continue; - update_option( $this->blog_options[$o_name]['option'], $o_value ); + update_option($this->blog_options[$o_name]['option'], $o_value); } //Now return the updated values @@ -1564,21 +1559,21 @@ function wp_getMediaItem($args) { $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $attachment_id = (int) $args[3]; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $attachment_id = (int) $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'upload_files' ) ) - return new IXR_Error( 403, __( 'You are not allowed to upload files to this site.' ) ); + if (!current_user_can('upload_files')) + return new IXR_Error(403, __('You are not allowed to upload files to this site.')); do_action('xmlrpc_call', 'wp.getMediaItem'); - if ( ! $attachment = get_post($attachment_id) ) - return new IXR_Error( 404, __( 'Invalid attachment ID.' ) ); + if (!$attachment = get_post($attachment_id)) + return new IXR_Error(404, __('Invalid attachment ID.')); // Format page date. $attachment_date = mysql2date('Ymd\TH:i:s', $attachment->post_date, false); @@ -1588,14 +1583,14 @@ $thumbnail_link = wp_get_attachment_thumb_url($attachment->ID); $attachment_struct = array( - 'date_created_gmt' => new IXR_Date($attachment_date_gmt), - 'parent' => $attachment->post_parent, - 'link' => $link, - 'thumbnail' => $thumbnail_link, - 'title' => $attachment->post_title, - 'caption' => $attachment->post_excerpt, - 'description' => $attachment->post_content, - 'metadata' => wp_get_attachment_metadata($attachment->ID), + 'date_created_gmt' => new IXR_Date($attachment_date_gmt), + 'parent' => $attachment->post_parent, + 'link' => $link, + 'thumbnail' => $thumbnail_link, + 'title' => $attachment->post_title, + 'caption' => $attachment->post_excerpt, + 'description' => $attachment->post_content, + 'metadata' => wp_get_attachment_metadata($attachment->ID), ); return $attachment_struct; @@ -1628,34 +1623,34 @@ $raw_args = $args; $this->escape($args); - $blog_id = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $struct = isset( $args[3] ) ? $args[3] : array() ; + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $struct = isset($args[3]) ? $args[3] : array(); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'upload_files' ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot upload files.' ) ); + if (!current_user_can('upload_files')) + return new IXR_Error(401, __('Sorry, you cannot upload files.')); do_action('xmlrpc_call', 'wp.getMediaLibrary'); - $parent_id = ( isset($struct['parent_id']) ) ? absint($struct['parent_id']) : '' ; - $mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : '' ; - $offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ; - $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ; + $parent_id = ( isset($struct['parent_id']) ) ? absint($struct['parent_id']) : ''; + $mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : ''; + $offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0; + $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1; - $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) ); + $attachments = get_posts(array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type)); $num_attachments = count($attachments); - if ( ! $num_attachments ) + if (!$num_attachments) return array(); $attachments_struct = array(); - foreach ($attachments as $attachment ) - $attachments_struct[] = $this->wp_getMediaItem( array( $raw_args[0], $raw_args[1], $raw_args[2], $attachment->ID ) ); + foreach ($attachments as $attachment) + $attachments_struct[] = $this->wp_getMediaItem(array($raw_args[0], $raw_args[1], $raw_args[2], $attachment->ID)); return $attachments_struct; } @@ -1671,25 +1666,25 @@ * - password * @return array */ - function wp_getPostFormats( $args ) { - $this->escape( $args ); + function wp_getPostFormats($args) { + $this->escape($args); $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; - if ( !$user = $this->login( $username, $password ) ) + if (!$user = $this->login($username, $password)) return $this->error; - do_action( 'xmlrpc_call', 'wp.getPostFormats' ); + do_action('xmlrpc_call', 'wp.getPostFormats'); $formats = get_post_format_strings(); # find out if they want a list of currently supports formats - if ( isset( $args[3] ) && is_array( $args[3] ) ) { - if ( $args[3]['show-supported'] ) { - if ( current_theme_supports( 'post-formats' ) ) { - $supported = get_theme_support( 'post-formats' ); + if (isset($args[3]) && is_array($args[3])) { + if ($args[3]['show-supported']) { + if (current_theme_supports('post-formats')) { + $supported = get_theme_support('post-formats'); $data['all'] = $formats; $data['supported'] = $supported[0]; @@ -1702,6 +1697,58 @@ return $formats; } + /** + * Delete a user + * + * @uses wp_delete_user() + * @param array $args Method parameters. Contains: + * - int $blog_id + * - string $username + * - string $password + * - int $user_id + * - int $reassign_id + * @return True when user is deleted. + */ + function wp_deleteUser($args) { + $this->escape($args); + + $blog_id = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $user_id = (int) $args[3]; + + if (!$user = $this->login($username, $password)) + return $this->error; + + do_action('xmlrpc_call', 'wp.deleteUser'); + + if (!current_user_can('delete_users')) + return new IXR_Error(401, __('You are not allowed to delete users.')); + + if (!get_userdata($user_id)) + return new IXR_Error(404, __('Invalid user ID.')); + + if ($user->ID == $user_id) + return new IXR_Error(401, __('You cannot delete yourself.')); + + if (isset($args[4])) { + $reassign_id = (int) $args[4]; + if (!get_userdata($user_id)) + return new IXR_Error(404, __('Invalid reassign user ID.')); + if($reassign_id == $user_id) + return new IXR_Error(404, __('Cannot reassign for a deleting user.')); + } else { + $reassign_id = 'novalue'; + } + + $result = wp_delete_user($user_id, $reassign_id); + + if (!$result) + return new IXR_Error(500, __('Cannot delete user.')); + + return true; + } + /* Blogger API functions. * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/ */ @@ -1717,15 +1764,15 @@ * @return array */ function blogger_getUsersBlogs($args) { - if ( is_multisite() ) + if (is_multisite()) return $this->_multisite_getUsersBlogs($args); $this->escape($args); $username = $args[1]; - $password = $args[2]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.getUsersBlogs'); @@ -1733,11 +1780,11 @@ $is_admin = current_user_can('manage_options'); $struct = array( - 'isAdmin' => $is_admin, - 'url' => get_option('home') . '/', - 'blogid' => '1', + 'isAdmin' => $is_admin, + 'url' => get_option('home') . '/', + 'blogid' => '1', 'blogName' => get_option('blogname'), - 'xmlrpc' => site_url( 'xmlrpc.php' ) + 'xmlrpc' => site_url('xmlrpc.php') ); return array($struct); @@ -1758,14 +1805,14 @@ $rpc->query('wp.getUsersBlogs', $args[1], $args[2]); $blogs = $rpc->getResponse(); - if ( isset($blogs['faultCode']) ) + if (isset($blogs['faultCode'])) return new IXR_Error($blogs['faultCode'], $blogs['faultString']); - if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) { + if ($_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path) { return $blogs; } else { - foreach ( (array) $blogs as $blog ) { - if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) ) + foreach ((array) $blogs as $blog) { + if (strpos($blog['url'], $_SERVER['HTTP_HOST'])) return array($blog); } return array(); @@ -1787,21 +1834,21 @@ $this->escape($args); $username = $args[1]; - $password = $args[2]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(401, __('Sorry, you do not have access to user data on this site.')); do_action('xmlrpc_call', 'blogger.getUserInfo'); $struct = array( - 'nickname' => $user->nickname, - 'userid' => $user->ID, - 'url' => $user->user_url, - 'lastname' => $user->last_name, + 'nickname' => $user->nickname, + 'userid' => $user->ID, + 'url' => $user->user_url, + 'lastname' => $user->last_name, 'firstname' => $user->first_name ); @@ -1820,15 +1867,15 @@ $this->escape($args); - $post_ID = (int) $args[1]; + $post_ID = (int) $args[1]; $username = $args[2]; - $password = $args[3]; + $password = $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_post', $post_ID ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) ); + if (!current_user_can('edit_post', $post_ID)) + return new IXR_Error(401, __('Sorry, you cannot edit this post.')); do_action('xmlrpc_call', 'blogger.getPost'); @@ -1836,15 +1883,15 @@ $categories = implode(',', wp_get_post_categories($post_ID)); - $content = ''.stripslashes($post_data['post_title']).''; - $content .= ''.$categories.''; + $content = '' . stripslashes($post_data['post_title']) . ''; + $content .= '' . $categories . ''; $content .= stripslashes($post_data['post_content']); $struct = array( - 'userid' => $post_data['post_author'], + 'userid' => $post_data['post_author'], 'dateCreated' => new IXR_Date(mysql2date('Ymd\TH:i:s', $post_data['post_date'], false)), - 'content' => $content, - 'postid' => (string) $post_data['ID'] + 'content' => $content, + 'postid' => (string) $post_data['ID'] ); return $struct; @@ -1863,35 +1910,35 @@ $this->escape($args); // $args[0] = appkey - ignored - $blog_ID = (int) $args[1]; /* though we don't use it yet */ + $blog_ID = (int) $args[1]; /* though we don't use it yet */ $username = $args[2]; - $password = $args[3]; - if ( isset( $args[4] ) ) - $query = array( 'numberposts' => absint( $args[4] ) ); + $password = $args[3]; + if (isset($args[4])) + $query = array('numberposts' => absint($args[4])); else $query = array(); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.getRecentPosts'); - $posts_list = wp_get_recent_posts( $query ); + $posts_list = wp_get_recent_posts($query); - if ( !$posts_list ) { + 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) { - if ( !current_user_can( 'edit_post', $entry['ID'] ) ) + if (!current_user_can('edit_post', $entry['ID'])) continue; $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date'], false); $categories = implode(',', wp_get_post_categories($entry['ID'])); - $content = ''.stripslashes($entry['post_title']).''; - $content .= ''.$categories.''; + $content = '' . stripslashes($entry['post_title']) . ''; + $content .= '' . $categories . ''; $content .= stripslashes($entry['post_content']); $struct[] = array( @@ -1900,11 +1947,10 @@ 'content' => $content, 'postid' => (string) $entry['ID'], ); - } $recent_posts = array(); - for ( $j=0; $jescape($args); - $blog_ID = (int) $args[1]; + $blog_ID = (int) $args[1]; $username = $args[2]; - $password = $args[3]; - $template = $args[4]; /* could be 'main' or 'archiveIndex', but we don't use it */ + $password = $args[3]; + $template = $args[4]; /* could be 'main' or 'archiveIndex', but we don't use it */ - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.getTemplate'); - if ( !current_user_can('edit_themes') ) + if (!current_user_can('edit_themes')) return new IXR_Error(401, __('Sorry, this user can not edit the template.')); /* 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); + $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'] . '/', $filename); $f = fopen($filename, 'r'); $content = fread($f, filesize($filename)); @@ -1962,23 +2008,23 @@ $this->escape($args); - $blog_ID = (int) $args[1]; + $blog_ID = (int) $args[1]; $username = $args[2]; - $password = $args[3]; - $content = $args[4]; - $template = $args[5]; /* could be 'main' or 'archiveIndex', but we don't use it */ + $password = $args[3]; + $content = $args[4]; + $template = $args[5]; /* could be 'main' or 'archiveIndex', but we don't use it */ - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.setTemplate'); - if ( !current_user_can('edit_themes') ) + if (!current_user_can('edit_themes')) return new IXR_Error(401, __('Sorry, this user cannot edit the template.')); /* 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); + $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'] . '/', $filename); if ($f = fopen($filename, 'w+')) { fwrite($f, $content); @@ -2002,19 +2048,19 @@ $this->escape($args); - $blog_ID = (int) $args[1]; /* though we don't use it yet */ + $blog_ID = (int) $args[1]; /* though we don't use it yet */ $username = $args[2]; - $password = $args[3]; - $content = $args[4]; - $publish = $args[5]; + $password = $args[3]; + $content = $args[4]; + $publish = $args[5]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.newPost'); $cap = ($publish) ? 'publish_posts' : 'edit_posts'; - if ( !current_user_can($cap) ) + if (!current_user_can($cap)) return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.')); $post_status = ($publish) ? 'publish' : 'draft'; @@ -2031,13 +2077,13 @@ $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 ) ) + if (is_wp_error($post_ID)) return new IXR_Error(500, $post_ID->get_error_message()); - if ( !$post_ID ) + if (!$post_ID) return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.')); - $this->attach_uploads( $post_ID, $post_content ); + $this->attach_uploads($post_ID, $post_content); logIO('O', "Posted ! ID: $post_ID"); @@ -2056,30 +2102,30 @@ $this->escape($args); - $post_ID = (int) $args[1]; - $username = $args[2]; - $password = $args[3]; - $content = $args[4]; - $publish = $args[5]; + $post_ID = (int) $args[1]; + $username = $args[2]; + $password = $args[3]; + $content = $args[4]; + $publish = $args[5]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.editPost'); - $actual_post = wp_get_single_post($post_ID,ARRAY_A); + $actual_post = wp_get_single_post($post_ID, ARRAY_A); - if ( !$actual_post || $actual_post['post_type'] != 'post' ) + if (!$actual_post || $actual_post['post_type'] != 'post') return new IXR_Error(404, __('Sorry, no such post.')); $this->escape($actual_post); - if ( !current_user_can('edit_post', $post_ID) ) + if (!current_user_can('edit_post', $post_ID)) 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') ) + 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.')); $post_title = xmlrpc_getposttitle($content); @@ -2090,10 +2136,10 @@ $result = wp_update_post($postdata); - if ( !$result ) + if (!$result) return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.')); - $this->attach_uploads( $ID, $post_content ); + $this->attach_uploads($ID, $post_content); return true; } @@ -2109,27 +2155,27 @@ function blogger_deletePost($args) { $this->escape($args); - $post_ID = (int) $args[1]; - $username = $args[2]; - $password = $args[3]; - $publish = $args[4]; + $post_ID = (int) $args[1]; + $username = $args[2]; + $password = $args[3]; + $publish = $args[4]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'blogger.deletePost'); - $actual_post = wp_get_single_post($post_ID,ARRAY_A); + $actual_post = wp_get_single_post($post_ID, ARRAY_A); - if ( !$actual_post || $actual_post['post_type'] != 'post' ) + if (!$actual_post || $actual_post['post_type'] != 'post') return new IXR_Error(404, __('Sorry, no such post.')); - if ( !current_user_can('delete_post', $post_ID) ) + if (!current_user_can('delete_post', $post_ID)) return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.')); $result = wp_delete_post($post_ID); - if ( !$result ) + if (!$result) return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.')); return true; @@ -2176,94 +2222,94 @@ function mw_newPost($args) { $this->escape($args); - $blog_ID = (int) $args[0]; // we will support this in the near future - $username = $args[1]; - $password = $args[2]; + $blog_ID = (int) $args[0]; // we will support this in the near future + $username = $args[1]; + $password = $args[2]; $content_struct = $args[3]; - $publish = isset( $args[4] ) ? $args[4] : 0; + $publish = isset($args[4]) ? $args[4] : 0; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'metaWeblog.newPost'); $page_template = ''; - if ( !empty( $content_struct['post_type'] ) ) { - if ( $content_struct['post_type'] == 'page' ) { - if ( $publish ) - $cap = 'publish_pages'; + if (!empty($content_struct['post_type'])) { + if ($content_struct['post_type'] == 'page') { + if ($publish) + $cap = 'publish_pages'; elseif ('publish' == $content_struct['page_status']) - $cap = 'publish_pages'; + $cap = 'publish_pages'; else $cap = 'edit_pages'; - $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); + $error_message = __('Sorry, you are not allowed to publish pages on this site.'); $post_type = 'page'; - if ( !empty( $content_struct['wp_page_template'] ) ) + if (!empty($content_struct['wp_page_template'])) $page_template = $content_struct['wp_page_template']; - } elseif ( $content_struct['post_type'] == 'post' ) { - if ( $publish ) - $cap = 'publish_posts'; + } elseif ($content_struct['post_type'] == 'post') { + if ($publish) + $cap = 'publish_posts'; elseif ('publish' == $content_struct['post_status']) - $cap = 'publish_posts'; + $cap = 'publish_posts'; else $cap = 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); + $error_message = __('Sorry, you are not allowed to publish posts on this site.'); $post_type = 'post'; } else { // No other post_type values are allowed here - return new IXR_Error( 401, __( 'Invalid post type.' ) ); + return new IXR_Error(401, __('Invalid post type.')); } } else { - if ( $publish ) - $cap = 'publish_posts'; + if ($publish) + $cap = 'publish_posts'; elseif ('publish' == $content_struct['post_status']) - $cap = 'publish_posts'; + $cap = 'publish_posts'; else $cap = 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); + $error_message = __('Sorry, you are not allowed to publish posts on this site.'); $post_type = 'post'; } - if ( !current_user_can( $cap ) ) - return new IXR_Error( 401, $error_message ); + if (!current_user_can($cap)) + return new IXR_Error(401, $error_message); // Check for a valid post format if one was given - if ( isset( $content_struct['wp_post_format'] ) ) { - $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] ); - if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) { - return new IXR_Error( 404, __( 'Invalid post format' ) ); + if (isset($content_struct['wp_post_format'])) { + $content_struct['wp_post_format'] = sanitize_key($content_struct['wp_post_format']); + if (!array_key_exists($content_struct['wp_post_format'], get_post_format_strings())) { + return new IXR_Error(404, __('Invalid post format')); } } // Let WordPress generate the post_name (slug) unless // one has been provided. $post_name = ""; - if ( isset($content_struct['wp_slug']) ) + 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']) ) + 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']) ) + 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']) ) + 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 ) { + 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') ) + 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') ) + if (!current_user_can('edit_others_pages')) return(new IXR_Error(401, __('You are not allowed to create pages as this user'))); break; default: @@ -2273,13 +2319,13 @@ $post_author = $content_struct['wp_author_id']; } - $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null; - $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null; + $post_title = isset($content_struct['title']) ? $content_struct['title'] : null; + $post_content = isset($content_struct['description']) ? $content_struct['description'] : null; $post_status = $publish ? 'publish' : 'draft'; - if ( isset( $content_struct["{$post_type}_status"] ) ) { - switch ( $content_struct["{$post_type}_status"] ) { + if (isset($content_struct["{$post_type}_status"])) { + switch ($content_struct["{$post_type}_status"]) { case 'draft': case 'pending': case 'private': @@ -2297,9 +2343,9 @@ $tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null; - if ( isset($content_struct['mt_allow_comments']) ) { - if ( !is_numeric($content_struct['mt_allow_comments']) ) { - switch ( $content_struct['mt_allow_comments'] ) { + 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; @@ -2311,7 +2357,7 @@ break; } } else { - switch ( (int) $content_struct['mt_allow_comments'] ) { + switch ((int) $content_struct['mt_allow_comments']) { case 0: case 2: $comment_status = 'closed'; @@ -2328,9 +2374,9 @@ $comment_status = get_option('default_comment_status'); } - if ( isset($content_struct['mt_allow_pings']) ) { - if ( !is_numeric($content_struct['mt_allow_pings']) ) { - switch ( $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; @@ -2342,7 +2388,7 @@ break; } } else { - switch ( (int) $content_struct['mt_allow_pings'] ) { + switch ((int) $content_struct['mt_allow_pings']) { case 0: $ping_status = 'closed'; break; @@ -2358,23 +2404,23 @@ $ping_status = get_option('default_ping_status'); } - if ( $post_more ) + if ($post_more) $post_content = $post_content . '' . $post_more; $to_ping = null; - if ( isset( $content_struct['mt_tb_ping_urls'] ) ) { + if (isset($content_struct['mt_tb_ping_urls'])) { $to_ping = $content_struct['mt_tb_ping_urls']; - if ( is_array($to_ping) ) + if (is_array($to_ping)) $to_ping = implode(' ', $to_ping); } // Do some timestamp voodoo - if ( !empty( $content_struct['date_created_gmt'] ) ) - $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force - elseif ( !empty( $content_struct['dateCreated']) ) + if (!empty($content_struct['date_created_gmt'])) + $dateCreated = str_replace('Z', '', $content_struct['date_created_gmt']->getIso()) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force + elseif (!empty($content_struct['dateCreated'])) $dateCreated = $content_struct['dateCreated']->getIso(); - if ( !empty( $dateCreated ) ) { + if (!empty($dateCreated)) { $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated)); $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT'); } else { @@ -2383,11 +2429,11 @@ } $post_category = array(); - if ( isset( $content_struct['categories'] ) ) { + if (isset($content_struct['categories'])) { $catnames = $content_struct['categories']; - logIO('O', 'Post cats: ' . var_export($catnames,true)); + logIO('O', 'Post cats: ' . var_export($catnames, true)); - if ( is_array($catnames) ) { + if (is_array($catnames)) { foreach ($catnames as $cat) { $post_category[] = get_cat_ID($cat); } @@ -2396,35 +2442,35 @@ $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', 'page_template'); - $post_ID = $postdata['ID'] = get_default_post_to_edit( $post_type, true )->ID; + $post_ID = $postdata['ID'] = get_default_post_to_edit($post_type, true)->ID; // Only posts can be sticky - if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) { - if ( $content_struct['sticky'] == true ) - stick_post( $post_ID ); - elseif ( $content_struct['sticky'] == false ) - unstick_post( $post_ID ); + if ($post_type == 'post' && isset($content_struct['sticky'])) { + if ($content_struct['sticky'] == true) + stick_post($post_ID); + elseif ($content_struct['sticky'] == false) + unstick_post($post_ID); } - if ( isset($content_struct['custom_fields']) ) + if (isset($content_struct['custom_fields'])) $this->set_custom_fields($post_ID, $content_struct['custom_fields']); // Handle enclosures $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null; $this->add_enclosure_if_new($post_ID, $thisEnclosure); - $this->attach_uploads( $post_ID, $post_content ); + $this->attach_uploads($post_ID, $post_content); // Handle post formats if assigned, value is validated earlier // in this function - if ( isset( $content_struct['wp_post_format'] ) ) - wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' ); + if (isset($content_struct['wp_post_format'])) + wp_set_post_terms($post_ID, array('post-format-' . $content_struct['wp_post_format']), 'post_format'); - $post_ID = wp_insert_post( $postdata, true ); - if ( is_wp_error( $post_ID ) ) + $post_ID = wp_insert_post($postdata, true); + if (is_wp_error($post_ID)) return new IXR_Error(500, $post_ID->get_error_message()); - if ( !$post_ID ) + if (!$post_ID) return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.')); logIO('O', "Posted ! ID: $post_ID"); @@ -2433,13 +2479,13 @@ } function add_enclosure_if_new($post_ID, $enclosure) { - if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) { + if (is_array($enclosure) && isset($enclosure['url']) && isset($enclosure['length']) && isset($enclosure['type'])) { $encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type']; $found = false; - foreach ( (array) get_post_custom($post_ID) as $key => $val) { + foreach ((array) get_post_custom($post_ID) as $key => $val) { if ($key == 'enclosure') { - foreach ( (array) $val as $enc ) { + foreach ((array) $val as $enc) { if ($enc == $encstring) { $found = true; break 2; @@ -2448,7 +2494,7 @@ } } if (!$found) - add_post_meta( $post_ID, 'enclosure', $encstring ); + add_post_meta($post_ID, 'enclosure', $encstring); } } @@ -2460,15 +2506,15 @@ * @param int $post_ID Post ID. * @param string $post_content Post Content for attachment. */ - function attach_uploads( $post_ID, $post_content ) { + 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 = '0' AND post_type = 'attachment'" ); - if ( is_array( $attachments ) ) { - foreach ( $attachments as $file ) { - if ( strpos( $post_content, $file->guid ) !== false ) - $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) ); + $attachments = $wpdb->get_results("SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'"); + if (is_array($attachments)) { + foreach ($attachments as $file) { + if (strpos($post_content, $file->guid) !== false) + $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID)); } } } @@ -2485,59 +2531,59 @@ $this->escape($args); - $post_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $post_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; $content_struct = $args[3]; - $publish = $args[4]; + $publish = $args[4]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'metaWeblog.editPost'); $cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); + $error_message = __('Sorry, you are not allowed to publish posts on this site.'); $post_type = 'post'; $page_template = ''; - if ( !empty( $content_struct['post_type'] ) ) { - if ( $content_struct['post_type'] == 'page' ) { - if ( $publish || 'publish' == $content_struct['page_status'] ) - $cap = 'publish_pages'; + if (!empty($content_struct['post_type'])) { + if ($content_struct['post_type'] == 'page') { + if ($publish || 'publish' == $content_struct['page_status']) + $cap = 'publish_pages'; else $cap = 'edit_pages'; - $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' ); + $error_message = __('Sorry, you are not allowed to publish pages on this site.'); $post_type = 'page'; - if ( !empty( $content_struct['wp_page_template'] ) ) + if (!empty($content_struct['wp_page_template'])) $page_template = $content_struct['wp_page_template']; - } elseif ( $content_struct['post_type'] == 'post' ) { - if ( $publish || 'publish' == $content_struct['post_status'] ) - $cap = 'publish_posts'; + } elseif ($content_struct['post_type'] == 'post') { + if ($publish || 'publish' == $content_struct['post_status']) + $cap = 'publish_posts'; else $cap = 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); + $error_message = __('Sorry, you are not allowed to publish posts on this site.'); $post_type = 'post'; } else { // No other post_type values are allowed here - return new IXR_Error( 401, __( 'Invalid post type.' ) ); + return new IXR_Error(401, __('Invalid post type.')); } } else { - if ( $publish || 'publish' == $content_struct['post_status'] ) - $cap = 'publish_posts'; + if ($publish || 'publish' == $content_struct['post_status']) + $cap = 'publish_posts'; else $cap = 'edit_posts'; - $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' ); + $error_message = __('Sorry, you are not allowed to publish posts on this site.'); $post_type = 'post'; } - if ( !current_user_can( $cap ) ) - return new IXR_Error( 401, $error_message ); + if (!current_user_can($cap)) + return new IXR_Error(401, $error_message); // Check for a valid post format if one was given - if ( isset( $content_struct['wp_post_format'] ) ) { - $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] ); - if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) { - return new IXR_Error( 404, __( 'Invalid post format' ) ); + if (isset($content_struct['wp_post_format'])) { + $content_struct['wp_post_format'] = sanitize_key($content_struct['wp_post_format']); + if (!array_key_exists($content_struct['wp_post_format'], get_post_format_strings())) { + return new IXR_Error(404, __('Invalid post format')); } } @@ -2546,7 +2592,7 @@ // 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"]) ) + if (empty($postdata["ID"])) return(new IXR_Error(404, __('Invalid post ID.'))); $this->escape($postdata); @@ -2555,32 +2601,32 @@ // Let WordPress manage slug if none was provided. $post_name = ""; $post_name = $postdata['post_name']; - if ( isset($content_struct['wp_slug']) ) + 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']) ) + 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']) ) + 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']) ) + 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 ) { + 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') ) + 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') ) + 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: @@ -2590,9 +2636,9 @@ $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'] ) { + 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; @@ -2604,7 +2650,7 @@ break; } } else { - switch ( (int) $content_struct['mt_allow_comments'] ) { + switch ((int) $content_struct['mt_allow_comments']) { case 0: case 2: $comment_status = 'closed'; @@ -2619,9 +2665,9 @@ } } - if ( isset($content_struct['mt_allow_pings']) ) { - if ( !is_numeric($content_struct['mt_allow_pings']) ) { - switch ( $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; @@ -2633,7 +2679,7 @@ break; } } else { - switch ( (int) $content_struct["mt_allow_pings"] ) { + switch ((int) $content_struct["mt_allow_pings"]) { case 0: $ping_status = 'closed'; break; @@ -2647,25 +2693,25 @@ } } - $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null; - $post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null; + $post_title = isset($content_struct['title']) ? $content_struct['title'] : null; + $post_content = isset($content_struct['description']) ? $content_struct['description'] : null; $post_category = array(); - if ( isset( $content_struct['categories'] ) ) { + if (isset($content_struct['categories'])) { $catnames = $content_struct['categories']; - if ( is_array($catnames) ) { + if (is_array($catnames)) { foreach ($catnames as $cat) { $post_category[] = get_cat_ID($cat); } } } - $post_excerpt = isset( $content_struct['mt_excerpt'] ) ? $content_struct['mt_excerpt'] : null; - $post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null; + $post_excerpt = isset($content_struct['mt_excerpt']) ? $content_struct['mt_excerpt'] : null; + $post_more = isset($content_struct['mt_text_more']) ? $content_struct['mt_text_more'] : null; $post_status = $publish ? 'publish' : 'draft'; - if ( isset( $content_struct["{$post_type}_status"] ) ) { - switch( $content_struct["{$post_type}_status"] ) { + if (isset($content_struct["{$post_type}_status"])) { + switch ($content_struct["{$post_type}_status"]) { case 'draft': case 'pending': case 'private': @@ -2678,36 +2724,36 @@ } } - $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null; + $tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null; - if ( ('publish' == $post_status) ) { - if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') ) + 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') ) + 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 ) + if ($post_more) $post_content = $post_content . "" . $post_more; $to_ping = null; - if ( isset( $content_struct['mt_tb_ping_urls'] ) ) { + if (isset($content_struct['mt_tb_ping_urls'])) { $to_ping = $content_struct['mt_tb_ping_urls']; - if ( is_array($to_ping) ) + if (is_array($to_ping)) $to_ping = implode(' ', $to_ping); } // Do some timestamp voodoo - if ( !empty( $content_struct['date_created_gmt'] ) ) - $dateCreated = str_replace( 'Z', '', $content_struct['date_created_gmt']->getIso() ) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force - elseif ( !empty( $content_struct['dateCreated']) ) + if (!empty($content_struct['date_created_gmt'])) + $dateCreated = str_replace('Z', '', $content_struct['date_created_gmt']->getIso()) . 'Z'; // We know this is supposed to be GMT, so we're going to slap that Z on there by force + elseif (!empty($content_struct['dateCreated'])) $dateCreated = $content_struct['dateCreated']->getIso(); - if ( !empty( $dateCreated ) ) { + if (!empty($dateCreated)) { $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated)); $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT'); } else { - $post_date = $postdata['post_date']; + $post_date = $postdata['post_date']; $post_date_gmt = $postdata['post_date_gmt']; } @@ -2715,35 +2761,35 @@ $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', 'page_template'); $result = wp_update_post($newpost, true); - if ( is_wp_error( $result ) ) + if (is_wp_error($result)) return new IXR_Error(500, $result->get_error_message()); - if ( !$result ) + if (!$result) return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.')); // Only posts can be sticky - if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) { - if ( $content_struct['sticky'] == true ) - stick_post( $post_ID ); - elseif ( $content_struct['sticky'] == false ) - unstick_post( $post_ID ); + if ($post_type == 'post' && isset($content_struct['sticky'])) { + if ($content_struct['sticky'] == true) + stick_post($post_ID); + elseif ($content_struct['sticky'] == false) + unstick_post($post_ID); } - if ( isset($content_struct['custom_fields']) ) + if (isset($content_struct['custom_fields'])) $this->set_custom_fields($post_ID, $content_struct['custom_fields']); // Handle enclosures $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null; $this->add_enclosure_if_new($post_ID, $thisEnclosure); - $this->attach_uploads( $ID, $post_content ); + $this->attach_uploads($ID, $post_content); // Handle post formats if assigned, validation is handled // earlier in this function - if ( isset( $content_struct['wp_post_format'] ) ) - wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' ); + if (isset($content_struct['wp_post_format'])) + wp_set_post_terms($post_ID, array('post-format-' . $content_struct['wp_post_format']), 'post_format'); - logIO('O',"(MW) Edited ! ID: $post_ID"); + logIO('O', "(MW) Edited ! ID: $post_ID"); return true; } @@ -2760,15 +2806,15 @@ $this->escape($args); - $post_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $post_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_post', $post_ID ) ) - return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) ); + if (!current_user_can('edit_post', $post_ID)) + return new IXR_Error(401, __('Sorry, you cannot edit this post.')); do_action('xmlrpc_call', 'metaWeblog.getPost'); @@ -2779,20 +2825,20 @@ $post_date_gmt = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt'], false); // For drafts use the GMT version of the post date - if ( $postdata['post_status'] == 'draft' ) - $post_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $postdata['post_date'] ), 'Ymd\TH:i:s' ); + if ($postdata['post_status'] == 'draft') + $post_date_gmt = get_gmt_from_date(mysql2date('Y-m-d H:i:s', $postdata['post_date']), 'Ymd\TH:i:s'); $categories = array(); $catids = wp_get_post_categories($post_ID); - foreach($catids as $catid) + foreach ($catids as $catid) $categories[] = get_cat_name($catid); $tagnames = array(); - $tags = wp_get_post_tags( $post_ID ); - if ( !empty( $tags ) ) { - foreach ( $tags as $tag ) + $tags = wp_get_post_tags($post_ID); + if (!empty($tags)) { + foreach ($tags as $tag) $tagnames[] = $tag->name; - $tagnames = implode( ', ', $tagnames ); + $tagnames = implode(', ', $tagnames); } else { $tagnames = ''; } @@ -2807,22 +2853,22 @@ $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0; // Consider future posts as published - if ( $postdata['post_status'] === 'future' ) + if ($postdata['post_status'] === 'future') $postdata['post_status'] = 'publish'; // Get post format - $post_format = get_post_format( $post_ID ); - if ( empty( $post_format ) ) + $post_format = get_post_format($post_ID); + if (empty($post_format)) $post_format = 'standard'; $sticky = false; - if ( is_sticky( $post_ID ) ) + if (is_sticky($post_ID)) $sticky = true; $enclosure = array(); - foreach ( (array) get_post_custom($post_ID) as $key => $val) { + foreach ((array) get_post_custom($post_ID) as $key => $val) { if ($key == 'enclosure') { - foreach ( (array) $val as $enc ) { + foreach ((array) $val as $enc) { $encdata = split("\n", $enc); $enclosure['url'] = trim(htmlspecialchars($encdata[0])); $enclosure['length'] = (int) trim($encdata[1]); @@ -2851,7 +2897,7 @@ 'wp_slug' => $postdata['post_name'], 'wp_password' => $postdata['post_password'], 'wp_author_id' => (string) $author->ID, - 'wp_author_display_name' => $author->display_name, + 'wp_author_display_name' => $author->display_name, 'date_created_gmt' => new IXR_Date($post_date_gmt), 'post_status' => $postdata['post_status'], 'custom_fields' => $this->get_custom_fields($post_ID), @@ -2859,7 +2905,8 @@ 'sticky' => $sticky ); - if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure; + if (!empty($enclosure)) + $resp['enclosure'] = $enclosure; return $resp; } else { @@ -2879,47 +2926,47 @@ $this->escape($args); - $blog_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - if ( isset( $args[3] ) ) - $query = array( 'numberposts' => absint( $args[3] ) ); + $blog_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + if (isset($args[3])) + $query = array('numberposts' => absint($args[3])); else $query = array(); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'metaWeblog.getRecentPosts'); - $posts_list = wp_get_recent_posts( $query ); + $posts_list = wp_get_recent_posts($query); - if ( !$posts_list ) - return array( ); + if (!$posts_list) + return array(); foreach ($posts_list as $entry) { - if ( !current_user_can( 'edit_post', $entry['ID'] ) ) + if (!current_user_can('edit_post', $entry['ID'])) continue; $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date'], false); $post_date_gmt = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt'], false); // For drafts use the GMT version of the date - if ( $entry['post_status'] == 'draft' ) - $post_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $entry['post_date'] ), 'Ymd\TH:i:s' ); + if ($entry['post_status'] == 'draft') + $post_date_gmt = get_gmt_from_date(mysql2date('Y-m-d H:i:s', $entry['post_date']), 'Ymd\TH:i:s'); $categories = array(); $catids = wp_get_post_categories($entry['ID']); - foreach( $catids as $catid ) + 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 ) { + $tags = wp_get_post_tags($entry['ID']); + if (!empty($tags)) { + foreach ($tags as $tag) { $tagnames[] = $tag->name; } - $tagnames = implode( ', ', $tagnames ); + $tagnames = implode(', ', $tagnames); } else { $tagnames = ''; } @@ -2934,12 +2981,12 @@ $allow_pings = ('open' == $entry['ping_status']) ? 1 : 0; // Consider future posts as published - if ( $entry['post_status'] === 'future' ) + if ($entry['post_status'] === 'future') $entry['post_status'] = 'publish'; // Get post format - $post_format = get_post_format( $entry['ID'] ); - if ( empty( $post_format ) ) + $post_format = get_post_format($entry['ID']); + if (empty($post_format)) $post_format = 'standard'; $struct[] = array( @@ -2967,11 +3014,10 @@ 'custom_fields' => $this->get_custom_fields($entry['ID']), 'wp_post_format' => $post_format ); - } $recent_posts = array(); - for ( $j=0; $jescape($args); - $blog_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view categories.')); do_action('xmlrpc_call', 'metaWeblog.getCategories'); $categories_struct = array(); - if ( $cats = get_categories(array('get' => 'all')) ) { - foreach ( $cats as $cat ) { + if ($cats = get_categories(array('get' => 'all'))) { + foreach ($cats as $cat) { $struct['categoryId'] = $cat->term_id; $struct['parentId'] = $cat->parent; $struct['description'] = $cat->name; @@ -3036,32 +3082,32 @@ function mw_newMediaObject($args) { global $wpdb; - $blog_ID = (int) $args[0]; - $username = $wpdb->escape($args[1]); - $password = $wpdb->escape($args[2]); - $data = $args[3]; + $blog_ID = (int) $args[0]; + $username = $wpdb->escape($args[1]); + $password = $wpdb->escape($args[2]); + $data = $args[3]; - $name = sanitize_file_name( $data['name'] ); + $name = sanitize_file_name($data['name']); $type = $data['type']; $bits = $data['bits']; - logIO('O', '(MW) Received '.strlen($bits).' bytes'); + logIO('O', '(MW) Received ' . strlen($bits) . ' bytes'); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'metaWeblog.newMediaObject'); - if ( !current_user_can('upload_files') ) { + 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.')); return $this->error; } - if ( $upload_err = apply_filters( 'pre_upload_error', false ) ) + if ($upload_err = apply_filters('pre_upload_error', false)) return new IXR_Error(500, $upload_err); - if ( !empty($data['overwrite']) && ($data['overwrite'] == true) ) { + if (!empty($data['overwrite']) && ($data['overwrite'] == true)) { // Get postmeta info on the object. $old_file = $wpdb->get_row(" SELECT ID @@ -3080,7 +3126,7 @@ } $upload = wp_upload_bits($name, NULL, $bits); - if ( ! empty($upload['error']) ) { + if (!empty($upload['error'])) { $errorString = sprintf(__('Could not write file %1$s (%2$s)'), $name, $upload['error']); logIO('O', '(MW) ' . $errorString); return new IXR_Error(500, $errorString); @@ -3094,14 +3140,14 @@ 'post_type' => 'attachment', 'post_parent' => $post_id, 'post_mime_type' => $type, - 'guid' => $upload[ 'url' ] + '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'] ) ); + $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 ), 'upload' ); + return apply_filters('wp_handle_upload', array('file' => $name, 'url' => $upload['url'], 'type' => $type), 'upload'); } /* MovableType API functions @@ -3120,36 +3166,36 @@ $this->escape($args); - $blog_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - if ( isset( $args[3] ) ) - $query = array( 'numberposts' => absint( $args[3] ) ); + $blog_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + if (isset($args[3])) + $query = array('numberposts' => absint($args[3])); else $query = array(); - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'mt.getRecentPostTitles'); - $posts_list = wp_get_recent_posts( $query ); + $posts_list = wp_get_recent_posts($query); - if ( !$posts_list ) { + 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) { - if ( !current_user_can( 'edit_post', $entry['ID'] ) ) + if (!current_user_can('edit_post', $entry['ID'])) continue; $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date'], false); $post_date_gmt = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt'], false); // For drafts use the GMT version of the date - if ( $entry['post_status'] == 'draft' ) - $post_date_gmt = get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $entry['post_date'] ), 'Ymd\TH:i:s' ); + if ($entry['post_status'] == 'draft') + $post_date_gmt = get_gmt_from_date(mysql2date('Y-m-d H:i:s', $entry['post_date']), 'Ymd\TH:i:s'); $struct[] = array( 'dateCreated' => new IXR_Date($post_date), @@ -3159,11 +3205,10 @@ 'post_status' => $entry['post_status'], 'date_created_gmt' => new IXR_Date($post_date_gmt) ); - } $recent_posts = array(); - for ( $j=0; $jescape($args); - $blog_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $blog_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_posts' ) ) - return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) ); + if (!current_user_can('edit_posts')) + return new IXR_Error(401, __('Sorry, you must be able to edit posts on this site in order to view categories.')); do_action('xmlrpc_call', 'mt.getCategoryList'); $categories_struct = array(); - if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) { - foreach ( $cats as $cat ) { + if ($cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0))) { + foreach ($cats as $cat) { $struct['categoryId'] = $cat->term_id; $struct['categoryName'] = $cat->name; @@ -3220,15 +3265,15 @@ $this->escape($args); - $post_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $post_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; - if ( !current_user_can( 'edit_post', $post_ID ) ) - return new IXR_Error( 401, __( 'Sorry, you can not edit this post.' ) ); + 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'); @@ -3236,7 +3281,7 @@ $catids = wp_get_post_categories(intval($post_ID)); // first listed category will be the primary category $isPrimary = true; - foreach ( $catids as $catid ) { + foreach ($catids as $catid) { $categories[] = array( 'categoryName' => get_cat_name($catid), 'categoryId' => (string) $catid, @@ -3260,20 +3305,20 @@ $this->escape($args); - $post_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; - $categories = $args[3]; + $post_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; + $categories = $args[3]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'mt.setPostCategories'); - if ( !current_user_can('edit_post', $post_ID) ) + if (!current_user_can('edit_post', $post_ID)) return new IXR_Error(401, __('Sorry, you cannot edit this post.')); - foreach ( $categories as $cat ) { + foreach ($categories as $cat) { $catids[] = $cat['categoryId']; } @@ -3295,7 +3340,7 @@ do_action('xmlrpc_call', 'mt.supportedMethods'); $supported_methods = array(); - foreach ( $this->methods as $key => $value ) { + foreach ($this->methods as $key => $value) { $supported_methods[] = $key; } @@ -3332,23 +3377,23 @@ $actual_post = wp_get_single_post($post_ID, ARRAY_A); - if ( !$actual_post ) + if (!$actual_post) return new IXR_Error(404, __('Sorry, no such post.')); - $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) ); + $comments = $wpdb->get_results($wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID)); - if ( !$comments ) + if (!$comments) return array(); $trackback_pings = array(); - foreach ( $comments as $comment ) { - if ( 'trackback' == $comment->comment_type ) { + foreach ($comments as $comment) { + if ('trackback' == $comment->comment_type) { $content = $comment->comment_content; $title = substr($content, 8, (strpos($content, '') - 8)); $trackback_pings[] = array( 'pingTitle' => $title, - 'pingURL' => $comment->comment_author_url, - 'pingIP' => $comment->comment_author_IP + 'pingURL' => $comment->comment_author_url, + 'pingIP' => $comment->comment_author_IP ); } } @@ -3368,19 +3413,19 @@ $this->escape($args); - $post_ID = (int) $args[0]; - $username = $args[1]; - $password = $args[2]; + $post_ID = (int) $args[0]; + $username = $args[1]; + $password = $args[2]; - if ( !$user = $this->login($username, $password) ) + if (!$user = $this->login($username, $password)) return $this->error; do_action('xmlrpc_call', 'mt.publishPost'); - if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) ) + if (!current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID)) return new IXR_Error(401, __('Sorry, you cannot publish this post.')); - $postdata = wp_get_single_post($post_ID,ARRAY_A); + $postdata = wp_get_single_post($post_ID, ARRAY_A); $postdata['post_status'] = 'publish'; @@ -3414,7 +3459,7 @@ $this->escape($args); $pagelinkedfrom = $args[0]; - $pagelinkedto = $args[1]; + $pagelinkedto = $args[1]; $title = ''; @@ -3423,41 +3468,41 @@ $pagelinkedto = str_replace('&', '&', $pagelinkedto); // Check if the page linked to is in our site - $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home'))); - if ( !$pos1 ) + $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?')); // let's find which post is linked to // FIXME: does url_to_postid() cover all these cases already? // if so, then let's use it and drop the old code. $urltest = parse_url($pagelinkedto); - if ( $post_ID = url_to_postid($pagelinkedto) ) { + if ($post_ID = url_to_postid($pagelinkedto)) { $way = 'url_to_postid()'; - } elseif ( preg_match('#p/[0-9]{1,}#', $urltest['path'], $match) ) { + } elseif (preg_match('#p/[0-9]{1,}#', $urltest['path'], $match)) { // the path defines the post_ID (archives/p/XXXX) $blah = explode('/', $match[0]); $post_ID = (int) $blah[1]; $way = 'from the path'; - } elseif ( preg_match('#p=[0-9]{1,}#', $urltest['query'], $match) ) { + } elseif (preg_match('#p=[0-9]{1,}#', $urltest['query'], $match)) { // the querystring defines the post_ID (?p=XXXX) $blah = explode('=', $match[0]); $post_ID = (int) $blah[1]; $way = 'from the querystring'; - } elseif ( isset($urltest['fragment']) ) { + } elseif (isset($urltest['fragment'])) { // an #anchor is there, it's either... - if ( intval($urltest['fragment']) ) { + if (intval($urltest['fragment'])) { // ...an integer #XXXX (simplest case) $post_ID = (int) $urltest['fragment']; $way = 'from the fragment (numeric)'; - } elseif ( preg_match('/post-[0-9]+/',$urltest['fragment']) ) { + } elseif (preg_match('/post-[0-9]+/', $urltest['fragment'])) { // ...a post id in the form 'post-###' $post_ID = preg_replace('/[^0-9]+/', '', $urltest['fragment']); $way = 'from the fragment (post-###)'; - } elseif ( is_string($urltest['fragment']) ) { + } elseif (is_string($urltest['fragment'])) { // ...or a string #title, a little more complicated $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']); - $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", like_escape( $title ) ); - if (! ($post_ID = $wpdb->get_var($sql)) ) { + $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", like_escape($title)); + if (!($post_ID = $wpdb->get_var($sql))) { // returning unknown error '0' is better than die()ing return new IXR_Error(0, ''); } @@ -3470,56 +3515,56 @@ $post_ID = (int) $post_ID; - logIO("O","(PB) URL='$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 + if (!$post) // Post_ID not found 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) ) + if ($post_ID == url_to_postid($pagelinkedfrom)) 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 ( !pings_open($post) ) + if (!pings_open($post)) 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 - if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) ) - return new IXR_Error( 48, __( 'The pingback has already been registered.' ) ); + if ($wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom))) + return new IXR_Error(48, __('The pingback has already been registered.')); // very stupid, but gives time to the 'from' server to publish ! sleep(1); // Let's check the remote site - $linea = wp_remote_fopen( $pagelinkedfrom ); - if ( !$linea ) + $linea = wp_remote_fopen($pagelinkedfrom); + if (!$linea) return new IXR_Error(16, __('The source URL does not exist.')); $linea = apply_filters('pre_remote_source', $linea, $pagelinkedto); // Work around bug in strip_tags(): $linea = str_replace(']*>/", "\n\n", $linea ); + $linea = preg_replace('/[\s\r\n\t]+/', ' ', $linea); // normalize spaces + $linea = preg_replace("/ <(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $linea); preg_match('|([^<]*?)|is', $linea, $matchtitle); $title = $matchtitle[1]; - if ( empty( $title ) ) + if (empty($title)) return new IXR_Error(32, __('We cannot find a title on that page.')); - $linea = strip_tags( $linea, '' ); // just keep the tag we need + $linea = strip_tags($linea, ''); // just keep the tag we need - $p = explode( "\n\n", $linea ); + $p = explode("\n\n", $linea); $preg_target = preg_quote($pagelinkedto, '|'); - foreach ( $p as $para ) { - if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link? - preg_match("|]+?".$preg_target."[^>]*>([^>]+?)|", $para, $context); + foreach ($p as $para) { + if (strpos($para, $pagelinkedto) !== false) { // it exists, but is it a link? + preg_match("|]+?" . $preg_target . "[^>]*>([^>]+?)|", $para, $context); // If the URL isn't in a link context, keep looking - if ( empty($context) ) + if (empty($context)) continue; // We're going to use this fake tag to mark the context in a bit @@ -3527,11 +3572,11 @@ $excerpt = preg_replace('|\|', '', $para); // prevent really long link text - if ( strlen($context[1]) > 100 ) + if (strlen($context[1]) > 100) $context[1] = substr($context[1], 0, 100) . '...'; - $marker = ''.$context[1].''; // set up our marker - $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker + $marker = '' . $context[1] . ''; // set up our marker + $excerpt = str_replace($context[0], $marker, $excerpt); // swap out the link for our marker $excerpt = strip_tags($excerpt, ''); // strip all tags but our context marker $excerpt = trim($excerpt); $preg_marker = preg_quote($marker, '|'); @@ -3541,13 +3586,13 @@ } } - if ( empty($context) ) // Link to target not found + 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 = str_replace('&', '&', $pagelinkedfrom); - $context = '[...] ' . esc_html( $excerpt ) . ' [...]'; - $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom ); + $context = '[...] ' . esc_html($excerpt) . ' [...]'; + $pagelinkedfrom = $wpdb->escape($pagelinkedfrom); $comment_post_ID = (int) $post_ID; $comment_author = $title; @@ -3587,30 +3632,32 @@ $url = $args; $post_ID = url_to_postid($url); - if ( !$post_ID ) { + if (!$post_ID) { // We aren't sure that the resource is available and/or pingback enabled 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 ) { + if (!$actual_post) { // No such post = resource not found return new IXR_Error(32, __('The specified target URL does not exist.')); } - $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) ); + $comments = $wpdb->get_results($wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID)); - if ( !$comments ) + if (!$comments) return array(); $pingbacks = array(); - foreach ( $comments as $comment ) { - if ( 'pingback' == $comment->comment_type ) + foreach ($comments as $comment) { + if ('pingback' == $comment->comment_type) $pingbacks[] = $comment->comment_author_url; } return $pingbacks; } + } + ?>