X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..00dbffaf1593b0ac719d98f00839221a9ca52133:/wp-admin/users.php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 61fd687d..6ea17657 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -7,61 +7,127 @@
*/
/** 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:') . '
' .
+ '' .
+ '' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . ' ' .
+ '' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . ' ' .
+ '' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . ' ' .
+ ' '
+) );
+
+$help = '' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '
' .
+ '' .
+ '' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . ' ';
+
+if ( is_multisite() )
+ $help .= '' . __( 'Remove allows you to remove a user from your site. It does not delete their posts. You can also remove multiple users at once by using Bulk Actions.' ) . ' ';
+else
+ $help .= '' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts. You can also delete multiple users at once by using Bulk Actions.' ) . ' ';
+
+$help .= ' ';
+
+get_current_screen()->add_help_tab( array(
+ 'id' => 'actions',
+ 'title' => __('Actions'),
+ 'content' => $help,
+) );
+unset( $help );
+
+get_current_screen()->set_help_sidebar(
+ '' . __('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 = '';
}
-switch ($doaction) {
+$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']);
}
@@ -71,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');
@@ -79,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;
@@ -112,6 +188,8 @@ case 'dodelete':
break;
case 'delete':
+ if ( is_multisite() )
+ wp_die( __('User deletion is not allowed from this screen.') );
check_admin_referer('bulk-users');
@@ -120,13 +198,15 @@ 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']));
+ $userids = array( intval( $_REQUEST['user'] ) );
else
- $userids = $_REQUEST['users'];
+ $userids = array_map( 'intval', (array) $_REQUEST['users'] );
+
+ add_action( 'admin_head', 'delete_users_add_js' );
include ('admin-header.php');
?>
@@ -137,38 +217,37 @@ case 'delete':
-
+
+
+
+
ID ) {
- echo "" . sprintf(__('ID #%1s: %2s The current user will not be deleted. '), $id, $user->user_login) . " \n";
+ echo "" . sprintf(__('ID #%1$s: %2$s The current user will not be deleted. '), $id, $user->user_login) . " \n";
} else {
- echo " " . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . " \n";
- $go_delete = true;
+ echo " " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . " \n";
+ $go_delete++;
}
}
- $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
- $user_dropdown = '';
- foreach ( (array) $all_logins as $login )
- if ( $login->ID == $current_user->ID || !in_array($login->ID, $userids) )
- $user_dropdown .= "ID}\">{$login->user_login} ";
- $user_dropdown .= ' ';
?>
-
+
-
+
@@ -178,6 +257,100 @@ case 'delete':
break;
+case 'doremove':
+ check_admin_referer('remove-users');
+
+ if ( ! is_multisite() )
+ wp_die( __( 'You can’t remove users.' ) );
+
+ if ( empty($_REQUEST['users']) ) {
+ wp_redirect($redirect);
+ exit;
+ }
+
+ if ( ! current_user_can( 'remove_users' ) )
+ wp_die( __( 'You can’t remove users.' ) );
+
+ $userids = $_REQUEST['users'];
+
+ $update = 'remove';
+ foreach ( $userids as $id ) {
+ $id = (int) $id;
+ if ( $id == $current_user->ID && !is_super_admin() ) {
+ $update = 'err_admin_remove';
+ continue;
+ }
+ if ( !current_user_can('remove_user', $id) ) {
+ $update = 'err_admin_remove';
+ continue;
+ }
+ remove_user_from_blog($id, $blog_id);
+ }
+
+ $redirect = add_query_arg( array('update' => $update), $redirect);
+ wp_redirect($redirect);
+ exit;
+
+break;
+
+case 'remove':
+
+ check_admin_referer('bulk-users');
+
+ if ( ! is_multisite() )
+ wp_die( __( 'You can’t remove users.' ) );
+
+ if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+ wp_redirect($redirect);
+ exit();
+ }
+
+ if ( !current_user_can('remove_users') )
+ $error = new WP_Error('edit_users', __('You can’t remove users.'));
+
+ if ( empty($_REQUEST['users']) )
+ $userids = array(intval($_REQUEST['user']));
+ else
+ $userids = $_REQUEST['users'];
+
+ include ('admin-header.php');
+?>
+
+prepare_items();
+ $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+ if ( $pagenum > $total_pages && $total_pages > 0 ) {
+ wp_redirect( add_query_arg( 'paged', $total_pages ) );
+ exit;
+ }
- // Query the users
- $wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
+ include('./admin-header.php');
$messages = array();
if ( isset($_GET['update']) ) :
@@ -202,21 +373,34 @@ default:
case 'del':
case 'del_many':
$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
- $messages[] = '' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '
';
+ $messages[] = '' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '
';
break;
case 'add':
- $messages[] = '' . __('New user created.') . '
';
+ if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+ $messages[] = '' . 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.' ) . '
';
+ }
break;
case 'promote':
- $messages[] = '' . __('Changed roles.') . '
';
+ $messages[] = '' . __('Changed roles.') . '
';
break;
case 'err_admin_role':
- $messages[] = '' . __("The current user's role must have user editing capabilities.") . '
';
- $messages[] = '' . __('Other user roles have been changed.') . '
';
+ $messages[] = '' . __('The current user’s role must have user editing capabilities.') . '
';
+ $messages[] = '' . __('Other user roles have been changed.') . '
';
break;
case 'err_admin_del':
- $messages[] = '' . __("You can't delete the current user.") . '
';
- $messages[] = '' . __('Other users have been deleted.') . '
';
+ $messages[] = '' . __('You can’t delete the current user.') . '
';
+ $messages[] = '' . __('Other users have been deleted.') . '
';
+ break;
+ case 'remove':
+ $messages[] = '' . __('User removed from this site.') . '
';
+ break;
+ case 'err_admin_remove':
+ $messages[] = '' . __("You can't remove the current user.") . '
';
+ $messages[] = '' . __('Other users have been removed.') . '
';
break;
}
endif; ?>
@@ -239,164 +423,33 @@ if ( ! empty($messages) ) {
-
' . __('Search results for “%s”') . '', wp_specialchars( get_search_query() ) ); ?>
-
-
-
+search_box( __( 'Search Users' ), 'user' ); ?>
-
-
- :
-
-
-
+display(); ?>
-
-
-
-results_are_paged() ) : ?>
-
page_links(); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- search_errors ) ) : ?>
-
-
- search_errors->get_error_messages() as $message )
- echo "$message ";
- ?>
-
-
-
-
-
-get_results() ) : ?>
-
- is_search() ) : ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-get_results() as $userid ) {
- $user_object = new WP_User($userid);
- $roles = $user_object->roles;
- $role = array_shift($roles);
-
- $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
- echo "\n\t" . user_row($user_object, $style, $role);
-}
-?>
-
-
-
-
-
-results_are_paged() ) : ?>
-
page_links(); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
- $var = 'new_' . $var;
- $$var = isset($_REQUEST[$formpost]) ? attribute_escape(stripslashes($_REQUEST[$formpost])) : '';
- }
- unset($name);
-?>
-
-
+include('./admin-footer.php');