X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..refs/tags/wordpress-3.4.2-scripts:/wp-admin/users.php diff --git a/wp-admin/users.php b/wp-admin/users.php index d11ee53d..f26255fc 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -7,25 +7,61 @@ */ /** WordPress Administration Bootstrap */ -require_once('admin.php'); +require_once( './admin.php' ); -/** WordPress Registration API */ -require_once( ABSPATH . WPINC . '/registration.php'); - -if ( !current_user_can('edit_users') ) - wp_die(__('Cheatin’ uh?')); +if ( ! current_user_can( 'list_users' ) ) + wp_die( __( 'Cheatin’ uh?' ) ); +$wp_list_table = _get_list_table('WP_Users_List_Table'); +$pagenum = $wp_list_table->get_pagenum(); $title = __('Users'); $parent_file = 'users.php'; -$update = $doaction = ''; -if ( isset($_REQUEST['action']) ) - $doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2']; - -if ( empty($doaction) ) { - if ( isset($_GET['changeit']) && !empty($_GET['new_role']) ) - $doaction = '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 = ''; @@ -37,32 +73,44 @@ if ( empty($_REQUEST) ) { $referer = ''; } -switch ($doaction) { +$update = ''; + +switch ( $wp_list_table->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(); } $editable_roles = get_editable_roles(); - if (!$editable_roles[$_REQUEST['new_role']]) + 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; } + // 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 = new WP_User($id); $user->set_role($_REQUEST['new_role']); } @@ -73,6 +121,8 @@ case 'promote': break; case 'dodelete': + if ( is_multisite() ) + wp_die( __('User deletion is not allowed from this screen.') ); check_admin_referer('delete-users'); @@ -81,7 +131,7 @@ case 'dodelete': exit(); } - if ( !current_user_can('delete_users') ) + if ( ! current_user_can( 'delete_users' ) ) wp_die(__('You can’t delete users.')); $userids = $_REQUEST['users']; @@ -89,19 +139,23 @@ case 'dodelete': $delete_count = 0; foreach ( (array) $userids as $id) { - if ( ! current_user_can('delete_user', $id) ) - wp_die(__('You can’t delete that user.')); + $id = (int) $id; - if($id == $current_user->ID) { + if ( ! current_user_can( 'delete_user', $id ) ) + wp_die(__( 'You can’t delete that user.' ) ); + + if ( $id == $current_user->ID ) { $update = 'err_admin_del'; continue; } - switch($_REQUEST['delete_option']) { + switch ( $_REQUEST['delete_option'] ) { case 'delete': - wp_delete_user($id); + if ( current_user_can('delete_user', $id) ) + wp_delete_user($id); break; case 'reassign': - wp_delete_user($id, $_REQUEST['reassign_user']); + if ( current_user_can('delete_user', $id) ) + wp_delete_user($id, $_REQUEST['reassign_user']); break; } ++$delete_count; @@ -114,6 +168,8 @@ case 'dodelete': break; case 'delete': + if ( is_multisite() ) + wp_die( __('User deletion is not allowed from this screen.') ); check_admin_referer('bulk-users'); @@ -122,13 +178,13 @@ case 'delete': 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.' ) ); if ( empty($_REQUEST['users']) ) $userids = array(intval($_REQUEST['user'])); else - $userids = $_REQUEST['users']; + $userids = (array) $_REQUEST['users']; include ('admin-header.php'); ?> @@ -139,38 +195,33 @@ case 'delete':