WordPress 3.5.1

[autoinstalls/wordpress.git] / wp-admin / users.php

diff --git a/wp-admin/users.php b/wp-admin/users.php
index f26255fca65dd35677e331dfcd2193c18b2e3457..6ea17657c15d4f3fd748cceafb7238c8211c3b5f 100644 (file)
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -75,6 +75,22 @@ if ( empty($_REQUEST) ) {
 
 $update = '';
 
 
 $update = '';
 

+/**
+ * @since 3.5.0
+ * @access private
+ */
+function delete_users_add_js() { ?>
+<script>
+jQuery(document).ready( function($) {
+       var submit = $('#submit').prop('disabled', true);
+       $('input[name=delete_option]').one('change', function() {
+               submit.prop('disabled', false);
+       });
+});
+</script>
+<?php
+}
+

 switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */
 switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */


@@ -111,7 +127,7 @@ case 'promote':
                if ( is_multisite() && !is_user_member_of_blog( $id ) )
                        wp_die(__('Cheatin&#8217; uh?'));
 
                if ( is_multisite() && !is_user_member_of_blog( $id ) )
                        wp_die(__('Cheatin&#8217; uh?'));
 

-               $user = new WP_User($id);
+               $user = get_userdata( $id );

                $user->set_role($_REQUEST['new_role']);
        }
 
                $user->set_role($_REQUEST['new_role']);
        }
 


@@ -131,16 +147,22 @@ case 'dodelete':
                exit();
        }
 
                exit();
        }
 

+       $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( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
+               wp_redirect( $url );
+               exit;
+       }
+

        if ( ! current_user_can( 'delete_users' ) )
                wp_die(__('You can&#8217;t delete users.'));
 
        if ( ! current_user_can( 'delete_users' ) )
                wp_die(__('You can&#8217;t delete users.'));
 

-       $userids = $_REQUEST['users'];

        $update = 'del';
        $delete_count = 0;
 
        $update = 'del';
        $delete_count = 0;
 

-       foreach ( (array) $userids as $id) {
-               $id = (int) $id;
-
+       foreach ( $userids as $id ) {

                if ( ! current_user_can( 'delete_user', $id ) )
                        wp_die(__( 'You can&#8217;t delete that user.' ) );
 
                if ( ! current_user_can( 'delete_user', $id ) )
                        wp_die(__( 'You can&#8217;t delete that user.' ) );
 


@@ -150,12 +172,10 @@ case 'dodelete':
                }
                switch ( $_REQUEST['delete_option'] ) {
                case 'delete':
                }
                switch ( $_REQUEST['delete_option'] ) {
                case 'delete':

-                       if ( current_user_can('delete_user', $id) )
-                               wp_delete_user($id);
+                       wp_delete_user( $id );

                        break;
                case 'reassign':
                        break;
                case 'reassign':

-                       if ( current_user_can('delete_user', $id) )
-                               wp_delete_user($id, $_REQUEST['reassign_user']);
+                       wp_delete_user( $id, $_REQUEST['reassign_user'] );

                        break;
                }
                ++$delete_count;
                        break;
                }
                ++$delete_count;


@@ -182,9 +202,11 @@ case 'delete':
                $errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
 
        if ( empty($_REQUEST['users']) )
                $errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
 
        if ( empty($_REQUEST['users']) )

-               $userids = array(intval($_REQUEST['user']));
+               $userids = array( intval( $_REQUEST['user'] ) );

        else
        else

-               $userids = (array) $_REQUEST['users'];
+               $userids = array_map( 'intval', (array) $_REQUEST['users'] );
+
+       add_action( 'admin_head', 'delete_users_add_js' );

 
        include ('admin-header.php');
 ?>
 
        include ('admin-header.php');
 ?>


@@ -195,29 +217,33 @@ case 'delete':
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>

+<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+<div class="error">
+       <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+</div>
+<?php endif; ?>

 <p><?php echo _n( 'You have specified this user for deletion:', 'You have specified these users for deletion:', count( $userids ) ); ?></p>
 <ul>
 <?php
        $go_delete = 0;
        foreach ( $userids as $id ) {
 <p><?php echo _n( 'You have specified this user for deletion:', 'You have specified these users for deletion:', count( $userids ) ); ?></p>
 <ul>
 <?php
        $go_delete = 0;
        foreach ( $userids as $id ) {

-               $id = (int) $id;
-               $user = new WP_User($id);
+               $user = get_userdata( $id );

                if ( $id == $current_user->ID ) {
                if ( $id == $current_user->ID ) {

-                       echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
+                       echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";

                } else {
                } else {

-                       echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
+                       echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";

                        $go_delete++;
                }
        }
        ?>
        </ul>
 <?php if ( $go_delete ) : ?>
                        $go_delete++;
                }
        }
        ?>
        </ul>
 <?php if ( $go_delete ) : ?>

-       <fieldset><p><legend><?php echo _n( 'What should be done with posts and links owned by this user?', 'What should be done with posts and links owned by these users?', $go_delete ); ?></legend></p>
+       <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>

        <ul style="list-style:none;">
        <ul style="list-style:none;">

-               <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
-               <?php _e('Delete all posts and links.'); ?></label></li>
+               <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
+               <?php _e('Delete all posts.'); ?></label></li>

                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />

-               <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:').'</label>';
+               <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';

                wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
        </ul></fieldset>
        <input type="hidden" name="action" value="dodelete" />
                wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
        </ul></fieldset>
        <input type="hidden" name="action" value="dodelete" />


@@ -302,13 +328,13 @@ case 'remove':
        $go_remove = false;
        foreach ( $userids as $id ) {
                $id = (int) $id;
        $go_remove = false;
        foreach ( $userids as $id ) {
                $id = (int) $id;

-               $user = new WP_User($id);
+               $user = get_userdata( $id );

                if ( $id == $current_user->ID && !is_super_admin() ) {
                if ( $id == $current_user->ID && !is_super_admin() ) {

-                       echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
+                       echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";

                } elseif ( !current_user_can('remove_user', $id) ) {
                } elseif ( !current_user_can('remove_user', $id) ) {

-                       echo "<li>" . sprintf(__('ID #%1s: %2s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+                       echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";

                } else {
                } else {

-                       echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
+                       echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";

                        $go_remove = true;
                }
        }
                        $go_remove = true;
                }
        }