Changeset 13941 for trunk/wp-admin/ms-users.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-users.php (modified) (5 diffs)

trunk/wp-admin/ms-users.php

@@ -34 +34 @@
             case 'add':
                 _e( 'User added.' );
-            break;
-            case 'add_superadmin':
-                _e( 'Network admin added.' );
-            break;
-            case 'remove_superadmin':
-                _e( 'Network admin removed.' );
             break;
         }
@@ -129 +123 @@
                     <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
                     <option value="delete"><?php _e( 'Delete' ); ?></option>
-                    <option value="spam"><?php _e( 'Mark as Spammers' ); ?></option>
+                    <option value="spam"><?php _e( 'Mark as Spam' ); ?></option>
                     <option value="notspam"><?php _e( 'Not Spam' ); ?></option>
-                    <option value="superadmin"><?php _e( 'Add Super Admins' ); ?></option>
-                    <option value="notsuperadmin"><?php _e( 'Remove Super Admins' ); ?></option>
                 </select>
                 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -228 +220 @@
                             case 'login':
                                 $avatar = get_avatar( $user['user_email'], 32 );
+                                $edit_link = ( $current_user->ID == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
                                 ?>
                                 <td class="username column-username">
-                                    <?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( 'user-edit.php?user_id=' . $user['ID'] ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
+                                    <?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
                                     if ( in_array( $user['user_login'], $super_admins ) )
                                         echo ' - ' . __( 'Super admin' );
@@ -236 +229 @@
                                     <br/>
                                     <div class="row-actions">
-                                        <span class="edit"><a href="<?php echo esc_url( admin_url( 'user-edit.php?user_id=' . $user['ID'] ) ); ?>"><?php _e( 'Edit'); ?></a></span>
+                                        <span class="edit"><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>"><?php _e( 'Edit' ); ?></a></span>
                                         <?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?>
                                         | <span class="delete"><a href="<?php echo $delete  = esc_url( admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
@@ -324 +317 @@
                     <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option>
                     <option value="delete"><?php _e( 'Delete' ); ?></option>
-                    <option value="spam"><?php _e( 'Mark as Spammers' ); ?></option>
+                    <option value="spam"><?php _e( 'Mark as Spam' ); ?></option>
                     <option value="notspam"><?php _e( 'Not Spam' ); ?></option>
-                    <option value="superadmin"><?php _e( 'Add Super Admins' ); ?></option>
-                    <option value="notsuperadmin"><?php _e( 'Remove Super Admins' ); ?></option>
                 </select>
                 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction2" id="doaction2" class="button-secondary action" />