Changeset 30020

Timestamp:

10/25/2014 01:51:36 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Users screen in network admin:

• Remove unused $key variables.
• Rename $val to $user_id for clarity.

props ipm-frommen.
fixes #30096.

File:

• trunk/src/wp-admin/network/users.php (modified) (5 diffs)

trunk/src/wp-admin/network/users.php

@@ -31 +31 @@
     $admin_out = '<option value="' . $current_user->ID . '">' . $current_user->user_login . '</option>';
 
-    foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
-        if ( $val != '' && $val != '0' ) {
-            $delete_user = get_userdata( $val );
+    foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
+        if ( $user_id != '' && $user_id != '0' ) {
+            $delete_user = get_userdata( $user_id );
 
             if ( ! current_user_can( 'delete_user', $delete_user->ID ) )
@@ -41 +41 @@
                 wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), $delete_user->user_login ) );
 
-            echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
-            $blogs = get_blogs_of_user( $val, true );
+            echo "<input type='hidden' name='user[]' value='{$user_id}'/>\n";
+            $blogs = get_blogs_of_user( $user_id, true );
 
             if ( !empty( $blogs ) ) {
@@ -52 +52 @@
                     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 = "<select name='blog[$user_id][$key]'>";
                         $user_list = '';
                         foreach ( $blog_users as $user ) {
@@ -124 +124 @@
                 $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':
@@ -140 +140 @@
 
                             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;
                         }