Changeset 34965

Timestamp:

10/08/2015 10:06:46 PM (11 years ago)

Author:

johnbillion

Message:

Introduce the ability to filter the Users admin listing screen by users with no role, if such users exist.

Fixes #22993
Props spmlucas, johnbillion

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-users-list-table.php (modified) (3 diffs)
• src/wp-includes/user-functions.php (modified) (5 diffs)
• tests/phpunit/tests/user/countUsers.php (added)
• tests/phpunit/tests/user/wpGetUsersWithNoRole.php (added)

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -88 +88 @@
                 $paged = $this->get_pagenum();
 
-                $args = array(
-                        'number' => $users_per_page,
-                        'offset' => ( $paged-1 ) * $users_per_page,
-                        'role' => $role,
-                        'search' => $usersearch,
-                        'fields' => 'all_with_meta'
-                );
+                if ( 'none' === $role ) {
+                        $args = array(
+                                'number' => $users_per_page,
+                                'offset' => ( $paged-1 ) * $users_per_page,
+                                'include' => wp_get_users_with_no_role(),
+                                'search' => $usersearch,
+                                'fields' => 'all_with_meta'
+                        );
+                } else {
+                        $args = array(
+                                'number' => $users_per_page,
+                                'offset' => ( $paged-1 ) * $users_per_page,
+                                'role' => $role,
+                                'search' => $usersearch,
+                                'fields' => 'all_with_meta'
+                        );
+                }
 
                 if ( '' !== $args['search'] )
@@ -167 +177 @@
                         $users_of_blog = count_users();
                 }
+
                 $total_users = $users_of_blog['total_users'];
                 $avail_roles =& $users_of_blog['avail_roles'];
@@ -188 +199 @@
                         $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
                         $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
+                }
+
+                if ( ! empty( $avail_roles['none' ] ) ) {
+
+                        $class = '';
+
+                        if ( 'none' === $role ) {
+                                $class = ' class="current"';
+                        }
+
+                        $name = __( 'No role' );
+                        /* translators: User role name with count */
+                        $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+                        $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+
                 }
 

trunk/src/wp-includes/user-functions.php

@@ -736 +736 @@
  *
  * @since 3.0.0
+ * @since 4.4.0 The number of users with no role is now included in the `none` element.
  *
  * @global wpdb $wpdb
@@ -776 +777 @@
                 $total_users = (int) $row[$col];
 
+                $role_counts['none'] = ( $total_users - array_sum( $role_counts ) );
+
                 $result['total_users'] = $total_users;
                 $result['avail_roles'] =& $role_counts;
         } else {
-                $avail_roles = array();
+                $avail_roles = array(
+                        'none' => 0,
+                );
 
                 $users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
@@ -787 +792 @@
                         if ( ! is_array( $b_roles ) )
                                 continue;
+                        if ( empty( $b_roles ) ) {
+                                $avail_roles['none']++;
+                        }
                         foreach ( $b_roles as $b_role => $val ) {
                                 if ( isset($avail_roles[$b_role]) ) {
@@ -798 +806 @@
                 $result['total_users'] = count( $users_of_blog );
                 $result['avail_roles'] =& $avail_roles;
+        }
+
+        if ( is_multisite() ) {
+                $result['avail_roles']['none'] = 0;
         }
 
@@ -2232 +2244 @@
         $manager->destroy_all();
 }
+
+/**
+ * Get the user IDs of all users with no role on this site.
+ *
+ * This function returns an empty array when used on Multisite.
+ *
+ * @since 4.4.0
+ *
+ * @return array Array of user IDs.
+ */
+function wp_get_users_with_no_role() {
+        global $wpdb;
+
+        if ( is_multisite() ) {
+                return array();
+        }
+
+        $prefix = $wpdb->get_blog_prefix();
+        $regex  = implode( '|', wp_roles()->get_names() );
+        $regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
+        $users  = $wpdb->get_col( $wpdb->prepare( "
+                SELECT user_id
+                FROM $wpdb->usermeta
+                WHERE meta_key = '{$prefix}capabilities'
+                AND meta_value NOT REGEXP %s
+        ", $regex ) );
+
+        return $users;
+}