X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/53f4633144ed68c8b8fb5861f992b5489894a940..refs/tags/wordpress-4.5:/wp-admin/users.php diff --git a/wp-admin/users.php b/wp-admin/users.php index df7648b7..789f34c9 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -1,16 +1,22 @@ ' . __( '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(); @@ -63,6 +69,12 @@ get_current_screen()->set_help_sidebar( '

' . __('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,18 +121,23 @@ 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?' ), 403 ); + 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)); @@ -205,7 +211,16 @@ 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' ); ?> @@ -233,39 +248,51 @@ case 'delete': foreach ( $userids as $id ) { $user = get_userdata( $id ); if ( $id == $current_user->ID ) { + /* translators: 1: user id, 2: user login */ echo "
  • " . sprintf(__('ID #%1$s: %2$s The current user will not be deleted.'), $id, $user->user_login) . "
    • \n"; } else { + /* translators: 1: user id, 2: user login */ echo "
  • " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "
    • \n"; $go_delete++; } } ?> - - -

    - -

    - -
    - + + + +

    + +

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

    @@ -351,10 +378,13 @@ case 'remove': $id = (int) $id; $user = get_userdata( $id ); if ( $id == $current_user->ID && !is_super_admin() ) { + /* translators: 1: user id, 2: user login */ echo "
  • " . sprintf(__('ID #%1$s: %2$s The current user will not be removed.'), $id, $user->user_login) . "
    • \n"; } elseif ( !current_user_can('remove_user', $id) ) { - echo "
  • " . sprintf(__('ID #%1$s: %2$s You don\'t have permission to remove this user.'), $id, $user->user_login) . "
    • \n"; + /* translators: 1: user id, 2: user login */ + echo "
  • " . sprintf(__('ID #%1$s: %2$s You don’t have permission to remove this user.'), $id, $user->user_login) . "
    • \n"; } else { + /* translators: 1: user id, 2: user login */ echo "
  • " . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "
    • \n"; $go_remove = true; } @@ -363,7 +393,7 @@ case 'remove': - +

    @@ -404,6 +434,7 @@ default: break; case 'add': if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) { + /* translators: %s: edit page url */ $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 ) ) ) ) . '

    '; @@ -453,13 +484,16 @@ if ( ! empty($messages) ) { - + - + ' . __('Search results for “%s”') . '', esc_html( $usersearch ) ); ?> +if ( strlen( $usersearch ) ) { + /* translators: %s: search keywords */ + printf( '' . __( 'Search results for “%s”' ) . '', esc_html( $usersearch ) ); +} +?> views(); ?>