<!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" />
<title>[22166] trunk/wp-admin/users.php: Force the user to explicitly choose between content deletion and reassignment when deleting users.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22166">22166</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-10 14:07:59 +0000 (Wed, 10 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Force the user to explicitly choose between content deletion and reassignment when deleting users. props Dan Rivera, Ben Brooks, GhostToast. fixes <a href="http://core.trac.wordpress.org/ticket/20045">#20045</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (22165 => 22166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2012-10-10 13:52:01 UTC (rev 22165)
+++ trunk/wp-admin/users.php 2012-10-10 14:07:59 UTC (rev 22166)
</span><span class="lines">@@ -75,6 +75,22 @@
</span><span class="cx">
</span><span class="cx"> $update = '';
</span><span class="cx">
</span><ins>+/**
+ * @since 3.5.0
+ * @access private
+ */
+function delete_users_add_js() { ?>
+<script>
+jQuery(document).ready( function($) {
+ var submit = $('#submit').prop('disabled', true);
+ $('input[name=delete_option]').one('change', function() {
+ submit.prop('disabled', false);
+ });
+});
+</script>
+<?php
+}
+
</ins><span class="cx"> switch ( $wp_list_table->current_action() ) {
</span><span class="cx">
</span><span class="cx"> /* Bulk Dropdown menu Role changes */
</span><span class="lines">@@ -131,16 +147,22 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $userids = array_map( 'intval', (array) $_REQUEST['users'] );
+
+ if ( empty( $_REQUEST['delete_option'] ) ) {
+ $url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
+ $url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
+ wp_redirect( $url );
+ exit;
+ }
+
</ins><span class="cx"> if ( ! current_user_can( 'delete_users' ) )
</span><span class="cx"> wp_die(__('You can&#8217;t delete users.'));
</span><span class="cx">
</span><del>- $userids = $_REQUEST['users'];
</del><span class="cx"> $update = 'del';
</span><span class="cx"> $delete_count = 0;
</span><span class="cx">
</span><del>- foreach ( (array) $userids as $id) {
- $id = (int) $id;
-
</del><ins>+ foreach ( $userids as $id ) {
</ins><span class="cx"> if ( ! current_user_can( 'delete_user', $id ) )
</span><span class="cx"> wp_die(__( 'You can&#8217;t delete that user.' ) );
</span><span class="cx">
</span><span class="lines">@@ -150,12 +172,10 @@
</span><span class="cx"> }
</span><span class="cx"> switch ( $_REQUEST['delete_option'] ) {
</span><span class="cx"> case 'delete':
</span><del>- if ( current_user_can('delete_user', $id) )
- wp_delete_user($id);
</del><ins>+ wp_delete_user( $id );
</ins><span class="cx"> break;
</span><span class="cx"> case 'reassign':
</span><del>- if ( current_user_can('delete_user', $id) )
- wp_delete_user($id, $_REQUEST['reassign_user']);
</del><ins>+ wp_delete_user( $id, $_REQUEST['reassign_user'] );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ++$delete_count;
</span><span class="lines">@@ -182,10 +202,12 @@
</span><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><del>- $userids = array(intval($_REQUEST['user']));
</del><ins>+ $userids = array( intval( $_REQUEST['user'] ) );
</ins><span class="cx"> else
</span><del>- $userids = (array) $_REQUEST['users'];
</del><ins>+ $userids = array_map( 'intval', (array) $_REQUEST['users'] );
</ins><span class="cx">
</span><ins>+ add_action( 'admin_head', 'delete_users_add_js' );
+
</ins><span class="cx"> include ('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <form action="" method="post" name="updateusers" id="updateusers">
</span><span class="lines">@@ -195,12 +217,16 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e('Delete Users'); ?></h2>
</span><ins>+<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+<div class="error">
+ <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+</div>
+<?php endif; ?>
</ins><span class="cx"> <p><?php echo _n( 'You have specified this user for deletion:', 'You have specified these users for deletion:', count( $userids ) ); ?></p>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php
</span><span class="cx"> $go_delete = 0;
</span><span class="cx"> foreach ( $userids as $id ) {
</span><del>- $id = (int) $id;
</del><span class="cx"> $user = get_userdata( $id );
</span><span class="cx"> if ( $id == $current_user->ID ) {
</span><span class="cx"> echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
</span><span class="lines">@@ -214,10 +240,10 @@
</span><span class="cx"> <?php if ( $go_delete ) : ?>
</span><span class="cx"> <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
</span><span class="cx"> <ul style="list-style:none;">
</span><del>- <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
</del><ins>+ <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
</ins><span class="cx"> <?php _e('Delete all posts.'); ?></label></li>
</span><span class="cx"> <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
</span><del>- <?php echo '<label for="delete_option1">'.__('Attribute all posts to:').'</label>';
</del><ins>+ <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
</ins><span class="cx"> wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
</span><span class="cx"> </ul></fieldset>
</span><span class="cx"> <input type="hidden" name="action" value="dodelete" />
</span></span></pre>
</div>
</div>
</body>
</html>