--- a/wp/wp-admin/network/users.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/network/users.php Tue Jun 09 03:35:32 2015 +0200
@@ -14,85 +14,120 @@
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
function confirm_delete_users( $users ) {
$current_user = wp_get_current_user();
- if ( !is_array( $users ) )
+ if ( ! is_array( $users ) || empty( $users ) ) {
return false;
-
- screen_icon();
+ }
?>
<h2><?php esc_html_e( 'Users' ); ?></h2>
- <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
+
+ <?php if ( 1 == count( $users ) ) : ?>
+ <p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
+ <?php else : ?>
+ <p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+ <?php endif; ?>
+
<form action="users.php?action=dodelete" method="post">
<input type="hidden" name="dodelete" />
<?php
wp_nonce_field( 'ms-users-delete' );
$site_admins = get_super_admins();
- $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
+ $admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+ <table class="form-table">
+ <?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
+ if ( $user_id != '' && $user_id != '0' ) {
+ $delete_user = get_userdata( $user_id );
- foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
- if ( $val != '' && $val != '0' ) {
- $delete_user = get_userdata( $val );
-
- if ( ! current_user_can( 'delete_user', $delete_user->ID ) )
+ if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+ }
- if ( in_array( $delete_user->user_login, $site_admins ) )
- wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), $delete_user->user_login ) );
+ if ( in_array( $delete_user->user_login, $site_admins ) ) {
+ wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+ }
+ ?>
+ <tr>
+ <th scope="row"><?php echo $delete_user->user_login; ?>
+ <?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
+ </th>
+ <?php $blogs = get_blogs_of_user( $user_id, true );
- echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
- $blogs = get_blogs_of_user( $val, true );
-
- if ( !empty( $blogs ) ) {
+ if ( ! empty( $blogs ) ) {
?>
- <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
+ <td><fieldset><p><legend><?php printf(
+ /* translators: user login */
+ __( 'What should be done with content owned by %s?' ),
+ '<em>' . $delete_user->user_login . '</em>'
+ ); ?></legend></p>
<?php
foreach ( (array) $blogs as $key => $details ) {
- $blog_users = get_users( array( 'blog_id' => $details->userblog_id ) );
+ $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
- $user_dropdown = "<select name='blog[$val][{$key}]'>";
+ $user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+ $user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
$user_list = '';
foreach ( $blog_users as $user ) {
- if ( ! in_array( $user->ID, $allusers ) )
+ if ( ! in_array( $user->ID, $allusers ) ) {
$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
+ }
}
- if ( '' == $user_list )
+ if ( '' == $user_list ) {
$user_list = $admin_out;
+ }
$user_dropdown .= $user_list;
$user_dropdown .= "</select>\n";
?>
<ul style="list-style:none;">
<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
- <?php _e( 'Delete all posts.' ); ?></label></li>
+ <?php _e( 'Delete all content.' ); ?></label></li>
<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
- <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
+ <?php echo __( 'Attribute all content to:' ) . "</label>\n" . $user_dropdown; ?></li>
</ul>
<?php
}
}
- echo "</fieldset>";
- }
+ echo "</fieldset></td></tr>";
+ } else {
+ ?>
+ <td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
+ <?php } ?>
+ </tr>
+ <?php
}
}
+ ?>
+ </table>
+ <?php
+ /** This action is documented in wp-admin/users.php */
+ do_action( 'delete_user_form', $current_user );
+
+ if ( 1 == count( $users ) ) : ?>
+ <p><?php _e( 'Once you hit “Confirm Deletion”, the user will be permanently removed.' ); ?></p>
+ <?php else : ?>
+ <p><?php _e( 'Once you hit “Confirm Deletion”, these users will be permanently removed.' ); ?></p>
+ <?php endif;
+
submit_button( __('Confirm Deletion'), 'delete' );
?>
</form>
- <?php
+ <?php
return true;
}
if ( isset( $_GET['action'] ) ) {
- do_action( 'wpmuadminedit' , '' );
+ /** This action is documented in wp-admin/network/edit.php */
+ do_action( 'wpmuadminedit' );
switch ( $_GET['action'] ) {
case 'deleteuser':
if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
check_admin_referer( 'deleteuser' );
@@ -105,16 +140,15 @@
echo '<div class="wrap">';
confirm_delete_users( $_POST['allusers'] );
echo '</div>';
- require_once( ABSPATH . 'wp-admin/admin-footer.php' );
- } else {
+ require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+ } else {
wp_redirect( network_admin_url( 'users.php' ) );
}
exit();
- break;
case 'allusers':
if ( !current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
check_admin_referer( 'bulk-users-network' );
@@ -122,12 +156,12 @@
$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
$userfunction = '';
- foreach ( (array) $_POST['allusers'] as $key => $val ) {
- if ( !empty( $val ) ) {
+ foreach ( (array) $_POST['allusers'] as $user_id ) {
+ if ( !empty( $user_id ) ) {
switch ( $doaction ) {
case 'delete':
if ( ! current_user_can( 'delete_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -136,29 +170,28 @@
echo '</div>';
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
exit();
- break;
case 'spam':
- $user = get_userdata( $val );
+ $user = get_userdata( $user_id );
if ( is_super_admin( $user->ID ) )
wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
$userfunction = 'all_spam';
- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details ) {
+ $blogs = get_blogs_of_user( $user_id, true );
+ foreach ( (array) $blogs as $details ) {
if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
update_blog_status( $details->userblog_id, 'spam', '1' );
}
- update_user_status( $val, 'spam', '1' );
+ update_user_status( $user_id, 'spam', '1' );
break;
case 'notspam':
$userfunction = 'all_notspam';
- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details )
+ $blogs = get_blogs_of_user( $user_id, true );
+ foreach ( (array) $blogs as $details )
update_blog_status( $details->userblog_id, 'spam', '0' );
- update_user_status( $val, 'spam', '0' );
+ update_user_status( $user_id, 'spam', '0' );
break;
}
}
@@ -173,12 +206,11 @@
wp_redirect( $location );
}
exit();
- break;
case 'dodelete':
check_admin_referer( 'ms-users-delete' );
if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
+ wp_die( __( 'You do not have permission to access this page.' ), 403 );
if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
foreach ( $_POST['blog'] as $id => $users ) {
@@ -209,7 +241,6 @@
wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
exit();
- break;
}
}
@@ -225,14 +256,14 @@
$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' );
get_current_screen()->add_help_tab( array(
'id' => 'overview',
'title' => __('Overview'),
'content' =>
'<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
- '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
+ '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
'<p>' . __('You can also go to the user’s profile page by clicking on the individual username.') . '</p>' .
'<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' .
'<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
@@ -241,15 +272,15 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+ '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
+ '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
?>
- <div id="message" class="updated"><p>
+ <div id="message" class="updated notice is-dismissible"><p>
<?php
switch ( $_REQUEST['action'] ) {
case 'delete':
@@ -274,7 +305,6 @@
}
?>
<div class="wrap">
- <?php screen_icon(); ?>
<h2><?php esc_html_e( 'Users' );
if ( current_user_can( 'create_users') ) : ?>
<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
@@ -287,11 +317,11 @@
<?php $wp_list_table->views(); ?>
- <form action="" method="get" class="search-form">
+ <form method="get" class="search-form">
<?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
</form>
- <form id="form-user-list" action='users.php?action=allusers' method='post'>
+ <form id="form-user-list" action="users.php?action=allusers" method="post">
<?php $wp_list_table->display(); ?>
</form>
</div>