Changeset 14176

Timestamp:

04/21/2010 05:43:53 PM (14 years ago)

Author:

ryan

Message:

Separate user deletion and removal. Add promote_users cap so that multisite Admins (not supes) can promote. see #13074

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/users.php (modified) (13 diffs)
• wp-includes/capabilities.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -610 +610 @@
         $role->add_cap( 'remove_users' );
         $role->add_cap( 'add_users' );
+        $role->add_cap( 'promote_users' );
         $role->add_cap( 'edit_theme_options' );
     }

trunk/wp-admin/includes/template.php

@@ -1824 +1824 @@
 
         // Set up the hover actions for this user
-        $del_cap_type = 'remove';
-        if ( !is_multisite() && current_user_can('delete_users') )
-            $del_cap_type = 'delete';
-
         $actions = array();
         $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-        if ( $current_user->ID != $user_object->ID && current_user_can( $del_cap_type . '_user', $user_object->ID ) )
+        if ( !is_multisite() && $current_user->ID != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
             $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>";
+        if ( is_multisite() && $current_user->ID != $user_object->ID && current_user_can('remove_user', $user_object->ID) )
+            $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . "</a>";
         $actions = apply_filters('user_row_actions', $actions, $user_object);
         $action_count = count($actions);

trunk/wp-admin/users.php

@@ -15 +15 @@
 if ( !current_user_can('edit_users') )
     wp_die(__('Cheatin’ uh?'));
-
-if ( ! is_multisite() && current_user_can('delete_users') ) {
-    $del_cap_user = 'delete_user';
-    $del_cap_users = 'delete_users';
-} else {
-    $del_cap_user = 'remove_user';
-    $del_cap_users = 'remove_users';
-}
 
 $title = __('Users');
@@ -67 +59 @@
             wp_die(__('You can’t edit that user.'));
         // The new role of the current user must also have edit_users caps
-        if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users') ) {
+        if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) {
             $update = 'err_admin_role';
             continue;
@@ -82 +74 @@
 
 case 'dodelete':
+    if ( is_multisite() )
+        wp_die( __('User deletion is not allowed from this screen.') );
 
     check_admin_referer('delete-users');
@@ -90 +84 @@
     }
 
-    if ( ! current_user_can($del_cap_users ) )
-        wp_die(__('You can’t remove users.'));
+    if ( ! current_user_can( 'delete_users' ) )
+        wp_die(__('You can’t delete users.'));
 
     $userids = $_REQUEST['users'];
@@ -98 +92 @@
 
     foreach ( (array) $userids as $id) {
-        if ( ! current_user_can( $del_cap_user, $id ) )
-            wp_die(__( 'You can’t remove that user.' ) );
+        if ( ! current_user_can( 'delete_user', $id ) )
+            wp_die(__( 'You can’t delete that user.' ) );
 
         if ( $id == $current_user->ID ) {
@@ -107 +101 @@
         switch ( $_REQUEST['delete_option'] ) {
         case 'delete':
-            if ( !is_multisite() && current_user_can('delete_user', $id) )
+            if ( current_user_can('delete_user', $id) )
                 wp_delete_user($id);
-            else
-                remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog
-            break;
         case 'reassign':
-            if ( !is_multisite() && current_user_can('delete_user', $id) )
+            if ( current_user_can('delete_user', $id) )
                 wp_delete_user($id, $_REQUEST['reassign_user']);
-            else
-                remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']);
             break;
         }
@@ -129 +118 @@
 
 case 'delete':
-
     check_admin_referer('bulk-users');
 
@@ -137 +125 @@
     }
 
-    if ( ! current_user_can( $del_cap_users ) )
+    if ( ! current_user_can( 'delete_users' ) )
         $errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
 
@@ -168 +156 @@
         }
     }
+    // @todo Delete is always for !is_multisite(). Use API.
     if ( !is_multisite() ) {
         $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
@@ -200 +189 @@
 break;
 
+case 'doremove':
+    check_admin_referer('remove-users');
+
+    if ( empty($_REQUEST['users']) ) {
+        wp_redirect($redirect);
+        exit;
+    }
+
+    if ( !current_user_can('remove_users')  )
+        die(__('You can’t remove users.'));
+
+    $userids = $_REQUEST['users'];
+
+    $update = 'remove';
+    foreach ( $userids as $id ) {
+        $id = (int) $id;
+        if ( $id == $current_user->id && !is_super_admin() ) {
+            $update = 'err_admin_remove';
+            continue;
+        }
+        if ( !current_user_can('delete_user', $id) ) {
+            $update = 'err_admin_remove';
+            continue;
+        }
+        remove_user_from_blog($id, $blog_id);
+    }
+
+    $redirect = add_query_arg( array('update' => $update), $redirect);
+    wp_redirect($redirect);
+    exit;
+
+break;
+
+case 'remove':
+
+    check_admin_referer('bulk-users');
+
+    if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+        wp_redirect($redirect);
+        exit();
+    }
+
+    if ( !current_user_can('remove_users') )
+        $error = new WP_Error('edit_users', __('You can’t remove users.'));
+
+    if ( empty($_REQUEST['users']) )
+        $userids = array(intval($_REQUEST['user']));
+    else
+        $userids = $_REQUEST['users'];
+
+    include ('admin-header.php');
+?>
+<form action="" method="post" name="updateusers" id="updateusers">
+<?php wp_nonce_field('remove-users') ?>
+<?php echo $referer; ?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php _e('Remove Users from Blog'); ?></h2>
+<p><?php _e('You have specified these users for removal:'); ?></p>
+<ul>
+<?php
+    $go_remove = false;
+    foreach ( $userids as $id ) {
+        $id = (int) $id;
+        $user = new WP_User($id);
+        if ( $id == $current_user->id && !is_super_admin() ) {
+            echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
+        } elseif ( !current_user_can('remove_user', $id) ) {
+            echo "<li>" . sprintf(__('ID #%1s: %2s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+        } else {
+            echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
+            $go_remove = true;
+        }
+    }
+    ?>
+<?php if ( $go_remove ) : ?>
+        <input type="hidden" name="action" value="doremove" />
+        <p class="submit"><input type="submit" name="submit" value="<?php esc_attr_e('Confirm Removal'); ?>" class="button-secondary" /></p>
+<?php else : ?>
+    <p><?php _e('There are no valid users selected for removal.'); ?></p>
+<?php endif; ?>
+</div>
+</form>
+<?php
+
+break;
+
 default:
 
@@ -243 +320 @@
             $messages[] = '<div id="message" class="error"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
             $messages[] = '<div id="message" class="updated"><p>' . __('Other users have been deleted.') . '</p></div>';
+            break;
+        case 'remove':
+            $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this blog.') . '</p></div>';
+            break;
+        case 'err_admin_remove':
+            $messages[] = '<div id="message" class="error"><p>' . __("You can't remove the current user.") . '</p></div>';
+            $messages[] = '<div id="message" class="updated fade"><p>' . __('Other users have been removed.') . '</p></div>';
             break;
         }
@@ -324 +408 @@
 <select name="action">
 <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
 <option value="delete"><?php _e('Delete'); ?></option>
+<?php } else { ?>
+<option value="remove"><?php _e('Remove'); ?></option>
+<?php } ?>
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -393 +481 @@
 <select name="action2">
 <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
 <option value="delete"><?php _e('Delete'); ?></option>
-</select>
+<?php } else { ?>
+<option value="remove"><?php _e('Remove'); ?></option>
+<?php } ?></select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
 </div>

trunk/wp-includes/capabilities.php

@@ -802 +802 @@
     case 'delete_user':
         $caps[] = 'delete_users';
+        break;
+    case 'promote_user':
+        $caps[] = 'promote_users';
         break;
     case 'edit_user':