<!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>[5290] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php: Support Forums: Convert Spam/Unspam, Unapprove/Approve toggle links to explicit actions.</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/5290">5290</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/5290","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-09 05:20:54 +0000 (Sun, 09 Apr 2017)</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'>Support Forums: Convert Spam/Unspam, Unapprove/Approve toggle links to explicit actions.
By default, bbPress treats them as toggles, which may cause conflicts if the same action is performed twice by different moderators.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2418">#2418</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2017-04-08 15:08:31 UTC (rev 5289)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2017-04-09 05:20:54 UTC (rev 5290)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_has_replies_parse_args', array( $this, 'add_post_status_to_query' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_admin_links', array( $this, 'admin_links' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_reply_admin_links', array( $this, 'admin_links' ), 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add valid topic and reply actions.
+ add_filter( 'bbp_get_toggle_topic_actions', array( $this, 'get_topic_actions' ) );
+ add_filter( 'bbp_get_toggle_reply_actions', array( $this, 'get_reply_actions' ) );
+
+ // Handle topic and reply actions.
+ add_filter( 'bbp_toggle_topic', array( $this, 'handle_topic_actions' ), 10, 3 );
+ add_filter( 'bbp_toggle_reply', array( $this, 'handle_reply_actions' ), 10, 3 );
+
+ // Convert toggle links to explicit actions.
+ add_filter( 'bbp_get_topic_spam_link', array( $this, 'convert_toggles_to_actions' ), 10, 3 );
+ add_filter( 'bbp_get_topic_approve_link', array( $this, 'convert_toggles_to_actions' ), 10, 3 );
+ add_filter( 'bbp_get_reply_spam_link', array( $this, 'convert_toggles_to_actions' ), 10, 3 );
+ add_filter( 'bbp_get_reply_approve_link', array( $this, 'convert_toggles_to_actions' ), 10, 3 );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,4 +360,214 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wporg_bbp_unarchive_post',
</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">+
+ /**
+ * Add Spam, Unspam, Unapprove, Approve to the list of valid topic actions.
+ *
+ * @param array $actions List of topic actions.
+ * @return array Filtered list of actions.
+ */
+ public function get_topic_actions( $actions ) {
+ $actions = array_merge( $actions, array(
+ 'wporg_bbp_spam_topic',
+ 'wporg_bbp_unspam_topic',
+ 'wporg_bbp_unapprove_topic',
+ 'wporg_bbp_approve_topic',
+ ) );
+
+ return $actions;
+ }
+
+ /**
+ * Add Spam, Unspam, Unapprove, Approve to the list of valid reply actions.
+ *
+ * @param array $actions List of reply actions.
+ * @return array Filtered list of actions.
+ */
+ public function get_reply_actions( $actions ) {
+ $actions = array_merge( $actions, array(
+ 'wporg_bbp_spam_reply',
+ 'wporg_bbp_unspam_reply',
+ 'wporg_bbp_unapprove_reply',
+ 'wporg_bbp_approve_reply',
+ ) );
+
+ return $actions;
+ }
+
+ /**
+ * Handle Spam, Unspam, Unapprove, Approve topic actions.
+ *
+ * By default, bbPress treats them as toggles, which may cause conflicts if
+ * the same action is performed twice by different moderators.
+ *
+ * @param array $retval {
+ * @type int $status Result of the action.
+ * @type string $message Message displayed in case of an error.
+ * @type string $redirect_to URL to redirect to.
+ * @type bool $view_all Whether to append 'view=all' to the URL.
+ * }
+ * @param array $r Parsed arguments.
+ * @param array $args Raw arguments.
+ * @return array
+ */
+ public function handle_topic_actions( $retval, $r, $args ) {
+ $nonce_suffix = bbp_get_topic_post_type() . '_' . (int) $r['id'];
+
+ switch ( $r['action'] ) {
+ case 'wporg_bbp_spam_topic':
+ check_ajax_referer( "spam-{$nonce_suffix}" );
+
+ if ( ! bbp_is_topic_spam( $r['id'] ) ) {
+ $retval['status'] = bbp_spam_topic( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.', 'wporg-forums' );
+ }
+ $retval['view_all'] = true;
+
+ break;
+
+ case 'wporg_bbp_unspam_topic':
+ check_ajax_referer( "spam-{$nonce_suffix}" );
+
+ if ( bbp_is_topic_spam( $r['id'] ) ) {
+ $retval['status'] = bbp_unspam_topic( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'wporg-forums' );
+ }
+ $retval['view_all'] = false;
+
+ break;
+
+ case 'wporg_bbp_unapprove_topic':
+ check_ajax_referer( "approve-{$nonce_suffix}" );
+
+ if ( ! bbp_is_topic_pending( $r['id'] ) ) {
+ $retval['status'] = bbp_unapprove_topic( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unapproving the topic.', 'wporg-forums' );
+ }
+ $retval['view_all'] = true;
+
+ break;
+
+ case 'wporg_bbp_approve_topic':
+ check_ajax_referer( "approve-{$nonce_suffix}" );
+
+ if ( bbp_is_topic_pending( $r['id'] ) ) {
+ $retval['status'] = bbp_approve_topic( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem approving the topic.', 'wporg-forums' );
+ }
+ $retval['view_all'] = false;
+
+ break;
+ }
+
+ // Add 'view=all' if needed
+ if ( ! empty( $retval['view_all'] ) ) {
+ $retval['redirect_to'] = bbp_add_view_all( $retval['redirect_to'], true );
+ }
+
+ return $retval;
+ }
+
+ /**
+ * Handle Spam, Unspam, Unapprove, Approve reply actions.
+ *
+ * By default, bbPress treats them as toggles, which may cause conflicts if
+ * the same action is performed twice by different moderators.
+ *
+ * @param array $retval {
+ * @type int $status Result of the action.
+ * @type string $message Message displayed in case of an error.
+ * @type string $redirect_to URL to redirect to.
+ * @type bool $view_all Whether to append 'view=all' to the URL.
+ * }
+ * @param array $r Parsed arguments.
+ * @param array $args Raw arguments.
+ * @return array
+ */
+ public function handle_reply_actions( $retval, $r, $args ) {
+ $nonce_suffix = bbp_get_reply_post_type() . '_' . (int) $r['id'];
+
+ switch ( $r['action'] ) {
+ case 'wporg_bbp_spam_reply':
+ check_ajax_referer( "spam-{$nonce_suffix}" );
+
+ if ( ! bbp_is_reply_spam( $r['id'] ) ) {
+ $retval['status'] = bbp_spam_reply( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem marking the reply as spam.', 'wporg-forums' );
+ }
+ $retval['view_all'] = true;
+
+ break;
+
+ case 'wporg_bbp_unspam_reply':
+ check_ajax_referer( "spam-{$nonce_suffix}" );
+
+ if ( bbp_is_reply_spam( $r['id'] ) ) {
+ $retval['status'] = bbp_unspam_reply( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam.', 'wporg-forums' );
+ }
+ $retval['view_all'] = false;
+
+ break;
+
+ case 'wporg_bbp_unapprove_reply':
+ check_ajax_referer( "approve-{$nonce_suffix}" );
+
+ if ( ! bbp_is_reply_pending( $r['id'] ) ) {
+ $retval['status'] = bbp_unapprove_reply( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unapproving the reply.', 'wporg-forums' );
+ }
+ $retval['view_all'] = true;
+
+ break;
+
+ case 'wporg_bbp_approve_reply':
+ check_ajax_referer( "approve-{$nonce_suffix}" );
+
+ if ( bbp_is_reply_pending( $r['id'] ) ) {
+ $retval['status'] = bbp_approve_reply( $r['id'] );
+ $retval['message'] = __( '<strong>ERROR</strong>: There was a problem approving the reply.', 'wporg-forums' );
+ }
+ $retval['view_all'] = false;
+
+ break;
+ }
+
+ // Add 'view=all' if needed
+ if ( ! empty( $retval['view_all'] ) ) {
+ $retval['redirect_to'] = bbp_add_view_all( $retval['redirect_to'], true );
+ }
+
+ return $retval;
+ }
+
+ /**
+ * Convert Spam/Unspam, Unapprove/Approve toggle links to explicit actions.
+ *
+ * @param string $link Link HTML.
+ * @param array $r Parsed arguments.
+ * @param array $args Raw arguments.
+ * @return string Filtered link.
+ */
+ public function convert_toggles_to_actions( $link, $r, $args ) {
+ if ( false !== strpos( $link, 'bbp_toggle_topic_spam' ) ) {
+ $action = ( bbp_is_topic_spam( $r['id'] ) ) ? 'wporg_bbp_unspam_topic' : 'wporg_bbp_spam_topic';
+ $link = str_replace( 'bbp_toggle_topic_spam', $action, $link );
+
+ } elseif ( false !== strpos( $link, 'bbp_toggle_topic_approve' ) ) {
+ $action = ( bbp_is_topic_pending( $r['id'] ) ) ? 'wporg_bbp_approve_topic' : 'wporg_bbp_unapprove_topic';
+ $link = str_replace( 'bbp_toggle_topic_approve', $action, $link );
+
+ } elseif ( false !== strpos( $link, 'bbp_toggle_reply_spam' ) ) {
+ $action = ( bbp_is_reply_spam( $r['id'] ) ) ? 'wporg_bbp_unspam_reply' : 'wporg_bbp_spam_reply';
+ $link = str_replace( 'bbp_toggle_reply_spam', $action, $link );
+
+ } elseif ( false !== strpos( $link, 'bbp_toggle_reply_approve' ) ) {
+ $action = ( bbp_is_reply_pending( $r['id'] ) ) ? 'wporg_bbp_approve_reply' : 'wporg_bbp_unapprove_reply';
+ $link = str_replace( 'bbp_toggle_reply_approve', $action, $link );
+
+ }
+
+ return $link;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>