diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/class-wp-users-list-table.php --- a/wp/wp-admin/includes/class-wp-users-list-table.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/includes/class-wp-users-list-table.php Mon Oct 14 17:39:30 2019 +0200 @@ -1,12 +1,19 @@ isset( $args['screen'] ) ? $args['screen'] : null, ) ); - $this->is_site_users = 'site-users-network' == $this->screen->id; + $this->is_site_users = 'site-users-network' === $this->screen->id; if ( $this->is_site_users ) $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; @@ -55,7 +59,8 @@ * Check the current user's permissions. * * @since 3.1.0 - * @access public + * + * @return bool */ public function ajax_user_can() { if ( $this->is_site_users ) @@ -68,7 +73,9 @@ * Prepare the users list for display. * * @since 3.1.0 - * @access public + * + * @global string $role + * @global string $usersearch */ public function prepare_items() { global $role, $usersearch; @@ -82,13 +89,23 @@ $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( $this->site_id ), + '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'] ) $args['search'] = '*' . $args['search'] . '*'; @@ -102,6 +119,16 @@ if ( isset( $_REQUEST['order'] ) ) $args['order'] = $_REQUEST['order']; + /** + * Filters the query arguments used to retrieve users for the current users list table. + * + * @since 4.4.0 + * + * @param array $args Arguments passed to WP_User_Query to retrieve items for the current + * users list table. + */ + $args = apply_filters( 'users_list_table_query_args', $args ); + // Query the user IDs for this page $wp_user_search = new WP_User_Query( $args ); @@ -117,7 +144,6 @@ * Output 'no users' message. * * @since 3.1.0 - * @access public */ public function no_items() { _e( 'No users found.' ); @@ -128,46 +154,66 @@ * with this table. * * Provides a list of roles and user count for that role for easy - * filtering of the user table. + * Filtersing of the user table. * * @since 3.1.0 - * @access protected + * + * @global string $role * * @return array An array of HTML links, one for each view. */ protected function get_views() { - global $wp_roles, $role; + global $role; + + $wp_roles = wp_roles(); if ( $this->is_site_users ) { $url = 'site-users.php?id=' . $this->site_id; switch_to_blog( $this->site_id ); - $users_of_blog = count_users(); + $users_of_blog = count_users( 'time', $this->site_id ); restore_current_blog(); } else { $url = 'users.php'; $users_of_blog = count_users(); } + $total_users = $users_of_blog['total_users']; $avail_roles =& $users_of_blog['avail_roles']; unset($users_of_blog); - $class = empty($role) ? ' class="current"' : ''; + $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : ''; + $role_links = array(); - $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; + $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; foreach ( $wp_roles->get_names() as $this_role => $name ) { if ( !isset($avail_roles[$this_role]) ) continue; - $class = ''; + $current_link_attributes = ''; - if ( $this_role == $role ) { - $class = ' class="current"'; + if ( $this_role === $role ) { + $current_link_attributes = ' class="current" aria-current="page"'; } $name = translate_user_role( $name ); /* translators: User role name with count */ $name = sprintf( __('%1$s (%2$s)'), $name, number_format_i18n( $avail_roles[$this_role] ) ); - $role_links[$this_role] = "$name"; + $role_links[$this_role] = "$name"; + } + + if ( ! empty( $avail_roles['none' ] ) ) { + + $current_link_attributes = ''; + + if ( 'none' === $role ) { + $current_link_attributes = ' class="current" aria-current="page"'; + } + + $name = __( 'No role' ); + /* translators: User role name with count */ + $name = sprintf( __('%1$s (%2$s)'), $name, number_format_i18n( $avail_roles['none' ] ) ); + $role_links['none'] = "$name"; + } return $role_links; @@ -177,7 +223,6 @@ * Retrieve an associative array of bulk actions available on this table. * * @since 3.1.0 - * @access protected * * @return array Array of bulk actions. */ @@ -199,24 +244,23 @@ * Output the controls to allow user roles to be changed in bulk. * * @since 3.1.0 - * @access protected * * @param string $which Whether this is being invoked above ("top") * or below the table ("bottom"). */ protected function extra_tablenav( $which ) { - if ( 'top' != $which ) - return; + $id = 'bottom' === $which ? 'new_role2' : 'new_role'; + $button_id = 'bottom' === $which ? 'changeit2' : 'changeit'; ?>
- - - '; + do_action( 'restrict_manage_users', $which ); + ?> +
+ '', 'username' => __( 'Username' ), 'name' => __( 'Name' ), - 'email' => __( 'E-mail' ), + 'email' => __( 'Email' ), 'role' => __( 'Role' ), 'posts' => __( 'Posts' ) ); @@ -276,20 +334,15 @@ * Get a list of sortable columns for the list table. * * @since 3.1.0 - * @access protected * * @return array Array of sortable columns. */ protected function get_sortable_columns() { $c = array( 'username' => 'login', - 'name' => 'name', 'email' => 'email', ); - if ( $this->is_site_users ) - unset( $c['posts'] ); - return $c; } @@ -297,28 +350,14 @@ * Generate the list table rows. * * @since 3.1.0 - * @access public */ public function display_rows() { // Query the post counts for this page if ( ! $this->is_site_users ) $post_counts = count_many_users_posts( array_keys( $this->items ) ); - $editable_roles = array_keys( get_editable_roles() ); - foreach ( $this->items as $userid => $user_object ) { - if ( count( $user_object->roles ) <= 1 ) { - $role = reset( $user_object->roles ); - } elseif ( $roles = array_intersect( array_values( $user_object->roles ), $editable_roles ) ) { - $role = reset( $roles ); - } else { - $role = reset( $user_object->roles ); - } - - if ( is_multisite() && empty( $user_object->allcaps ) ) - continue; - - echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 ); + echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 ); } } @@ -326,21 +365,17 @@ * Generate HTML for a single row on the users.php admin panel. * * @since 3.1.0 - * @since 4.2.0 The `$style` argument was deprecated. - * @access public - * - * @global WP_Roles $wp_roles User roles object. + * @since 4.2.0 The `$style` parameter was deprecated. + * @since 4.4.0 The `$role` parameter was deprecated. * - * @param object $user_object The current user object. - * @param string $style Deprecated. Not used. - * @param string $role Optional. Key for the $wp_roles array. Default empty. - * @param int $numposts Optional. Post count to display for this user. Defaults - * to zero, as in, a new user has made zero posts. + * @param WP_User $user_object The current user object. + * @param string $style Deprecated. Not used. + * @param string $role Deprecated. Not used. + * @param int $numposts Optional. Post count to display for this user. Defaults + * to zero, as in, a new user has made zero posts. * @return string Output for a single row. */ public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { - global $wp_roles; - if ( ! ( $user_object instanceof WP_User ) ) { $user_object = get_userdata( (int) $user_object ); } @@ -352,20 +387,29 @@ else $url = 'users.php?'; + $user_roles = $this->get_role_list( $user_object ); + + // Set up the hover actions for this user + $actions = array(); $checkbox = ''; + $super_admin = ''; + + if ( is_multisite() && current_user_can( 'manage_network_users' ) ) { + if ( in_array( $user_object->user_login, get_super_admins(), true ) ) { + $super_admin = ' — ' . __( 'Super Admin' ); + } + } + // Check if the user for this row is editable if ( current_user_can( 'list_users' ) ) { // Set up the user editing link $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) ); - // Set up the hover actions for this user - $actions = array(); - if ( current_user_can( 'edit_user', $user_object->ID ) ) { - $edit = "$user_object->user_login
"; + $edit = "{$user_object->user_login}{$super_admin}
"; $actions['edit'] = '' . __( 'Edit' ) . ''; } else { - $edit = "$user_object->user_login
"; + $edit = "{$user_object->user_login}{$super_admin}
"; } if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) @@ -373,8 +417,20 @@ if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) ) $actions['remove'] = "" . __( 'Remove' ) . ""; + // Add a link to the user's author archive, if not empty. + $author_posts_url = get_author_posts_url( $user_object->ID ); + if ( $author_posts_url ) { + $actions['view'] = sprintf( + '%s', + esc_url( $author_posts_url ), + /* translators: %s: author's display name */ + esc_attr( sprintf( __( 'View posts by %s' ), $user_object->display_name ) ), + __( 'View' ) + ); + } + /** - * Filter the action links displayed under each user in the Users list table. + * Filters the action links displayed under each user in the Users list table. * * @since 2.8.0 * @@ -384,77 +440,145 @@ * @param WP_User $user_object WP_User object for the currently-listed user. */ $actions = apply_filters( 'user_row_actions', $actions, $user_object ); - $edit .= $this->row_actions( $actions ); + + // Role classes. + $role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) ); // Set up the checkbox ( because the user is editable, otherwise it's empty ) $checkbox = '' - . ""; + . ""; } else { - $edit = '' . $user_object->user_login . ''; + $edit = "{$user_object->user_login}{$super_admin}"; } - $role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' ); $avatar = get_avatar( $user_object->ID, 32 ); + // Comma-separated list of user roles. + $roles_list = implode( ', ', $user_roles ); + $r = ""; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } + if ( 'posts' === $column_name ) { + $classes .= ' num'; // Special case for that column + } - $style = ''; - if ( in_array( $column_name, $hidden ) ) - $style = ' style="display:none;"'; + if ( in_array( $column_name, $hidden ) ) { + $classes .= ' hidden'; + } - $attributes = "$class$style"; + $data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"'; + + $attributes = "class='$classes' $data"; - switch ( $column_name ) { - case 'cb': - $r .= "$checkbox"; - break; - case 'username': - $r .= "$avatar $edit"; - break; - case 'name': - $r .= "$user_object->first_name $user_object->last_name"; - break; - case 'email': - $r .= "$email"; - break; - case 'role': - $r .= "$role_name"; - break; - case 'posts': - $attributes = 'class="posts column-posts num"' . $style; - $r .= ""; - if ( $numposts > 0 ) { - $r .= ""; - $r .= $numposts; - $r .= ''; - } else { - $r .= 0; - } - $r .= ""; - break; - default: - $r .= ""; + if ( 'cb' === $column_name ) { + $r .= "$checkbox"; + } else { + $r .= ""; + switch ( $column_name ) { + case 'username': + $r .= "$avatar $edit"; + break; + case 'name': + if ( $user_object->first_name && $user_object->last_name ) { + $r .= "$user_object->first_name $user_object->last_name"; + } elseif ( $user_object->first_name ) { + $r .= $user_object->first_name; + } elseif ( $user_object->last_name ) { + $r .= $user_object->last_name; + } else { + $r .= '' . _x( 'Unknown', 'name' ) . ''; + } + break; + case 'email': + $r .= "$email"; + break; + case 'role': + $r .= esc_html( $roles_list ); + break; + case 'posts': + if ( $numposts > 0 ) { + $r .= ""; + $r .= ''; + $r .= '' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . ''; + $r .= ''; + } else { + $r .= 0; + } + break; + default: + /** + * Filters the display output of custom columns in the Users list table. + * + * @since 2.8.0 + * + * @param string $output Custom column output. Default empty. + * @param string $column_name Column name. + * @param int $user_id ID of the currently-listed user. + */ + $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); + } - /** - * Filter the display output of custom columns in the Users list table. - * - * @since 2.8.0 - * - * @param string $output Custom column output. Default empty. - * @param string $column_name Column name. - * @param int $user_id ID of the currently-listed user. - */ - $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); - $r .= ""; + if ( $primary === $column_name ) { + $r .= $this->row_actions( $actions ); + } + $r .= ""; } } $r .= ''; return $r; } + + /** + * Gets the name of the default primary column. + * + * @since 4.3.0 + * + * @return string Name of the default primary column, in this case, 'username'. + */ + protected function get_default_primary_column_name() { + return 'username'; + } + + /** + * Returns an array of user roles for a given user object. + * + * @since 4.4.0 + * + * @param WP_User $user_object The WP_User object. + * @return array An array of user roles. + */ + protected function get_role_list( $user_object ) { + $wp_roles = wp_roles(); + + $role_list = array(); + + foreach ( $user_object->roles as $role ) { + if ( isset( $wp_roles->role_names[ $role ] ) ) { + $role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] ); + } + } + + if ( empty( $role_list ) ) { + $role_list['none'] = _x( 'None', 'no user roles' ); + } + + /** + * Filters the returned array of roles for a user. + * + * @since 4.4.0 + * + * @param array $role_list An array of user roles. + * @param WP_User $user_object A WP_User object. + */ + return apply_filters( 'get_role_list', $role_list, $user_object ); + } + }