<!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>[18562] trunk/wp-admin: Dissolve wp-admin/network/edit.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, #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/18562">18562</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-08-18 02:29:06 +0000 (Thu, 18 Aug 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Dissolve wp-admin/network/edit.php. props PeteMall, fixes <a href="http://core.trac.wordpress.org/ticket/18379">#18379</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (18561 => 18562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php        2011-08-17 21:02:43 UTC (rev 18561)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php        2011-08-18 02:29:06 UTC (rev 18562)
</span><span class="lines">@@ -248,22 +248,22 @@
</span><span class="cx">                                                         $actions['backend']        = &quot;&lt;span class='backend'&gt;&lt;a href='&quot; . esc_url( get_admin_url( $blog['blog_id'] ) ) . &quot;' class='edit'&gt;&quot; . __( 'Dashboard' ) . '&lt;/a&gt;&lt;/span&gt;';
</span><span class="cx">                                                         if ( $current_site-&gt;blog_id != $blog['blog_id'] ) {
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>-                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ), 'confirm' ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>-                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Archive', 'verb; site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Archive', 'verb; site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                 if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>-                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Not Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Not Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                 else
</span><del>-                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . _x( 'Spam', 'site' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                 if ( current_user_can( 'delete_site', $blog['blog_id'] ) )
</span><del>-                                                                        $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'edit.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ), 'confirm') ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                         }
</span><span class="cx"> 
</span><span class="cx">                                                         $actions['visit']        = &quot;&lt;span class='view'&gt;&lt;a href='&quot; . esc_url( get_home_url( $blog['blog_id'] ) ) . &quot;' rel='permalink'&gt;&quot; . __( 'Visit' ) . '&lt;/a&gt;&lt;/span&gt;';
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (18561 => 18562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php        2011-08-17 21:02:43 UTC (rev 18561)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php        2011-08-18 02:29:06 UTC (rev 18562)
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx">                                                                 $actions = array();
</span><span class="cx">                                                                 $actions['edit'] = '&lt;a href=&quot;' . $edit_link . '&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt;';
</span><span class="cx"> 
</span><del>-                                                                if ( current_user_can( 'delete_user', $user-&gt;ID) &amp;&amp; ! in_array( $user-&gt;user_login, $super_admins ) ) {
-                                                                        $actions['delete'] = '&lt;a href=&quot;' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;amp;action=deleteuser&amp;amp;id=' . $user-&gt;ID ) ) ) . '&quot; class=&quot;delete&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;';
</del><ins>+                                                                if ( current_user_can( 'delete_user', $user-&gt;ID ) &amp;&amp; ! in_array( $user-&gt;user_login, $super_admins ) ) {
+                                                                        $actions['delete'] = '&lt;a href=&quot;' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&amp;amp;action=deleteuser&amp;amp;id=' . $user-&gt;ID ) ) ) . '&quot; class=&quot;delete&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                 }
</span><span class="cx"> 
</span><span class="cx">                                                                 $actions = apply_filters( 'ms_user_row_actions', $actions, $user );
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (18561 => 18562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php        2011-08-17 21:02:43 UTC (rev 18561)
+++ trunk/wp-admin/network/edit.php        2011-08-18 02:29:06 UTC (rev 18562)
</span><span class="lines">@@ -18,396 +18,11 @@
</span><span class="cx">         exit;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-function confirm_delete_users( $users ) {
-        $current_user = wp_get_current_user();
-        if ( !is_array( $users ) )
-                return false;
-
-        screen_icon();
-        ?&gt;
-        &lt;h2&gt;&lt;?php esc_html_e( 'Users' ); ?&gt;&lt;/h2&gt;
-        &lt;p&gt;&lt;?php _e( 'Transfer or delete posts and links before deleting users.' ); ?&gt;&lt;/p&gt;
-        &lt;form action=&quot;edit.php?action=dodelete&quot; method=&quot;post&quot;&gt;
-        &lt;input type=&quot;hidden&quot; name=&quot;dodelete&quot; /&gt;
-        &lt;?php
-        wp_nonce_field( 'ms-users-delete' );
-        $site_admins = get_super_admins();
-        $admin_out = &quot;&lt;option value='$current_user-&gt;ID'&gt;$current_user-&gt;user_login&lt;/option&gt;&quot;;
-
-        foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key =&gt; $val ) {
-                if ( $val != '' &amp;&amp; $val != '0' ) {
-                        $delete_user = new WP_User( $val );
-
-                        if ( ! current_user_can( 'delete_user', $delete_user-&gt;ID ) )
-                                wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user-&gt;user_login ) );
-
-                        if ( in_array( $delete_user-&gt;user_login, $site_admins ) )
-                                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user-&gt;user_login ) );
-
-                        echo &quot;&lt;input type='hidden' name='user[]' value='{$val}'/&gt;\n&quot;;
-                        $blogs = get_blogs_of_user( $val, true );
-
-                        if ( !empty( $blogs ) ) {
-                                ?&gt;
-                                &lt;br /&gt;&lt;fieldset&gt;&lt;p&gt;&lt;legend&gt;&lt;?php printf( __( &quot;What should be done with posts and links owned by &lt;em&gt;%s&lt;/em&gt;?&quot; ), $delete_user-&gt;user_login ); ?&gt;&lt;/legend&gt;&lt;/p&gt;
-                                &lt;?php
-                                foreach ( (array) $blogs as $key =&gt; $details ) {
-                                        $blog_users = get_users( array( 'blog_id' =&gt; $details-&gt;userblog_id ) );
-                                        if ( is_array( $blog_users ) &amp;&amp; !empty( $blog_users ) ) {
-                                                $user_site = &quot;&lt;a href='&quot; . esc_url( get_home_url( $details-&gt;userblog_id ) ) . &quot;'&gt;{$details-&gt;blogname}&lt;/a&gt;&quot;;
-                                                $user_dropdown = &quot;&lt;select name='blog[$val][{$key}]'&gt;&quot;;
-                                                $user_list = '';
-                                                foreach ( $blog_users as $user ) {
-                                                        if ( ! in_array( $user-&gt;ID, $allusers ) )
-                                                                $user_list .= &quot;&lt;option value='{$user-&gt;ID}'&gt;{$user-&gt;user_login}&lt;/option&gt;&quot;;
-                                                }
-                                                if ( '' == $user_list )
-                                                        $user_list = $admin_out;
-                                                $user_dropdown .= $user_list;
-                                                $user_dropdown .= &quot;&lt;/select&gt;\n&quot;;
-                                                ?&gt;
-                                                &lt;ul style=&quot;list-style:none;&quot;&gt;
-                                                        &lt;li&gt;&lt;?php printf( __( 'Site: %s' ), $user_site ); ?&gt;&lt;/li&gt;
-                                                        &lt;li&gt;&lt;label&gt;&lt;input type=&quot;radio&quot; id=&quot;delete_option0&quot; name=&quot;delete[&lt;?php echo $details-&gt;userblog_id . '][' . $delete_user-&gt;ID ?&gt;]&quot; value=&quot;delete&quot; checked=&quot;checked&quot; /&gt;
-                                                        &lt;?php _e( 'Delete all posts and links.' ); ?&gt;&lt;/label&gt;&lt;/li&gt;
-                                                        &lt;li&gt;&lt;label&gt;&lt;input type=&quot;radio&quot; id=&quot;delete_option1&quot; name=&quot;delete[&lt;?php echo $details-&gt;userblog_id . '][' . $delete_user-&gt;ID ?&gt;]&quot; value=&quot;reassign&quot; /&gt;
-                                                        &lt;?php echo __( 'Attribute all posts and links to:' ) . '&lt;/label&gt;' . $user_dropdown; ?&gt;&lt;/li&gt;
-                                                &lt;/ul&gt;
-                                                &lt;?php
-                                        }
-                                }
-                                echo &quot;&lt;/fieldset&gt;&quot;;
-                        }
-                }
-        }
-
-        submit_button( __('Confirm Deletion'), 'delete' );
-        ?&gt;
-        &lt;/form&gt;
-    &lt;?php
-        return true;
-}
-
</del><span class="cx"> do_action( 'wpmuadminedit' , '');
</span><span class="cx"> 
</span><del>-if ( isset( $_GET['id' ]) )
-        $id = intval( $_GET['id'] );
-elseif ( isset( $_POST['id'] ) )
-        $id = intval( $_POST['id'] );
</del><ins>+// Let plugins use us as a post handler easily
+do_action( 'network_admin_edit_' . $_GET['action'] );
+wp_redirect( network_admin_url( 'index.php' ) );
+exit();
</ins><span class="cx"> 
</span><del>-switch ( $_GET['action'] ) {
-        case 'updateblog':
-                // No longer used.
-        break;
-
-        case 'deleteblog':
-                check_admin_referer('deleteblog');
-                if ( ! ( current_user_can( 'manage_sites' ) &amp;&amp; current_user_can( 'delete_sites' ) ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                if ( $id != '0' &amp;&amp; $id != $current_site-&gt;blog_id &amp;&amp; current_user_can( 'delete_site', $id ) ) {
-                        wpmu_delete_blog( $id, true );
-                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'delete' ), wp_get_referer() ) );
-                } else {
-                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'not_deleted' ), wp_get_referer() ) );
-                }
-
-                exit();
-        break;
-
-        case 'allblogs':
-                if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) &amp;&amp; isset( $_POST['allblogs'] ) ) {
-                        check_admin_referer( 'bulk-sites' );
-
-                        if ( ! current_user_can( 'manage_sites' ) )
-                                wp_die( __( 'You do not have permission to access this page.' ) );
-
-                        if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
-                                $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-
-                        $blogfunction = '';
-
-                        foreach ( (array) $_POST['allblogs'] as $key =&gt; $val ) {
-                                if ( $val != '0' &amp;&amp; $val != $current_site-&gt;blog_id ) {
-                                        switch ( $doaction ) {
-                                                case 'delete':
-                                                        if ( ! current_user_can( 'delete_site', $val ) )
-                                                                wp_die( __( 'You are not allowed to delete the site.' ) );
-                                                        $blogfunction = 'all_delete';
-                                                        wpmu_delete_blog( $val, true );
-                                                break;
-
-                                                case 'spam':
-                                                        $blogfunction = 'all_spam';
-                                                        update_blog_status( $val, 'spam', '1' );
-                                                        set_time_limit( 60 );
-                                                break;
-
-                                                case 'notspam':
-                                                        $blogfunction = 'all_notspam';
-                                                        update_blog_status( $val, 'spam', '0' );
-                                                        set_time_limit( 60 );
-                                                break;
-                                        }
-                                } else {
-                                        wp_die( __( 'You are not allowed to change the current site.' ) );
-                                }
-                        }
-
-                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $blogfunction ), wp_get_referer() ) );
-                } else {
-                        wp_redirect( network_admin_url( 'sites.php' ) );
-                }
-                exit();
-        break;
-
-        case 'archiveblog':
-                check_admin_referer( 'archiveblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'archived', '1' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'archive' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'unarchiveblog':
-                check_admin_referer( 'unarchiveblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'archived', '0' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unarchive' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'activateblog':
-                check_admin_referer( 'activateblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'deleted', '0' );
-                do_action( 'activate_blog', $id );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'activate' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'deactivateblog':
-                check_admin_referer( 'deactivateblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                do_action( 'deactivate_blog', $id );
-                update_blog_status( $id, 'deleted', '1' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'deactivate' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'unspamblog':
-                check_admin_referer( 'unspamblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'spam', '0' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unspam' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'spamblog':
-                check_admin_referer( 'spamblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'spam', '1' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'spam' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'unmatureblog':
-                check_admin_referer( 'unmatureblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'mature', '0' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unmature' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        case 'matureblog':
-                check_admin_referer( 'matureblog' );
-                if ( ! current_user_can( 'manage_sites' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                update_blog_status( $id, 'mature', '1' );
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'mature' ), wp_get_referer() ) );
-                exit();
-        break;
-
-        // Common
-        case 'confirm':
-                check_admin_referer( 'confirm' );
-                if ( !headers_sent() ) {
-                        nocache_headers();
-                        header( 'Content-Type: text/html; charset=utf-8' );
-                }
-                if ( $current_site-&gt;blog_id == $id )
-                        wp_die( __( 'You are not allowed to change the current site.' ) );
-                ?&gt;
-                &lt;!DOCTYPE html&gt;
-                &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?&gt;&gt;
-                        &lt;head&gt;
-                                &lt;title&gt;&lt;?php _e( 'WordPress &amp;rsaquo; Confirm your action' ); ?&gt;&lt;/title&gt;
-
-                                &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot; /&gt;
-                                &lt;?php
-                                wp_admin_css( 'install', true );
-                                wp_admin_css( 'ie', true );
-                                ?&gt;
-                        &lt;/head&gt;
-                        &lt;body&gt;
-                                &lt;h1 id=&quot;logo&quot;&gt;&lt;img alt=&quot;WordPress&quot; src=&quot;&lt;?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?&gt;&quot; /&gt;&lt;/h1&gt;
-                                &lt;form action=&quot;edit.php?action=&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; method=&quot;post&quot;&gt;
-                                        &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; /&gt;
-                                        &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ); ?&gt;&quot; /&gt;
-                                        &lt;input type=&quot;hidden&quot; name=&quot;_wp_http_referer&quot; value=&quot;&lt;?php echo esc_attr( wp_get_referer() ); ?&gt;&quot; /&gt;
-                                        &lt;?php wp_nonce_field( $_GET['action2'], '_wpnonce', false ); ?&gt;
-                                        &lt;p&gt;&lt;?php echo esc_html( stripslashes( $_GET['msg'] ) ); ?&gt;&lt;/p&gt;
-                                        &lt;?php submit_button( __('Confirm'), 'button' ); ?&gt;
-                                &lt;/form&gt;
-                        &lt;/body&gt;
-                &lt;/html&gt;
-                &lt;?php
-                exit();
-        break;
-
-        // Users
-        case 'deleteuser':
-                if ( ! current_user_can( 'manage_network_users' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                check_admin_referer( 'deleteuser' );
-
-                if ( $id != '0' &amp;&amp; $id != '1' ) {
-                        $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
-                        $title = __( 'Users' );
-                        $parent_file = 'users.php';
-                        require_once( '../admin-header.php' );
-                        echo '&lt;div class=&quot;wrap&quot;&gt;';
-                        confirm_delete_users( $_POST['allusers'] );
-                        echo '&lt;/div&gt;';
-            require_once( '../admin-footer.php' );
-                  } else {
-                        wp_redirect( network_admin_url( 'users.php' ) );
-                }
-                exit();
-        break;
-
-        case 'allusers':
-                if ( !current_user_can( 'manage_network_users' ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) &amp;&amp; isset( $_POST['allusers'] ) ) {
-                        check_admin_referer( 'bulk-users-network' );
-
-                        if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
-                                $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-
-                        $userfunction = '';
-
-                        foreach ( (array) $_POST['allusers'] as $key =&gt; $val ) {
-                                if ( !empty( $val ) ) {
-                                        switch ( $doaction ) {
-                                                case 'delete':
-                                                        if ( ! current_user_can( 'delete_users' ) )
-                                                                wp_die( __( 'You do not have permission to access this page.' ) );
-                                                        $title = __( 'Users' );
-                                                        $parent_file = 'users.php';
-                                                        require_once( '../admin-header.php' );
-                                                        echo '&lt;div class=&quot;wrap&quot;&gt;';
-                                                        confirm_delete_users( $_POST['allusers'] );
-                                                        echo '&lt;/div&gt;';
-                                            require_once( '../admin-footer.php' );
-                                            exit();
-                                               break;
-
-                                                case 'spam':
-                                                        $user = new WP_User( $val );
-                                                        if ( in_array( $user-&gt;user_login, get_super_admins() ) )
-                                                                wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user-&gt;user_login ) ) );
-
-                                                        $userfunction = 'all_spam';
-                                                        $blogs = get_blogs_of_user( $val, true );
-                                                        foreach ( (array) $blogs as $key =&gt; $details ) {
-                                                                if ( $details-&gt;userblog_id != $current_site-&gt;blog_id ) // main blog not a spam !
-                                                                        update_blog_status( $details-&gt;userblog_id, 'spam', '1' );
-                                                        }
-                                                        update_user_status( $val, 'spam', '1' );
-                                                break;
-
-                                                case 'notspam':
-                                                        $userfunction = 'all_notspam';
-                                                        $blogs = get_blogs_of_user( $val, true );
-                                                        foreach ( (array) $blogs as $key =&gt; $details )
-                                                                update_blog_status( $details-&gt;userblog_id, 'spam', '0' );
-
-                                                        update_user_status( $val, 'spam', '0' );
-                                                break;
-                                        }
-                                }
-                        }
-
-                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $userfunction ), wp_get_referer() ) );
-                } else {
-                        $location = network_admin_url( 'users.php' );
-
-                        if ( ! empty( $_REQUEST['paged'] ) )
-                                $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
-                        wp_redirect( $location );
-                }
-                exit();
-        break;
-
-        case 'dodelete':
-                check_admin_referer( 'ms-users-delete' );
-                if ( ! ( current_user_can( 'manage_network_users' ) &amp;&amp; current_user_can( 'delete_users' ) ) )
-                        wp_die( __( 'You do not have permission to access this page.' ) );
-
-                if ( ! empty( $_POST['blog'] ) &amp;&amp; is_array( $_POST['blog'] ) ) {
-                        foreach ( $_POST['blog'] as $id =&gt; $users ) {
-                                foreach ( $users as $blogid =&gt; $user_id ) {
-                                        if ( ! current_user_can( 'delete_user', $id ) )
-                                                continue;
-
-                                        if ( ! empty( $_POST['delete'] ) &amp;&amp; 'reassign' == $_POST['delete'][$blogid][$id] )
-                                                remove_user_from_blog( $id, $blogid, $user_id );
-                                        else
-                                                remove_user_from_blog( $id, $blogid );
-                                }
-                        }
-                }
-                $i = 0;
-                if ( is_array( $_POST['user'] ) &amp;&amp; ! empty( $_POST['user'] ) )
-                        foreach( $_POST['user'] as $id ) {
-                                if ( ! current_user_can( 'delete_user', $id ) )
-                                        continue;
-                                wpmu_delete_user( $id );
-                                $i++;
-                        }
-
-                if ( $i == 1 )
-                        $deletefunction = 'delete';
-                else
-                        $deletefunction = 'all_delete';
-
-                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $deletefunction ), network_admin_url( 'users.php' ) ) );
-                exit();
-        break;
-
-        default:
-                // Let plugins use us as a post handler easily
-                do_action( 'network_admin_edit_' . $_GET['action'] );
-                wp_redirect( network_admin_url( 'index.php' ) );
-                exit();
-        break;
-}
</del><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (18561 => 18562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php        2011-08-17 21:02:43 UTC (rev 18561)
+++ trunk/wp-admin/network/sites.php        2011-08-18 02:29:06 UTC (rev 18562)
</span><span class="lines">@@ -42,6 +42,196 @@
</span><span class="cx"> 
</span><span class="cx"> $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="cx"> 
</span><ins>+if ( isset( $_GET['action'] ) ) {
+        do_action( 'wpmuadminedit' , '' );
+
+        switch ( $_GET['action'] ) {
+                case 'updateblog':
+                        // No longer used.
+                break;
+
+                case 'deleteblog':
+                        check_admin_referer('deleteblog');
+                        if ( ! ( current_user_can( 'manage_sites' ) &amp;&amp; current_user_can( 'delete_sites' ) ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        if ( $id != '0' &amp;&amp; $id != $current_site-&gt;blog_id &amp;&amp; current_user_can( 'delete_site', $id ) ) {
+                                wpmu_delete_blog( $id, true );
+                                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'delete' ), wp_get_referer() ) );
+                        } else {
+                                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'not_deleted' ), wp_get_referer() ) );
+                        }
+
+                        exit();
+                break;
+
+                case 'allblogs':
+                        if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) &amp;&amp; isset( $_POST['allblogs'] ) ) {
+                                check_admin_referer( 'bulk-sites' );
+
+                                if ( ! current_user_can( 'manage_sites' ) )
+                                        wp_die( __( 'You do not have permission to access this page.' ) );
+
+                                if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
+                                        $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
+
+                                $blogfunction = '';
+
+                                foreach ( (array) $_POST['allblogs'] as $key =&gt; $val ) {
+                                        if ( $val != '0' &amp;&amp; $val != $current_site-&gt;blog_id ) {
+                                                switch ( $doaction ) {
+                                                        case 'delete':
+                                                                if ( ! current_user_can( 'delete_site', $val ) )
+                                                                        wp_die( __( 'You are not allowed to delete the site.' ) );
+                                                                $blogfunction = 'all_delete';
+                                                                wpmu_delete_blog( $val, true );
+                                                        break;
+
+                                                        case 'spam':
+                                                                $blogfunction = 'all_spam';
+                                                                update_blog_status( $val, 'spam', '1' );
+                                                                set_time_limit( 60 );
+                                                        break;
+
+                                                        case 'notspam':
+                                                                $blogfunction = 'all_notspam';
+                                                                update_blog_status( $val, 'spam', '0' );
+                                                                set_time_limit( 60 );
+                                                        break;
+                                                }
+                                        } else {
+                                                wp_die( __( 'You are not allowed to change the current site.' ) );
+                                        }
+                                }
+
+                                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $blogfunction ), wp_get_referer() ) );
+                        } else {
+                                wp_redirect( network_admin_url( 'sites.php' ) );
+                        }
+                        exit();
+                break;
+
+                case 'archiveblog':
+                        check_admin_referer( 'archiveblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'archived', '1' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'archive' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'unarchiveblog':
+                        check_admin_referer( 'unarchiveblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'archived', '0' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unarchive' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'activateblog':
+                        check_admin_referer( 'activateblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'deleted', '0' );
+                        do_action( 'activate_blog', $id );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'activate' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'deactivateblog':
+                        check_admin_referer( 'deactivateblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        do_action( 'deactivate_blog', $id );
+                        update_blog_status( $id, 'deleted', '1' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'deactivate' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'unspamblog':
+                        check_admin_referer( 'unspamblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'spam', '0' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unspam' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'spamblog':
+                        check_admin_referer( 'spamblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'spam', '1' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'spam' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'unmatureblog':
+                        check_admin_referer( 'unmatureblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'mature', '0' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'unmature' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                case 'matureblog':
+                        check_admin_referer( 'matureblog' );
+                        if ( ! current_user_can( 'manage_sites' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        update_blog_status( $id, 'mature', '1' );
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; 'mature' ), wp_get_referer() ) );
+                        exit();
+                break;
+
+                // Common
+                case 'confirm':
+                        check_admin_referer( 'confirm' );
+                        if ( !headers_sent() ) {
+                                nocache_headers();
+                                header( 'Content-Type: text/html; charset=utf-8' );
+                        }
+                        if ( $current_site-&gt;blog_id == $id )
+                                wp_die( __( 'You are not allowed to change the current site.' ) );
+                        ?&gt;
+                        &lt;!DOCTYPE html&gt;
+                        &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?&gt;&gt;
+                                &lt;head&gt;
+                                        &lt;title&gt;&lt;?php _e( 'WordPress &amp;rsaquo; Confirm your action' ); ?&gt;&lt;/title&gt;
+
+                                        &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot; /&gt;
+                                        &lt;?php
+                                        wp_admin_css( 'install', true );
+                                        wp_admin_css( 'ie', true );
+                                        ?&gt;
+                                &lt;/head&gt;
+                                &lt;body&gt;
+                                        &lt;h1 id=&quot;logo&quot;&gt;&lt;img alt=&quot;WordPress&quot; src=&quot;&lt;?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?&gt;&quot; /&gt;&lt;/h1&gt;
+                                        &lt;form action=&quot;sites.php?action=&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; method=&quot;post&quot;&gt;
+                                                &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; /&gt;
+                                                &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ); ?&gt;&quot; /&gt;
+                                                &lt;input type=&quot;hidden&quot; name=&quot;_wp_http_referer&quot; value=&quot;&lt;?php echo esc_attr( wp_get_referer() ); ?&gt;&quot; /&gt;
+                                                &lt;?php wp_nonce_field( $_GET['action2'], '_wpnonce', false ); ?&gt;
+                                                &lt;p&gt;&lt;?php echo esc_html( stripslashes( $_GET['msg'] ) ); ?&gt;&lt;/p&gt;
+                                                &lt;?php submit_button( __('Confirm'), 'button' ); ?&gt;
+                                        &lt;/form&gt;
+                                &lt;/body&gt;
+                        &lt;/html&gt;
+                        &lt;?php
+                        exit();
+                break;
+        }
+}
+
</ins><span class="cx"> $msg = '';
</span><span class="cx"> if ( isset( $_REQUEST['updated'] ) &amp;&amp; $_REQUEST['updated'] == 'true' &amp;&amp; ! empty( $_REQUEST['action'] ) ) {
</span><span class="cx">         switch ( $_REQUEST['action'] ) {
</span><span class="lines">@@ -109,7 +299,7 @@
</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;blogs&quot; /&gt;
</span><span class="cx"> &lt;/form&gt;
</span><span class="cx"> 
</span><del>-&lt;form id=&quot;form-site-list&quot; action=&quot;edit.php?action=allblogs&quot; method=&quot;post&quot;&gt;
</del><ins>+&lt;form id=&quot;form-site-list&quot; action=&quot;sites.php?action=allblogs&quot; method=&quot;post&quot;&gt;
</ins><span class="cx">         &lt;?php $wp_list_table-&gt;display(); ?&gt;
</span><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (18561 => 18562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php        2011-08-17 21:02:43 UTC (rev 18561)
+++ trunk/wp-admin/network/users.php        2011-08-18 02:29:06 UTC (rev 18562)
</span><span class="lines">@@ -16,6 +16,205 @@
</span><span class="cx"> if ( ! current_user_can( 'manage_network_users' ) )
</span><span class="cx">         wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx"> 
</span><ins>+function confirm_delete_users( $users ) {
+        $current_user = wp_get_current_user();
+        if ( !is_array( $users ) )
+                return false;
+
+        screen_icon();
+        ?&gt;
+        &lt;h2&gt;&lt;?php esc_html_e( 'Users' ); ?&gt;&lt;/h2&gt;
+        &lt;p&gt;&lt;?php _e( 'Transfer or delete posts and links before deleting users.' ); ?&gt;&lt;/p&gt;
+        &lt;form action=&quot;users.php?action=dodelete&quot; method=&quot;post&quot;&gt;
+        &lt;input type=&quot;hidden&quot; name=&quot;dodelete&quot; /&gt;
+        &lt;?php
+        wp_nonce_field( 'ms-users-delete' );
+        $site_admins = get_super_admins();
+        $admin_out = &quot;&lt;option value='$current_user-&gt;ID'&gt;$current_user-&gt;user_login&lt;/option&gt;&quot;;
+
+        foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key =&gt; $val ) {
+                if ( $val != '' &amp;&amp; $val != '0' ) {
+                        $delete_user = new WP_User( $val );
+
+                        if ( ! current_user_can( 'delete_user', $delete_user-&gt;ID ) )
+                                wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user-&gt;user_login ) );
+
+                        if ( in_array( $delete_user-&gt;user_login, $site_admins ) )
+                                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user-&gt;user_login ) );
+
+                        echo &quot;&lt;input type='hidden' name='user[]' value='{$val}'/&gt;\n&quot;;
+                        $blogs = get_blogs_of_user( $val, true );
+
+                        if ( !empty( $blogs ) ) {
+                                ?&gt;
+                                &lt;br /&gt;&lt;fieldset&gt;&lt;p&gt;&lt;legend&gt;&lt;?php printf( __( &quot;What should be done with posts and links owned by &lt;em&gt;%s&lt;/em&gt;?&quot; ), $delete_user-&gt;user_login ); ?&gt;&lt;/legend&gt;&lt;/p&gt;
+                                &lt;?php
+                                foreach ( (array) $blogs as $key =&gt; $details ) {
+                                        $blog_users = get_users( array( 'blog_id' =&gt; $details-&gt;userblog_id ) );
+                                        if ( is_array( $blog_users ) &amp;&amp; !empty( $blog_users ) ) {
+                                                $user_site = &quot;&lt;a href='&quot; . esc_url( get_home_url( $details-&gt;userblog_id ) ) . &quot;'&gt;{$details-&gt;blogname}&lt;/a&gt;&quot;;
+                                                $user_dropdown = &quot;&lt;select name='blog[$val][{$key}]'&gt;&quot;;
+                                                $user_list = '';
+                                                foreach ( $blog_users as $user ) {
+                                                        if ( ! in_array( $user-&gt;ID, $allusers ) )
+                                                                $user_list .= &quot;&lt;option value='{$user-&gt;ID}'&gt;{$user-&gt;user_login}&lt;/option&gt;&quot;;
+                                                }
+                                                if ( '' == $user_list )
+                                                        $user_list = $admin_out;
+                                                $user_dropdown .= $user_list;
+                                                $user_dropdown .= &quot;&lt;/select&gt;\n&quot;;
+                                                ?&gt;
+                                                &lt;ul style=&quot;list-style:none;&quot;&gt;
+                                                        &lt;li&gt;&lt;?php printf( __( 'Site: %s' ), $user_site ); ?&gt;&lt;/li&gt;
+                                                        &lt;li&gt;&lt;label&gt;&lt;input type=&quot;radio&quot; id=&quot;delete_option0&quot; name=&quot;delete[&lt;?php echo $details-&gt;userblog_id . '][' . $delete_user-&gt;ID ?&gt;]&quot; value=&quot;delete&quot; checked=&quot;checked&quot; /&gt;
+                                                        &lt;?php _e( 'Delete all posts and links.' ); ?&gt;&lt;/label&gt;&lt;/li&gt;
+                                                        &lt;li&gt;&lt;label&gt;&lt;input type=&quot;radio&quot; id=&quot;delete_option1&quot; name=&quot;delete[&lt;?php echo $details-&gt;userblog_id . '][' . $delete_user-&gt;ID ?&gt;]&quot; value=&quot;reassign&quot; /&gt;
+                                                        &lt;?php echo __( 'Attribute all posts and links to:' ) . '&lt;/label&gt;' . $user_dropdown; ?&gt;&lt;/li&gt;
+                                                &lt;/ul&gt;
+                                                &lt;?php
+                                        }
+                                }
+                                echo &quot;&lt;/fieldset&gt;&quot;;
+                        }
+                }
+        }
+
+        submit_button( __('Confirm Deletion'), 'delete' );
+        ?&gt;
+        &lt;/form&gt;
+    &lt;?php
+        return true;
+}
+
+if ( isset( $_GET['action'] ) ) {
+        do_action( 'wpmuadminedit' , '' );
+
+        switch ( $_GET['action'] ) {
+                case 'deleteuser':
+                        if ( ! current_user_can( 'manage_network_users' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        check_admin_referer( 'deleteuser' );
+
+                        $id = intval( $_GET['id'] );
+                        if ( $id != '0' &amp;&amp; $id != '1' ) {
+                                $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
+                                $title = __( 'Users' );
+                                $parent_file = 'users.php';
+                                require_once( '../admin-header.php' );
+                                echo '&lt;div class=&quot;wrap&quot;&gt;';
+                                confirm_delete_users( $_POST['allusers'] );
+                                echo '&lt;/div&gt;';
+                    require_once( '../admin-footer.php' );
+                          } else {
+                                wp_redirect( network_admin_url( 'users.php' ) );
+                        }
+                        exit();
+                break;
+
+                case 'allusers':
+                        if ( !current_user_can( 'manage_network_users' ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) &amp;&amp; isset( $_POST['allusers'] ) ) {
+                                check_admin_referer( 'bulk-users-network' );
+
+                                if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
+                                        $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
+
+                                $userfunction = '';
+
+                                foreach ( (array) $_POST['allusers'] as $key =&gt; $val ) {
+                                        if ( !empty( $val ) ) {
+                                                switch ( $doaction ) {
+                                                        case 'delete':
+                                                                if ( ! current_user_can( 'delete_users' ) )
+                                                                        wp_die( __( 'You do not have permission to access this page.' ) );
+                                                                $title = __( 'Users' );
+                                                                $parent_file = 'users.php';
+                                                                require_once( '../admin-header.php' );
+                                                                echo '&lt;div class=&quot;wrap&quot;&gt;';
+                                                                confirm_delete_users( $_POST['allusers'] );
+                                                                echo '&lt;/div&gt;';
+                                                    require_once( '../admin-footer.php' );
+                                                    exit();
+                                                       break;
+
+                                                        case 'spam':
+                                                                $user = new WP_User( $val );
+                                                                if ( in_array( $user-&gt;user_login, get_super_admins() ) )
+                                                                        wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user-&gt;user_login ) ) );
+
+                                                                $userfunction = 'all_spam';
+                                                                $blogs = get_blogs_of_user( $val, true );
+                                                                foreach ( (array) $blogs as $key =&gt; $details ) {
+                                                                        if ( $details-&gt;userblog_id != $current_site-&gt;blog_id ) // main blog not a spam !
+                                                                                update_blog_status( $details-&gt;userblog_id, 'spam', '1' );
+                                                                }
+                                                                update_user_status( $val, 'spam', '1' );
+                                                        break;
+
+                                                        case 'notspam':
+                                                                $userfunction = 'all_notspam';
+                                                                $blogs = get_blogs_of_user( $val, true );
+                                                                foreach ( (array) $blogs as $key =&gt; $details )
+                                                                        update_blog_status( $details-&gt;userblog_id, 'spam', '0' );
+
+                                                                update_user_status( $val, 'spam', '0' );
+                                                        break;
+                                                }
+                                        }
+                                }
+
+                                wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $userfunction ), wp_get_referer() ) );
+                        } else {
+                                $location = network_admin_url( 'users.php' );
+
+                                if ( ! empty( $_REQUEST['paged'] ) )
+                                        $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+                                wp_redirect( $location );
+                        }
+                        exit();
+                break;
+
+                case 'dodelete':
+                        check_admin_referer( 'ms-users-delete' );
+                        if ( ! ( current_user_can( 'manage_network_users' ) &amp;&amp; current_user_can( 'delete_users' ) ) )
+                                wp_die( __( 'You do not have permission to access this page.' ) );
+
+                        if ( ! empty( $_POST['blog'] ) &amp;&amp; is_array( $_POST['blog'] ) ) {
+                                foreach ( $_POST['blog'] as $id =&gt; $users ) {
+                                        foreach ( $users as $blogid =&gt; $user_id ) {
+                                                if ( ! current_user_can( 'delete_user', $id ) )
+                                                        continue;
+
+                                                if ( ! empty( $_POST['delete'] ) &amp;&amp; 'reassign' == $_POST['delete'][$blogid][$id] )
+                                                        remove_user_from_blog( $id, $blogid, $user_id );
+                                                else
+                                                        remove_user_from_blog( $id, $blogid );
+                                        }
+                                }
+                        }
+                        $i = 0;
+                        if ( is_array( $_POST['user'] ) &amp;&amp; ! empty( $_POST['user'] ) )
+                                foreach( $_POST['user'] as $id ) {
+                                        if ( ! current_user_can( 'delete_user', $id ) )
+                                                continue;
+                                        wpmu_delete_user( $id );
+                                        $i++;
+                                }
+
+                        if ( $i == 1 )
+                                $deletefunction = 'delete';
+                        else
+                                $deletefunction = 'all_delete';
+
+                        wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $deletefunction ), network_admin_url( 'users.php' ) ) );
+                        exit();
+                break;        
+        }
+}
+
</ins><span class="cx"> $wp_list_table = _get_list_table('WP_MS_Users_List_Table');
</span><span class="cx"> $pagenum = $wp_list_table-&gt;get_pagenum();
</span><span class="cx"> $wp_list_table-&gt;prepare_items();
</span><span class="lines">@@ -88,7 +287,7 @@
</span><span class="cx">                 &lt;?php $wp_list_table-&gt;search_box( __( 'Search Users' ), 'user' ); ?&gt;
</span><span class="cx">         &lt;/form&gt;
</span><span class="cx"> 
</span><del>-        &lt;form id=&quot;form-user-list&quot; action='edit.php?action=allusers' method='post'&gt;
</del><ins>+        &lt;form id=&quot;form-user-list&quot; action='users.php?action=allusers' method='post'&gt;
</ins><span class="cx">                 &lt;?php $wp_list_table-&gt;display(); ?&gt;
</span><span class="cx">         &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span></span></pre>
</div>
</div>

</body>
</html>