X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..2376fb745f4ae8c6bd2353127524e0b28005143d:/wp-admin/users.php diff --git a/wp-admin/users.php b/wp-admin/users.php index 61fd687d..aeaabc3b 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -7,17 +7,28 @@ */ /** 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') ) +if ( !current_user_can('list_users') ) wp_die(__('Cheatin’ uh?')); $title = __('Users'); $parent_file = 'users.php'; +// contextual help - choose Help on the top right of admin panel to preview this. +add_contextual_help($current_screen, + '

' . __('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 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.') . '

' . + '

' . __('For more information:') . '

' . + '

' . __('Documentation on Authors and Users') . '

' . + '

' . __('Roles and Capabilities Descriptions') . '

' . + '

' . __('Support Forums') . '

' +); + $update = $doaction = ''; if ( isset($_REQUEST['action']) ) $doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2']; @@ -28,10 +39,10 @@ if ( empty($doaction) ) { } 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 = ''; @@ -39,28 +50,36 @@ if ( empty($_REQUEST) ) { switch ($doaction) { +/* Bulk Dropdown menu Role changes */ case 'promote': check_admin_referer('bulk-users'); - if (empty($_REQUEST['users'])) { + 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')) { + // 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; } + // 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']); } @@ -71,6 +90,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,7 +100,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']; @@ -87,19 +108,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 ( ! 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); + 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; @@ -112,6 +137,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,8 +147,8 @@ 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'])); @@ -147,15 +174,21 @@ case 'delete': if ( $id == $current_user->ID ) { echo "
  • " . sprintf(__('ID #%1s: %2s The current user will not be deleted.'), $id, $user->user_login) . "
    • \n"; } else { - echo "
  • " . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "
    • \n"; + echo "
  • " . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "
    • \n"; $go_delete = true; } } - $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login"); + // @todo Delete is always for !is_multisite(). Use API. + if ( !is_multisite() ) { + $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login"); + } else { + // WPMU only searches users of current blog + $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities' ORDER BY user_login"); + } $user_dropdown = ''; ?> @@ -168,7 +201,7 @@ case 'delete': '.__('Attribute all posts and links to:')." $user_dropdown"; ?> -

    +

    @@ -178,6 +211,94 @@ case 'delete': break; +case 'doremove': + check_admin_referer('remove-users'); + + if ( empty($_REQUEST['users']) ) { + wp_redirect($redirect); + exit; + } + + if ( !current_user_can('remove_users') ) + 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 ( 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'); +?> +
    + + + +
    + +

    +

    +
    +
    +get_results()); + + // Query the users for this page + cache_users($wp_user_search->get_results()); + $messages = array(); if ( isset($_GET['update']) ) : switch($_GET['update']) { 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('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '

    '; break; case 'add': - $messages[] = '

    ' . __('New user created.') . '

    '; + $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,32 +371,24 @@ if ( ! empty($messages) ) {
    -

    ' . __('Search results for “%s”') . '', wp_specialchars( get_search_query() ) ); ?> +

    ' . __('Search results for “%s”') . '', esc_html( $_GET['usersearch'] ) ); ?>

      meta_value); - foreach ( (array) $b_roles as $b_role => $val ) { - if ( !isset($avail_roles[$b_role]) ) - $avail_roles[$b_role] = 0; - $avail_roles[$b_role]++; - } -} +$users_of_blog = count_users(); +$total_users = $users_of_blog['total_users']; +$avail_roles =& $users_of_blog['avail_roles']; unset($users_of_blog); $current_role = false; $class = empty($role) ? ' class="current"' : ''; -$role_links[] = "
    • " . sprintf( __ngettext( 'All (%s)', 'All (%s)', $total_users ), number_format_i18n( $total_users ) ) . ''; +$role_links = array(); +$role_links[] = "
    • " . 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; @@ -276,8 +400,9 @@ foreach ( $wp_roles->get_names() as $this_role => $name ) { $class = ' class="current"'; } - $name = translate_with_context($name); - $name = sprintf( _c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$this_role] ); + $name = translate_user_role( $name ); + /* translators: User role name with count */ + $name = sprintf( __('%1$s (%2$s)'), $name, $avail_roles[$this_role] ); $role_links[] = "
    • $name"; } echo implode( " |
      • \n", $role_links) . ''; @@ -289,9 +414,9 @@ unset($role_links);

      - - - + + +

      @@ -305,11 +430,15 @@ unset($role_links);
      - - - + + +
      @@ -355,8 +484,11 @@ foreach ( $wp_user_search->get_results() as $userid ) { $roles = $user_object->roles; $role = array_shift($roles); + if ( is_multisite() && empty( $role ) ) + continue; + $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"'; - echo "\n\t" . user_row($user_object, $style, $role); + echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] ); } ?> @@ -371,9 +503,12 @@ foreach ( $wp_user_search->get_results() as $userid ) {
      - + + + +

      @@ -385,11 +520,13 @@ foreach ( $wp_user_search->get_results() as $userid ) {
    '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])) : ''; + $$var = isset($_REQUEST[$formpost]) ? esc_attr(stripslashes($_REQUEST[$formpost])) : ''; } unset($name); +} ?>
    @@ -398,5 +535,5 @@ break; } // end of the $doaction switch -include('admin-footer.php'); +include('./admin-footer.php'); ?>