<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16582] trunk/wp-admin/network/site-users.php:
Update and error messages for site-users.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16582">16582</a></dd>
<dt>Author</dt> <dd>PeteMall</dd>
<dt>Date</dt> <dd>2010-11-25 09:13:38 +0000 (Thu, 25 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update and error messages for site-users. See <a href="http://trac.wordpress.org/ticket/15558">#15558</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16581 => 16582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2010-11-25 02:14:33 UTC (rev 16581)
+++ trunk/wp-admin/network/site-users.php 2010-11-25 09:13:38 UTC (rev 16582)
</span><span class="lines">@@ -51,26 +51,37 @@
</span><span class="cx">
</span><span class="cx"> $action = $wp_list_table->current_action();
</span><span class="cx">
</span><ins>+if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] )
+ wp_redirect( wp_get_referer() );
+
</ins><span class="cx"> if ( $action ) {
</span><span class="cx"> switch_to_blog( $id );
</span><span class="cx">
</span><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'adduser':
</span><span class="cx"> if ( !empty( $_POST['newuser'] ) ) {
</span><del>- $newuser = $_POST['newuser'];
</del><ins>+ $update = 'add';
+ $newuser = $_POST['newuser'];
</ins><span class="cx"> $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
</span><span class="cx"> if ( $userid ) {
</span><span class="cx"> $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
</span><span class="cx"> if ( $user == false )
</span><span class="cx"> add_user_to_blog( $id, $userid, $_POST['new_role'] );
</span><ins>+ else
+ $update = 'err_add_member';
+ } else {
+ $update = 'err_add_notfound';
</ins><span class="cx"> }
</span><ins>+ } else {
+ $update = 'err_add_notfound';
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'remove':
</span><span class="cx"> if ( !current_user_can('remove_users') )
</span><span class="cx"> die(__('You can&#8217;t remove users.'));
</span><del>-
</del><ins>+
+ $update = 'remove';
</ins><span class="cx"> if ( isset( $_REQUEST['users'] ) ) {
</span><span class="cx"> $userids = $_REQUEST['users'];
</span><span class="cx">
</span><span class="lines">@@ -78,8 +89,10 @@
</span><span class="cx"> $user_id = (int) $user_id;
</span><span class="cx"> remove_user_from_blog( $user_id, $id );
</span><span class="cx"> }
</span><ins>+ } elseif ( isset( $_GET['user'] ) ) {
+ remove_user_from_blog( $_GET['user'] );
</ins><span class="cx"> } else {
</span><del>- remove_user_from_blog( $_GET['user'] );
</del><ins>+ $update = 'err_remove';
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -88,23 +101,27 @@
</span><span class="cx"> if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
</span><span class="cx"> wp_die(__('You can&#8217;t give users that role.'));
</span><span class="cx">
</span><del>- $userids = $_REQUEST['users'];
- $update = 'promote';
- foreach ( $userids as $user_id ) {
- $user_id = (int) $user_id;
</del><ins>+ if ( isset( $_REQUEST['users'] ) ) {
+ $userids = $_REQUEST['users'];
+ $update = 'promote';
+ foreach ( $userids as $user_id ) {
+ $user_id = (int) $user_id;
</ins><span class="cx">
</span><del>- // If the user doesn't already belong to the blog, bail.
- if ( !is_user_member_of_blog( $user_id ) )
- wp_die(__('Cheatin&#8217; uh?'));
</del><ins>+ // If the user doesn't already belong to the blog, bail.
+ if ( !is_user_member_of_blog( $user_id ) )
+ wp_die(__('Cheatin&#8217; uh?'));
</ins><span class="cx">
</span><del>- $user = new WP_User( $user_id );
- $user->set_role( $_REQUEST['new_role'] );
</del><ins>+ $user = new WP_User( $user_id );
+ $user->set_role( $_REQUEST['new_role'] );
+ }
+ } else {
+ $update = 'err_promote';
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> restore_current_blog();
</span><del>- wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
</del><ins>+ wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
</span><span class="lines">@@ -113,10 +130,8 @@
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx"> $submenu_file = 'sites.php';
</span><span class="cx">
</span><del>-require('../admin-header.php');
</del><ins>+require('../admin-header.php'); ?>
</ins><span class="cx">
</span><del>-?>
-
</del><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon('ms-admin'); ?>
</span><span class="cx"> <h2 id="edit-site"><?php echo $title ?></h2>
</span><span class="lines">@@ -129,7 +144,34 @@
</span><span class="cx"> echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-</h3>
</del><ins>+</h3><?php
+
+if ( isset($_GET['update']) ) :
+ switch($_GET['update']) {
+ case 'add':
+ echo '<div id="message" class="updated"><p>' . __( 'User added.' ) . '</p></div>';
+ break;
+ case 'err_add_member':
+ echo '<div id="message" class="error"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+ break;
+ case 'err_add_notfound':
+ echo '<div id="message" class="error"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+ break;
+ case 'promote':
+ echo '<div id="message" class="updated"><p>' . __( 'Changed roles.' ) . '</p></div>';
+ break;
+ case 'err_promote':
+ echo '<div id="message" class="error"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+ break;
+ case 'remove':
+ echo '<div id="message" class="updated fade"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+ break;
+ case 'err_remove':
+ echo '<div id="message" class="error"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+ break;
+ }
+endif; ?>
+
</ins><span class="cx"> <form class="search-form" action="" method="get">
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
</span></span></pre>
</div>
</div>
</body>
</html>