Changeset 6668

Timestamp:

08/25/2017 06:21:26 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Tools: include users with "unexpected" roles in bbp_admin_repair_user_roles()

This change makes sure that if a user has an unexpectedly missing or predictably broken role entry, they are still mapped to the $default_role for the current site, and fixes a problem with the role repair tool where users with the most broken roles were still never actually repaired.

Trunk, for 2.6.

File:

• trunk/src/includes/admin/tools/repair.php (modified) (3 diffs)

trunk/src/includes/admin/tools/repair.php

@@ -723 +723 @@
         }
 
+        // Get non-forum roles
+        $blog_roles = array_keys( bbp_get_blog_roles() );
+
         // Iterate through each role...
-        foreach ( array_keys( bbp_get_blog_roles() ) as $role ) {
+        foreach ( $blog_roles as $role ) {
 
                 // Reset the offset
@@ -730 +733 @@
 
                 // If no role map exists, give the default forum role (bbp-participant)
-                $new_role = isset( $role_map[ $role ] ) ? $role_map[ $role ] : $default_role;
+                $new_role = isset( $role_map[ $role ] )
+                        ? $role_map[ $role ]
+                        : $default_role;
 
                 // Get users of this site, limited to 1000
@@ -743 +748 @@
                         foreach ( (array) $users as $user_id ) {
                                 if ( bbp_set_user_role( $user_id, $new_role ) ) {
+                                        ++$changed; // Keep a count to display at the end
+                                }
+                        }
+
+                        // Bump the offset for the next query iteration
+                        $offset = $offset + 1000;
+                }
+        }
+
+        // Reset the offset
+        $offset  = 0;
+        $bbp_db  = bbp_db();
+        $cap_key = $bbp_db->get_blog_prefix() . 'capabilities';
+
+        // Users without roles should be granted the default role, but not on multi-
+        // site installations where not all users get a role by default.
+        if ( ! is_multisite() ) {
+
+                // Get users with missing capabilities on this site, limited to 1000
+                while ( $users = get_users( array(
+                        'meta_key'     => $cap_key,
+                        'meta_compare' => 'NOT EXISTS',
+                        'fields'       => 'ID',
+                        'number'       => 1000,
+                        'offset'       => $offset
+                ) ) ) {
+
+                        // Iterate through each user of $role and try to set it
+                        foreach ( (array) $users as $user_id ) {
+                                if ( bbp_set_user_role( $user_id, $default_role ) ) {
+                                        ++$changed; // Keep a count to display at the end
+                                }
+                        }
+
+                        // Bump the offset for the next query iteration
+                        $offset = $offset + 1000;
+                }
+
+        // On multisite, we'll look for users with an empty capabilities array.
+        // These are users who basically have malformed caps, and we can fix that.
+        } else {
+
+                // Get users with empty capabilities on this site, limited to 1000
+                while ( $users = get_users( array(
+                        'meta_key'   => $cap_key,
+                        'meta_value' => 'a:0:{}',
+                        'fields'     => 'ID',
+                        'number'     => 1000,
+                        'offset'     => $offset
+                ) ) ) {
+
+                        // Iterate through each user of $role and try to set it
+                        foreach ( (array) $users as $user_id ) {
+                                if ( bbp_set_user_role( $user_id, $default_role ) ) {
                                         ++$changed; // Keep a count to display at the end
                                 }