' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '
' . - '' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '
' . - '' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '
' . +get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => '' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '
' . + '' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '
' +) ) ; + +get_current_screen()->add_help_tab( array( + 'id' => 'screen-display', + 'title' => __('Screen Display'), + 'content' => '' . __('You can customize the display of this screen in a number of ways:') . '
' . + '' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '
' . + '' . __('For more information:') . '
' . - '' . __('Documentation on Managing Users') . '
' . - '' . __('Descriptions of Roles and Capabilities') . '
' . - '' . __('Support Forums') . '
' + '' . __('Documentation on Managing Users') . '
' . + '' . __('Descriptions of Roles and Capabilities') . '
' . + '' . __('Support Forums') . '
' ); if ( empty($_REQUEST) ) { - $referer = ''; + $referer = ''; } elseif ( isset($_REQUEST['wp_http_referer']) ) { - $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), stripslashes($_REQUEST['wp_http_referer'])); + $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash( $_REQUEST['wp_http_referer'] ) ); $referer = ''; } else { $redirect = 'users.php'; @@ -42,6 +75,25 @@ if ( empty($_REQUEST) ) { $update = ''; +/** + * @since 3.5.0 + * @access private + */ +function delete_users_add_js() { ?> + +current_action() ) { /* Bulk Dropdown menu Role changes */ @@ -67,25 +119,24 @@ case 'promote': if ( ! current_user_can('promote_user', $id) ) wp_die(__('You can’t edit that user.')); - // The new role of the current user must also have promote_users caps - if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) { - $update = 'err_admin_role'; - continue; + // The new role of the current user must also have the promote_users cap or be a multisite super admin + if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') + && ! ( is_multisite() && is_super_admin() ) ) { + $update = 'err_admin_role'; + continue; } // If the user doesn't already belong to the blog, bail. if ( is_multisite() && !is_user_member_of_blog( $id ) ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); - $user = new WP_User($id); + $user = get_userdata( $id ); $user->set_role($_REQUEST['new_role']); } wp_redirect(add_query_arg('update', $update, $redirect)); exit(); -break; - case 'dodelete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -97,16 +148,22 @@ case 'dodelete': exit(); } + $userids = array_map( 'intval', (array) $_REQUEST['users'] ); + + if ( empty( $_REQUEST['delete_option'] ) ) { + $url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' ); + $url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) ); + wp_redirect( $url ); + exit; + } + if ( ! current_user_can( 'delete_users' ) ) wp_die(__('You can’t delete users.')); - $userids = $_REQUEST['users']; $update = 'del'; $delete_count = 0; - foreach ( (array) $userids as $id) { - $id = (int) $id; - + foreach ( $userids as $id ) { if ( ! current_user_can( 'delete_user', $id ) ) wp_die(__( 'You can’t delete that user.' ) ); @@ -116,12 +173,10 @@ case 'dodelete': } switch ( $_REQUEST['delete_option'] ) { case 'delete': - if ( current_user_can('delete_user', $id) ) - wp_delete_user($id); + wp_delete_user( $id ); break; case 'reassign': - if ( current_user_can('delete_user', $id) ) - wp_delete_user($id, $_REQUEST['reassign_user']); + wp_delete_user( $id, $_REQUEST['reassign_user'] ); break; } ++$delete_count; @@ -131,8 +186,6 @@ case 'dodelete': wp_redirect($redirect); exit(); -break; - case 'delete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -148,44 +201,69 @@ case 'delete': $errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) ); if ( empty($_REQUEST['users']) ) - $userids = array(intval($_REQUEST['user'])); + $userids = array( intval( $_REQUEST['user'] ) ); else - $userids = $_REQUEST['users']; + $userids = array_map( 'intval', (array) $_REQUEST['users'] ); - include ('admin-header.php'); + add_action( 'admin_head', 'delete_users_add_js' ); + + include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -