Changeset 4311 for trunk/includes/users/capabilities.php

Timestamp:

11/03/2012 07:06:20 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Update bbp_map_primary_meta_caps() to block for inactive users, and check cap for active users.
• See #1939.

File:

• trunk/includes/users/capabilities.php (modified) (2 diffs)

trunk/includes/users/capabilities.php

@@ -50 +50 @@
         // What capability is being checked?
         switch ( $cap ) {
-
-                // Minimum required cap to read any forum content
-                case 'spectate' :
-
-                // Minimum required cap to create any forum content
+                case 'spectate'    :
                 case 'participate' :
-
-                        // Inactive users cannot participate
+                case 'moderate'    :
+
+                        // Do not allow inactive users
                         if ( bbp_is_user_inactive( $user_id ) ) {
                                 $caps = array( 'do_not_allow' );
 
                         // Moderators are always participants
-                        } elseif ( user_can( $user_id, 'moderate' ) ) {
+                        } else {
                                 $caps = array( $cap );
-
-                        // Map to read
-                        } else {
-                                $caps = array( 'read' );
-                        }
-
-                        break;
-
-                case 'moderate' :
-
-                        // All admins are moderators
-                        if ( user_can( $user_id, 'administrator' ) ) {
-                                $caps = array( 'read' );
                         }
 
@@ -259 +243 @@
 
         // Bail if not logged in or already a member of this site
-        if ( ! is_user_logged_in() || current_user_can( 'read' ) )
+        if ( ! is_user_logged_in() )
+                return;
+
+        // Get the current user ID
+        $user_id = get_current_user_id();
+
+        // Bail if user already has a forums role
+        if ( bbp_get_user_role( $user_id ) )
                 return;
 
         // Bail if user is marked as spam or is deleted
-        if ( bbp_is_user_inactive() )
+        if ( bbp_is_user_inactive( $user_id ) )
                 return;