X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/users.php?ds=sidebyside diff --git a/wp-admin/users.php b/wp-admin/users.php index d8089b4c..6ea17657 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -1,57 +1,133 @@ get_pagenum(); $title = __('Users'); $parent_file = 'users.php'; -$action = $_REQUEST['action']; -$update = ''; - -if ( empty($action) ) { - if ( isset($_GET['deleteit']) ) - $action = 'delete'; - elseif ( isset($_GET['changeit']) && !empty($_GET['new_role']) ) - $action = 'promote'; -} +add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) ); + +// contextual help - choose Help on the top right of admin panel to preview this. +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') . '
' +); 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'])); - $referer = ''; + $referer = ''; } else { $redirect = 'users.php'; + $referer = ''; +} + +$update = ''; + +/** + * @since 3.5.0 + * @access private + */ +function delete_users_add_js() { ?> + +current_action() ) { +/* Bulk Dropdown menu Role changes */ case 'promote': check_admin_referer('bulk-users'); - if (empty($_REQUEST['users'])) { + if ( ! current_user_can( 'promote_users' ) ) + wp_die( __( 'You can’t edit that user.' ) ); + + if ( empty($_REQUEST['users']) ) { wp_redirect($redirect); exit(); } - if ( !current_user_can('edit_users') ) - wp_die(__('You can’t edit users.')); + $editable_roles = get_editable_roles(); + if ( empty( $editable_roles[$_REQUEST['new_role']] ) ) + wp_die(__('You can’t give users that role.')); $userids = $_REQUEST['users']; $update = 'promote'; - foreach($userids as $id) { - if ( ! current_user_can('edit_user', $id) ) + foreach ( $userids as $id ) { + $id = (int) $id; + + 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 edit_users caps - if($id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_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; } - $user = new WP_User($id); + // If the user doesn't already belong to the blog, bail. + if ( is_multisite() && !is_user_member_of_blog( $id ) ) + wp_die(__('Cheatin’ uh?')); + + $user = get_userdata( $id ); $user->set_role($_REQUEST['new_role']); } @@ -61,6 +137,8 @@ case 'promote': break; case 'dodelete': + if ( is_multisite() ) + wp_die( __('User deletion is not allowed from this screen.') ); check_admin_referer('delete-users'); @@ -69,27 +147,35 @@ case 'dodelete': exit(); } - if ( !current_user_can('delete_users') ) + $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) { - if ( ! current_user_can('delete_user', $id) ) - wp_die(__('You can’t delete that user.')); + foreach ( $userids as $id ) { + if ( ! current_user_can( 'delete_user', $id ) ) + wp_die(__( 'You can’t delete that user.' ) ); - if($id == $current_user->ID) { + if ( $id == $current_user->ID ) { $update = 'err_admin_del'; continue; } - switch($_REQUEST['delete_option']) { + switch ( $_REQUEST['delete_option'] ) { case 'delete': - wp_delete_user($id); + wp_delete_user( $id ); break; case 'reassign': - wp_delete_user($id, $_REQUEST['reassign_user']); + wp_delete_user( $id, $_REQUEST['reassign_user'] ); break; } ++$delete_count; @@ -102,18 +188,25 @@ case 'dodelete': break; case 'delete': + if ( is_multisite() ) + wp_die( __('User deletion is not allowed from this screen.') ); check_admin_referer('bulk-users'); - if ( empty($_REQUEST['users']) ) { + if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) { wp_redirect($redirect); exit(); } - if ( !current_user_can('delete_users') ) - $errors = new WP_Error('edit_users', __('You can’t delete users.')); + if ( ! current_user_can( 'delete_users' ) ) + $errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) ); - $userids = $_REQUEST['users']; + if ( empty($_REQUEST['users']) ) + $userids = array( intval( $_REQUEST['user'] ) ); + else + $userids = array_map( 'intval', (array) $_REQUEST['users'] ); + + add_action( 'admin_head', 'delete_users_add_js' ); include ('admin-header.php'); ?> @@ -122,38 +215,39 @@ case 'delete':+
' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '
' . sprintf( __( 'New user created. Edit user' ), + esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), + self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '
'; + } else { + $messages[] = '' . __( 'New user created.' ) . '
' . __('Changed roles.') . '
'; break; case 'err_admin_role': - ?> -' . __('The current user’s role must have user editing capabilities.') . '
'; + $messages[] = '' . __('Other user roles have been changed.') . '
' . __('You can’t delete the current user.') . '
'; + $messages[] = '' . __('Other users have been deleted.') . '
' . __('User removed from this site.') . '
' . __("You can't remove the current user.") . '
' . __('Other users have been removed.') . '
$message
"; - ?> -' . sprintf(__('Users cannot currently register themselves, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '
'; -?> - -