Changeset 13419

Timestamp:

02/25/2010 10:11:54 PM (15 years ago)

Author:

wpmuguru

Message:

move super admin list maintenance from ms-options to ms-users, See #11644

Location:

trunk/wp-admin

Files:

• ms-edit.php (modified) (2 diffs)
• ms-options.php (modified) (1 diff)
• ms-users.php (modified) (4 diffs)

trunk/wp-admin/ms-edit.php

@@ -115 +115 @@
         }
 
-        $site_admins = explode( ' ', str_replace( ",", " ", $_POST['site_admins'] ) );
-        if ( is_array( $site_admins ) ) {
-            $mainblog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
-            if ( $mainblog_id ) {
-                reset( $site_admins );
-                foreach ( (array) $site_admins as $site_admin ) {
-                    $uid = get_user_by('login', $site_admin);
-                    if ( $uid )
-                        add_user_to_blog( $mainblog_id, $uid->ID, 'administrator' );
-                }
-            }
-            update_site_option( 'site_admins' , $site_admins );
-        }
-
         // Update more options here
         do_action( 'update_wpmu_options' );
@@ -493 +479 @@
 
             wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) );
+        } elseif ( isset( $_POST[ 'add_superadmin' ] ) ) {
+            $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+            $mainblog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
+            foreach ( (array) $_POST['allusers'] as $key => $val ) {
+                if ( $val == '' || $val == '0' )
+                    continue;
+                $user = new WP_User( $val );
+                if ( in_array( $user->user_login, $super_admins ) )
+                    continue;
+                if ( $mainblog_id )
+                    add_user_to_blog( $mainblog_id, $user->ID, 'administrator' );
+                $super_admins[] = $user->user_login;
+            }
+            update_site_option( 'site_admins' , $super_admins );
+
+            wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'add_superadmin' ), $_SERVER['HTTP_REFERER'] ) );
+        } elseif ( isset( $_POST[ 'remove_superadmin' ] ) ) {
+            $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+            foreach ( (array) $_POST['allusers'] as $key => $val ) {
+                if ( $val == '' || $val == '0' )
+                    continue;
+                $user = new WP_User( $val );
+                foreach ( $super_admins as $key => $username ) {
+                    if ( $username == $user->user_login ) {
+                        unset( $super_admins[ $key ] );
+                        break;
+                    }
+                }
+            }
+            update_site_option( 'site_admins' , $super_admins );
+
+            wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'remove_superadmin' ), $_SERVER['HTTP_REFERER'] ) );
         } else {
             foreach ( (array) $_POST['allusers'] as $key => $val ) {

trunk/wp-admin/ms-options.php

@@ -235 +235 @@
                 <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' )
                     echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>
-            </tr>
-        </table>
-
-        <h3><?php _e('Administration Settings') ?></h3>
-        <table class="form-table">
-            <tr valign="top">
-                <th scope="row"><?php _e('Network Admins') ?></th>
-                <td>
-                    <input name="site_admins" type="text" id="site_admins" style="width: 95%" value="<?php echo esc_attr( implode(' ', get_site_option( 'site_admins', array( 'admin' ) ) ) ) ?>" size="45" />
-                    <br />
-                    <?php _e('These users may login to the main site and administer the network. Space separated list of usernames.') ?>
-                </td>
             </tr>
         </table>

trunk/wp-admin/ms-users.php

@@ -34 +34 @@
             case 'add':
                 _e('User added !');
+            break;
+            case 'add_superadmin':
+                _e('Super admin added !');
+            break;
+            case 'remove_superadmin':
+                _e('Super admin removed !');
             break;
         }
@@ -120 +126 @@
                 <input type="submit" value="<?php esc_attr_e('Mark as Spammers') ?>" name="alluser_spam" class="button-secondary" />
                 <input type="submit" value="<?php esc_attr_e('Not Spam') ?>" name="alluser_notspam" class="button-secondary" />
+                <input type="submit" value="<?php esc_attr_e('Add to Super Admin list') ?>" name="add_superadmin" class="button-secondary" />
+                <input type="submit" value="<?php esc_attr_e('Remove from Super Admin list') ?>" name="remove_superadmin" class="button-secondary" />
                 <?php wp_nonce_field( 'allusers' ); ?>
                 <br class="clear" />
@@ -158 +166 @@
             <?php if ($user_list) {
                 $class = '';
+                $super_admins = get_site_option( 'site_admins' );
                 foreach ( (array) $user_list as $user) {
                     $class = ('alternate' == $class) ? '' : 'alternate';
@@ -186 +195 @@
                                 ?>
                                 <td class="username column-username">
-                                    <?php echo $avatar; ?><strong><a href="<?php echo $edit; ?>" class="edit"><?php echo stripslashes($user['user_login']); ?></a></strong>
+                                    <?php echo $avatar; ?><strong><a href="<?php echo $edit; ?>" class="edit"><?php echo stripslashes($user['user_login']); ?></a><?php
+                                if ( in_array( $user[ 'user_login' ], $super_admins ) ) 
+                                    echo ' - ' . __( 'Super admin' );
+?></strong>
                                     <br/>
                                     <div class="row-actions">