X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01..c81aba3d563f7459dc79140e4c5be67bcf506b92:/wp-admin/users.php diff --git a/wp-admin/users.php b/wp-admin/users.php index 2a28f74b..cec9747c 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -1,23 +1,29 @@ ' . __( 'Cheatin’ uh?' ) . '' . + '

' . __( 'You are not allowed to browse users.' ) . '

', + 403 + ); +} $wp_list_table = _get_list_table('WP_Users_List_Table'); $pagenum = $wp_list_table->get_pagenum(); $title = __('Users'); $parent_file = 'users.php'; -add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) ); +add_screen_option( 'per_page' ); // contextual help - choose Help on the top right of admin panel to preview this. get_current_screen()->add_help_tab( array( @@ -43,9 +49,9 @@ $help = '

' . __('Hovering over a row in the users list will display action li '

  • ' . __('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.' ) . '
    • '; + $help .= '
  • ' . __( 'Remove allows you to remove a user from your site. It does not delete their content. 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 .= '
  • ' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '
    • '; $help .= ''; @@ -58,11 +64,17 @@ unset( $help ); get_current_screen()->set_help_sidebar( '

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

    ' ); +get_current_screen()->set_screen_reader_content( array( + 'heading_views' => __( 'Filter users list' ), + 'heading_pagination' => __( 'Users list navigation' ), + 'heading_list' => __( 'Users list' ), +) ); + if ( empty($_REQUEST) ) { $referer = ''; } elseif ( isset($_REQUEST['wp_http_referer']) ) { @@ -75,25 +87,6 @@ if ( empty($_REQUEST) ) { $update = ''; -/** - * @since 3.5.0 - * @access private - */ -function delete_users_add_js() { ?> - -current_action() ) { /* Bulk Dropdown menu Role changes */ @@ -109,8 +102,16 @@ case 'promote': } $editable_roles = get_editable_roles(); - if ( empty( $editable_roles[$_REQUEST['new_role']] ) ) - wp_die(__('You can’t give users that role.')); + $role = false; + if ( ! empty( $_REQUEST['new_role2'] ) ) { + $role = $_REQUEST['new_role2']; + } elseif ( ! empty( $_REQUEST['new_role'] ) ) { + $role = $_REQUEST['new_role']; + } + + if ( ! $role || empty( $editable_roles[ $role ] ) ) { + wp_die( __( 'You can’t give users that role.' ) ); + } $userids = $_REQUEST['users']; $update = 'promote'; @@ -120,25 +121,28 @@ 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 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') + if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $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?')); + if ( is_multisite() && !is_user_member_of_blog( $id ) ) { + wp_die( + '

    ' . __( 'Cheatin’ uh?' ) . '

    ' . + '

    ' . __( 'One of the selected users is not a member of this site.' ) . '

    ', + 403 + ); + } $user = get_userdata( $id ); - $user->set_role($_REQUEST['new_role']); + $user->set_role( $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.') ); @@ -188,8 +192,6 @@ case 'dodelete': wp_redirect($redirect); exit(); -break; - case 'delete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -209,22 +211,37 @@ case 'delete': else $userids = array_map( 'intval', (array) $_REQUEST['users'] ); - add_action( 'admin_head', 'delete_users_add_js' ); + $users_have_content = false; + if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) { + $users_have_content = true; + } elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) { + $users_have_content = true; + } + + if ( $users_have_content ) { + add_action( 'admin_head', 'delete_users_add_js' ); + } include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
    +
    -

    +

    -
    -

    -
    +
    +

    +
    -

    + + +

    + +

    + + - -

    -
      -
      • -
    • - ' . __( 'Attribute all posts to:' ) . ' '; - wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>
      • -
    + + + + +

    + +

    + +
      +
      • +
    • + ' . __( 'Attribute all content to:' ) . ' '; + wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>
      • +
    + - +

    @@ -293,8 +328,6 @@ case 'doremove': wp_redirect($redirect); exit; -break; - case 'remove': check_admin_referer('bulk-users'); @@ -317,13 +350,19 @@ case 'remove': include( ABSPATH . 'wp-admin/admin-header.php' ); ?> - +
    -

    -

    +

    + + +

    + +

    + +
      +
    - +

    @@ -374,34 +414,39 @@ default: case 'del': case 'del_many': $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; - $messages[] = '

    ' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '

    '; + if ( 1 == $delete_count ) { + $message = __( 'User deleted.' ); + } else { + $message = _n( '%s user deleted.', '%s users deleted.', $delete_count ); + } + $messages[] = '

    ' . sprintf( $message, number_format_i18n( $delete_count ) ) . '

    '; break; case 'add': if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) { - $messages[] = '

    ' . sprintf( __( 'New user created. Edit user' ), + $messages[] = '

    ' . sprintf( __( 'New user created. Edit user' ), esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '

    '; } else { - $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.') . '

    '; + $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.') . '

    '; + $messages[] = '

    ' . __("You can't remove the current user.") . '

    '; + $messages[] = '

    ' . __('Other users have been removed.') . '

    '; break; } endif; ?> @@ -423,22 +468,22 @@ if ( ! empty($messages) ) { } ?>
    -

    +

    - + - + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> -

    + views(); ?> - + search_box( __( 'Search Users' ), 'user' ); ?>