Changeset 13941 for trunk/wp-admin/ms-edit.php

Timestamp:

04/02/2010 06:46:07 AM (16 years ago)

Author:

nacin

Message:

Move add/remove super admin out of bulk edit and into user-edit.php. Introduce grant_super_admin() and revoke_super_admin(). Link to profile.php in ms-users user row for current user. Add defensive check by forcing IS_PROFILE_PAGE on user-edit if trying to edit your own user_id. see #12460

File:

• trunk/wp-admin/ms-edit.php (modified) (2 diffs)

trunk/wp-admin/ms-edit.php

@@ -525 +525 @@
 
             foreach ( (array) $_POST['allusers'] as $key => $val ) {
-                if ( $val != '' || $val != '0' ) {
+                if ( !empty( $val ) ) {
                     switch ( $doaction ) {
                         case 'delete':
@@ -540 +540 @@
                         case 'superadmin':
                             $userfunction = 'add_superadmin';
-                            $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
-                            $user = new WP_User( $val );
-                            if ( ! in_array( $user->user_login, $super_admins ) ) {
-                                if ( $current_site->blog_id )
-                                    add_user_to_blog( $current_site->blog_id, $user->ID, 'administrator' );
-
-                                $super_admins[] = $user->user_login;
-                                update_site_option( 'site_admins' , $super_admins );
-                            }
+                            grant_super_admin( $val );
                         break;
 
                         case 'notsuperadmin':
                             $userfunction = 'remove_superadmin';
-                            $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-                            $admin_email = get_site_option( 'admin_email' );
-                            
-                            $user = new WP_User( $val );
-                            if ( $user->ID != $current_user->ID || $user->user_email != $admin_email ) {
-                                foreach ( $super_admins as $key => $username ) {
-                                    if ( $username == $user->user_login ) {
-                                        unset( $super_admins[$key] );
-                                        break;
-                                    }
-                                }
-                            }
-
-                            update_site_option( 'site_admins' , $super_admins );
+                            revoke_super_admin( $val );
                         break;