X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/users.php diff --git a/wp-admin/users.php b/wp-admin/users.php index 6ea17657..27e264ca 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -7,17 +7,17 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'list_users' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 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 +43,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,15 +58,15 @@ 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') . '

    ' ); 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'])); + $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash( $_REQUEST['wp_http_referer'] ) ); $referer = ''; } else { $redirect = 'users.php'; @@ -86,6 +86,9 @@ jQuery(document).ready( function($) { $('input[name=delete_option]').one('change', function() { submit.prop('disabled', false); }); + $('#reassign_user').focus( function() { + $('#delete_option1').prop('checked', true).trigger('change'); + }); }); set_role($_REQUEST['new_role']); @@ -134,8 +137,6 @@ case 'promote': 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.') ); @@ -185,8 +186,6 @@ case 'dodelete': wp_redirect($redirect); exit(); -break; - case 'delete': if ( is_multisite() ) wp_die( __('User deletion is not allowed from this screen.') ); @@ -208,21 +207,26 @@ case 'delete': add_action( 'admin_head', 'delete_users_add_js' ); - include ('admin-header.php'); + include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
    +
    -

    -
    -

    -
    +
    +

    +
    -

    + + +

    + +

    + + -

    + +

    + +

    +
      • +
    • - ' . __( 'Attribute all posts to:' ) . ' '; + ' . __( 'Attribute all content to:' ) . ' '; wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?>
    + @@ -291,8 +309,6 @@ case 'doremove': wp_redirect($redirect); exit; -break; - case 'remove': check_admin_referer('bulk-users'); @@ -313,14 +329,13 @@ case 'remove': else $userids = $_REQUEST['users']; - include ('admin-header.php'); + include( ABSPATH . 'wp-admin/admin-header.php' ); ?> - +
    -

      @@ -339,6 +354,7 @@ case 'remove': } } ?> +
    @@ -354,7 +370,7 @@ break; default: if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); + wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ); exit; } @@ -365,7 +381,7 @@ default: exit; } - include('./admin-header.php'); + include( ABSPATH . 'wp-admin/admin-header.php' ); $messages = array(); if ( isset($_GET['update']) ) : @@ -373,34 +389,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' ), - esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), + $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; ?> @@ -422,7 +443,6 @@ if ( ! empty($messages) ) { } ?>
    -

    views(); ?> - + search_box( __( 'Search Users' ), 'user' ); ?> @@ -452,4 +472,4 @@ break; } // end of the $doaction switch -include('./admin-footer.php'); +include( ABSPATH . 'wp-admin/admin-footer.php' );