Improve API usage in wp-app.php for post operations and attachment deletion. Proper cap checks. Unregister put_file and delete_file as core itself doesn't provide for file replacement.

git-svn-id: http://core.svn.wordpress.org/trunk@21744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-09-04 20:57:36 +00:00
parent f7a8369422
commit 37f9c1ca49
1 changed files with 21 additions and 20 deletions

View File

@ -167,9 +167,7 @@ class wp_atom_server {
array('GET' => 'get_attachment', array('GET' => 'get_attachment',
'POST' => 'create_attachment'), 'POST' => 'create_attachment'),
'@/attachment/file/(\d+)$@' => '@/attachment/file/(\d+)$@' =>
array('GET' => 'get_file', array('GET' => 'get_file'),
'PUT' => 'put_file',
'DELETE' => 'delete_file'),
'@/attachment/(\d+)$@' => '@/attachment/(\d+)$@' =>
array('GET' => 'get_attachment', array('GET' => 'get_attachment',
'PUT' => 'put_attachment', 'PUT' => 'put_attachment',
@ -315,6 +313,12 @@ EOD;
$entry = array_pop($parser->feed->entries); $entry = array_pop($parser->feed->entries);
$publish = ! ( isset( $entry->draft ) && 'yes' == trim( $entry->draft ) );
$cap = ($publish) ? 'publish_posts' : 'edit_posts';
if ( !current_user_can($cap) )
$this->auth_required(__('Sorry, you do not have the right to edit/publish new posts.'));
$catnames = array(); $catnames = array();
if ( !empty( $entry->categories ) ) { if ( !empty( $entry->categories ) ) {
foreach ( $entry->categories as $cat ) { foreach ( $entry->categories as $cat ) {
@ -331,13 +335,6 @@ EOD;
array_push($post_category, $cat->term_id); array_push($post_category, $cat->term_id);
} }
$publish = ! ( isset( $entry->draft ) && 'yes' == trim( $entry->draft ) );
$cap = ($publish) ? 'publish_posts' : 'edit_posts';
if ( !current_user_can($cap) )
$this->auth_required(__('Sorry, you do not have the right to edit/publish new posts.'));
$blog_ID = get_current_blog_id(); $blog_ID = get_current_blog_id();
$post_status = ($publish) ? 'publish' : 'draft'; $post_status = ($publish) ? 'publish' : 'draft';
$post_author = (int) $user_ID; $post_author = (int) $user_ID;
@ -398,7 +395,7 @@ EOD;
function get_post($postID) { function get_post($postID) {
global $entry; global $entry;
if ( !current_user_can( 'edit_post', $postID ) ) if ( ! get_post( $postID ) || ! current_user_can( 'edit_post', $postID ) )
$this->auth_required( __( 'Sorry, you do not have the right to access this post.' ) ); $this->auth_required( __( 'Sorry, you do not have the right to access this post.' ) );
$this->set_current_entry($postID); $this->set_current_entry($postID);
@ -429,10 +426,14 @@ EOD;
global $entry; global $entry;
$this->set_current_entry($postID); $this->set_current_entry($postID);
if ( !current_user_can('edit_post', $entry['ID']) ) if ( !current_user_can('edit_post', $postID) )
$this->auth_required(__('Sorry, you do not have the right to edit this post.')); $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
$publish = ! ( isset($parsed->draft) && 'yes' == trim($parsed->draft) ); $publish = ! ( isset($parsed->draft) && 'yes' == trim($parsed->draft) );
if ( $publish && ! current_user_can( 'publish_posts' ) )
$this->auth_required( __( 'Sorry, you do not have the right to publish this post.' ) );
$post_status = ($publish) ? 'publish' : 'draft'; $post_status = ($publish) ? 'publish' : 'draft';
extract($entry); extract($entry);
@ -473,7 +474,7 @@ EOD;
global $entry; global $entry;
$this->set_current_entry($postID); $this->set_current_entry($postID);
if ( !current_user_can('edit_post', $postID) ) if ( !current_user_can('delete_post', $postID) )
$this->auth_required(__('Sorry, you do not have the right to delete this post.')); $this->auth_required(__('Sorry, you do not have the right to delete this post.'));
if ( $entry['post_type'] == 'attachment' ) { if ( $entry['post_type'] == 'attachment' ) {
@ -504,6 +505,9 @@ EOD;
if ( !isset($postID) ) { if ( !isset($postID) ) {
$this->get_attachments(); $this->get_attachments();
} else { } else {
if ( ! current_user_can( 'edit_post', $postID ) )
$this->auth_required( __( 'Sorry, you do not have the right to edit this post.' ) );
$this->set_current_entry($postID); $this->set_current_entry($postID);
$output = $this->get_entry($postID, 'attachment'); $output = $this->get_entry($postID, 'attachment');
$this->output($output); $this->output($output);
@ -589,7 +593,7 @@ EOD;
global $entry; global $entry;
$this->set_current_entry($postID); $this->set_current_entry($postID);
if ( !current_user_can('edit_post', $entry['ID']) ) if ( !current_user_can('edit_post', $entry['ID']) || 'attachment' != $entry['post_type'] )
$this->auth_required(__('Sorry, you do not have the right to edit this post.')); $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
extract($entry); extract($entry);
@ -624,7 +628,7 @@ EOD;
global $entry; global $entry;
$this->set_current_entry($postID); $this->set_current_entry($postID);
if ( !current_user_can('edit_post', $postID) ) if ( !current_user_can('delete_post', $postID) )
$this->auth_required(__('Sorry, you do not have the right to delete this post.')); $this->auth_required(__('Sorry, you do not have the right to delete this post.'));
$location = get_post_meta($entry['ID'], '_wp_attached_file', true); $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
@ -633,11 +637,8 @@ EOD;
if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) ) if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
$this->internal_error(__('Error occurred while accessing post metadata for file location.')); $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
// delete file
@unlink($location);
// delete attachment // delete attachment
$result = wp_delete_post($postID); $result = wp_delete_attachment($postID);
if ( !$result ) if ( !$result )
$this->internal_error(__('For some strange yet very annoying reason, this post could not be deleted.')); $this->internal_error(__('For some strange yet very annoying reason, this post could not be deleted.'));
@ -968,7 +969,7 @@ EOD;
$count = get_option('posts_per_rss'); $count = get_option('posts_per_rss');
wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1)) . '&orderby=modified&post_status=any'); wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1)) . '&orderby=modified&perm=readable');
$post = $GLOBALS['post']; $post = $GLOBALS['post'];
$posts = $GLOBALS['posts']; $posts = $GLOBALS['posts'];