X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01..refs/tags/wordpress-4.1-scripts:/wp-admin/network/users.php?ds=sidebyside diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index fd50b218..86a4d74d 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -22,17 +22,17 @@ function confirm_delete_users( $users ) { return false; ?>
- + @@ -109,7 +112,6 @@ if ( isset( $_GET['action'] ) ) { wp_redirect( network_admin_url( 'users.php' ) ); } exit(); - break; case 'allusers': if ( !current_user_can( 'manage_network_users' ) ) @@ -121,8 +123,8 @@ if ( isset( $_GET['action'] ) ) { $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' ) ) @@ -135,29 +137,28 @@ if ( isset( $_GET['action'] ) ) { echo ''; 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; } } @@ -172,7 +173,6 @@ if ( isset( $_GET['action'] ) ) { wp_redirect( $location ); } exit(); - break; case 'dodelete': check_admin_referer( 'ms-users-delete' ); @@ -208,7 +208,6 @@ if ( isset( $_GET['action'] ) ) { wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) ); exit(); - break; } } @@ -241,7 +240,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '' . __('For more information:') . '
' . '' . __('Documentation on Network Users') . '
' . - '' . __('Support Forums') . '
' + '' . __('Support Forums') . '
' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); @@ -289,7 +288,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( search_box( __( 'Search Users' ), 'all-user' ); ?> -