--- a/wp/wp-includes/class-wp-xmlrpc-server.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/class-wp-xmlrpc-server.php Mon Oct 14 18:28:13 2019 +0200
@@ -61,95 +61,95 @@
public function __construct() {
$this->methods = array(
// WordPress API
- 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs',
- 'wp.newPost' => 'this:wp_newPost',
- 'wp.editPost' => 'this:wp_editPost',
- 'wp.deletePost' => 'this:wp_deletePost',
- 'wp.getPost' => 'this:wp_getPost',
- 'wp.getPosts' => 'this:wp_getPosts',
- 'wp.newTerm' => 'this:wp_newTerm',
- 'wp.editTerm' => 'this:wp_editTerm',
- 'wp.deleteTerm' => 'this:wp_deleteTerm',
- 'wp.getTerm' => 'this:wp_getTerm',
- 'wp.getTerms' => 'this:wp_getTerms',
- 'wp.getTaxonomy' => 'this:wp_getTaxonomy',
- 'wp.getTaxonomies' => 'this:wp_getTaxonomies',
- 'wp.getUser' => 'this:wp_getUser',
- 'wp.getUsers' => 'this:wp_getUsers',
- 'wp.getProfile' => 'this:wp_getProfile',
- 'wp.editProfile' => 'this:wp_editProfile',
- '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.deleteFile' => 'this:wp_deletePost', // 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.getPostType' => 'this:wp_getPostType',
- 'wp.getPostTypes' => 'this:wp_getPostTypes',
- 'wp.getRevisions' => 'this:wp_getRevisions',
- 'wp.restoreRevision' => 'this:wp_restoreRevision',
+ 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs',
+ 'wp.newPost' => 'this:wp_newPost',
+ 'wp.editPost' => 'this:wp_editPost',
+ 'wp.deletePost' => 'this:wp_deletePost',
+ 'wp.getPost' => 'this:wp_getPost',
+ 'wp.getPosts' => 'this:wp_getPosts',
+ 'wp.newTerm' => 'this:wp_newTerm',
+ 'wp.editTerm' => 'this:wp_editTerm',
+ 'wp.deleteTerm' => 'this:wp_deleteTerm',
+ 'wp.getTerm' => 'this:wp_getTerm',
+ 'wp.getTerms' => 'this:wp_getTerms',
+ 'wp.getTaxonomy' => 'this:wp_getTaxonomy',
+ 'wp.getTaxonomies' => 'this:wp_getTaxonomies',
+ 'wp.getUser' => 'this:wp_getUser',
+ 'wp.getUsers' => 'this:wp_getUsers',
+ 'wp.getProfile' => 'this:wp_getProfile',
+ 'wp.editProfile' => 'this:wp_editProfile',
+ '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.deleteFile' => 'this:wp_deletePost', // 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.getPostType' => 'this:wp_getPostType',
+ 'wp.getPostTypes' => 'this:wp_getPostTypes',
+ 'wp.getRevisions' => 'this:wp_getRevisions',
+ 'wp.restoreRevision' => 'this:wp_restoreRevision',
// Blogger API
- 'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
- 'blogger.getUserInfo' => 'this:blogger_getUserInfo',
- 'blogger.getPost' => 'this:blogger_getPost',
- 'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
- 'blogger.newPost' => 'this:blogger_newPost',
- 'blogger.editPost' => 'this:blogger_editPost',
- 'blogger.deletePost' => 'this:blogger_deletePost',
+ 'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
+ 'blogger.getUserInfo' => 'this:blogger_getUserInfo',
+ 'blogger.getPost' => 'this:blogger_getPost',
+ 'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
+ 'blogger.newPost' => 'this:blogger_newPost',
+ 'blogger.editPost' => 'this:blogger_editPost',
+ 'blogger.deletePost' => 'this:blogger_deletePost',
// MetaWeblog API (with MT extensions to structs)
- 'metaWeblog.newPost' => 'this:mw_newPost',
- 'metaWeblog.editPost' => 'this:mw_editPost',
- 'metaWeblog.getPost' => 'this:mw_getPost',
- 'metaWeblog.getRecentPosts' => 'this:mw_getRecentPosts',
- 'metaWeblog.getCategories' => 'this:mw_getCategories',
- 'metaWeblog.newMediaObject' => 'this:mw_newMediaObject',
+ 'metaWeblog.newPost' => 'this:mw_newPost',
+ 'metaWeblog.editPost' => 'this:mw_editPost',
+ 'metaWeblog.getPost' => 'this:mw_getPost',
+ 'metaWeblog.getRecentPosts' => 'this:mw_getRecentPosts',
+ 'metaWeblog.getCategories' => 'this:mw_getCategories',
+ 'metaWeblog.newMediaObject' => 'this:mw_newMediaObject',
// MetaWeblog API aliases for Blogger API
// see http://www.xmlrpc.com/stories/storyReader$2460
- 'metaWeblog.deletePost' => 'this:blogger_deletePost',
- 'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
+ 'metaWeblog.deletePost' => 'this:blogger_deletePost',
+ 'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
// MovableType API
- 'mt.getCategoryList' => 'this:mt_getCategoryList',
- 'mt.getRecentPostTitles' => 'this:mt_getRecentPostTitles',
- 'mt.getPostCategories' => 'this:mt_getPostCategories',
- 'mt.setPostCategories' => 'this:mt_setPostCategories',
- 'mt.supportedMethods' => 'this:mt_supportedMethods',
- 'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
- 'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
- 'mt.publishPost' => 'this:mt_publishPost',
+ 'mt.getCategoryList' => 'this:mt_getCategoryList',
+ 'mt.getRecentPostTitles' => 'this:mt_getRecentPostTitles',
+ 'mt.getPostCategories' => 'this:mt_getPostCategories',
+ 'mt.setPostCategories' => 'this:mt_setPostCategories',
+ 'mt.supportedMethods' => 'this:mt_supportedMethods',
+ 'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
+ 'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
+ 'mt.publishPost' => 'this:mt_publishPost',
// PingBack
- 'pingback.ping' => 'this:pingback_ping',
+ 'pingback.ping' => 'this:pingback_ping',
'pingback.extensions.getPingbacks' => 'this:pingback_extensions_getPingbacks',
- 'demo.sayHello' => 'this:sayHello',
- 'demo.addTwoNumbers' => 'this:addTwoNumbers'
+ 'demo.sayHello' => 'this:sayHello',
+ 'demo.addTwoNumbers' => 'this:addTwoNumbers',
);
$this->initialise_blog_option_info();
@@ -171,7 +171,7 @@
*
* @since 4.0.0
*
- * @param callable $name Method to call.
+ * @param string $name Method to call.
* @param array $arguments Arguments to pass when calling.
* @return array|IXR_Error|false Return value of the callback, false otherwise.
*/
@@ -188,7 +188,7 @@
* @since 2.9.0
*/
public function serve_request() {
- $this->IXR_Server($this->methods);
+ $this->IXR_Server( $this->methods );
}
/**
@@ -322,14 +322,16 @@
* when array is passed.
*/
public function escape( &$data ) {
- if ( ! is_array( $data ) )
+ if ( ! is_array( $data ) ) {
return wp_slash( $data );
+ }
foreach ( $data as &$v ) {
- if ( is_array( $v ) )
+ if ( is_array( $v ) ) {
$this->escape( $v );
- elseif ( ! is_object( $v ) )
+ } elseif ( ! is_object( $v ) ) {
$v = wp_slash( $v );
+ }
}
}
@@ -341,20 +343,21 @@
* @param int $post_id Post ID.
* @return array Custom fields, if exist.
*/
- public function get_custom_fields($post_id) {
+ public function get_custom_fields( $post_id ) {
$post_id = (int) $post_id;
$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'],
- "value" => $meta['meta_value']
+ 'id' => $meta['meta_id'],
+ 'key' => $meta['meta_key'],
+ 'value' => $meta['meta_value'],
);
}
@@ -369,25 +372,27 @@
* @param int $post_id Post ID.
* @param array $fields Custom fields.
*/
- public function set_custom_fields($post_id, $fields) {
+ public function set_custom_fields( $post_id, $fields ) {
$post_id = (int) $post_id;
foreach ( (array) $fields as $meta ) {
- if ( isset($meta['id']) ) {
+ if ( isset( $meta['id'] ) ) {
$meta['id'] = (int) $meta['id'];
- $pmeta = get_metadata_by_mid( 'post', $meta['id'] );
+ $pmeta = get_metadata_by_mid( 'post', $meta['id'] );
if ( ! $pmeta || $pmeta->post_id != $post_id ) {
continue;
}
- if ( isset($meta['key']) ) {
+ if ( isset( $meta['key'] ) ) {
$meta['key'] = wp_unslash( $meta['key'] );
- if ( $meta['key'] !== $pmeta->meta_key )
+ if ( $meta['key'] !== $pmeta->meta_key ) {
continue;
+ }
$meta['value'] = wp_unslash( $meta['value'] );
- if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) )
+ 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'] );
}
@@ -440,7 +445,7 @@
foreach ( (array) $fields as $meta ) {
if ( isset( $meta['id'] ) ) {
$meta['id'] = (int) $meta['id'];
- $pmeta = get_metadata_by_mid( 'term', $meta['id'] );
+ $pmeta = get_metadata_by_mid( 'term', $meta['id'] );
if ( isset( $meta['key'] ) ) {
$meta['key'] = wp_unslash( $meta['key'] );
if ( $meta['key'] !== $pmeta->meta_key ) {
@@ -469,153 +474,153 @@
public function initialise_blog_option_info() {
$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' => get_bloginfo( 'version' )
+ 'software_version' => array(
+ 'desc' => __( 'Software Version' ),
+ 'readonly' => true,
+ 'value' => get_bloginfo( 'version' ),
),
- 'blog_url' => array(
- 'desc' => __( 'WordPress Address (URL)' ),
- 'readonly' => true,
- 'option' => 'siteurl'
+ 'blog_url' => array(
+ 'desc' => __( 'WordPress Address (URL)' ),
+ 'readonly' => true,
+ 'option' => 'siteurl',
),
- 'home_url' => array(
- 'desc' => __( 'Site Address (URL)' ),
- 'readonly' => true,
- 'option' => 'home'
+ 'home_url' => array(
+ 'desc' => __( 'Site Address (URL)' ),
+ 'readonly' => true,
+ 'option' => 'home',
),
- 'login_url' => array(
- 'desc' => __( 'Login Address (URL)' ),
- 'readonly' => true,
- 'value' => wp_login_url( )
+ 'login_url' => array(
+ 'desc' => __( 'Login Address (URL)' ),
+ 'readonly' => true,
+ 'value' => wp_login_url(),
),
- 'admin_url' => array(
- 'desc' => __( 'The URL to the admin area' ),
- 'readonly' => true,
- 'value' => get_admin_url( )
+ 'admin_url' => array(
+ 'desc' => __( 'The URL to the admin area' ),
+ 'readonly' => true,
+ 'value' => get_admin_url(),
),
'image_default_link_type' => array(
- 'desc' => __( 'Image default link type' ),
- 'readonly' => true,
- 'option' => 'image_default_link_type'
+ 'desc' => __( 'Image default link type' ),
+ 'readonly' => true,
+ 'option' => 'image_default_link_type',
),
- 'image_default_size' => array(
- 'desc' => __( 'Image default size' ),
- 'readonly' => true,
- 'option' => 'image_default_size'
+ 'image_default_size' => array(
+ 'desc' => __( 'Image default size' ),
+ 'readonly' => true,
+ 'option' => 'image_default_size',
),
- 'image_default_align' => array(
- 'desc' => __( 'Image default align' ),
- 'readonly' => true,
- 'option' => 'image_default_align'
+ 'image_default_align' => array(
+ 'desc' => __( 'Image default align' ),
+ 'readonly' => true,
+ 'option' => 'image_default_align',
),
- 'template' => array(
- 'desc' => __( 'Template' ),
- 'readonly' => true,
- 'option' => 'template'
+ 'template' => array(
+ 'desc' => __( 'Template' ),
+ 'readonly' => true,
+ 'option' => 'template',
),
- 'stylesheet' => array(
- 'desc' => __( 'Stylesheet' ),
- 'readonly' => true,
- 'option' => 'stylesheet'
+ 'stylesheet' => array(
+ 'desc' => __( 'Stylesheet' ),
+ 'readonly' => true,
+ 'option' => 'stylesheet',
),
- 'post_thumbnail' => array(
- 'desc' => __('Post Thumbnail'),
- 'readonly' => true,
- 'value' => current_theme_supports( 'post-thumbnails' )
+ 'post_thumbnail' => array(
+ 'desc' => __( 'Post Thumbnail' ),
+ 'readonly' => true,
+ 'value' => current_theme_supports( 'post-thumbnails' ),
),
// 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',
),
- 'medium_large_size_w' => array(
- 'desc' => __( 'Medium-Large size image width' ),
- 'readonly' => false,
- 'option' => 'medium_large_size_w'
+ 'medium_large_size_w' => array(
+ 'desc' => __( 'Medium-Large size image width' ),
+ 'readonly' => false,
+ 'option' => 'medium_large_size_w',
),
- 'medium_large_size_h' => array(
- 'desc' => __( 'Medium-Large size image height' ),
- 'readonly' => false,
- 'option' => 'medium_large_size_h'
+ 'medium_large_size_h' => array(
+ 'desc' => __( 'Medium-Large size image height' ),
+ 'readonly' => false,
+ 'option' => 'medium_large_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',
),
- 'default_comment_status' => array(
- 'desc' => __( 'Allow people to post comments on new articles' ),
- 'readonly' => false,
- 'option' => 'default_comment_status'
+ 'default_comment_status' => array(
+ 'desc' => __( 'Allow people to post comments on new articles' ),
+ 'readonly' => false,
+ 'option' => 'default_comment_status',
),
- 'default_ping_status' => array(
- 'desc' => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
- 'readonly' => false,
- 'option' => 'default_ping_status'
- )
+ 'default_ping_status' => array(
+ 'desc' => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
+ 'readonly' => false,
+ 'option' => 'default_ping_status',
+ ),
);
/**
@@ -653,7 +658,7 @@
}
// If this isn't on WPMU then just use blogger_getUsersBlogs
- if ( !is_multisite() ) {
+ if ( ! is_multisite() ) {
array_unshift( $args, 1 );
return $this->blogger_getUsersBlogs( $args );
}
@@ -663,8 +668,9 @@
$username = $args[0];
$password = $args[1];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/**
* Fires after the XML-RPC user has been authenticated but before the rest of
@@ -679,24 +685,25 @@
*/
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();
$primary_blog_id = 0;
- $active_blog = get_active_blog_for_user( $user->ID );
+ $active_blog = get_active_blog_for_user( $user->ID );
if ( $active_blog ) {
$primary_blog_id = (int) $active_blog->blog_id;
}
foreach ( $blogs as $blog ) {
// Don't include blogs that aren't hosted at this site.
- if ( $blog->site_id != get_current_network_id() )
+ if ( $blog->site_id != get_current_network_id() ) {
continue;
+ }
$blog_id = $blog->userblog_id;
switch_to_blog( $blog_id );
- $is_admin = current_user_can( 'manage_options' );
+ $is_admin = current_user_can( 'manage_options' );
$is_primary = ( (int) $blog_id === $primary_blog_id );
$struct[] = array(
@@ -735,32 +742,35 @@
/**
* Prepares taxonomy data for return in an XML-RPC object.
*
- *
* @param object $taxonomy The unprepared taxonomy data.
* @param array $fields The subset of taxonomy fields to return.
* @return array The prepared taxonomy data.
*/
protected function _prepare_taxonomy( $taxonomy, $fields ) {
$_taxonomy = array(
- 'name' => $taxonomy->name,
- 'label' => $taxonomy->label,
+ 'name' => $taxonomy->name,
+ 'label' => $taxonomy->label,
'hierarchical' => (bool) $taxonomy->hierarchical,
- 'public' => (bool) $taxonomy->public,
- 'show_ui' => (bool) $taxonomy->show_ui,
- '_builtin' => (bool) $taxonomy->_builtin,
+ 'public' => (bool) $taxonomy->public,
+ 'show_ui' => (bool) $taxonomy->show_ui,
+ '_builtin' => (bool) $taxonomy->_builtin,
);
- if ( in_array( 'labels', $fields ) )
+ if ( in_array( 'labels', $fields ) ) {
$_taxonomy['labels'] = (array) $taxonomy->labels;
-
- if ( in_array( 'cap', $fields ) )
+ }
+
+ if ( in_array( 'cap', $fields ) ) {
$_taxonomy['cap'] = (array) $taxonomy->cap;
-
- if ( in_array( 'menu', $fields ) )
+ }
+
+ if ( in_array( 'menu', $fields ) ) {
$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
-
- if ( in_array( 'object_type', $fields ) )
+ }
+
+ if ( in_array( 'object_type', $fields ) ) {
$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+ }
/**
* Filters XML-RPC-prepared data for the given taxonomy.
@@ -777,20 +787,20 @@
/**
* Prepares term data for return in an XML-RPC object.
*
- *
* @param array|object $term The unprepared term data.
* @return array The prepared term data.
*/
protected function _prepare_term( $term ) {
$_term = $term;
- if ( ! is_array( $_term ) )
+ if ( ! is_array( $_term ) ) {
$_term = get_object_vars( $_term );
+ }
// For integers which may be larger than XML-RPC supports ensure we return strings.
- $_term['term_id'] = strval( $_term['term_id'] );
- $_term['term_group'] = strval( $_term['term_group'] );
+ $_term['term_id'] = strval( $_term['term_id'] );
+ $_term['term_group'] = strval( $_term['term_group'] );
$_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
- $_term['parent'] = strval( $_term['parent'] );
+ $_term['parent'] = strval( $_term['parent'] );
// Count we are happy to return as an integer because people really shouldn't use terms that much.
$_term['count'] = intval( $_term['count'] );
@@ -812,7 +822,6 @@
/**
* Convert a WordPress date string to an IXR_Date object.
*
- *
* @param string $date Date string to convert.
* @return IXR_Date IXR_Date object.
*/
@@ -826,7 +835,6 @@
/**
* Convert a WordPress GMT date string to an IXR_Date object.
*
- *
* @param string $date_gmt WordPress GMT date string.
* @param string $date Date string.
* @return IXR_Date IXR_Date object.
@@ -841,7 +849,6 @@
/**
* Prepares post data for return in an XML-RPC object.
*
- *
* @param array $post The unprepared post data.
* @param array $fields The subset of post type fields to return.
* @return array The prepared post data.
@@ -876,51 +883,54 @@
// Thumbnail.
$post_fields['post_thumbnail'] = array();
- $thumbnail_id = get_post_thumbnail_id( $post['ID'] );
+ $thumbnail_id = get_post_thumbnail_id( $post['ID'] );
if ( $thumbnail_id ) {
- $thumbnail_size = current_theme_supports('post-thumbnail') ? 'post-thumbnail' : 'thumbnail';
+ $thumbnail_size = current_theme_supports( 'post-thumbnail' ) ? 'post-thumbnail' : 'thumbnail';
$post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
}
// Consider future posts as published.
- if ( $post_fields['post_status'] === 'future' )
+ if ( $post_fields['post_status'] === 'future' ) {
$post_fields['post_status'] = 'publish';
+ }
// Fill in blank post format.
$post_fields['post_format'] = get_post_format( $post['ID'] );
- if ( empty( $post_fields['post_format'] ) )
+ if ( empty( $post_fields['post_format'] ) ) {
$post_fields['post_format'] = 'standard';
+ }
// Merge requested $post_fields fields into $_post.
if ( in_array( 'post', $fields ) ) {
$_post = array_merge( $_post, $post_fields );
} else {
$requested_fields = array_intersect_key( $post_fields, array_flip( $fields ) );
- $_post = array_merge( $_post, $requested_fields );
+ $_post = array_merge( $_post, $requested_fields );
}
$all_taxonomy_fields = in_array( 'taxonomies', $fields );
if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
$post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
- $terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
- $_post['terms'] = array();
+ $terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
+ $_post['terms'] = array();
foreach ( $terms as $term ) {
$_post['terms'][] = $this->_prepare_term( $term );
}
}
- if ( in_array( 'custom_fields', $fields ) )
+ if ( in_array( 'custom_fields', $fields ) ) {
$_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+ }
if ( in_array( 'enclosure', $fields ) ) {
$_post['enclosure'] = array();
- $enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
+ $enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
if ( ! empty( $enclosures ) ) {
- $encdata = explode( "\n", $enclosures[0] );
- $_post['enclosure']['url'] = trim( htmlspecialchars( $encdata[0] ) );
+ $encdata = explode( "\n", $enclosures[0] );
+ $_post['enclosure']['url'] = trim( htmlspecialchars( $encdata[0] ) );
$_post['enclosure']['length'] = (int) trim( $encdata[1] );
- $_post['enclosure']['type'] = trim( $encdata[2] );
+ $_post['enclosure']['type'] = trim( $encdata[2] );
}
}
@@ -948,14 +958,14 @@
*/
protected function _prepare_post_type( $post_type, $fields ) {
$_post_type = array(
- 'name' => $post_type->name,
- 'label' => $post_type->label,
+ 'name' => $post_type->name,
+ 'label' => $post_type->label,
'hierarchical' => (bool) $post_type->hierarchical,
- 'public' => (bool) $post_type->public,
- 'show_ui' => (bool) $post_type->show_ui,
- '_builtin' => (bool) $post_type->_builtin,
- 'has_archive' => (bool) $post_type->has_archive,
- 'supports' => get_all_post_type_supports( $post_type->name ),
+ 'public' => (bool) $post_type->public,
+ 'show_ui' => (bool) $post_type->show_ui,
+ '_builtin' => (bool) $post_type->_builtin,
+ 'has_archive' => (bool) $post_type->has_archive,
+ 'supports' => get_all_post_type_supports( $post_type->name ),
);
if ( in_array( 'labels', $fields ) ) {
@@ -963,18 +973,19 @@
}
if ( in_array( 'cap', $fields ) ) {
- $_post_type['cap'] = (array) $post_type->cap;
+ $_post_type['cap'] = (array) $post_type->cap;
$_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
}
if ( in_array( 'menu', $fields ) ) {
$_post_type['menu_position'] = (int) $post_type->menu_position;
- $_post_type['menu_icon'] = $post_type->menu_icon;
- $_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
- }
-
- if ( in_array( 'taxonomies', $fields ) )
+ $_post_type['menu_icon'] = $post_type->menu_icon;
+ $_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
+ }
+
+ if ( in_array( 'taxonomies', $fields ) ) {
$_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+ }
/**
* Filters XML-RPC-prepared date for the given post type.
@@ -991,7 +1002,6 @@
/**
* Prepares media item data for return in an XML-RPC object.
*
- *
* @param object $media_item The unprepared media item data.
* @param string $thumbnail_size The image size to use for the thumbnail URL.
* @return array The prepared media item data.
@@ -1006,14 +1016,15 @@
'caption' => $media_item->post_excerpt,
'description' => $media_item->post_content,
'metadata' => wp_get_attachment_metadata( $media_item->ID ),
- 'type' => $media_item->post_mime_type
+ 'type' => $media_item->post_mime_type,
);
$thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
- if ( $thumbnail_src )
+ if ( $thumbnail_src ) {
$_media_item['thumbnail'] = $thumbnail_src[0];
- else
+ } else {
$_media_item['thumbnail'] = $_media_item['link'];
+ }
/**
* Filters XML-RPC-prepared data for the given media item.
@@ -1030,28 +1041,27 @@
/**
* Prepares page data for return in an XML-RPC object.
*
- *
* @param object $page The unprepared page data.
* @return array The prepared page data.
*/
protected function _prepare_page( $page ) {
// Get all of the page content and link.
$full_page = get_extended( $page->post_content );
- $link = get_permalink( $page->ID );
+ $link = get_permalink( $page->ID );
// Get info the page parent if there is one.
- $parent_title = "";
+ $parent_title = '';
if ( ! empty( $page->post_parent ) ) {
- $parent = get_post( $page->post_parent );
+ $parent = get_post( $page->post_parent );
$parent_title = $parent->post_title;
}
// Determine comment and ping settings.
$allow_comments = comments_open( $page->ID ) ? 1 : 0;
- $allow_pings = pings_open( $page->ID ) ? 1 : 0;
+ $allow_pings = pings_open( $page->ID ) ? 1 : 0;
// Format page date.
- $page_date = $this->_convert_date( $page->post_date );
+ $page_date = $this->_convert_date( $page->post_date );
$page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
// Pull the categories info together.
@@ -1066,8 +1076,9 @@
$author = get_userdata( $page->post_author );
$page_template = get_page_template_slug( $page->ID );
- if ( empty( $page_template ) )
+ if ( empty( $page_template ) ) {
$page_template = 'default';
+ }
$_page = array(
'dateCreated' => $page_date,
@@ -1093,7 +1104,7 @@
'wp_author_display_name' => $author->display_name,
'date_created_gmt' => $page_date_gmt,
'custom_fields' => $this->get_custom_fields( $page->ID ),
- 'wp_page_template' => $page_template
+ 'wp_page_template' => $page_template,
);
/**
@@ -1110,7 +1121,6 @@
/**
* Prepares comment data for return in an XML-RPC object.
*
- *
* @param object $comment The unprepared comment data.
* @return array The prepared comment data.
*/
@@ -1134,9 +1144,9 @@
'parent' => $comment->comment_parent,
'status' => $comment_status,
'content' => $comment->comment_content,
- 'link' => get_comment_link($comment),
+ 'link' => get_comment_link( $comment ),
'post_id' => $comment->comment_post_ID,
- 'post_title' => get_the_title($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,
@@ -1158,7 +1168,6 @@
/**
* Prepares user data for return in an XML-RPC object.
*
- *
* @param WP_User $user The unprepared user object.
* @param array $fields The subset of user fields to return.
* @return array The prepared user data.
@@ -1167,17 +1176,17 @@
$_user = array( 'user_id' => strval( $user->ID ) );
$user_fields = array(
- 'username' => $user->user_login,
- 'first_name' => $user->user_firstname,
- 'last_name' => $user->user_lastname,
- 'registered' => $this->_convert_date( $user->user_registered ),
- 'bio' => $user->user_description,
- 'email' => $user->user_email,
- 'nickname' => $user->nickname,
- 'nicename' => $user->user_nicename,
- 'url' => $user->user_url,
- 'display_name' => $user->display_name,
- 'roles' => $user->roles,
+ 'username' => $user->user_login,
+ 'first_name' => $user->user_firstname,
+ 'last_name' => $user->user_lastname,
+ 'registered' => $this->_convert_date( $user->user_registered ),
+ 'bio' => $user->user_description,
+ 'email' => $user->user_email,
+ 'nickname' => $user->nickname,
+ 'nicename' => $user->user_nicename,
+ 'url' => $user->user_url,
+ 'display_name' => $user->display_name,
+ 'roles' => $user->roles,
);
if ( in_array( 'all', $fields ) ) {
@@ -1185,10 +1194,10 @@
} else {
if ( in_array( 'basic', $fields ) ) {
$basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
- $fields = array_merge( $fields, $basic_fields );
+ $fields = array_merge( $fields, $basic_fields );
}
$requested_fields = array_intersect_key( $user_fields, array_flip( $fields ) );
- $_user = array_merge( $_user, $requested_fields );
+ $_user = array_merge( $_user, $requested_fields );
}
/**
@@ -1251,8 +1260,9 @@
* @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
*/
public function wp_newPost( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -1260,8 +1270,9 @@
$password = $args[2];
$content_struct = $args[3];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
// convert the date field back to IXR form
if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
@@ -1320,7 +1331,7 @@
if ( $update ) {
unstick_post( $post_data['ID'] );
}
- } elseif ( isset( $post_data['sticky'] ) ) {
+ } elseif ( isset( $post_data['sticky'] ) ) {
if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to make posts sticky.' ) );
}
@@ -1373,21 +1384,26 @@
$post_data = wp_parse_args( array_intersect_key( $content_struct, $defaults ), $defaults );
$post_type = get_post_type_object( $post_data['post_type'] );
- if ( ! $post_type )
+ if ( ! $post_type ) {
return new IXR_Error( 403, __( 'Invalid post type.' ) );
+ }
$update = ! empty( $post_data['ID'] );
if ( $update ) {
- if ( ! get_post( $post_data['ID'] ) )
+ if ( ! get_post( $post_data['ID'] ) ) {
return new IXR_Error( 401, __( 'Invalid post ID.' ) );
- if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
+ }
+ if ( ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
- if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
+ }
+ if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) ) {
return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+ }
} else {
- if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
+ if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+ }
}
switch ( $post_data['post_status'] ) {
@@ -1395,41 +1411,49 @@
case 'pending':
break;
case 'private':
- if ( ! current_user_can( $post_type->cap->publish_posts ) )
+ if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type.' ) );
+ }
break;
case 'publish':
case 'future':
- if ( ! current_user_can( $post_type->cap->publish_posts ) )
+ if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type.' ) );
+ }
break;
default:
- if ( ! get_post_status_object( $post_data['post_status'] ) )
+ if ( ! get_post_status_object( $post_data['post_status'] ) ) {
$post_data['post_status'] = 'draft';
- break;
- }
-
- if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
+ }
+ break;
+ }
+
+ if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type.' ) );
+ }
$post_data['post_author'] = absint( $post_data['post_author'] );
if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
- if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
+ if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
+ }
$author = get_userdata( $post_data['post_author'] );
- if ( ! $author )
+ if ( ! $author ) {
return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+ }
} else {
$post_data['post_author'] = $user->ID;
}
- if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' )
+ if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' ) {
unset( $post_data['comment_status'] );
-
- if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
+ }
+
+ if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' ) {
unset( $post_data['ping_status'] );
+ }
// Do some timestamp voodoo.
if ( ! empty( $post_data['post_date_gmt'] ) ) {
@@ -1443,15 +1467,16 @@
$post_data['edit_date'] = false;
if ( ! empty( $dateCreated ) ) {
- $post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+ $post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
// Flag the post date to be edited.
$post_data['edit_date'] = true;
}
- if ( ! isset( $post_data['ID'] ) )
+ if ( ! isset( $post_data['ID'] ) ) {
$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+ }
$post_ID = $post_data['ID'];
if ( $post_data['post_type'] == 'post' ) {
@@ -1463,16 +1488,18 @@
if ( isset( $post_data['post_thumbnail'] ) ) {
// empty value deletes, non-empty value adds/updates.
- if ( ! $post_data['post_thumbnail'] )
+ if ( ! $post_data['post_thumbnail'] ) {
delete_post_thumbnail( $post_ID );
- elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
+ } elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) ) {
return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+ }
set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
unset( $content_struct['post_thumbnail'] );
}
- if ( isset( $post_data['custom_fields'] ) )
+ if ( isset( $post_data['custom_fields'] ) ) {
$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+ }
if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
$post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
@@ -1486,21 +1513,24 @@
// Validating term ids.
foreach ( $taxonomies as $taxonomy ) {
- if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+ if ( ! array_key_exists( $taxonomy, $post_type_taxonomies ) ) {
return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
-
- if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+ }
+
+ if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->assign_terms ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
-
- $term_ids = $post_data['terms'][$taxonomy];
+ }
+
+ $term_ids = $post_data['terms'][ $taxonomy ];
$terms[ $taxonomy ] = array();
foreach ( $term_ids as $term_id ) {
$term = get_term_by( 'id', $term_id, $taxonomy );
- if ( ! $term )
+ if ( ! $term ) {
return new IXR_Error( 403, __( 'Invalid term ID.' ) );
-
- $terms[$taxonomy][] = (int) $term_id;
+ }
+
+ $terms[ $taxonomy ][] = (int) $term_id;
}
}
}
@@ -1510,11 +1540,13 @@
$taxonomies = array_keys( $post_data['terms_names'] );
foreach ( $taxonomies as $taxonomy ) {
- if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+ if ( ! array_key_exists( $taxonomy, $post_type_taxonomies ) ) {
return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
-
- if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+ }
+
+ if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->assign_terms ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+ }
/*
* For hierarchical taxonomies, we can't assign a term when multiple terms
@@ -1522,37 +1554,46 @@
*/
$ambiguous_terms = array();
if ( is_taxonomy_hierarchical( $taxonomy ) ) {
- $tax_term_names = get_terms( $taxonomy, array( 'fields' => 'names', 'hide_empty' => false ) );
+ $tax_term_names = get_terms(
+ $taxonomy,
+ array(
+ 'fields' => 'names',
+ 'hide_empty' => false,
+ )
+ );
// Count the number of terms with the same name.
$tax_term_names_count = array_count_values( $tax_term_names );
// Filter out non-ambiguous term names.
- $ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one') );
+ $ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one' ) );
$ambiguous_terms = array_keys( $ambiguous_tax_term_counts );
}
- $term_names = $post_data['terms_names'][$taxonomy];
+ $term_names = $post_data['terms_names'][ $taxonomy ];
foreach ( $term_names as $term_name ) {
- if ( in_array( $term_name, $ambiguous_terms ) )
+ if ( in_array( $term_name, $ambiguous_terms ) ) {
return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+ }
$term = get_term_by( 'name', $term_name, $taxonomy );
if ( ! $term ) {
// Term doesn't exist, so check that the user is allowed to create new terms.
- if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
+ if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->edit_terms ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+ }
// Create the new term.
$term_info = wp_insert_term( $term_name, $taxonomy );
- if ( is_wp_error( $term_info ) )
+ if ( is_wp_error( $term_info ) ) {
return new IXR_Error( 500, $term_info->get_error_message() );
-
- $terms[$taxonomy][] = (int) $term_info['term_id'];
+ }
+
+ $terms[ $taxonomy ][] = (int) $term_info['term_id'];
} else {
- $terms[$taxonomy][] = (int) $term->term_id;
+ $terms[ $taxonomy ][] = (int) $term->term_id;
}
}
}
@@ -1565,8 +1606,9 @@
if ( isset( $post_data['post_format'] ) ) {
$format = set_post_format( $post_ID, $post_data['post_format'] );
- if ( is_wp_error( $format ) )
+ if ( is_wp_error( $format ) ) {
return new IXR_Error( 500, $format->get_error_message() );
+ }
unset( $post_data['post_format'] );
}
@@ -1588,11 +1630,13 @@
$post_data = apply_filters( 'xmlrpc_wp_insert_post_data', $post_data, $content_struct );
$post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
- 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( 401, __( 'Sorry, your entry could not be posted.' ) );
+ }
return strval( $post_ID );
}
@@ -1617,8 +1661,9 @@
* @return true|IXR_Error True on success, IXR_Error on failure.
*/
public function wp_editPost( $args ) {
- if ( ! $this->minimum_args( $args, 5 ) )
+ if ( ! $this->minimum_args( $args, 5 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -1627,16 +1672,18 @@
$post_id = (int) $args[3];
$content_struct = $args[4];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.editPost' );
$post = get_post( $post_id, ARRAY_A );
- if ( empty( $post['ID'] ) )
+ if ( empty( $post['ID'] ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+ }
if ( isset( $content_struct['if_not_modified_since'] ) ) {
// If the post has been modified since the date provided, return an error.
@@ -1652,17 +1699,19 @@
* Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
* since _insert_post() will ignore the non-GMT date if the GMT date is set.
*/
- if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
+ if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
unset( $post['post_date_gmt'] );
- else
+ } else {
$post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+ }
$this->escape( $post );
$merged_content_struct = array_merge( $post, $content_struct );
$retval = $this->_insert_post( $user, $merged_content_struct );
- if ( $retval instanceof IXR_Error )
+ if ( $retval instanceof IXR_Error ) {
return $retval;
+ }
return true;
}
@@ -1685,17 +1734,19 @@
* @return true|IXR_Error True on success, IXR_Error instance on failure.
*/
public function wp_deletePost( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $post_id = (int) $args[3];
-
- if ( ! $user = $this->login( $username, $password ) )
+ $username = $args[1];
+ $password = $args[2];
+ $post_id = (int) $args[3];
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.deletePost' );
@@ -1768,8 +1819,9 @@
* - 'enclosure'
*/
public function wp_getPost( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -1791,19 +1843,22 @@
$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPost' );
$post = get_post( $post_id, ARRAY_A );
- if ( empty( $post['ID'] ) )
+ if ( empty( $post['ID'] ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( ! current_user_can( 'edit_post', $post_id ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
return $this->_prepare_post( $post, $fields );
}
@@ -1831,8 +1886,9 @@
* @return array|IXR_Error Array contains a collection of posts.
*/
public function wp_getPosts( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -1847,8 +1903,9 @@
$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPosts' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPosts' );
@@ -1857,31 +1914,37 @@
if ( isset( $filter['post_type'] ) ) {
$post_type = get_post_type_object( $filter['post_type'] );
- if ( ! ( (bool) $post_type ) )
+ if ( ! ( (bool) $post_type ) ) {
return new IXR_Error( 403, __( 'Invalid post type.' ) );
+ }
} else {
$post_type = get_post_type_object( 'post' );
}
- if ( ! current_user_can( $post_type->cap->edit_posts ) )
+ if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+ }
$query['post_type'] = $post_type->name;
- if ( isset( $filter['post_status'] ) )
+ if ( isset( $filter['post_status'] ) ) {
$query['post_status'] = $filter['post_status'];
-
- if ( isset( $filter['number'] ) )
+ }
+
+ if ( isset( $filter['number'] ) ) {
$query['numberposts'] = absint( $filter['number'] );
-
- if ( isset( $filter['offset'] ) )
+ }
+
+ if ( isset( $filter['offset'] ) ) {
$query['offset'] = absint( $filter['offset'] );
+ }
if ( isset( $filter['orderby'] ) ) {
$query['orderby'] = $filter['orderby'];
- if ( isset( $filter['order'] ) )
+ if ( isset( $filter['order'] ) ) {
$query['order'] = $filter['order'];
+ }
}
if ( isset( $filter['s'] ) ) {
@@ -1890,15 +1953,17 @@
$posts_list = wp_get_recent_posts( $query );
- if ( ! $posts_list )
+ if ( ! $posts_list ) {
return array();
+ }
// Holds all the posts data.
$struct = array();
foreach ( $posts_list as $post ) {
- if ( ! current_user_can( 'edit_post', $post['ID'] ) )
+ if ( ! current_user_can( 'edit_post', $post['ID'] ) ) {
continue;
+ }
$struct[] = $this->_prepare_post( $post, $fields );
}
@@ -1926,8 +1991,9 @@
* @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
*/
public function wp_newTerm( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -1935,14 +2001,16 @@
$password = $args[2];
$content_struct = $args[3];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.newTerm' );
- if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+ if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
@@ -1956,38 +2024,46 @@
$term_data = array();
$term_data['name'] = trim( $content_struct['name'] );
- if ( empty( $term_data['name'] ) )
+ if ( empty( $term_data['name'] ) ) {
return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+ }
if ( isset( $content_struct['parent'] ) ) {
- if ( ! $taxonomy['hierarchical'] )
+ if ( ! $taxonomy['hierarchical'] ) {
return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+ }
$parent_term_id = (int) $content_struct['parent'];
- $parent_term = get_term( $parent_term_id , $taxonomy['name'] );
-
- if ( is_wp_error( $parent_term ) )
+ $parent_term = get_term( $parent_term_id, $taxonomy['name'] );
+
+ if ( is_wp_error( $parent_term ) ) {
return new IXR_Error( 500, $parent_term->get_error_message() );
-
- if ( ! $parent_term )
+ }
+
+ if ( ! $parent_term ) {
return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+ }
$term_data['parent'] = $content_struct['parent'];
}
- if ( isset( $content_struct['description'] ) )
+ if ( isset( $content_struct['description'] ) ) {
$term_data['description'] = $content_struct['description'];
-
- if ( isset( $content_struct['slug'] ) )
+ }
+
+ if ( isset( $content_struct['slug'] ) ) {
$term_data['slug'] = $content_struct['slug'];
-
- $term = wp_insert_term( $term_data['name'] , $taxonomy['name'] , $term_data );
-
- if ( is_wp_error( $term ) )
+ }
+
+ $term = wp_insert_term( $term_data['name'], $taxonomy['name'], $term_data );
+
+ if ( is_wp_error( $term ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $term )
+ }
+
+ if ( ! $term ) {
return new IXR_Error( 500, __( 'Sorry, your term could not be created.' ) );
+ }
// Add term meta.
if ( isset( $content_struct['custom_fields'] ) ) {
@@ -2018,8 +2094,9 @@
* @return true|IXR_Error True on success, IXR_Error instance on failure.
*/
public function wp_editTerm( $args ) {
- if ( ! $this->minimum_args( $args, 5 ) )
+ if ( ! $this->minimum_args( $args, 5 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2028,14 +2105,16 @@
$term_id = (int) $args[3];
$content_struct = $args[4];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.editTerm' );
- if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+ if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
@@ -2044,13 +2123,15 @@
// hold the data of the term
$term_data = array();
- $term = get_term( $term_id , $content_struct['taxonomy'] );
-
- if ( is_wp_error( $term ) )
+ $term = get_term( $term_id, $content_struct['taxonomy'] );
+
+ if ( is_wp_error( $term ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $term )
+ }
+
+ if ( ! $term ) {
return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+ }
if ( ! current_user_can( 'edit_term', $term_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this term.' ) );
@@ -2059,39 +2140,47 @@
if ( isset( $content_struct['name'] ) ) {
$term_data['name'] = trim( $content_struct['name'] );
- if ( empty( $term_data['name'] ) )
+ if ( empty( $term_data['name'] ) ) {
return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+ }
}
if ( ! empty( $content_struct['parent'] ) ) {
- if ( ! $taxonomy['hierarchical'] )
+ if ( ! $taxonomy['hierarchical'] ) {
return new IXR_Error( 403, __( 'Cannot set parent term, taxonomy is not hierarchical.' ) );
+ }
$parent_term_id = (int) $content_struct['parent'];
- $parent_term = get_term( $parent_term_id , $taxonomy['name'] );
-
- if ( is_wp_error( $parent_term ) )
+ $parent_term = get_term( $parent_term_id, $taxonomy['name'] );
+
+ if ( is_wp_error( $parent_term ) ) {
return new IXR_Error( 500, $parent_term->get_error_message() );
-
- if ( ! $parent_term )
+ }
+
+ if ( ! $parent_term ) {
return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+ }
$term_data['parent'] = $content_struct['parent'];
}
- if ( isset( $content_struct['description'] ) )
+ if ( isset( $content_struct['description'] ) ) {
$term_data['description'] = $content_struct['description'];
-
- if ( isset( $content_struct['slug'] ) )
+ }
+
+ if ( isset( $content_struct['slug'] ) ) {
$term_data['slug'] = $content_struct['slug'];
-
- $term = wp_update_term( $term_id , $taxonomy['name'] , $term_data );
-
- if ( is_wp_error( $term ) )
+ }
+
+ $term = wp_update_term( $term_id, $taxonomy['name'], $term_data );
+
+ if ( is_wp_error( $term ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $term )
+ }
+
+ if ( ! $term ) {
return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+ }
// Update term meta.
if ( isset( $content_struct['custom_fields'] ) ) {
@@ -2120,33 +2209,38 @@
* @return bool|IXR_Error True on success, IXR_Error instance on failure.
*/
public function wp_deleteTerm( $args ) {
- if ( ! $this->minimum_args( $args, 5 ) )
+ if ( ! $this->minimum_args( $args, 5 ) ) {
return $this->error;
+ }
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $taxonomy = $args[3];
- $term_id = (int) $args[4];
-
- if ( ! $user = $this->login( $username, $password ) )
+ $username = $args[1];
+ $password = $args[2];
+ $taxonomy = $args[3];
+ $term_id = (int) $args[4];
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.deleteTerm' );
- if ( ! taxonomy_exists( $taxonomy ) )
+ if ( ! taxonomy_exists( $taxonomy ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $taxonomy );
- $term = get_term( $term_id, $taxonomy->name );
-
- if ( is_wp_error( $term ) )
+ $term = get_term( $term_id, $taxonomy->name );
+
+ if ( is_wp_error( $term ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $term )
+ }
+
+ if ( ! $term ) {
return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+ }
if ( ! current_user_can( 'delete_term', $term_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this term.' ) );
@@ -2154,11 +2248,13 @@
$result = wp_delete_term( $term_id, $taxonomy->name );
- if ( is_wp_error( $result ) )
+ if ( is_wp_error( $result ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $result )
+ }
+
+ if ( ! $result ) {
return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+ }
return $result;
}
@@ -2191,34 +2287,39 @@
* - 'count'
*/
public function wp_getTerm( $args ) {
- if ( ! $this->minimum_args( $args, 5 ) )
+ if ( ! $this->minimum_args( $args, 5 ) ) {
return $this->error;
+ }
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $taxonomy = $args[3];
- $term_id = (int) $args[4];
-
- if ( ! $user = $this->login( $username, $password ) )
+ $username = $args[1];
+ $password = $args[2];
+ $taxonomy = $args[3];
+ $term_id = (int) $args[4];
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getTerm' );
- if ( ! taxonomy_exists( $taxonomy ) )
+ if ( ! taxonomy_exists( $taxonomy ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $taxonomy );
- $term = get_term( $term_id , $taxonomy->name, ARRAY_A );
-
- if ( is_wp_error( $term ) )
+ $term = get_term( $term_id, $taxonomy->name, ARRAY_A );
+
+ if ( is_wp_error( $term ) ) {
return new IXR_Error( 500, $term->get_error_message() );
-
- if ( ! $term )
+ }
+
+ if ( ! $term ) {
return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+ }
if ( ! current_user_can( 'assign_term', $term_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign this term.' ) );
@@ -2250,57 +2351,67 @@
* @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
*/
public function wp_getTerms( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $taxonomy = $args[3];
- $filter = isset( $args[4] ) ? $args[4] : array();
-
- if ( ! $user = $this->login( $username, $password ) )
+ $username = $args[1];
+ $password = $args[2];
+ $taxonomy = $args[3];
+ $filter = isset( $args[4] ) ? $args[4] : array();
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getTerms' );
- if ( ! taxonomy_exists( $taxonomy ) )
+ if ( ! taxonomy_exists( $taxonomy ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $taxonomy );
- if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+ if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
+ }
$query = array();
- if ( isset( $filter['number'] ) )
+ if ( isset( $filter['number'] ) ) {
$query['number'] = absint( $filter['number'] );
-
- if ( isset( $filter['offset'] ) )
+ }
+
+ if ( isset( $filter['offset'] ) ) {
$query['offset'] = absint( $filter['offset'] );
+ }
if ( isset( $filter['orderby'] ) ) {
$query['orderby'] = $filter['orderby'];
- if ( isset( $filter['order'] ) )
+ if ( isset( $filter['order'] ) ) {
$query['order'] = $filter['order'];
- }
-
- if ( isset( $filter['hide_empty'] ) )
+ }
+ }
+
+ if ( isset( $filter['hide_empty'] ) ) {
$query['hide_empty'] = $filter['hide_empty'];
- else
+ } else {
$query['get'] = 'all';
-
- if ( isset( $filter['search'] ) )
+ }
+
+ if ( isset( $filter['search'] ) ) {
$query['search'] = $filter['search'];
+ }
$terms = get_terms( $taxonomy->name, $query );
- if ( is_wp_error( $terms ) )
+ if ( is_wp_error( $terms ) ) {
return new IXR_Error( 500, $terms->get_error_message() );
+ }
$struct = array();
@@ -2332,8 +2443,9 @@
* @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
*/
public function wp_getTaxonomy( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2355,19 +2467,22 @@
$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
- if ( ! taxonomy_exists( $taxonomy ) )
+ if ( ! taxonomy_exists( $taxonomy ) ) {
return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+ }
$taxonomy = get_taxonomy( $taxonomy );
- if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+ if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
+ }
return $this->_prepare_taxonomy( $taxonomy, $fields );
}
@@ -2392,8 +2507,9 @@
* by `$fields`, or an IXR_Error instance on failure.
*/
public function wp_getTaxonomies( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2408,8 +2524,9 @@
$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomies' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getTaxonomies' );
@@ -2421,8 +2538,9 @@
foreach ( $taxonomies as $taxonomy ) {
// capability check for post_types
- if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+ if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
continue;
+ }
$struct[] = $this->_prepare_taxonomy( $taxonomy, $fields );
}
@@ -2467,8 +2585,9 @@
* - 'roles'
*/
public function wp_getUser( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2490,19 +2609,22 @@
$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getUser' );
- if ( ! current_user_can( 'edit_user', $user_id ) )
+ if ( ! current_user_can( 'edit_user', $user_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this user.' ) );
+ }
$user_data = get_userdata( $user_id );
- if ( ! $user_data )
+ if ( ! $user_data ) {
return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+ }
return $this->_prepare_user( $user_data, $fields );
}
@@ -2532,8 +2654,9 @@
* @return array|IXR_Error users data
*/
public function wp_getUsers( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2548,14 +2671,16 @@
$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUsers' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getUsers' );
- if ( ! current_user_can( 'list_users' ) )
+ if ( ! current_user_can( 'list_users' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to list users.' ) );
+ }
$query = array( 'fields' => 'all_with_meta' );
@@ -2565,13 +2690,15 @@
if ( isset( $filter['orderby'] ) ) {
$query['orderby'] = $filter['orderby'];
- if ( isset( $filter['order'] ) )
+ if ( isset( $filter['order'] ) ) {
$query['order'] = $filter['order'];
+ }
}
if ( isset( $filter['role'] ) ) {
- if ( get_role( $filter['role'] ) === null )
+ if ( get_role( $filter['role'] ) === null ) {
return new IXR_Error( 403, __( 'Invalid role.' ) );
+ }
$query['role'] = $filter['role'];
}
@@ -2584,8 +2711,9 @@
$_users = array();
foreach ( $users as $user_data ) {
- if ( current_user_can( 'edit_user', $user_data->ID ) )
+ if ( current_user_can( 'edit_user', $user_data->ID ) ) {
$_users[] = $this->_prepare_user( $user_data, $fields );
+ }
}
return $_users;
}
@@ -2606,8 +2734,9 @@
* @return array|IXR_Error (@see wp_getUser)
*/
public function wp_getProfile( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2621,14 +2750,16 @@
$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getProfile' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getProfile' );
- if ( ! current_user_can( 'edit_user', $user->ID ) )
+ if ( ! current_user_can( 'edit_user', $user->ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
+ }
$user_data = get_userdata( $user->ID );
@@ -2658,8 +2789,9 @@
* @return true|IXR_Error True, on success.
*/
public function wp_editProfile( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -2667,48 +2799,59 @@
$password = $args[2];
$content_struct = $args[3];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.editProfile' );
- if ( ! current_user_can( 'edit_user', $user->ID ) )
+ if ( ! current_user_can( 'edit_user', $user->ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
+ }
// holds data of the user
- $user_data = array();
+ $user_data = array();
$user_data['ID'] = $user->ID;
// only set the user details if it was given
- if ( isset( $content_struct['first_name'] ) )
+ if ( isset( $content_struct['first_name'] ) ) {
$user_data['first_name'] = $content_struct['first_name'];
-
- if ( isset( $content_struct['last_name'] ) )
+ }
+
+ if ( isset( $content_struct['last_name'] ) ) {
$user_data['last_name'] = $content_struct['last_name'];
-
- if ( isset( $content_struct['url'] ) )
+ }
+
+ if ( isset( $content_struct['url'] ) ) {
$user_data['user_url'] = $content_struct['url'];
-
- if ( isset( $content_struct['display_name'] ) )
+ }
+
+ if ( isset( $content_struct['display_name'] ) ) {
$user_data['display_name'] = $content_struct['display_name'];
-
- if ( isset( $content_struct['nickname'] ) )
+ }
+
+ if ( isset( $content_struct['nickname'] ) ) {
$user_data['nickname'] = $content_struct['nickname'];
-
- if ( isset( $content_struct['nicename'] ) )
+ }
+
+ if ( isset( $content_struct['nicename'] ) ) {
$user_data['user_nicename'] = $content_struct['nicename'];
-
- if ( isset( $content_struct['bio'] ) )
+ }
+
+ if ( isset( $content_struct['bio'] ) ) {
$user_data['description'] = $content_struct['bio'];
+ }
$result = wp_update_user( $user_data );
- 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 user cannot be updated.' ) );
+ }
return true;
}
@@ -2735,26 +2878,27 @@
$username = $args[2];
$password = $args[3];
- if ( !$user = $this->login($username, $password) ) {
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
}
- $page = get_post($page_id);
- if ( ! $page )
+ $page = get_post( $page_id );
+ if ( ! $page ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can( 'edit_page', $page_id ) )
+ }
+
+ if ( ! current_user_can( 'edit_page', $page_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPage' );
// If we found the page then format the data.
- if ( $page->ID && ($page->post_type == 'page') ) {
+ if ( $page->ID && ( $page->post_type == 'page' ) ) {
return $this->_prepare_page( $page );
- }
- // If the page doesn't exist indicate that.
- else {
+ } else {
+ // If the page doesn't exist indicate that.
return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
}
}
@@ -2779,27 +2923,36 @@
$username = $args[1];
$password = $args[2];
- $num_pages = isset($args[3]) ? (int) $args[3] : 10;
-
- if ( !$user = $this->login($username, $password) )
+ $num_pages = isset( $args[3] ) ? (int) $args[3] : 10;
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- if ( !current_user_can( 'edit_pages' ) )
+ }
+
+ if ( ! current_user_can( 'edit_pages' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPages' );
- $pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
- $num_pages = count($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 ) {
$pages_struct = array();
- foreach ($pages as $page) {
- if ( current_user_can( 'edit_page', $page->ID ) )
+ foreach ( $pages as $page ) {
+ if ( current_user_can( 'edit_page', $page->ID ) ) {
$pages_struct[] = $this->_prepare_page( $page );
+ }
}
return $pages_struct;
@@ -2830,14 +2983,15 @@
$username = $this->escape( $args[1] );
$password = $this->escape( $args[2] );
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.newPage' );
// Mark this as content for a page.
- $args[3]["post_type"] = 'page';
+ $args[3]['post_type'] = 'page';
// Let mw_newPost do all of the heavy lifting.
return $this->mw_newPost( $args );
@@ -2865,26 +3019,30 @@
$password = $args[2];
$page_id = (int) $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.deletePage' );
// Get the current page based on the page_id and
// make sure it is a page and not a post.
- $actual_page = get_post($page_id, ARRAY_A);
- if ( !$actual_page || ($actual_page['post_type'] != 'page') )
+ $actual_page = get_post( $page_id, ARRAY_A );
+ 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 are not allowed to delete this page.' ) );
+ }
// Attempt to delete the page.
- $result = wp_delete_post($page_id);
- if ( !$result )
+ $result = wp_delete_post( $page_id );
+ if ( ! $result ) {
return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+ }
/**
* Fires after a page has been successfully deleted via XML-RPC.
@@ -2927,7 +3085,7 @@
$escaped_username = $this->escape( $username );
$escaped_password = $this->escape( $password );
- if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
+ if ( ! $user = $this->login( $escaped_username, $escaped_password ) ) {
return $this->error;
}
@@ -2935,13 +3093,15 @@
do_action( 'xmlrpc_call', 'wp.editPage' );
// Get the page data and make sure it is a page.
- $actual_page = get_post($page_id, ARRAY_A);
- if ( !$actual_page || ($actual_page['post_type'] != 'page') )
+ $actual_page = get_post( $page_id, ARRAY_A );
+ 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 are not allowed to edit this page.' ) );
+ }
// Mark this as content for a page.
$content['post_type'] = 'page';
@@ -2952,7 +3112,7 @@
$username,
$password,
$content,
- $publish
+ $publish,
);
// Let mw_editPost do all of the heavy lifting.
@@ -2983,17 +3143,20 @@
$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' ) )
+ }
+
+ if ( ! current_user_can( 'edit_pages' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPageList' );
// Get list of pages ids and titles
- $page_list = $wpdb->get_results("
+ $page_list = $wpdb->get_results(
+ "
SELECT ID page_id,
post_title page_title,
post_parent page_parent_id,
@@ -3003,17 +3166,18 @@
FROM {$wpdb->posts}
WHERE post_type = 'page'
ORDER BY ID
- ");
+ "
+ );
// The date needs to be formatted properly.
- $num_pages = count($page_list);
+ $num_pages = count( $page_list );
for ( $i = 0; $i < $num_pages; $i++ ) {
- $page_list[$i]->dateCreated = $this->_convert_date( $page_list[$i]->post_date );
- $page_list[$i]->date_created_gmt = $this->_convert_date_gmt( $page_list[$i]->post_date_gmt, $page_list[$i]->post_date );
-
- unset($page_list[$i]->post_date_gmt);
- unset($page_list[$i]->post_date);
- unset($page_list[$i]->post_status);
+ $page_list[ $i ]->dateCreated = $this->_convert_date( $page_list[ $i ]->post_date );
+ $page_list[ $i ]->date_created_gmt = $this->_convert_date_gmt( $page_list[ $i ]->post_date_gmt, $page_list[ $i ]->post_date );
+
+ unset( $page_list[ $i ]->post_date_gmt );
+ unset( $page_list[ $i ]->post_date );
+ unset( $page_list[ $i ]->post_status );
}
return $page_list;
@@ -3039,21 +3203,23 @@
$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 are not allowed to edit posts.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
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,
);
}
@@ -3080,11 +3246,13 @@
$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 must be able to edit posts on this site in order to view tags.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getKeywords' );
@@ -3093,13 +3261,13 @@
if ( $all_tags = get_tags() ) {
foreach ( (array) $all_tags as $tag ) {
- $struct = array();
- $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 ) );
+ $struct = array();
+ $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;
}
@@ -3130,8 +3298,9 @@
$password = $args[2];
$category = $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.newCategory' );
@@ -3143,33 +3312,37 @@
// 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"]) )
- $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);
+ $cat_id = wp_insert_category( $new_category, true );
if ( is_wp_error( $cat_id ) ) {
- if ( 'term_exists' == $cat_id->get_error_code() )
+ 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.'));
+ } else {
+ return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
+ }
} elseif ( ! $cat_id ) {
- return new IXR_Error(500, __('Sorry, the new category failed.'));
+ return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
}
/**
@@ -3207,8 +3380,9 @@
$password = $args[2];
$category_id = (int) $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.deleteCategory' );
@@ -3258,21 +3432,27 @@
$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' ) )
+ }
+
+ 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.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
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 ) {
+ $args = array(
+ 'get' => 'all',
+ 'number' => $max_results,
+ 'name__like' => $category,
+ );
+ 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,
);
}
@@ -3294,12 +3474,12 @@
* }
* @return array|IXR_Error
*/
- public function wp_getComment($args) {
- $this->escape($args);
-
- $username = $args[1];
- $password = $args[2];
- $comment_id = (int) $args[3];
+ public function wp_getComment( $args ) {
+ $this->escape( $args );
+
+ $username = $args[1];
+ $password = $args[2];
+ $comment_id = (int) $args[3];
if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
@@ -3350,7 +3530,7 @@
$username = $args[1];
$password = $args[2];
- $struct = isset( $args[3] ) ? $args[3] : array();
+ $struct = isset( $args[3] ) ? $args[3] : array();
if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
@@ -3393,13 +3573,15 @@
$number = absint( $struct['number'] );
}
- $comments = get_comments( array(
- 'status' => $status,
- 'post_id' => $post_id,
- 'offset' => $offset,
- 'number' => $number,
- 'post_type' => $post_type,
- ) );
+ $comments = get_comments(
+ array(
+ 'status' => $status,
+ 'post_id' => $post_id,
+ 'offset' => $offset,
+ 'number' => $number,
+ 'post_type' => $post_type,
+ )
+ );
$comments_struct = array();
if ( is_array( $comments ) ) {
@@ -3430,11 +3612,11 @@
* @return bool|IXR_Error See wp_delete_comment().
*/
public function wp_deleteComment( $args ) {
- $this->escape($args);
-
- $username = $args[1];
- $password = $args[2];
- $comment_ID = (int) $args[3];
+ $this->escape( $args );
+
+ $username = $args[1];
+ $password = $args[2];
+ $comment_ID = (int) $args[3];
if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
@@ -3498,12 +3680,12 @@
public function wp_editComment( $args ) {
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $comment_ID = (int) $args[3];
+ $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;
}
@@ -3517,45 +3699,53 @@
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.editComment' );
-
- if ( isset($content_struct['status']) ) {
+ $comment = array(
+ 'comment_ID' => $comment_ID,
+ );
+
+ if ( isset( $content_struct['status'] ) ) {
$statuses = get_comment_statuses();
- $statuses = array_keys($statuses);
-
- if ( ! in_array($content_struct['status'], $statuses) )
+ $statuses = array_keys( $statuses );
+
+ if ( ! in_array( $content_struct['status'], $statuses ) ) {
return new IXR_Error( 401, __( 'Invalid comment status.' ) );
- $comment_approved = $content_struct['status'];
+ }
+
+ $comment['comment_approved'] = $content_struct['status'];
}
// Do some timestamp voodoo
- if ( !empty( $content_struct['date_created_gmt'] ) ) {
+ if ( ! empty( $content_struct['date_created_gmt'] ) ) {
// We know this is supposed to be GMT, so we're going to slap that Z on there by force
- $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
- $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
- $comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
- }
-
- if ( isset($content_struct['content']) )
- $comment_content = $content_struct['content'];
-
- if ( isset($content_struct['author']) )
- $comment_author = $content_struct['author'];
-
- if ( isset($content_struct['author_url']) )
- $comment_author_url = $content_struct['author_url'];
-
- 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 ) )
- return new IXR_Error(500, $result->get_error_message());
-
- if ( !$result )
- return new IXR_Error(500, __('Sorry, the comment could not be edited.'));
+ $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+ $comment['comment_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+ $comment['comment_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+ }
+
+ if ( isset( $content_struct['content'] ) ) {
+ $comment['comment_content'] = $content_struct['content'];
+ }
+
+ if ( isset( $content_struct['author'] ) ) {
+ $comment['comment_author'] = $content_struct['author'];
+ }
+
+ if ( isset( $content_struct['author_url'] ) ) {
+ $comment['comment_author_url'] = $content_struct['author_url'];
+ }
+
+ if ( isset( $content_struct['author_email'] ) ) {
+ $comment['comment_author_email'] = $content_struct['author_email'];
+ }
+
+ $result = wp_update_comment( $comment );
+ if ( is_wp_error( $result ) ) {
+ return new IXR_Error( 500, $result->get_error_message() );
+ }
+
+ if ( ! $result ) {
+ return new IXR_Error( 500, __( 'Sorry, the comment could not be edited.' ) );
+ }
/**
* Fires after a comment has been successfully updated via XML-RPC.
@@ -3586,8 +3776,8 @@
* }
* @return int|IXR_Error See wp_new_comment().
*/
- public function wp_newComment($args) {
- $this->escape($args);
+ public function wp_newComment( $args ) {
+ $this->escape( $args );
$username = $args[1];
$password = $args[2];
@@ -3604,11 +3794,11 @@
*/
$allow_anon = apply_filters( 'xmlrpc_allow_anonymous_comments', false );
- $user = $this->login($username, $password);
-
- if ( !$user ) {
+ $user = $this->login( $username, $password );
+
+ if ( ! $user ) {
$logged_in = false;
- if ( $allow_anon && get_option('comment_registration') ) {
+ if ( $allow_anon && get_option( 'comment_registration' ) ) {
return new IXR_Error( 403, __( 'You must be registered to comment.' ) );
} elseif ( ! $allow_anon ) {
return $this->error;
@@ -3617,10 +3807,11 @@
$logged_in = true;
}
- if ( is_numeric($post) )
- $post_id = absint($post);
- else
- $post_id = url_to_postid($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.' ) );
@@ -3645,37 +3836,41 @@
if ( $logged_in ) {
$display_name = $user->display_name;
- $user_email = $user->user_email;
- $user_url = $user->user_url;
-
- $comment['comment_author'] = $this->escape( $display_name );
+ $user_email = $user->user_email;
+ $user_url = $user->user_url;
+
+ $comment['comment_author'] = $this->escape( $display_name );
$comment['comment_author_email'] = $this->escape( $user_email );
- $comment['comment_author_url'] = $this->escape( $user_url );
- $comment['user_ID'] = $user->ID;
+ $comment['comment_author_url'] = $this->escape( $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'] )
+ 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']) )
+ } 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_parent'] = isset( $content_struct['comment_parent'] ) ? absint( $content_struct['comment_parent'] ) : 0;
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.newComment' );
@@ -3727,7 +3922,7 @@
}
if ( ! current_user_can( 'publish_posts' ) ) {
- return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
}
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
@@ -3754,9 +3949,9 @@
public function wp_getCommentCount( $args ) {
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $post_id = (int) $args[3];
+ $username = $args[1];
+ $password = $args[2];
+ $post_id = (int) $args[3];
if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
@@ -3768,7 +3963,7 @@
}
if ( ! current_user_can( 'edit_post', $post_id ) ) {
- return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details of this post.' ) );
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details of this post.' ) );
}
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
@@ -3777,10 +3972,10 @@
$count = wp_count_comments( $post_id );
return array(
- 'approved' => $count->approved,
+ 'approved' => $count->approved,
'awaiting_moderation' => $count->moderated,
- 'spam' => $count->spam,
- 'total_comments' => $count->total_comments
+ 'spam' => $count->spam,
+ 'total_comments' => $count->total_comments,
);
}
@@ -3804,11 +3999,13 @@
$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, __( 'Sorry, you are not allowed access to details about this site.' ) );
+ }
+
+ if ( ! current_user_can( 'edit_posts' ) ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
@@ -3836,11 +4033,13 @@
$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, __( 'Sorry, you are not allowed access to details about this site.' ) );
+ }
+
+ if ( ! current_user_can( 'edit_pages' ) ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
@@ -3868,13 +4067,15 @@
$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, __( 'Sorry, you are not allowed access to details about this site.' ) );
-
- $templates = get_page_templates();
+ }
+
+ if ( ! current_user_can( 'edit_pages' ) ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
+ }
+
+ $templates = get_page_templates();
$templates['Default'] = 'default';
return $templates;
@@ -3898,18 +4099,20 @@
public function wp_getOptions( $args ) {
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $options = isset( $args[3] ) ? (array) $args[3] : array();
-
- if ( !$user = $this->login($username, $password) )
+ $username = $args[1];
+ $password = $args[2];
+ $options = isset( $args[3] ) ? (array) $args[3] : array();
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
// If no specific options where asked for, return all of them
- if ( count( $options ) == 0 )
- $options = array_keys($this->blog_options);
-
- return $this->_getOptions($options);
+ if ( count( $options ) == 0 ) {
+ $options = array_keys( $this->blog_options );
+ }
+
+ return $this->_getOptions( $options );
}
/**
@@ -3920,20 +4123,21 @@
* @param array $options Options to retrieve.
* @return array
*/
- public function _getOptions($options) {
- $data = array();
+ public function _getOptions( $options ) {
+ $data = array();
$can_manage = current_user_can( 'manage_options' );
foreach ( $options as $option ) {
if ( array_key_exists( $option, $this->blog_options ) ) {
- $data[$option] = $this->blog_options[$option];
+ $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'] );
- unset($data[$option]['option']);
+ if ( isset( $data[ $option ]['option'] ) ) {
+ $data[ $option ]['value'] = get_option( $data[ $option ]['option'] );
+ unset( $data[ $option ]['option'] );
}
- if ( ! $can_manage )
- $data[$option]['readonly'] = true;
+ if ( ! $can_manage ) {
+ $data[ $option ]['readonly'] = true;
+ }
}
}
@@ -3958,30 +4162,34 @@
public function wp_setOptions( $args ) {
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $options = (array) $args[3];
-
- if ( !$user = $this->login($username, $password) )
+ $username = $args[1];
+ $password = $args[2];
+ $options = (array) $args[3];
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- if ( !current_user_can( 'manage_options' ) )
+ }
+
+ if ( ! current_user_can( 'manage_options' ) ) {
return new IXR_Error( 403, __( 'Sorry, you are not allowed to update options.' ) );
+ }
$option_names = array();
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'], wp_unslash( $o_value ) );
+ }
+
+ update_option( $this->blog_options[ $o_name ]['option'], wp_unslash( $o_value ) );
}
//Now return the updated values
- return $this->_getOptions($option_names);
+ return $this->_getOptions( $option_names );
}
/**
@@ -4010,21 +4218,24 @@
public function wp_getMediaItem( $args ) {
$this->escape( $args );
- $username = $args[1];
- $password = $args[2];
- $attachment_id = (int) $args[3];
-
- if ( !$user = $this->login($username, $password) )
+ $username = $args[1];
+ $password = $args[2];
+ $attachment_id = (int) $args[3];
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- if ( !current_user_can( 'upload_files' ) )
+ }
+
+ if ( ! current_user_can( 'upload_files' ) ) {
return new IXR_Error( 403, __( 'Sorry, you are not allowed to upload files.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getMediaItem' );
- if ( ! $attachment = get_post($attachment_id) )
+ if ( ! $attachment = get_post( $attachment_id ) ) {
return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+ }
return $this->_prepare_media_item( $attachment );
}
@@ -4055,33 +4266,44 @@
* }
* @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
*/
- public function wp_getMediaLibrary($args) {
- $this->escape($args);
-
- $username = $args[1];
- $password = $args[2];
- $struct = isset( $args[3] ) ? $args[3] : array() ;
-
- if ( !$user = $this->login($username, $password) )
+ public function wp_getMediaLibrary( $args ) {
+ $this->escape( $args );
+
+ $username = $args[1];
+ $password = $args[2];
+ $struct = isset( $args[3] ) ? $args[3] : array();
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- if ( !current_user_can( 'upload_files' ) )
+ }
+
+ if ( ! current_user_can( 'upload_files' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
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 ;
-
- $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
+ $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_struct = array();
- foreach ($attachments as $attachment )
+ foreach ( $attachments as $attachment ) {
$attachments_struct[] = $this->_prepare_media_item( $attachment );
+ }
return $attachments_struct;
}
@@ -4106,11 +4328,13 @@
$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, __( 'Sorry, you are not allowed access to details about this site.' ) );
+ }
+
+ if ( ! current_user_can( 'edit_posts' ) ) {
+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to access details about this site.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPostFormats' );
@@ -4123,8 +4347,8 @@
if ( current_theme_supports( 'post-formats' ) ) {
$supported = get_theme_support( 'post-formats' );
- $data = array();
- $data['all'] = $formats;
+ $data = array();
+ $data['all'] = $formats;
$data['supported'] = $supported[0];
$formats = $data;
@@ -4163,8 +4387,9 @@
* - 'supports'
*/
public function wp_getPostType( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -4186,19 +4411,22 @@
$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
}
- if ( !$user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPostType' );
- if ( ! post_type_exists( $post_type_name ) )
+ if ( ! post_type_exists( $post_type_name ) ) {
return new IXR_Error( 403, __( 'Invalid post type.' ) );
+ }
$post_type = get_post_type_object( $post_type_name );
- if ( ! current_user_can( $post_type->cap->edit_posts ) )
+ if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+ }
return $this->_prepare_post_type( $post_type, $fields );
}
@@ -4222,8 +4450,9 @@
* @return array|IXR_Error
*/
public function wp_getPostTypes( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -4238,8 +4467,9 @@
$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostTypes' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getPostTypes' );
@@ -4249,10 +4479,11 @@
$struct = array();
foreach ( $post_types as $post_type ) {
- if ( ! current_user_can( $post_type->cap->edit_posts ) )
+ if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
continue;
-
- $struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
+ }
+
+ $struct[ $post_type->name ] = $this->_prepare_post_type( $post_type, $fields );
}
return $struct;
@@ -4281,8 +4512,9 @@
* @return array|IXR_Error contains a collection of posts.
*/
public function wp_getRevisions( $args ) {
- if ( ! $this->minimum_args( $args, 4 ) )
+ if ( ! $this->minimum_args( $args, 4 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -4304,36 +4536,43 @@
$fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
}
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.getRevisions' );
- if ( ! $post = get_post( $post_id ) )
+ if ( ! $post = get_post( $post_id ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( ! current_user_can( 'edit_post', $post_id ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+ }
// Check if revisions are enabled.
- if ( ! wp_revisions_enabled( $post ) )
+ if ( ! wp_revisions_enabled( $post ) ) {
return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+ }
$revisions = wp_get_post_revisions( $post_id );
- if ( ! $revisions )
+ if ( ! $revisions ) {
return array();
+ }
$struct = array();
foreach ( $revisions as $revision ) {
- if ( ! current_user_can( 'read_post', $revision->ID ) )
+ if ( ! current_user_can( 'read_post', $revision->ID ) ) {
continue;
+ }
// Skip autosaves
- if ( wp_is_post_autosave( $revision ) )
+ if ( wp_is_post_autosave( $revision ) ) {
continue;
+ }
$struct[] = $this->_prepare_post( get_object_vars( $revision ), $fields );
}
@@ -4359,8 +4598,9 @@
* @return bool|IXR_Error false if there was an error restoring, true if success.
*/
public function wp_restoreRevision( $args ) {
- if ( ! $this->minimum_args( $args, 3 ) )
+ if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
+ }
$this->escape( $args );
@@ -4368,27 +4608,33 @@
$password = $args[2];
$revision_id = (int) $args[3];
- if ( ! $user = $this->login( $username, $password ) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'wp.restoreRevision' );
- if ( ! $revision = wp_get_post_revision( $revision_id ) )
+ if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( wp_is_post_autosave( $revision ) )
+ }
+
+ if ( wp_is_post_autosave( $revision ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( ! $post = get_post( $revision->post_parent ) )
+ }
+
+ if ( ! $post = get_post( $revision->post_parent ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
// Check if revisions are disabled.
- if ( ! wp_revisions_enabled( $post ) )
+ if ( ! wp_revisions_enabled( $post ) ) {
return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+ }
$post = wp_restore_post_revision( $revision_id );
@@ -4415,37 +4661,38 @@
* }
* @return array|IXR_Error
*/
- public function blogger_getUsersBlogs($args) {
+ public function blogger_getUsersBlogs( $args ) {
if ( ! $this->minimum_args( $args, 3 ) ) {
return $this->error;
}
if ( is_multisite() ) {
- return $this->_multisite_getUsersBlogs($args);
- }
-
- $this->escape($args);
+ return $this->_multisite_getUsersBlogs( $args );
+ }
+
+ $this->escape( $args );
$username = $args[1];
$password = $args[2];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
- $is_admin = current_user_can('manage_options');
+ $is_admin = current_user_can( 'manage_options' );
$struct = array(
'isAdmin' => $is_admin,
- 'url' => get_option('home') . '/',
+ 'url' => get_option( 'home' ) . '/',
'blogid' => '1',
- 'blogName' => get_option('blogname'),
+ 'blogName' => get_option( 'blogname' ),
'xmlrpc' => site_url( 'xmlrpc.php', 'rpc' ),
);
- return array($struct);
+ return array( $struct );
}
/**
@@ -4465,21 +4712,23 @@
$current_blog = get_site();
$domain = $current_blog->domain;
- $path = $current_blog->path . 'xmlrpc.php';
+ $path = $current_blog->path . 'xmlrpc.php';
$rpc = new IXR_Client( set_url_scheme( "http://{$domain}{$path}" ) );
- $rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
+ $rpc->query( 'wp.getUsersBlogs', $args[1], $args[2] );
$blogs = $rpc->getResponse();
- if ( isset($blogs['faultCode']) )
- return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
+ if ( isset( $blogs['faultCode'] ) ) {
+ return new IXR_Error( $blogs['faultCode'], $blogs['faultString'] );
+ }
if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
return $blogs;
} else {
foreach ( (array) $blogs as $blog ) {
- if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) )
- return array($blog);
+ if ( strpos( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
+ return array( $blog );
+ }
}
return array();
}
@@ -4507,11 +4756,13 @@
$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 are not allowed to access user data on this site.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
@@ -4521,7 +4772,7 @@
'userid' => $user->ID,
'url' => $user->user_url,
'lastname' => $user->last_name,
- 'firstname' => $user->first_name
+ 'firstname' => $user->first_name,
);
return $struct;
@@ -4549,30 +4800,33 @@
$username = $args[2];
$password = $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- $post_data = get_post($post_ID, ARRAY_A);
- if ( ! $post_data )
+ }
+
+ $post_data = get_post( $post_ID, ARRAY_A );
+ if ( ! $post_data ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can( 'edit_post', $post_ID ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.getPost' );
- $categories = implode(',', wp_get_post_categories($post_ID));
-
- $content = '<title>'.wp_unslash($post_data['post_title']).'</title>';
- $content .= '<category>'.$categories.'</category>';
- $content .= wp_unslash($post_data['post_content']);
+ $categories = implode( ',', wp_get_post_categories( $post_ID ) );
+
+ $content = '<title>' . wp_unslash( $post_data['post_title'] ) . '</title>';
+ $content .= '<category>' . $categories . '</category>';
+ $content .= wp_unslash( $post_data['post_content'] );
$struct = array(
- 'userid' => $post_data['post_author'],
+ 'userid' => $post_data['post_author'],
'dateCreated' => $this->_convert_date( $post_data['post_date'] ),
'content' => $content,
- 'postid' => (string) $post_data['ID']
+ 'postid' => (string) $post_data['ID'],
);
return $struct;
@@ -4596,49 +4850,53 @@
*/
public function blogger_getRecentPosts( $args ) {
- $this->escape($args);
+ $this->escape( $args );
// $args[0] = appkey - ignored
$username = $args[2];
$password = $args[3];
- if ( isset( $args[4] ) )
+ if ( isset( $args[4] ) ) {
$query = array( 'numberposts' => absint( $args[4] ) );
- else
+ } else {
$query = array();
-
- 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 are not allowed to edit posts.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.getRecentPosts' );
$posts_list = wp_get_recent_posts( $query );
- if ( !$posts_list ) {
- $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+ if ( ! $posts_list ) {
+ $this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
return $this->error;
}
$recent_posts = array();
- foreach ($posts_list as $entry) {
- if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+ foreach ( $posts_list as $entry ) {
+ if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
continue;
+ }
$post_date = $this->_convert_date( $entry['post_date'] );
- $categories = implode(',', wp_get_post_categories($entry['ID']));
-
- $content = '<title>'.wp_unslash($entry['post_title']).'</title>';
- $content .= '<category>'.$categories.'</category>';
- $content .= wp_unslash($entry['post_content']);
+ $categories = implode( ',', wp_get_post_categories( $entry['ID'] ) );
+
+ $content = '<title>' . wp_unslash( $entry['post_title'] ) . '</title>';
+ $content .= '<category>' . $categories . '</category>';
+ $content .= wp_unslash( $entry['post_content'] );
$recent_posts[] = array(
- 'userid' => $entry['post_author'],
+ 'userid' => $entry['post_author'],
'dateCreated' => $post_date,
- 'content' => $content,
- 'postid' => (string) $entry['ID'],
+ 'content' => $content,
+ 'postid' => (string) $entry['ID'],
);
}
@@ -4654,8 +4912,8 @@
* @param array $args Unused.
* @return IXR_Error Error object.
*/
- public function blogger_getTemplate($args) {
- return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+ public function blogger_getTemplate( $args ) {
+ return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
}
/**
@@ -4667,8 +4925,8 @@
* @param array $args Unused.
* @return IXR_Error Error object.
*/
- public function blogger_setTemplate($args) {
- return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+ public function blogger_setTemplate( $args ) {
+ return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
}
/**
@@ -4696,35 +4954,39 @@
$content = $args[4];
$publish = $args[5];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.newPost' );
- $cap = ($publish) ? 'publish_posts' : 'edit_posts';
- if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
- return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
-
- $post_status = ($publish) ? 'publish' : 'draft';
+ $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
+ if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || ! current_user_can( $cap ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+ }
+
+ $post_status = ( $publish ) ? 'publish' : 'draft';
$post_author = $user->ID;
- $post_title = xmlrpc_getposttitle($content);
- $post_category = xmlrpc_getpostcategory($content);
- $post_content = xmlrpc_removepostdata($content);
-
- $post_date = current_time('mysql');
- $post_date_gmt = current_time('mysql', 1);
-
- $post_data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
-
- $post_ID = wp_insert_post($post_data);
- if ( is_wp_error( $post_ID ) )
- return new IXR_Error(500, $post_ID->get_error_message());
-
- if ( !$post_ID )
- return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
+ $post_title = xmlrpc_getposttitle( $content );
+ $post_category = xmlrpc_getpostcategory( $content );
+ $post_content = xmlrpc_removepostdata( $content );
+
+ $post_date = current_time( 'mysql' );
+ $post_date_gmt = current_time( 'mysql', 1 );
+
+ $post_data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status' );
+
+ $post_ID = wp_insert_post( $post_data );
+ if ( is_wp_error( $post_ID ) ) {
+ return new IXR_Error( 500, $post_ID->get_error_message() );
+ }
+
+ if ( ! $post_ID ) {
+ return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+ }
$this->attach_uploads( $post_ID, $post_content );
@@ -4760,7 +5022,7 @@
*/
public function blogger_editPost( $args ) {
- $this->escape($args);
+ $this->escape( $args );
$post_ID = (int) $args[1];
$username = $args[2];
@@ -4781,28 +5043,28 @@
return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
}
- $this->escape($actual_post);
+ $this->escape( $actual_post );
if ( ! current_user_can( 'edit_post', $post_ID ) ) {
- return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
}
if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
}
- $postdata = array();
- $postdata['ID'] = $actual_post['ID'];
- $postdata['post_content'] = xmlrpc_removepostdata( $content );
- $postdata['post_title'] = xmlrpc_getposttitle( $content );
+ $postdata = array();
+ $postdata['ID'] = $actual_post['ID'];
+ $postdata['post_content'] = xmlrpc_removepostdata( $content );
+ $postdata['post_title'] = xmlrpc_getposttitle( $content );
$postdata['post_category'] = xmlrpc_getpostcategory( $content );
- $postdata['post_status'] = $actual_post['post_status'];
- $postdata['post_excerpt'] = $actual_post['post_excerpt'];
- $postdata['post_status'] = $publish ? 'publish' : 'draft';
+ $postdata['post_status'] = $actual_post['post_status'];
+ $postdata['post_excerpt'] = $actual_post['post_excerpt'];
+ $postdata['post_status'] = $publish ? 'publish' : 'draft';
$result = wp_update_post( $postdata );
if ( ! $result ) {
- return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+ return new IXR_Error( 500, __( 'For some strange yet very annoying reason, this post could not be edited.' ) );
}
$this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
@@ -4841,8 +5103,9 @@
$username = $args[2];
$password = $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'blogger.deletePost' );
@@ -4918,122 +5181,142 @@
* }
* @return int|IXR_Error
*/
- public function mw_newPost($args) {
- $this->escape($args);
+ public function mw_newPost( $args ) {
+ $this->escape( $args );
$username = $args[1];
$password = $args[2];
$content_struct = $args[3];
$publish = isset( $args[4] ) ? $args[4] : 0;
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
$page_template = '';
- if ( !empty( $content_struct['post_type'] ) ) {
+ if ( ! empty( $content_struct['post_type'] ) ) {
if ( $content_struct['post_type'] == 'page' ) {
- if ( $publish )
- $cap = 'publish_pages';
- elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] )
- $cap = 'publish_pages';
- else
+ if ( $publish ) {
+ $cap = 'publish_pages';
+ } elseif ( isset( $content_struct['page_status'] ) && '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.' );
- $post_type = 'page';
- if ( !empty( $content_struct['wp_page_template'] ) )
+ $post_type = 'page';
+ 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 ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] )
- $cap = 'publish_posts';
- else
+ if ( $publish ) {
+ $cap = 'publish_posts';
+ } elseif ( isset( $content_struct['post_status'] ) && '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.' );
- $post_type = 'post';
+ $post_type = 'post';
} else {
// No other post_type values are allowed here
return new IXR_Error( 401, __( 'Invalid post type.' ) );
}
} else {
- if ( $publish )
- $cap = 'publish_posts';
- elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
- $cap = 'publish_posts';
- else
+ if ( $publish ) {
+ $cap = 'publish_posts';
+ } elseif ( isset( $content_struct['post_status'] ) && '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.' );
- $post_type = 'post';
- }
-
- if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+ $post_type = 'post';
+ }
+
+ if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
- if ( !current_user_can( $cap ) )
+ }
+ 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() ) ) {
+ 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']) )
+ $post_name = '';
+ if ( isset( $content_struct['wp_slug'] ) ) {
$post_name = $content_struct['wp_slug'];
+ }
// Only use a password if one was given.
- if ( isset($content_struct['wp_password']) )
+ if ( isset( $content_struct['wp_password'] ) ) {
$post_password = $content_struct['wp_password'];
+ } else {
+ $post_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'];
+ } else {
+ $post_parent = 0;
+ }
// 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'];
+ } else {
+ $menu_order = 0;
+ }
$post_author = $user->ID;
// If an author id was provided then use it instead.
if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
switch ( $post_type ) {
- case "post":
- if ( !current_user_can( 'edit_others_posts' ) )
+ case 'post':
+ if ( ! current_user_can( 'edit_others_posts' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
+ }
break;
- case "page":
- if ( !current_user_can( 'edit_others_pages' ) )
+ case 'page':
+ if ( ! current_user_can( 'edit_others_pages' ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to create pages as this user.' ) );
+ }
break;
default:
return new IXR_Error( 401, __( 'Invalid post type.' ) );
}
$author = get_userdata( $content_struct['wp_author_id'] );
- if ( ! $author )
+ if ( ! $author ) {
return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+ }
$post_author = $content_struct['wp_author_id'];
}
- $post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : 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':
case 'publish':
- $post_status = $content_struct["{$post_type}_status"];
+ $post_status = $content_struct[ "{$post_type}_status" ];
break;
default:
$post_status = $publish ? 'publish' : 'draft';
@@ -5041,13 +5324,13 @@
}
}
- $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;
-
- $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']) ) {
+ $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;
+
+ $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'] ) {
case 'closed':
$comment_status = 'closed';
@@ -5077,8 +5360,8 @@
$comment_status = get_default_comment_status( $post_type );
}
- if ( isset($content_struct['mt_allow_pings']) ) {
- if ( !is_numeric($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';
@@ -5107,28 +5390,31 @@
$ping_status = get_default_comment_status( $post_type, 'pingback' );
}
- if ( $post_more )
+ if ( $post_more ) {
$post_content = $post_content . '<!--more-->' . $post_more;
+ }
$to_ping = null;
if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
$to_ping = $content_struct['mt_tb_ping_urls'];
- if ( is_array($to_ping) )
- $to_ping = implode(' ', $to_ping);
+ if ( is_array( $to_ping ) ) {
+ $to_ping = implode( ' ', $to_ping );
+ }
}
// Do some timestamp voodoo
- if ( !empty( $content_struct['date_created_gmt'] ) )
+ if ( ! empty( $content_struct['date_created_gmt'] ) ) {
// We know this is supposed to be GMT, so we're going to slap that Z on there by force
$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
- elseif ( !empty( $content_struct['dateCreated']) )
+ } elseif ( ! empty( $content_struct['dateCreated'] ) ) {
$dateCreated = $content_struct['dateCreated']->getIso();
-
- if ( !empty( $dateCreated ) ) {
- $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
- $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+ }
+
+ if ( ! empty( $dateCreated ) ) {
+ $post_date = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+ $post_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
} else {
- $post_date = '';
+ $post_date = '';
$post_date_gmt = '';
}
@@ -5136,54 +5422,59 @@
if ( isset( $content_struct['categories'] ) ) {
$catnames = $content_struct['categories'];
- if ( is_array($catnames) ) {
- foreach ($catnames as $cat) {
- $post_category[] = get_cat_ID($cat);
+ if ( is_array( $catnames ) ) {
+ foreach ( $catnames as $cat ) {
+ $post_category[] = get_cat_ID( $cat );
}
}
}
- $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');
+ $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;
// Only posts can be sticky
if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
- $data = $postdata;
+ $data = $postdata;
$data['sticky'] = $content_struct['sticky'];
- $error = $this->_toggle_sticky( $data );
+ $error = $this->_toggle_sticky( $data );
if ( $error ) {
return $error;
}
}
- if ( isset($content_struct['custom_fields']) )
- $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
-
- if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
- if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+ if ( isset( $content_struct['custom_fields'] ) ) {
+ $this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+ }
+
+ if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
+ if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+ }
unset( $content_struct['wp_post_thumbnail'] );
}
// Handle enclosures
- $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
- $this->add_enclosure_if_new($post_ID, $thisEnclosure);
+ $thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+ $this->add_enclosure_if_new( $post_ID, $thisEnclosure );
$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'] ) )
+ if ( isset( $content_struct['wp_post_format'] ) ) {
set_post_format( $post_ID, $content_struct['wp_post_format'] );
+ }
$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 )
- return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
+ if ( is_wp_error( $post_ID ) ) {
+ return new IXR_Error( 500, $post_ID->get_error_message() );
+ }
+
+ if ( ! $post_ID ) {
+ return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+ }
/**
* Fires after a new post has been successfully created via the XML-RPC MovableType API.
@@ -5195,7 +5486,7 @@
*/
do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args );
- return strval($post_ID);
+ return strval( $post_ID );
}
/**
@@ -5209,7 +5500,7 @@
public function add_enclosure_if_new( $post_ID, $enclosure ) {
if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
$encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
- $found = false;
+ $found = false;
if ( $enclosures = get_post_meta( $post_ID, 'enclosure' ) ) {
foreach ( $enclosures as $enc ) {
// This method used to omit the trailing new line. #23219
@@ -5219,8 +5510,9 @@
}
}
}
- if ( ! $found )
+ if ( ! $found ) {
add_post_meta( $post_ID, 'enclosure', $encstring );
+ }
}
}
@@ -5241,8 +5533,9 @@
$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 ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
- $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+ if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
+ $wpdb->update( $wpdb->posts, array( 'post_parent' => $post_ID ), array( 'ID' => $file->ID ) );
+ }
}
}
}
@@ -5272,8 +5565,9 @@
$content_struct = $args[3];
$publish = isset( $args[4] ) ? $args[4] : 0;
- if ( ! $user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
@@ -5284,59 +5578,70 @@
* If there is no post data for the give post id, stop now and return an error.
* Otherwise a new post will be created (which was the old behavior).
*/
- if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
+ if ( ! $postdata || empty( $postdata['ID'] ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( ! current_user_can( 'edit_post', $post_ID ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
// Use wp.editPost to edit post types other than post and page.
- if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
+ if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ) ) ) {
return new IXR_Error( 401, __( 'Invalid post type.' ) );
+ }
// Thwart attempt to change the post type.
- if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) )
+ if ( ! empty( $content_struct['post_type'] ) && ( $content_struct['post_type'] != $postdata['post_type'] ) ) {
return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+ }
// 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() ) ) {
+ if ( ! array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
return new IXR_Error( 404, __( 'Invalid post format.' ) );
}
}
- $this->escape($postdata);
-
- $ID = $postdata['ID'];
- $post_content = $postdata['post_content'];
- $post_title = $postdata['post_title'];
- $post_excerpt = $postdata['post_excerpt'];
- $post_password = $postdata['post_password'];
- $post_parent = $postdata['post_parent'];
- $post_type = $postdata['post_type'];
- $menu_order = $postdata['menu_order'];
+ $this->escape( $postdata );
+
+ $ID = $postdata['ID'];
+ $post_content = $postdata['post_content'];
+ $post_title = $postdata['post_title'];
+ $post_excerpt = $postdata['post_excerpt'];
+ $post_password = $postdata['post_password'];
+ $post_parent = $postdata['post_parent'];
+ $post_type = $postdata['post_type'];
+ $menu_order = $postdata['menu_order'];
+ $ping_status = $postdata['ping_status'];
+ $comment_status = $postdata['comment_status'];
// Let WordPress manage slug if none was provided.
$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'];
+ }
$page_template = null;
- if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
+ if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type ) {
$page_template = $content_struct['wp_page_template'];
+ }
$post_author = $postdata['post_author'];
@@ -5362,8 +5667,8 @@
}
}
- if ( isset($content_struct['mt_allow_comments']) ) {
- if ( !is_numeric($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';
@@ -5391,8 +5696,8 @@
}
}
- if ( isset($content_struct['mt_allow_pings']) ) {
- if ( !is_numeric($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';
@@ -5405,7 +5710,7 @@
break;
}
} else {
- switch ( (int) $content_struct["mt_allow_pings"] ) {
+ switch ( (int) $content_struct['mt_allow_pings'] ) {
case 0:
$ping_status = 'closed';
break;
@@ -5419,35 +5724,38 @@
}
}
- if ( isset( $content_struct['title'] ) )
- $post_title = $content_struct['title'];
-
- if ( isset( $content_struct['description'] ) )
+ if ( isset( $content_struct['title'] ) ) {
+ $post_title = $content_struct['title'];
+ }
+
+ if ( isset( $content_struct['description'] ) ) {
$post_content = $content_struct['description'];
+ }
$post_category = array();
if ( isset( $content_struct['categories'] ) ) {
$catnames = $content_struct['categories'];
- if ( is_array($catnames) ) {
- foreach ($catnames as $cat) {
- $post_category[] = get_cat_ID($cat);
+ if ( is_array( $catnames ) ) {
+ foreach ( $catnames as $cat ) {
+ $post_category[] = get_cat_ID( $cat );
}
}
}
- if ( isset( $content_struct['mt_excerpt'] ) )
- $post_excerpt = $content_struct['mt_excerpt'];
+ if ( isset( $content_struct['mt_excerpt'] ) ) {
+ $post_excerpt = $content_struct['mt_excerpt'];
+ }
$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':
case 'publish':
- $post_status = $content_struct["{$post_type}_status"];
+ $post_status = $content_struct[ "{$post_type}_status" ];
break;
default:
$post_status = $publish ? 'publish' : 'draft';
@@ -5465,29 +5773,32 @@
}
}
- if ( $post_more )
- $post_content = $post_content . "<!--more-->" . $post_more;
+ if ( $post_more ) {
+ $post_content = $post_content . '<!--more-->' . $post_more;
+ }
$to_ping = null;
if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
$to_ping = $content_struct['mt_tb_ping_urls'];
- if ( is_array($to_ping) )
- $to_ping = implode(' ', $to_ping);
+ if ( is_array( $to_ping ) ) {
+ $to_ping = implode( ' ', $to_ping );
+ }
}
// Do some timestamp voodoo.
- if ( !empty( $content_struct['date_created_gmt'] ) )
+ if ( ! empty( $content_struct['date_created_gmt'] ) ) {
// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
- elseif ( !empty( $content_struct['dateCreated']) )
+ } elseif ( ! empty( $content_struct['dateCreated'] ) ) {
$dateCreated = $content_struct['dateCreated']->getIso();
+ }
// Default to not flagging the post date to be edited unless it's intentional.
$edit_date = false;
- if ( !empty( $dateCreated ) ) {
- $post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
- $post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+ if ( ! empty( $dateCreated ) ) {
+ $post_date = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+ $post_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
// Flag the post date to be edited.
$edit_date = true;
@@ -5497,50 +5808,55 @@
}
// We've got all the data -- post it.
- $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', '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 ) )
- return new IXR_Error(500, $result->get_error_message());
-
- if ( !$result )
- return new IXR_Error(500, __('Sorry, your entry could not be edited.'));
+ $newpost = compact( 'ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', '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 ) ) {
+ return new IXR_Error( 500, $result->get_error_message() );
+ }
+
+ if ( ! $result ) {
+ return new IXR_Error( 500, __( 'Sorry, your entry could not be edited.' ) );
+ }
// Only posts can be sticky
if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
- $data = $newpost;
- $data['sticky'] = $content_struct['sticky'];
+ $data = $newpost;
+ $data['sticky'] = $content_struct['sticky'];
$data['post_type'] = 'post';
- $error = $this->_toggle_sticky( $data, true );
+ $error = $this->_toggle_sticky( $data, true );
if ( $error ) {
return $error;
}
}
- if ( isset($content_struct['custom_fields']) )
- $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
-
- if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
+ if ( isset( $content_struct['custom_fields'] ) ) {
+ $this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+ }
+
+ if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
// Empty value deletes, non-empty value adds/updates.
if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
delete_post_thumbnail( $post_ID );
} else {
- if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+ if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+ }
}
unset( $content_struct['wp_post_thumbnail'] );
}
// Handle enclosures.
- $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
- $this->add_enclosure_if_new($post_ID, $thisEnclosure);
+ $thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+ $this->add_enclosure_if_new( $post_ID, $thisEnclosure );
$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'] ) )
+ if ( isset( $content_struct['wp_post_format'] ) ) {
set_post_format( $post_ID, $content_struct['wp_post_format'] );
+ }
/**
* Fires after a post has been successfully updated via the XML-RPC MovableType API.
@@ -5577,112 +5893,122 @@
$username = $args[1];
$password = $args[2];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- $postdata = get_post($post_ID, ARRAY_A);
- if ( ! $postdata )
+ }
+
+ $postdata = get_post( $post_ID, ARRAY_A );
+ if ( ! $postdata ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can( 'edit_post', $post_ID ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
- if ($postdata['post_date'] != '') {
- $post_date = $this->_convert_date( $postdata['post_date'] );
- $post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
- $post_modified = $this->_convert_date( $postdata['post_modified'] );
+ if ( $postdata['post_date'] != '' ) {
+ $post_date = $this->_convert_date( $postdata['post_date'] );
+ $post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
+ $post_modified = $this->_convert_date( $postdata['post_modified'] );
$post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
$categories = array();
- $catids = wp_get_post_categories($post_ID);
- foreach ($catids as $catid)
- $categories[] = get_cat_name($catid);
+ $catids = wp_get_post_categories( $post_ID );
+ 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 );
} else {
$tagnames = '';
}
- $post = get_extended($postdata['post_content']);
- $link = get_permalink($postdata['ID']);
+ $post = get_extended( $postdata['post_content'] );
+ $link = get_permalink( $postdata['ID'] );
// Get the author info.
- $author = get_userdata($postdata['post_author']);
-
- $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
- $allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
+ $author = get_userdata( $postdata['post_author'] );
+
+ $allow_comments = ( 'open' == $postdata['comment_status'] ) ? 1 : 0;
+ $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 ) )
+ 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) {
- if ($key == 'enclosure') {
+ foreach ( (array) get_post_custom( $post_ID ) as $key => $val ) {
+ if ( $key == 'enclosure' ) {
foreach ( (array) $val as $enc ) {
- $encdata = explode("\n", $enc);
- $enclosure['url'] = trim(htmlspecialchars($encdata[0]));
- $enclosure['length'] = (int) trim($encdata[1]);
- $enclosure['type'] = trim($encdata[2]);
+ $encdata = explode( "\n", $enc );
+ $enclosure['url'] = trim( htmlspecialchars( $encdata[0] ) );
+ $enclosure['length'] = (int) trim( $encdata[1] );
+ $enclosure['type'] = trim( $encdata[2] );
break 2;
}
}
}
$resp = array(
- 'dateCreated' => $post_date,
- 'userid' => $postdata['post_author'],
- 'postid' => $postdata['ID'],
- 'description' => $post['main'],
- 'title' => $postdata['post_title'],
- 'link' => $link,
- 'permaLink' => $link,
+ 'dateCreated' => $post_date,
+ 'userid' => $postdata['post_author'],
+ 'postid' => $postdata['ID'],
+ 'description' => $post['main'],
+ 'title' => $postdata['post_title'],
+ 'link' => $link,
+ 'permaLink' => $link,
// commented out because no other tool seems to use this
// 'content' => $entry['post_content'],
- 'categories' => $categories,
- 'mt_excerpt' => $postdata['post_excerpt'],
- 'mt_text_more' => $post['extended'],
- 'wp_more_text' => $post['more_text'],
- 'mt_allow_comments' => $allow_comments,
- 'mt_allow_pings' => $allow_pings,
- 'mt_keywords' => $tagnames,
- 'wp_slug' => $postdata['post_name'],
- 'wp_password' => $postdata['post_password'],
- 'wp_author_id' => (string) $author->ID,
+ 'categories' => $categories,
+ 'mt_excerpt' => $postdata['post_excerpt'],
+ 'mt_text_more' => $post['extended'],
+ 'wp_more_text' => $post['more_text'],
+ 'mt_allow_comments' => $allow_comments,
+ 'mt_allow_pings' => $allow_pings,
+ 'mt_keywords' => $tagnames,
+ 'wp_slug' => $postdata['post_name'],
+ 'wp_password' => $postdata['post_password'],
+ 'wp_author_id' => (string) $author->ID,
'wp_author_display_name' => $author->display_name,
- 'date_created_gmt' => $post_date_gmt,
- 'post_status' => $postdata['post_status'],
- 'custom_fields' => $this->get_custom_fields($post_ID),
- 'wp_post_format' => $post_format,
- 'sticky' => $sticky,
- 'date_modified' => $post_modified,
- 'date_modified_gmt' => $post_modified_gmt
+ 'date_created_gmt' => $post_date_gmt,
+ 'post_status' => $postdata['post_status'],
+ 'custom_fields' => $this->get_custom_fields( $post_ID ),
+ 'wp_post_format' => $post_format,
+ 'sticky' => $sticky,
+ 'date_modified' => $post_modified,
+ 'date_modified_gmt' => $post_modified_gmt,
);
- if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure;
+ if ( ! empty( $enclosure ) ) {
+ $resp['enclosure'] = $enclosure;
+ }
$resp['wp_post_thumbnail'] = get_post_thumbnail_id( $postdata['ID'] );
return $resp;
} else {
- return new IXR_Error(404, __('Sorry, no such post.'));
+ return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
}
}
@@ -5706,43 +6032,49 @@
$username = $args[1];
$password = $args[2];
- if ( isset( $args[3] ) )
+ if ( isset( $args[3] ) ) {
$query = array( 'numberposts' => absint( $args[3] ) );
- else
+ } else {
$query = array();
-
- 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 are not allowed to edit posts.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts' );
$posts_list = wp_get_recent_posts( $query );
- if ( !$posts_list )
+ if ( ! $posts_list ) {
return array();
+ }
$recent_posts = array();
- foreach ($posts_list as $entry) {
- if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+ foreach ( $posts_list as $entry ) {
+ if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
continue;
-
- $post_date = $this->_convert_date( $entry['post_date'] );
- $post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
- $post_modified = $this->_convert_date( $entry['post_modified'] );
+ }
+
+ $post_date = $this->_convert_date( $entry['post_date'] );
+ $post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
+ $post_modified = $this->_convert_date( $entry['post_modified'] );
$post_modified_gmt = $this->_convert_date_gmt( $entry['post_modified_gmt'], $entry['post_modified'] );
$categories = array();
- $catids = wp_get_post_categories($entry['ID']);
- foreach ( $catids as $catid )
- $categories[] = get_cat_name($catid);
+ $catids = wp_get_post_categories( $entry['ID'] );
+ foreach ( $catids as $catid ) {
+ $categories[] = get_cat_name( $catid );
+ }
$tagnames = array();
- $tags = wp_get_post_tags( $entry['ID'] );
- if ( !empty( $tags ) ) {
+ $tags = wp_get_post_tags( $entry['ID'] );
+ if ( ! empty( $tags ) ) {
foreach ( $tags as $tag ) {
$tagnames[] = $tag->name;
}
@@ -5751,53 +6083,55 @@
$tagnames = '';
}
- $post = get_extended($entry['post_content']);
- $link = get_permalink($entry['ID']);
+ $post = get_extended( $entry['post_content'] );
+ $link = get_permalink( $entry['ID'] );
// Get the post author info.
- $author = get_userdata($entry['post_author']);
-
- $allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
- $allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
+ $author = get_userdata( $entry['post_author'] );
+
+ $allow_comments = ( 'open' == $entry['comment_status'] ) ? 1 : 0;
+ $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 ) )
+ if ( empty( $post_format ) ) {
$post_format = 'standard';
+ }
$recent_posts[] = array(
- 'dateCreated' => $post_date,
- 'userid' => $entry['post_author'],
- 'postid' => (string) $entry['ID'],
- 'description' => $post['main'],
- 'title' => $entry['post_title'],
- 'link' => $link,
- 'permaLink' => $link,
+ 'dateCreated' => $post_date,
+ 'userid' => $entry['post_author'],
+ 'postid' => (string) $entry['ID'],
+ 'description' => $post['main'],
+ 'title' => $entry['post_title'],
+ 'link' => $link,
+ 'permaLink' => $link,
// commented out because no other tool seems to use this
// 'content' => $entry['post_content'],
- 'categories' => $categories,
- 'mt_excerpt' => $entry['post_excerpt'],
- 'mt_text_more' => $post['extended'],
- 'wp_more_text' => $post['more_text'],
- 'mt_allow_comments' => $allow_comments,
- 'mt_allow_pings' => $allow_pings,
- 'mt_keywords' => $tagnames,
- 'wp_slug' => $entry['post_name'],
- 'wp_password' => $entry['post_password'],
- 'wp_author_id' => (string) $author->ID,
+ 'categories' => $categories,
+ 'mt_excerpt' => $entry['post_excerpt'],
+ 'mt_text_more' => $post['extended'],
+ 'wp_more_text' => $post['more_text'],
+ 'mt_allow_comments' => $allow_comments,
+ 'mt_allow_pings' => $allow_pings,
+ 'mt_keywords' => $tagnames,
+ 'wp_slug' => $entry['post_name'],
+ 'wp_password' => $entry['post_password'],
+ 'wp_author_id' => (string) $author->ID,
'wp_author_display_name' => $author->display_name,
- 'date_created_gmt' => $post_date_gmt,
- 'post_status' => $entry['post_status'],
- 'custom_fields' => $this->get_custom_fields($entry['ID']),
- 'wp_post_format' => $post_format,
- 'date_modified' => $post_modified,
- 'date_modified_gmt' => $post_modified_gmt,
- 'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
- 'wp_post_thumbnail' => get_post_thumbnail_id( $entry['ID'] )
+ 'date_created_gmt' => $post_date_gmt,
+ 'post_status' => $entry['post_status'],
+ 'custom_fields' => $this->get_custom_fields( $entry['ID'] ),
+ 'wp_post_format' => $post_format,
+ 'date_modified' => $post_modified,
+ 'date_modified_gmt' => $post_modified_gmt,
+ 'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
+ 'wp_post_thumbnail' => get_post_thumbnail_id( $entry['ID'] ),
);
}
@@ -5824,27 +6158,29 @@
$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 must be able to edit posts on this site in order to view categories.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.getCategories' );
$categories_struct = array();
- if ( $cats = get_categories(array('get' => 'all')) ) {
+ if ( $cats = get_categories( array( 'get' => 'all' ) ) ) {
foreach ( $cats as $cat ) {
- $struct = array();
- $struct['categoryId'] = $cat->term_id;
- $struct['parentId'] = $cat->parent;
- $struct['description'] = $cat->name;
+ $struct = array();
+ $struct['categoryId'] = $cat->term_id;
+ $struct['parentId'] = $cat->parent;
+ $struct['description'] = $cat->name;
$struct['categoryDescription'] = $cat->description;
- $struct['categoryName'] = $cat->name;
- $struct['htmlUrl'] = esc_html(get_category_link($cat->term_id));
- $struct['rssUrl'] = esc_html(get_category_feed_link($cat->term_id, 'rss2'));
+ $struct['categoryName'] = $cat->name;
+ $struct['htmlUrl'] = esc_html( get_category_link( $cat->term_id ) );
+ $struct['rssUrl'] = esc_html( get_category_feed_link( $cat->term_id, 'rss2' ) );
$categories_struct[] = $struct;
}
@@ -5885,19 +6221,27 @@
$type = $data['type'];
$bits = $data['bits'];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
- if ( !current_user_can('upload_files') ) {
+ if ( ! current_user_can( 'upload_files' ) ) {
$this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
return $this->error;
}
if ( is_multisite() && upload_is_user_over_quota( false ) ) {
- $this->error = new IXR_Error( 401, __( 'Sorry, you have used your space allocation.' ) );
+ $this->error = new IXR_Error(
+ 401,
+ sprintf(
+ /* translators: %s: allowed space allocation */
+ __( 'Sorry, you have used your space allocation of %s. Please delete some files to upload more files.' ),
+ size_format( get_space_allowed() * MB_IN_BYTES )
+ )
+ );
return $this->error;
}
@@ -5915,8 +6259,8 @@
return new IXR_Error( 500, $upload_err );
}
- $upload = wp_upload_bits($name, null, $bits);
- if ( ! empty($upload['error']) ) {
+ $upload = wp_upload_bits( $name, null, $bits );
+ if ( ! empty( $upload['error'] ) ) {
/* translators: 1: file name, 2: error message */
$errorString = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );
return new IXR_Error( 500, $errorString );
@@ -5926,20 +6270,21 @@
if ( ! empty( $data['post_id'] ) ) {
$post_id = (int) $data['post_id'];
- if ( ! current_user_can( 'edit_post', $post_id ) )
+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
}
$attachment = array(
- 'post_title' => $name,
- 'post_content' => '',
- 'post_type' => 'attachment',
- 'post_parent' => $post_id,
+ 'post_title' => $name,
+ 'post_content' => '',
+ '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 );
+ $id = wp_insert_attachment( $attachment, $upload['file'], $post_id );
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
/**
@@ -5986,40 +6331,43 @@
$username = $args[1];
$password = $args[2];
- if ( isset( $args[3] ) )
+ if ( isset( $args[3] ) ) {
$query = array( 'numberposts' => absint( $args[3] ) );
- else
+ } else {
$query = array();
-
- if ( !$user = $this->login($username, $password) )
+ }
+
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.getRecentPostTitles' );
$posts_list = wp_get_recent_posts( $query );
- if ( !$posts_list ) {
- $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+ if ( ! $posts_list ) {
+ $this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
return $this->error;
}
$recent_posts = array();
- foreach ($posts_list as $entry) {
- if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+ foreach ( $posts_list as $entry ) {
+ if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
continue;
-
- $post_date = $this->_convert_date( $entry['post_date'] );
+ }
+
+ $post_date = $this->_convert_date( $entry['post_date'] );
$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
$recent_posts[] = array(
- 'dateCreated' => $post_date,
- 'userid' => $entry['post_author'],
- 'postid' => (string) $entry['ID'],
- 'title' => $entry['post_title'],
- 'post_status' => $entry['post_status'],
- 'date_created_gmt' => $post_date_gmt
+ 'dateCreated' => $post_date,
+ 'userid' => $entry['post_author'],
+ 'postid' => (string) $entry['ID'],
+ 'title' => $entry['post_title'],
+ 'post_status' => $entry['post_status'],
+ 'date_created_gmt' => $post_date_gmt,
);
}
@@ -6046,21 +6394,28 @@
$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 must be able to edit posts on this site in order to view categories.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.getCategoryList' );
$categories_struct = array();
- if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
+ if ( $cats = get_categories(
+ array(
+ 'hide_empty' => 0,
+ 'hierarchical' => 0,
+ )
+ ) ) {
foreach ( $cats as $cat ) {
- $struct = array();
- $struct['categoryId'] = $cat->term_id;
+ $struct = array();
+ $struct['categoryId'] = $cat->term_id;
$struct['categoryName'] = $cat->name;
$categories_struct[] = $struct;
@@ -6091,29 +6446,32 @@
$username = $args[1];
$password = $args[2];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
-
- if ( ! get_post( $post_ID ) )
+ }
+
+ if ( ! get_post( $post_ID ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can( 'edit_post', $post_ID ) )
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.getPostCategories' );
$categories = array();
- $catids = wp_get_post_categories(intval($post_ID));
+ $catids = wp_get_post_categories( intval( $post_ID ) );
// first listed category will be the primary category
$isPrimary = true;
foreach ( $catids as $catid ) {
$categories[] = array(
- 'categoryName' => get_cat_name($catid),
- 'categoryId' => (string) $catid,
- 'isPrimary' => $isPrimary
+ 'categoryName' => get_cat_name( $catid ),
+ 'categoryId' => (string) $catid,
+ 'isPrimary' => $isPrimary,
);
- $isPrimary = false;
+ $isPrimary = false;
}
return $categories;
@@ -6142,24 +6500,27 @@
$password = $args[2];
$categories = $args[3];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.setPostCategories' );
- if ( ! get_post( $post_ID ) )
+ if ( ! get_post( $post_ID ) ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can('edit_post', $post_ID) )
- return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+ }
$catids = array();
foreach ( $categories as $cat ) {
$catids[] = $cat['categoryId'];
}
- wp_set_post_categories($post_ID, $catids);
+ wp_set_post_categories( $post_ID, $catids );
return true;
}
@@ -6213,25 +6574,27 @@
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
- $actual_post = get_post($post_ID, ARRAY_A);
-
- 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) );
-
- if ( !$comments )
+ $actual_post = get_post( $post_ID, ARRAY_A );
+
+ 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 ) );
+
+ if ( ! $comments ) {
return array();
+ }
$trackback_pings = array();
foreach ( $comments as $comment ) {
if ( 'trackback' == $comment->comment_type ) {
- $content = $comment->comment_content;
- $title = substr($content, 8, (strpos($content, '</strong>') - 8));
+ $content = $comment->comment_content;
+ $title = substr( $content, 8, ( strpos( $content, '</strong>' ) - 8 ) );
$trackback_pings[] = array(
'pingTitle' => $title,
'pingURL' => $comment->comment_author_url,
- 'pingIP' => $comment->comment_author_IP
+ 'pingIP' => $comment->comment_author_IP,
);
}
}
@@ -6260,25 +6623,28 @@
$username = $args[1];
$password = $args[2];
- if ( !$user = $this->login($username, $password) )
+ if ( ! $user = $this->login( $username, $password ) ) {
return $this->error;
+ }
/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
do_action( 'xmlrpc_call', 'mt.publishPost' );
- $postdata = get_post($post_ID, ARRAY_A);
- if ( ! $postdata )
+ $postdata = get_post( $post_ID, ARRAY_A );
+ if ( ! $postdata ) {
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
-
- if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
- return new IXR_Error(401, __('Sorry, you are not allowed to publish this post.'));
+ }
+
+ if ( ! current_user_can( 'publish_posts' ) || ! current_user_can( 'edit_post', $post_ID ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
+ }
$postdata['post_status'] = 'publish';
// retain old cats
- $cats = wp_get_post_categories($post_ID);
+ $cats = wp_get_post_categories( $post_ID );
$postdata['post_category'] = $cats;
- $this->escape($postdata);
+ $this->escape( $postdata );
return wp_update_post( $postdata );
}
@@ -6309,8 +6675,8 @@
$this->escape( $args );
$pagelinkedfrom = str_replace( '&', '&', $args[0] );
- $pagelinkedto = str_replace( '&', '&', $args[1] );
- $pagelinkedto = str_replace( '&', '&', $pagelinkedto );
+ $pagelinkedto = str_replace( '&', '&', $args[1] );
+ $pagelinkedto = str_replace( '&', '&', $pagelinkedto );
/**
* Filters the pingback source URI.
@@ -6322,87 +6688,93 @@
*/
$pagelinkedfrom = apply_filters( 'pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto );
- if ( ! $pagelinkedfrom )
+ if ( ! $pagelinkedfrom ) {
return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
+ }
// 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 $this->pingback_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) ) {
+ $urltest = parse_url( $pagelinkedto );
+ if ( $post_ID = url_to_postid( $pagelinkedto ) ) {
// $way
- } elseif ( isset( $urltest['path'] ) && preg_match('#p/[0-9]{1,}#', $urltest['path'], $match) ) {
+ } elseif ( isset( $urltest['path'] ) && preg_match( '#p/[0-9]{1,}#', $urltest['path'], $match ) ) {
// the path defines the post_ID (archives/p/XXXX)
- $blah = explode('/', $match[0]);
+ $blah = explode( '/', $match[0] );
$post_ID = (int) $blah[1];
- } elseif ( isset( $urltest['query'] ) && preg_match('#p=[0-9]{1,}#', $urltest['query'], $match) ) {
+ } elseif ( isset( $urltest['query'] ) && preg_match( '#p=[0-9]{1,}#', $urltest['query'], $match ) ) {
// the querystring defines the post_ID (?p=XXXX)
- $blah = explode('=', $match[0]);
+ $blah = explode( '=', $match[0] );
$post_ID = (int) $blah[1];
- } 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'];
- } 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']);
- } elseif ( is_string($urltest['fragment']) ) {
+ $post_ID = preg_replace( '/[^0-9]+/', '', $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", $title );
- if (! ($post_ID = $wpdb->get_var($sql)) ) {
+ $title = preg_replace( '/[^a-z0-9]/i', '.', $urltest['fragment'] );
+ $sql = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
+ if ( ! ( $post_ID = $wpdb->get_var( $sql ) ) ) {
// returning unknown error '0' is better than die()ing
- return $this->pingback_error( 0, '' );
+ return $this->pingback_error( 0, '' );
}
}
} else {
// TODO: Attempt to extract a post ID from the given URL
- return $this->pingback_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.' ) );
+ return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
}
$post_ID = (int) $post_ID;
- $post = get_post($post_ID);
-
- if ( !$post ) // Post_ID not found
- return $this->pingback_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) )
+ $post = get_post( $post_ID );
+
+ if ( ! $post ) { // Post_ID not found
+ return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
+ }
+
+ if ( $post_ID == url_to_postid( $pagelinkedfrom ) ) {
return $this->pingback_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) )
- return $this->pingback_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 ( ! pings_open( $post ) ) {
+ return $this->pingback_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) ) )
+ if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom ) ) ) {
return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+ }
// very stupid, but gives time to the 'from' server to publish !
- sleep(1);
+ sleep( 1 );
$remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
/** This filter is documented in wp-includes/class-http.php */
- $user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) );
+ $user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ), $url );
// Let's check the remote site
$http_api_args = array(
- 'timeout' => 10,
- 'redirection' => 0,
+ 'timeout' => 10,
+ 'redirection' => 0,
'limit_response_size' => 153600, // 150 KB
- 'user-agent' => "$user_agent; verifying pingback from $remote_ip",
- 'headers' => array(
+ 'user-agent' => "$user_agent; verifying pingback from $remote_ip",
+ 'headers' => array(
'X-Pingback-Forwarded-For' => $remote_ip,
),
);
- $request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
+ $request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
$remote_source = $remote_source_original = wp_remote_retrieve_body( $request );
if ( ! $remote_source ) {
@@ -6422,7 +6794,7 @@
// Work around bug in strip_tags():
$remote_source = str_replace( '<!DOC', '<DOC', $remote_source );
$remote_source = preg_replace( '/[\r\n\t ]+/', ' ', $remote_source ); // normalize spaces
- $remote_source = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $remote_source );
+ $remote_source = preg_replace( '/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/', "\n\n", $remote_source );
preg_match( '|<title>([^<]*?)</title>|is', $remote_source, $matchtitle );
$title = isset( $matchtitle[1] ) ? $matchtitle[1] : '';
@@ -6434,58 +6806,67 @@
$p = explode( "\n\n", $remote_source );
- $preg_target = preg_quote($pagelinkedto, '|');
+ $preg_target = preg_quote( $pagelinkedto, '|' );
foreach ( $p as $para ) {
- if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
- preg_match("|<a[^>]+?".$preg_target."[^>]*>([^>]+?)</a>|", $para, $context);
+ if ( strpos( $para, $pagelinkedto ) !== false ) { // it exists, but is it a link?
+ preg_match( '|<a[^>]+?' . $preg_target . '[^>]*>([^>]+?)</a>|', $para, $context );
// If the URL isn't in a link context, keep looking
- if ( empty($context) )
+ if ( empty( $context ) ) {
continue;
+ }
// We're going to use this fake tag to mark the context in a bit
// the marker is needed in case the link text appears more than once in the paragraph
- $excerpt = preg_replace('|\</?wpcontext\>|', '', $para);
+ $excerpt = preg_replace( '|\</?wpcontext\>|', '', $para );
// prevent really long link text
- if ( strlen($context[1]) > 100 )
- $context[1] = substr($context[1], 0, 100) . '…';
-
- $marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker
- $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
- $excerpt = strip_tags($excerpt, '<wpcontext>'); // strip all tags but our context marker
- $excerpt = trim($excerpt);
- $preg_marker = preg_quote($marker, '|');
- $excerpt = preg_replace("|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt);
- $excerpt = strip_tags($excerpt); // YES, again, to remove the marker wrapper
+ if ( strlen( $context[1] ) > 100 ) {
+ $context[1] = substr( $context[1], 0, 100 ) . '…';
+ }
+
+ $marker = '<wpcontext>' . $context[1] . '</wpcontext>'; // set up our marker
+ $excerpt = str_replace( $context[0], $marker, $excerpt ); // swap out the link for our marker
+ $excerpt = strip_tags( $excerpt, '<wpcontext>' ); // strip all tags but our context marker
+ $excerpt = trim( $excerpt );
+ $preg_marker = preg_quote( $marker, '|' );
+ $excerpt = preg_replace( "|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt );
+ $excerpt = strip_tags( $excerpt ); // YES, again, to remove the marker wrapper
break;
}
}
- if ( empty($context) ) // Link to target not found
+ if ( empty( $context ) ) { // Link to target not found
return $this->pingback_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 = str_replace( '&', '&', $pagelinkedfrom );
+
+ $context = '[…] ' . esc_html( $excerpt ) . ' […]';
$pagelinkedfrom = $this->escape( $pagelinkedfrom );
- $comment_post_ID = (int) $post_ID;
- $comment_author = $title;
+ $comment_post_ID = (int) $post_ID;
+ $comment_author = $title;
$comment_author_email = '';
- $this->escape($comment_author);
+ $this->escape( $comment_author );
$comment_author_url = $pagelinkedfrom;
- $comment_content = $context;
- $this->escape($comment_content);
+ $comment_content = $context;
+ $this->escape( $comment_content );
$comment_type = 'pingback';
$commentdata = compact(
- 'comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email',
- 'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
+ 'comment_post_ID',
+ 'comment_author',
+ 'comment_author_url',
+ 'comment_author_email',
+ 'comment_content',
+ 'comment_type',
+ 'remote_source',
+ 'remote_source_original'
);
- $comment_ID = wp_new_comment($commentdata);
+ $comment_ID = wp_new_comment( $commentdata );
if ( is_wp_error( $comment_ID ) ) {
return $this->pingback_error( 0, $comment_ID->get_error_message() );
@@ -6524,28 +6905,30 @@
$url = $this->escape( $url );
- $post_ID = url_to_postid($url);
- if ( !$post_ID ) {
+ $post_ID = url_to_postid( $url );
+ if ( ! $post_ID ) {
// We aren't sure that the resource is available and/or pingback enabled
- return $this->pingback_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 = get_post($post_ID, ARRAY_A);
-
- if ( !$actual_post ) {
+ return $this->pingback_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 = get_post( $post_ID, ARRAY_A );
+
+ if ( ! $actual_post ) {
// No such post = resource not found
- return $this->pingback_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) );
-
- if ( !$comments )
+ return $this->pingback_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 ) );
+
+ if ( ! $comments ) {
return array();
+ }
$pingbacks = array();
foreach ( $comments as $comment ) {
- if ( 'pingback' == $comment->comment_type )
+ if ( 'pingback' == $comment->comment_type ) {
$pingbacks[] = $comment->comment_author_url;
+ }
}
return $pingbacks;