<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14176] trunk: Separate user deletion and removal.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14176">14176</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-21 17:43:53 +0000 (Wed, 21 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Separate user deletion and removal. Add promote_users cap so that multisite Admins (not supes) can promote. see <a href="http://trac.wordpress.org/ticket/13074">#13074</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14175 => 14176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-04-21 17:14:25 UTC (rev 14175)
+++ trunk/wp-admin/includes/schema.php 2010-04-21 17:43:53 UTC (rev 14176)
</span><span class="lines">@@ -609,6 +609,7 @@
</span><span class="cx"> $role->add_cap( 'update_core' );
</span><span class="cx"> $role->add_cap( 'remove_users' );
</span><span class="cx"> $role->add_cap( 'add_users' );
</span><ins>+ $role->add_cap( 'promote_users' );
</ins><span class="cx"> $role->add_cap( 'edit_theme_options' );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14175 => 14176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-04-21 17:14:25 UTC (rev 14175)
+++ trunk/wp-admin/includes/template.php 2010-04-21 17:43:53 UTC (rev 14176)
</span><span class="lines">@@ -1823,14 +1823,12 @@
</span><span class="cx"> $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
</span><span class="cx">
</span><span class="cx"> // Set up the hover actions for this user
</span><del>- $del_cap_type = 'remove';
- if ( !is_multisite() && current_user_can('delete_users') )
- $del_cap_type = 'delete';
-
</del><span class="cx"> $actions = array();
</span><span class="cx"> $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
</span><del>- if ( $current_user->ID != $user_object->ID && current_user_can( $del_cap_type . '_user', $user_object->ID ) )
</del><ins>+ if ( !is_multisite() && $current_user->ID != $user_object->ID && current_user_can('delete_user', $user_object->ID) )
</ins><span class="cx"> $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>";
</span><ins>+ 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>";
</ins><span class="cx"> $actions = apply_filters('user_row_actions', $actions, $user_object);
</span><span class="cx"> $action_count = count($actions);
</span><span class="cx"> $i = 0;
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (14175 => 14176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-04-21 17:14:25 UTC (rev 14175)
+++ trunk/wp-admin/users.php 2010-04-21 17:43:53 UTC (rev 14176)
</span><span class="lines">@@ -15,14 +15,6 @@
</span><span class="cx"> if ( !current_user_can('edit_users') )
</span><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><span class="cx">
</span><del>-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';
-}
-
</del><span class="cx"> $title = __('Users');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><span class="lines">@@ -66,7 +58,7 @@
</span><span class="cx"> if ( ! current_user_can('edit_user', $id) )
</span><span class="cx"> wp_die(__('You can&#8217;t edit that user.'));
</span><span class="cx"> // The new role of the current user must also have edit_users caps
</span><del>- if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users') ) {
</del><ins>+ if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users') ) {
</ins><span class="cx"> $update = 'err_admin_role';
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -81,6 +73,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'dodelete':
</span><ins>+ if ( is_multisite() )
+ wp_die( __('User deletion is not allowed from this screen.') );
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('delete-users');
</span><span class="cx">
</span><span class="lines">@@ -89,16 +83,16 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! current_user_can($del_cap_users ) )
- wp_die(__('You can&#8217;t remove users.'));
</del><ins>+ if ( ! current_user_can( 'delete_users' ) )
+ wp_die(__('You can&#8217;t delete users.'));
</ins><span class="cx">
</span><span class="cx"> $userids = $_REQUEST['users'];
</span><span class="cx"> $update = 'del';
</span><span class="cx"> $delete_count = 0;
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $userids as $id) {
</span><del>- if ( ! current_user_can( $del_cap_user, $id ) )
- wp_die(__( 'You can&#8217;t remove that user.' ) );
</del><ins>+ if ( ! current_user_can( 'delete_user', $id ) )
+ wp_die(__( 'You can&#8217;t delete that user.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( $id == $current_user->ID ) {
</span><span class="cx"> $update = 'err_admin_del';
</span><span class="lines">@@ -106,16 +100,11 @@
</span><span class="cx"> }
</span><span class="cx"> switch ( $_REQUEST['delete_option'] ) {
</span><span class="cx"> case 'delete':
</span><del>- if ( !is_multisite() && current_user_can('delete_user', $id) )
</del><ins>+ if ( current_user_can('delete_user', $id) )
</ins><span class="cx"> wp_delete_user($id);
</span><del>- else
- remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog
- break;
</del><span class="cx"> case 'reassign':
</span><del>- if ( !is_multisite() && current_user_can('delete_user', $id) )
</del><ins>+ if ( current_user_can('delete_user', $id) )
</ins><span class="cx"> wp_delete_user($id, $_REQUEST['reassign_user']);
</span><del>- else
- remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ++$delete_count;
</span><span class="lines">@@ -128,7 +117,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'delete':
</span><del>-
</del><span class="cx"> check_admin_referer('bulk-users');
</span><span class="cx">
</span><span class="cx"> if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
</span><span class="lines">@@ -136,7 +124,7 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! current_user_can( $del_cap_users ) )
</del><ins>+ if ( ! current_user_can( 'delete_users' ) )
</ins><span class="cx"> $errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
</span><span class="cx">
</span><span class="cx"> if ( empty($_REQUEST['users']) )
</span><span class="lines">@@ -167,6 +155,7 @@
</span><span class="cx"> $go_delete = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ // @todo Delete is always for !is_multisite(). Use API.
</ins><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
</span><span class="cx"> } else {
</span><span class="lines">@@ -199,6 +188,94 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+case 'doremove':
+ check_admin_referer('remove-users');
+
+ if ( empty($_REQUEST['users']) ) {
+ wp_redirect($redirect);
+ exit;
+ }
+
+ if ( !current_user_can('remove_users') )
+ die(__('You can&#8217;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&#8217;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;
+
</ins><span class="cx"> default:
</span><span class="cx">
</span><span class="cx"> if ( !empty($_GET['_wp_http_referer']) ) {
</span><span class="lines">@@ -243,6 +320,13 @@
</span><span class="cx"> $messages[] = '<div id="message" class="error"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
</span><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('Other users have been deleted.') . '</p></div>';
</span><span class="cx"> break;
</span><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx"> endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -323,7 +407,11 @@
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action">
</span><span class="cx"> <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><ins>+<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
</ins><span class="cx"> <option value="delete"><?php _e('Delete'); ?></option>
</span><ins>+<?php } else { ?>
+<option value="remove"><?php _e('Remove'); ?></option>
+<?php } ?>
</ins><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
</span><span class="cx"> <label class="screen-reader-text" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option><?php wp_dropdown_roles(); ?></select>
</span><span class="lines">@@ -392,8 +480,11 @@
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action2">
</span><span class="cx"> <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><ins>+<?php if ( !is_multisite() && current_user_can('delete_users') ) { ?>
</ins><span class="cx"> <option value="delete"><?php _e('Delete'); ?></option>
</span><del>-</select>
</del><ins>+<?php } else { ?>
+<option value="remove"><?php _e('Remove'); ?></option>
+<?php } ?></select>
</ins><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (14175 => 14176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-04-21 17:14:25 UTC (rev 14175)
+++ trunk/wp-includes/capabilities.php 2010-04-21 17:43:53 UTC (rev 14176)
</span><span class="lines">@@ -802,6 +802,9 @@
</span><span class="cx"> case 'delete_user':
</span><span class="cx"> $caps[] = 'delete_users';
</span><span class="cx"> break;
</span><ins>+ case 'promote_user':
+ $caps[] = 'promote_users';
+ break;
</ins><span class="cx"> case 'edit_user':
</span><span class="cx"> if ( !isset( $args[0] ) || $user_id != $args[0] ) {
</span><span class="cx"> $caps[] = 'edit_users';
</span></span></pre>
</div>
</div>
</body>
</html>