<!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>[30020] trunk/src/wp-admin/network/users.php: Users screen in network admin:</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/30020">30020</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/30020","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-25 13:51:36 +0000 (Sat, 25 Oct 2014)</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'>Users screen in network admin:
* Remove unused $key variables.
* Rename $val to $user_id for clarity.
props ipm-frommen.
fixes <a href="https://core.trac.wordpress.org/ticket/30096">#30096</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2014-10-25 13:42:57 UTC (rev 30019)
+++ trunk/src/wp-admin/network/users.php 2014-10-25 13:51:36 UTC (rev 30020)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_admins = get_super_admins();
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_out = '<option value="' . $current_user->ID . '">' . $current_user->user_login . '</option>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
- if ( $val != '' && $val != '0' ) {
- $delete_user = get_userdata( $val );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
+ if ( $user_id != '' && $user_id != '0' ) {
+ $delete_user = get_userdata( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_user', $delete_user->ID ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,8 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $delete_user->user_login, $site_admins ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), $delete_user->user_login ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
- $blogs = get_blogs_of_user( $val, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<input type='hidden' name='user[]' value='{$user_id}'/>\n";
+ $blogs = get_blogs_of_user( $user_id, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $blogs ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_dropdown = "<select name='blog[$val][{$key}]'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_dropdown = "<select name='blog[$user_id][$key]'>";
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_list = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blog_users as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $user->ID, $allusers ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,8 +123,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
</span><span class="cx" style="display: block; padding: 0 10px"> $userfunction = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $_POST['allusers'] as $key => $val ) {
- if ( !empty( $val ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $_POST['allusers'] as $user_id ) {
+ if ( !empty( $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_users' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,26 +139,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'spam':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = get_userdata( $val );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_userdata( $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_super_admin( $user->ID ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $userfunction = 'all_spam';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogs = get_blogs_of_user( $user_id, true );
+ foreach ( (array) $blogs as $details ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $val, 'spam', '1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_status( $user_id, 'spam', '1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'notspam':
</span><span class="cx" style="display: block; padding: 0 10px"> $userfunction = 'all_notspam';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogs = get_blogs_of_user( $val, true );
- foreach ( (array) $blogs as $key => $details )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogs = get_blogs_of_user( $user_id, true );
+ foreach ( (array) $blogs as $details )
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '0' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $val, 'spam', '0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_status( $user_id, 'spam', '0' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>