Changeset 4301

Timestamp:

11/02/2012 07:25:11 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Update BBP_User_Admin to use roles UI instead of capabilities.
• Leave capabilities in for now, but hidden behind a switch function.
• See #1939.

File:

• trunk/includes/admin/users.php (modified) (3 diffs)

trunk/includes/admin/users.php

@@ -47 +47 @@
             return;
 
-        // Admin styles
-        add_action( 'admin_head',        array( $this, 'admin_head'          ) );
-
         // User profile edit/display actions
-        add_action( 'edit_user_profile', array( $this, 'user_profile_forums' ) );
-
-        // Noop WordPress additional caps output area
-        add_filter( 'additional_capabilities_display', '__return_false' );
+        add_action( 'edit_user_profile', array( $this, 'secondary_role_display' ) );
+
+        // Show advanced capabilities
+        if ( bbp_use_advanced_capability_editor() ) {
+
+            // Admin styles
+            add_action( 'admin_head',        array( $this, 'admin_head' ) );
+
+            // User profile edit/display actions
+            add_action( 'edit_user_profile', array( $this, 'advanced_capability_display' ) );
+
+            // Noop WordPress additional caps output area
+            add_filter( 'additional_capabilities_display', '__return_false' );
+        }
     }
 
@@ -93 +100 @@
 
     /**
-     * Responsible for saving additional profile options and settings
+     * Default interface for setting a forum role
+     *
+     * @since bbPress (r4285)
+     *
+     * @param WP_User $profileuser User data
+     * @return bool Always false
+     */
+    public function secondary_role_display( $profileuser ) {
+
+        // Bail if current user cannot edit users
+        if ( ! current_user_can( 'edit_user', $profileuser->ID ) )
+            return; ?>
+
+        <h3><?php _e( 'Forums', 'bbpress' ); ?></h3>
+
+        <table class="form-table">
+            <tbody>
+                <tr>
+                    <th><?php _e( 'Forum Role', 'bbpress' ); ?></th>
+                    <td>
+
+                        <?php $user_role = bbp_get_user_role( $profileuser->ID ); ?>
+
+                        <select name="bbp-forums-role" id="bbp-forums-role">
+
+                            <?php if ( ! empty( $user_role ) ) : ?>
+
+                                <option value=""><?php _e( '&mdash; No role for this forum &mdash;', 'bbpress' ); ?></option>
+
+                            <?php else : ?>
+
+                                <option value="" selected="selected"><?php _e( '&mdash; No role for this forum &mdash;', 'bbpress' ); ?></option>
+
+                            <?php endif; ?>
+
+                            <?php foreach ( bbp_get_editable_roles() as $role => $details ) : ?>
+
+                                <option <?php selected( $user_role, $role ); ?> value="<?php echo esc_attr( $role ); ?>"><?php echo translate_user_role( $details['name'] ); ?></option>
+
+                            <?php endforeach; ?>
+
+                        </select>
+                    </td>
+                </tr>
+
+            </tbody>
+        </table>
+
+        <?php
+    }
+
+    /**
+     * Responsible for displaying bbPress's advanced capability interface.
+     *
+     * Hidden by default. Must be explicitly enabled.
      *
      * @since bbPress (r2464)
@@ -101 +162 @@
      * @return bool Always false
      */
-    public function user_profile_forums( $profileuser ) {
+    public function advanced_capability_display( $profileuser ) {
 
         // Bail if current user cannot edit users
         if ( ! current_user_can( 'edit_user', $profileuser->ID ) )
             return; ?>
-
-        <h3><?php _e( 'Forum Capabilities', 'bbpress' ); ?></h3>
 
         <table class="form-table">