<!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>[3306] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes: WordCamp Budgets: Prevent modifications to submitted requests using Bulk Edit.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3306">3306</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3306","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-06 23:46:09 +0000 (Mon, 06 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Budgets: Prevent modifications to submitted requests using Bulk Edit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-06-06 21:20:12 UTC (rev 3305)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-06-06 23:46:09 UTC (rev 3306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,21 +915,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Adds the context to the cap. Typically the object ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function modify_capabilities( $required_capabilities, $requested_capability, $user_id, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo maybe centralize this, since almost identical to counterparts in other modules
+ $post = \WordCamp_Budgets::get_map_meta_cap_post( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_a( $post, 'WP_Post' ) && self::POST_TYPE == $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Only network admins can edit requests once they've been paid.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * They can still open the request (in order to view the status and details), but won't be allowed to make any changes to it.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * They can also edit and re-submit requests that were marked as incomplete.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit_post' == $requested_capability && 'paid' == $post->post_status && isset( $_REQUEST['action'] ) && 'edit' != $_REQUEST['action'] ) {
- $required_capabilities[] = 'manage_network';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $post->post_status, array( 'auto-draft', 'draft' ), true ) ) {
+ if ( 'edit_post' == $requested_capability && 'wcb-incomplete' != $post->post_status ) {
+ $is_saving_edit = isset( $_REQUEST['action'] ) && 'edit' != $_REQUEST['action']; // 'edit' is opening the Edit Invoice screen, 'editpost' is when it's submitted
+ $is_bulk_edit = isset( $_REQUEST['bulk_edit'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Only network admins can delete requests
- if ( 'delete_post' == $requested_capability ) {
- $required_capabilities[] = 'manage_network';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_saving_edit || $is_bulk_edit ) {
+ $required_capabilities[] = 'manage_network';
+ }
+ }
+
+ // Only network admins can delete requests
+ if ( 'delete_post' == $requested_capability ) {
+ $required_capabilities[] = 'manage_network';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2016-06-06 21:20:12 UTC (rev 3305)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2016-06-06 23:46:09 UTC (rev 3306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Adds the context to the cap. Typically the object ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function modify_capabilities( $required_capabilities, $requested_capability, $user_id, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = \WordCamp_Budgets::get_map_meta_cap_post( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_a( $post, 'WP_Post' ) || POST_TYPE !== $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $required_capabilities;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,8 +696,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $drafted_status = in_array( $post->post_status, array( 'auto-draft', 'draft' ), true );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_or_incomplete_status = $drafted_status || 'wcb-incomplete' === $post->post_status;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_bulk_edit = isset( $_REQUEST['bulk_edit'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch( $requested_capability ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'edit_post':
+ $is_saving_edit = isset( $_REQUEST['action'] ) && 'edit' != $_REQUEST['action']; // 'edit' is opening the Edit Invoice screen, 'editpost' is when it's submitted
+
+ if ( ( $is_saving_edit && ! $draft_or_incomplete_status ) || $is_bulk_edit ) {
+ $required_capabilities[] = 'manage_network';
+ }
+ break;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'draft_post':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $draft_or_incomplete_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $required_capabilities = array( 'edit_posts' );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2016-06-06 21:20:12 UTC (rev 3305)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2016-06-06 23:46:09 UTC (rev 3306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,9 +476,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function modify_capabilities( $required_capabilities, $requested_capability, $user_id, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // todo maybe centralize this, since almost identical to counterpart in payment-requests.php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = \WordCamp_Budgets::get_map_meta_cap_post( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $post;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_a( $post, 'WP_Post' ) && POST_TYPE == $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Only network admins can edit/delete requests once they've been submitted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,7 +486,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $post->post_status, array( 'auto-draft', 'draft' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'edit_post' == $requested_capability ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['action'] ) && 'edit' != $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_saving_edit = isset( $_REQUEST['action'] ) && 'edit' != $_REQUEST['action']; // 'edit' is opening the Edit Invoice screen, 'editpost' is when it's submitted
+ $is_bulk_edit = isset( $_REQUEST['bulk_edit'] );
+
+ if ( $is_saving_edit || $is_bulk_edit ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $required_capabilities[] = 'manage_network';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-06-06 21:20:12 UTC (rev 3305)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-06-06 23:46:09 UTC (rev 3306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,6 +899,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the current post when inside a `map_meta_cap` callback
+ *
+ * Normally it's just the global $post, but sometimes you have to dig it out of $args (e.g., a bulk edit)
+ *
+ * @param array $args The $args that was passed to the `map_meta_cap` callback
+ *
+ * @return WP_Post|null
+ */
+ public static function get_map_meta_cap_post( $args ) {
+ $post = null;
+
+ /*
+ * Use a reference to the global $post if it already exists, but don't create one otherwise
+ *
+ * i.e., Don't use `global $post` and then assign the result of `get_post()` to that.
+ *
+ * If $GLOBAL['post'] didn't already exist and then we created one, then that could have unintentional
+ * side-effects outside of this function.
+ */
+ if ( isset( $GLOBALS['post'] ) ) {
+ $post = $GLOBALS['post'];
+ } elseif ( isset( $args[0] ) && is_int( $args[0] ) ) {
+ $post = get_post( $args[0] );
+ }
+
+ return $post;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Insert an entry into a log for one of the custom post types
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id The post ID.
</span></span></pre>
</div>
</div>
</body>
</html>