<!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>[34025] trunk/src/wp-admin: Move `confirm_delete_users()` from `wp-admin/network/users.php` to `wp-admin/includes/ms.php`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34025">34025</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34025","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-10 22:22:44 +0000 (Thu, 10 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move `confirm_delete_users()` from `wp-admin/network/users.php` to `wp-admin/includes/ms.php`.
See <a href="https://core.trac.wordpress.org/ticket/33813">#33813</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-09-10 22:22:41 UTC (rev 34024)
+++ trunk/src/wp-admin/includes/ms.php 2015-09-10 22:22:44 UTC (rev 34025)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,3 +981,112 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ *
+ * @param array $users
+ */
+function confirm_delete_users( $users ) {
+ $current_user = wp_get_current_user();
+ if ( ! is_array( $users ) || empty( $users ) ) {
+ return false;
+ }
+ ?>
+ <h1><?php esc_html_e( 'Users' ); ?></h1>
+
+ <?php if ( 1 == count( $users ) ) : ?>
+ <p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
+ <?php else : ?>
+ <p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+ <?php endif; ?>
+
+ <form action="users.php?action=dodelete" method="post">
+ <input type="hidden" name="dodelete" />
+ <?php
+ wp_nonce_field( 'ms-users-delete' );
+ $site_admins = get_super_admins();
+ $admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+ <table class="form-table">
+ <?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
+ if ( $user_id != '' && $user_id != '0' ) {
+ $delete_user = get_userdata( $user_id );
+
+ if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
+ wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+ }
+
+ if ( in_array( $delete_user->user_login, $site_admins ) ) {
+ wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+ }
+ ?>
+ <tr>
+ <th scope="row"><?php echo $delete_user->user_login; ?>
+ <?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
+ </th>
+ <?php $blogs = get_blogs_of_user( $user_id, true );
+
+ if ( ! empty( $blogs ) ) {
+ ?>
+ <td><fieldset><p><legend><?php printf(
+ /* translators: user login */
+ __( 'What should be done with content owned by %s?' ),
+ '<em>' . $delete_user->user_login . '</em>'
+ ); ?></legend></p>
+ <?php
+ foreach ( (array) $blogs as $key => $details ) {
+ $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
+ if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
+ $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
+ $user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+ $user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
+ $user_list = '';
+ foreach ( $blog_users as $user ) {
+ if ( ! in_array( $user->ID, $allusers ) ) {
+ $user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
+ }
+ }
+ if ( '' == $user_list ) {
+ $user_list = $admin_out;
+ }
+ $user_dropdown .= $user_list;
+ $user_dropdown .= "</select>\n";
+ ?>
+ <ul style="list-style:none;">
+ <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
+ <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
+ <?php _e( 'Delete all content.' ); ?></label></li>
+ <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
+ <?php _e( 'Attribute all content to:' ); ?></label>
+ <?php echo $user_dropdown; ?></li>
+ </ul>
+ <?php
+ }
+ }
+ echo "</fieldset></td></tr>";
+ } else {
+ ?>
+ <td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
+ <?php } ?>
+ </tr>
+ <?php
+ }
+ }
+
+ ?>
+ </table>
+ <?php
+ /** This action is documented in wp-admin/users.php */
+ do_action( 'delete_user_form', $current_user );
+
+ if ( 1 == count( $users ) ) : ?>
+ <p><?php _e( 'Once you hit “Confirm Deletion”, the user will be permanently removed.' ); ?></p>
+ <?php else : ?>
+ <p><?php _e( 'Once you hit “Confirm Deletion”, these users will be permanently removed.' ); ?></p>
+ <?php endif;
+
+ submit_button( __('Confirm Deletion'), 'delete' );
+ ?>
+ </form>
+ <?php
+ return true;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2015-09-10 22:22:41 UTC (rev 34024)
+++ trunk/src/wp-admin/network/users.php 2015-09-10 22:22:44 UTC (rev 34025)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,115 +16,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You do not have permission to access this page.' ), 403 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- *
- * @param array $users
- */
-function confirm_delete_users( $users ) {
- $current_user = wp_get_current_user();
- if ( ! is_array( $users ) || empty( $users ) ) {
- return false;
- }
- ?>
- <h1><?php esc_html_e( 'Users' ); ?></h1>
-
- <?php if ( 1 == count( $users ) ) : ?>
- <p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
- <?php else : ?>
- <p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
- <?php endif; ?>
-
- <form action="users.php?action=dodelete" method="post">
- <input type="hidden" name="dodelete" />
- <?php
- wp_nonce_field( 'ms-users-delete' );
- $site_admins = get_super_admins();
- $admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
- <table class="form-table">
- <?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
- if ( $user_id != '' && $user_id != '0' ) {
- $delete_user = get_userdata( $user_id );
-
- if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
- wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
- }
-
- if ( in_array( $delete_user->user_login, $site_admins ) ) {
- wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
- }
- ?>
- <tr>
- <th scope="row"><?php echo $delete_user->user_login; ?>
- <?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
- </th>
- <?php $blogs = get_blogs_of_user( $user_id, true );
-
- if ( ! empty( $blogs ) ) {
- ?>
- <td><fieldset><p><legend><?php printf(
- /* translators: user login */
- __( 'What should be done with content owned by %s?' ),
- '<em>' . $delete_user->user_login . '</em>'
- ); ?></legend></p>
- <?php
- foreach ( (array) $blogs as $key => $details ) {
- $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
- if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
- $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
- $user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
- $user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
- $user_list = '';
- foreach ( $blog_users as $user ) {
- if ( ! in_array( $user->ID, $allusers ) ) {
- $user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
- }
- }
- if ( '' == $user_list ) {
- $user_list = $admin_out;
- }
- $user_dropdown .= $user_list;
- $user_dropdown .= "</select>\n";
- ?>
- <ul style="list-style:none;">
- <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
- <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
- <?php _e( 'Delete all content.' ); ?></label></li>
- <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
- <?php _e( 'Attribute all content to:' ); ?></label>
- <?php echo $user_dropdown; ?></li>
- </ul>
- <?php
- }
- }
- echo "</fieldset></td></tr>";
- } else {
- ?>
- <td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
- <?php } ?>
- </tr>
- <?php
- }
- }
-
- ?>
- </table>
- <?php
- /** This action is documented in wp-admin/users.php */
- do_action( 'delete_user_form', $current_user );
-
- if ( 1 == count( $users ) ) : ?>
- <p><?php _e( 'Once you hit “Confirm Deletion”, the user will be permanently removed.' ); ?></p>
- <?php else : ?>
- <p><?php _e( 'Once you hit “Confirm Deletion”, these users will be permanently removed.' ); ?></p>
- <?php endif;
-
- submit_button( __('Confirm Deletion'), 'delete' );
- ?>
- </form>
- <?php
- return true;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['action'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/edit.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wpmuadminedit' );
</span></span></pre>
</div>
</div>
</body>
</html>