<!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>[BuddyPress][7562] trunk: Don't do capabilities checks in bp_core_process_spammer_status()</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7562">7562</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-11-12 15:14:04 +0000 (Tue, 12 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't do capabilities checks in bp_core_process_spammer_status()
These inline checks prevent the function from being used programmatically, such
as during a cron job. Instead, we move the cap checks up to the controller
"action" functions.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5233">#5233</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsactionsphp">trunk/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (7561 => 7562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2013-11-11 02:24:01 UTC (rev 7561)
+++ trunk/bp-members/bp-members-actions.php 2013-11-12 15:14:04 UTC (rev 7562)
</span><span class="lines">@@ -25,6 +25,12 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_action_set_spammer_status( $user_id = 0 ) {
</span><span class="cx">
</span><ins>+ // Only super admins can currently spam users (but they can't spam
+ // themselves)
+ if ( ! is_super_admin() || bp_is_my_profile() ) {
+ return;
+ }
+
</ins><span class="cx"> // Use displayed user if it's not yourself
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> $user_id = bp_displayed_user_id();
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (7561 => 7562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2013-11-11 02:24:01 UTC (rev 7561)
+++ trunk/bp-members/bp-members-functions.php 2013-11-12 15:14:04 UTC (rev 7562)
</span><span class="lines">@@ -533,25 +533,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Processes a spammed or unspammed user
</del><ins>+ * Process a spammed or unspammed user.
</ins><span class="cx"> *
</span><del>- * This function is called in three ways:
- * - in bp_settings_action_capabilities() (from the front-end)
- * - by bp_core_mark_user_spam_admin() (from wp-admin)
- * - bp_core_mark_user_ham_admin() (from wp-admin)
</del><ins>+ * This function is called from three places:
</ins><span class="cx"> *
</span><del>- * @since BuddyPress (1.6)
</del><ins>+ * - in bp_settings_action_capabilities() (from the front-end)
+ * - by bp_core_mark_user_spam_admin() (from wp-admin)
+ * - bp_core_mark_user_ham_admin() (from wp-admin)
</ins><span class="cx"> *
</span><del>- * @param int $user_id The user being spammed/hammed
- * @param string $status 'spam' if being marked as spam, 'ham' otherwise
</del><ins>+ * @since BuddyPress (1.6.0)
+ *
+ * @param int $user_id The ID of the user being spammed/hammed.
+ * @param string $status 'spam' if being marked as spam, 'ham' otherwise.
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_process_spammer_status( $user_id, $status ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- // Only super admins can currently spam users
- if ( !is_super_admin() || bp_is_my_profile() )
- return;
-
</del><span class="cx"> // Bail if no user ID
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-actions.php (7561 => 7562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-actions.php 2013-11-11 02:24:01 UTC (rev 7561)
+++ trunk/bp-settings/bp-settings-actions.php 2013-11-12 15:14:04 UTC (rev 7562)
</span><span class="lines">@@ -278,6 +278,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Only super admins can currently spam users (but they can't spam
+ // themselves)
+ if ( ! is_super_admin() || bp_is_my_profile() ) {
+ return;
+ }
+
</ins><span class="cx"> // Nonce check
</span><span class="cx"> check_admin_referer( 'capabilities' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>