<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21744] trunk/wp-includes/class-wp-atom-server.php: Improve API usage in wp-app.php for post operations and attachment deletion.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21744">21744</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-04 20:57:36 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpatomserverphp">trunk/wp-includes/class-wp-atom-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpatomserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-atom-server.php (21743 => 21744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-atom-server.php 2012-09-04 20:57:18 UTC (rev 21743)
+++ trunk/wp-includes/class-wp-atom-server.php 2012-09-04 20:57:36 UTC (rev 21744)
</span><span class="lines">@@ -167,9 +167,7 @@
</span><span class="cx"> array('GET' => 'get_attachment',
</span><span class="cx"> 'POST' => 'create_attachment'),
</span><span class="cx"> '@/attachment/file/(\d+)$@' =>
</span><del>- array('GET' => 'get_file',
- 'PUT' => 'put_file',
- 'DELETE' => 'delete_file'),
</del><ins>+ array('GET' => 'get_file'),
</ins><span class="cx"> '@/attachment/(\d+)$@' =>
</span><span class="cx"> array('GET' => 'get_attachment',
</span><span class="cx"> 'PUT' => 'put_attachment',
</span><span class="lines">@@ -315,6 +313,12 @@
</span><span class="cx">
</span><span class="cx"> $entry = array_pop($parser->feed->entries);
</span><span class="cx">
</span><ins>+ $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.'));
+
</ins><span class="cx"> $catnames = array();
</span><span class="cx"> if ( !empty( $entry->categories ) ) {
</span><span class="cx"> foreach ( $entry->categories as $cat ) {
</span><span class="lines">@@ -331,13 +335,6 @@
</span><span class="cx"> array_push($post_category, $cat->term_id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $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.'));
-
</del><span class="cx"> $blog_ID = get_current_blog_id();
</span><span class="cx"> $post_status = ($publish) ? 'publish' : 'draft';
</span><span class="cx"> $post_author = (int) $user_ID;
</span><span class="lines">@@ -398,7 +395,7 @@
</span><span class="cx"> function get_post($postID) {
</span><span class="cx"> global $entry;
</span><span class="cx">
</span><del>- if ( !current_user_can( 'edit_post', $postID ) )
</del><ins>+ if ( ! get_post( $postID ) || ! current_user_can( 'edit_post', $postID ) )
</ins><span class="cx"> $this->auth_required( __( 'Sorry, you do not have the right to access this post.' ) );
</span><span class="cx">
</span><span class="cx"> $this->set_current_entry($postID);
</span><span class="lines">@@ -429,10 +426,14 @@
</span><span class="cx"> global $entry;
</span><span class="cx"> $this->set_current_entry($postID);
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $entry['ID']) )
</del><ins>+ if ( !current_user_can('edit_post', $postID) )
</ins><span class="cx"> $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
</span><span class="cx">
</span><span class="cx"> $publish = ! ( isset($parsed->draft) && 'yes' == trim($parsed->draft) );
</span><ins>+
+ if ( $publish && ! current_user_can( 'publish_posts' ) )
+ $this->auth_required( __( 'Sorry, you do not have the right to publish this post.' ) );
+
</ins><span class="cx"> $post_status = ($publish) ? 'publish' : 'draft';
</span><span class="cx">
</span><span class="cx"> extract($entry);
</span><span class="lines">@@ -473,7 +474,7 @@
</span><span class="cx"> global $entry;
</span><span class="cx"> $this->set_current_entry($postID);
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $postID) )
</del><ins>+ if ( !current_user_can('delete_post', $postID) )
</ins><span class="cx"> $this->auth_required(__('Sorry, you do not have the right to delete this post.'));
</span><span class="cx">
</span><span class="cx"> if ( $entry['post_type'] == 'attachment' ) {
</span><span class="lines">@@ -504,6 +505,9 @@
</span><span class="cx"> if ( !isset($postID) ) {
</span><span class="cx"> $this->get_attachments();
</span><span class="cx"> } else {
</span><ins>+ if ( ! current_user_can( 'edit_post', $postID ) )
+ $this->auth_required( __( 'Sorry, you do not have the right to edit this post.' ) );
+
</ins><span class="cx"> $this->set_current_entry($postID);
</span><span class="cx"> $output = $this->get_entry($postID, 'attachment');
</span><span class="cx"> $this->output($output);
</span><span class="lines">@@ -589,7 +593,7 @@
</span><span class="cx"> global $entry;
</span><span class="cx"> $this->set_current_entry($postID);
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $entry['ID']) )
</del><ins>+ if ( !current_user_can('edit_post', $entry['ID']) || 'attachment' != $entry['post_type'] )
</ins><span class="cx"> $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
</span><span class="cx">
</span><span class="cx"> extract($entry);
</span><span class="lines">@@ -624,7 +628,7 @@
</span><span class="cx"> global $entry;
</span><span class="cx"> $this->set_current_entry($postID);
</span><span class="cx">
</span><del>- if ( !current_user_can('edit_post', $postID) )
</del><ins>+ if ( !current_user_can('delete_post', $postID) )
</ins><span class="cx"> $this->auth_required(__('Sorry, you do not have the right to delete this post.'));
</span><span class="cx">
</span><span class="cx"> $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
</span><span class="lines">@@ -633,11 +637,8 @@
</span><span class="cx"> if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
</span><span class="cx"> $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
</span><span class="cx">
</span><del>- // delete file
- @unlink($location);
-
</del><span class="cx"> // delete attachment
</span><del>- $result = wp_delete_post($postID);
</del><ins>+ $result = wp_delete_attachment($postID);
</ins><span class="cx">
</span><span class="cx"> if ( !$result )
</span><span class="cx"> $this->internal_error(__('For some strange yet very annoying reason, this post could not be deleted.'));
</span><span class="lines">@@ -968,7 +969,7 @@
</span><span class="cx">
</span><span class="cx"> $count = get_option('posts_per_rss');
</span><span class="cx">
</span><del>- wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1)) . '&orderby=modified&post_status=any');
</del><ins>+ wp('posts_per_page=' . $count . '&offset=' . ($count * ($page-1)) . '&orderby=modified&perm=readable');
</ins><span class="cx">
</span><span class="cx"> $post = $GLOBALS['post'];
</span><span class="cx"> $posts = $GLOBALS['posts'];
</span></span></pre>
</div>
</div>
</body>
</html>