<!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>[12747] sites/trunk/wordpress.org/public_html/wp-content: Support Forums: Moderators: Allow moderators on the English forums to block users.</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 { white-space: pre-line; 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/12747">12747</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/12747","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-18 05:41:27 +0000 (Tue, 18 Jul 2023)</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: Moderators: Allow moderators on the English forums to block users.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5707">#5707</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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformuserrolesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-roles.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 2023-07-18 04:50:05 UTC (rev 12746)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2023-07-18 05:41:27 UTC (rev 12747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_map_primary_meta_caps', array( $this, 'map_meta_caps' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_post_request', array( $this, 'edit_user_handler' ), 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow moderators to manage user roles.
+ add_filter( 'bbp_get_caps_for_role', array( $this, 'bbp_get_caps_for_role' ), 10, 2 );
+
+ // Limit which roles a moderator can assign to a user. Before bbp_profile_update_role().
+ add_action( 'bbp_profile_update', array( $this, 'bbp_profile_update' ), 1 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Append 'view=all' to forum, topic, and reply URLs in moderator views.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_forum_permalink', array( $this, 'add_view_all' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_topic_permalink', array( $this, 'add_view_all' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,12 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $caps;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'promote_user' === $cap || 'promote_users' === $cap ) {
- // Only keymasters can promote users.
- $caps = array( 'keep_gate' );
- } else {
- $caps = array( 'moderate' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $caps = array( 'moderate' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,6 +199,50 @@
</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">+ * Allow (global) moderators to assign roles to users.
+ *
+ * @param array $caps Role capabilities.
+ * @param string $role Role name.
+ * @return array
+ */
+ function bbp_get_caps_for_role( $caps, $role ) {
+ if (
+ $role === bbp_get_moderator_role() &&
+ Plugin::get_instance()->is_main_forums
+ ) {
+ $caps['promote_users'] = true;
+ }
+
+ return $caps;
+ }
+
+ /**
+ * Limit the site/forum roles a moderator can set.
+ */
+ public function bbp_profile_update() {
+ // Keymasters need no special handling.
+ if ( bbp_is_user_keymaster( get_current_user_id() ) ) {
+ return;
+ }
+
+ $new_forum_role = sanitize_key( $_POST['bbp-forums-role'] ?? '' );
+
+ // Prevent setting any roles.
+ unset( $_POST['role'], $_POST['bbp-forums-role'] );
+
+ $allowed_roles = array(
+ bbp_get_participant_role(),
+ bbp_get_spectator_role(),
+ bbp_get_blocked_role()
+ );
+
+ // If it's an allowed role, add it back so it can be processed by bbp_profile_update_role().
+ if ( in_array( $new_forum_role, $allowed_roles, true ) ) {
+ $_POST['bbp-forums-role'] = $new_forum_role;
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Allow keymasters and moderators to change user's email address
</span><span class="cx" style="display: block; padding: 0 10px"> * without requiring a confirmation.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasspluginphp"></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-plugin.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-plugin.php 2023-07-18 04:50:05 UTC (rev 12746)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php 2023-07-18 05:41:27 UTC (rev 12747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $blocks = false;
</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">+ * Define whether this is the global forums, or a locale forum.
+ * ie. https://wordpress.org/support/
+ *
+ * @var bool
+ */
+ public $is_main_forums = false;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Always return the same instance of this plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return Plugin
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,14 +74,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->emails = new Emails;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->audit_log = new Audit_Log;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set a flag to indicate whether this is the global forums, or a locale forum.
+ $this->is_main_forums = (
+ defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) &&
+ WPORG_SUPPORT_FORUMS_BLOGID == get_current_blog_id()
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // These modifications are specific to https://wordpress.org/support/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_id = get_current_blog_id();
- if ( $blog_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_main_forums ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->dropin = new Dropin;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->support_compat = new Support_Compat;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only load Performance_Optimizations if necessary.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->performance = new Performance_Optimizations;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->performance = new Performance_Optimizations;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ratings_Compat is loaded by Theme_Directory_Compat or
</span><span class="cx" style="display: block; padding: 0 10px"> // Plugin_Directory_Compat depending on the request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plugins = new Plugin_Directory_Compat;
</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">+ // Only load the Block Support if the Blocks Everywhere plugin is available.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'Automattic\Blocks_Everywhere\Blocks_Everywhere' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->blocks = new Blocks;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->blocks = new Blocks;
</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"> add_action( 'bbp_add_rewrite_rules', array( $this, 'maybe_flush_rewrite_rules' ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformuserrolesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-roles.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/themes/pub/wporg-support/bbpress/form-user-roles.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-roles.php 2023-07-18 05:41:27 UTC (rev 12747)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,35 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Modify the roles section of the bbPress profiles.
+ * - Hide site roles from Moderators as they can't be set.
+ * - Limit the role selection UI for moderators to lower-roles.
+ *
+ * bbPress doesn't expect moderators to have the ability to change roles as much as we allow,
+ * that causes us to need to filter capabilities and the resulting UI.
+ */
+if ( bbp_is_user_keymaster( get_current_user_id() ) ) {
+?><div>
+ <label for="role"><?php esc_html_e( 'Blog Role', 'bbpress' ); ?></label>
+
+ <?php bbp_edit_user_blog_role(); ?>
+
+</div>
+<?php } ?>
+
+<div>
+ <label for="forum-role"><?php esc_html_e( 'Forum Role', 'bbpress' ); ?></label>
+
+ <?php bbp_edit_user_forums_role(); ?>
+
+ <?php
+ if ( ! bbp_is_user_keymaster( get_current_user_id() ) ) {
+ /*
+ * Capabilities are handled server-side, but the UI isn't reflective of that.
+ * This JS is a quick fix without filtering bbPress functions.
+ */
+ ?>
+ <script>
+ jQuery( '#bbp-forums-role').find( '[value="bbp_moderator"],[value="bbp_keymaster"]' ).remove();
+ </script>
+ <?php } ?>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-roles.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>