Changeset 12747

Timestamp:

07/18/2023 05:41:27 AM (14 months ago)

Author:

dd32

Message:

Support Forums: Moderators: Allow moderators on the English forums to block users.

Fixes #5707.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/support-forums/inc/class-moderators.php (modified) (3 diffs)
• plugins/support-forums/inc/class-plugin.php (modified) (3 diffs)
• themes/pub/wporg-support/bbpress/form-user-roles.php (added)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php

@@ -21 +21 @@
         add_filter( 'bbp_map_primary_meta_caps',        array( $this, 'map_meta_caps' ), 10, 4 );
         add_action( 'bbp_post_request',                 array( $this, 'edit_user_handler' ), 0 );
+
+        // 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 );
 
         // Append 'view=all' to forum, topic, and reply URLs in moderator views.
@@ -185 +191 @@
                     }
 
-                    if ( 'promote_user' === $cap || 'promote_users' === $cap ) {
-                        // Only keymasters can promote users.
-                        $caps = array( 'keep_gate' );
-                    } else {
-                        $caps = array( 'moderate' );
-                    }
+                    $caps = array( 'moderate' );
                 }
                 break;
@@ -196 +197 @@
 
         return $caps;
+    }
+
+    /**
+     * 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;
+        }
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin.php

@@ -42 +42 @@
 
     /**
+     * Define whether this is the global forums, or a locale forum.
+     * ie. https://wordpress.org/support/
+     *
+     * @var bool
+     */
+    public $is_main_forums = false;
+
+    /**
      * Always return the same instance of this plugin.
      *
@@ -67 +75 @@
         $this->audit_log    = new Audit_Log;
 
+        // 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()
+        );
+
         // These modifications are specific to https://wordpress.org/support/
-        $blog_id = get_current_blog_id();
-        if ( $blog_id && defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == $blog_id ) {
+        if ( $this->is_main_forums ) {
             $this->dropin          = new Dropin;
             $this->support_compat  = new Support_Compat;
 
             // Only load Performance_Optimizations if necessary.
-            $this->performance = new Performance_Optimizations;
+            $this->performance     = new Performance_Optimizations;
 
             // Ratings_Compat is loaded by Theme_Directory_Compat or
@@ -82 +95 @@
         }
 
+        // Only load the Block Support if the Blocks Everywhere plugin is available.
         if ( class_exists( 'Automattic\Blocks_Everywhere\Blocks_Everywhere' ) ) {
-            $this->blocks = new Blocks;
+            $this->blocks          = new Blocks;
         }