WP Merge and misc fixes, worth upgrading for!

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@460 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 23 insertions, 97 deletions

diff --git a/wp-inst/wp-admin/users.php b/wp-inst/wp-admin/users.php
index 611f7af..c0f20b9 100644
--- a/wp-inst/wp-admin/users.php
+++ b/wp-inst/wp-admin/users.php
@@ -45,7 +45,7 @@ case 'dodelete':
 		header('Location: users.php?update=del');
 		exit;
 	}
-	if (empty($_POST['users'])) {
+	if ( empty($_POST['users']) ) {
 		header('Location: users.php');
 	}
 
@@ -110,7 +110,7 @@ case 'delete':
 			$go_delete = true;
 		}
  	}
- 	$all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
+	$all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities'");
  	$user_dropdown = '<select name="reassign_user">';
  	foreach ($all_logins as $login) {
 		if ( $login->ID == $current_user->id || !in_array($login->ID, $userids) ) {
@@ -126,7 +126,7 @@ case 'delete':
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
 		<?php _e('Delete all posts and links.'); ?></label></li>
 		<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-		<?php echo sprintf(__('<label for="delete_option1">Attribute all posts and links to:</label> %s'), $user_dropdown); ?></li>
+		<?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
 	</ul>
 	<input type="hidden" name="action" value="dodelete" />
 	<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" /></p>
@@ -141,45 +141,25 @@ break;
 
 case 'addexistinguser':
 	check_admin_referer();
+	if ( !current_user_can('edit_users') )
+		die(__('You can&#8217;t edit users.'));
+
 	$new_user_login = wp_specialchars(trim($_POST['newuser']));
 	/* checking that username has been typed */
-	if ($new_user_login == '')
-		$errors['user_login'] = __('<strong>ERROR</strong>: Please enter a username.');
-	if ( username_exists( $new_user_login ) ) {
-		$user_ID = $wpdb->get_var( "SELECT ID FROM $wpdb->users WHERE user_login = '$new_user_login'" );
-		$user = new WP_User($user_ID);
-		$user->set_role( $_POST[ 'new_role' ] );
-	}
-	header('Location: users.php?update=add');
-	die();
-break;
-
-case 'adduser':
-	exit;
-	check_admin_referer();
-	
-	$errors = add_user();
-	
-	if(count($errors) == 0) {
-		header('Location: users.php?update=add');
-		die();
-	}
-
-case "searchusers":
-		$search = $_GET[ 'search' ];
-		$id = $_GET[ 'id' ];
-		$query = "SELECT " . $wpdb->users . ".ID, " . $wpdb->users . ".user_login FROM " . $wpdb->users . ", " . $wpdb->usermeta . " WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND " . $wpdb->usermeta . ".meta_key = '" . $wpmuBaseTablePrefix . $id . "_capabilities'";
-		$query = "SELECT " . $wpdb->users . ".ID, " . $wpdb->users . ".user_login FROM " . $wpdb->users . " WHERE user_login LIKE '%" . $search . "%' limit 0,10";
-		$users = $wpdb->get_results( $query );
-		if( is_array( $users ) ) {
-			while( list( $key, $val ) = each( $users ) ) 
-			{ 
-				print '<span onclick="javascript:return update_AJAX_search_box(\'' . $val->user_login . '\');"><a>' . $val->user_login . '</a></span><br>';
+	if ($new_user_login != '' && $new_user_login != 'admin' ) {
+		if ( username_exists( $new_user_login ) ) {
+			$user_ID = $wpdb->get_var( "SELECT ID FROM $wpdb->users WHERE user_login = '$new_user_login'" );
+			if( $wpdb->get_var( "SELECT user_id FROM {$wpdb->usermeta} WHERE user_id = '{$user_ID}' AND meta_key = '{$wpdb->prefix}capabilities'" ) == false ) {
+				$user = new WP_User($user_ID);
+				$user->set_role( $_POST[ 'new_role' ] );
+				do_action( "added_existing_user", $user_ID );
+				header('Location: users.php?update=add');
+				die();
 			}
-		} else {
-			print "No Users Found";
 		}
-		exit;
+	}
+	header('Location: users.php');
+	die();
 break;
 default:
 	if( is_array( $_POST[ 'new_roles' ] ) ) {
@@ -202,11 +182,7 @@ default:
 	
 	include ('admin-header.php');
 	
-	if( is_site_admin() ) {
-	    $userids = $wpdb->get_col("SELECT ID FROM $wpdb->users");
-	} else {
-	    $userids = $wpdb->get_col("SELECT ID FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities'");
-	}
+	$userids = $wpdb->get_col("SELECT ID FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities'");
 	
 	foreach($userids as $userid) {
 		$tmp_user = new WP_User($userid);
@@ -305,7 +281,7 @@ default:
 				<td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
 				<td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
 				<td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
-				<td><select name="new_roles[{$user_object->ID}]" id="new_role">";
+				<td><select name='new_roles[{$user_object->ID}]' id='new_role'>";
 			foreach($wp_roles->role_names as $roleid => $name) {
 				$selected = '';
 				if( $role == $roleid)
@@ -334,10 +310,8 @@ foreach($wp_roles->role_names as $role => $name) {
 $role_select .= '</select>';
 ?>  
   <ul style="list-style:none;">
-	<?php if( is_site_admin() ) { ?>
   	<li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
-	<?php } ?>
-  	<li><input type="radio" name="action" id="action1" value="promote" /> <?php echo sprintf(__('<label for="action1">Set the Role of checked users to:</label> %s'), $role_select); ?></li>
+  	<li><input type="radio" name="action" id="action1" value="promote" /> <?php echo '<label for="action1">'.__('Set the Role of checked users to:')."</label> $role_select"; ?></li>
   </ul>
 	<p class="submit"><input type="submit" value="<?php _e('Update &raquo;'); ?>" /></p>
 </div>
@@ -347,10 +321,9 @@ $role_select .= '</select>';
 <h2><?php _e('Add User From Community') ?></h2>
 <form action="" method="post" name="adduser" id="adduser">
 <input type='hidden' name='action' value='addexistinguser'>
-<p>As you type WordPress will offer you a choice of usernames.<br /> Click one to select and hit <em>Add User</em> to add the user.</p>
+<p>Type the username of another user to add them to your blog.</p>
 <table>
-<tr><th scope="row">User&nbsp;Login: </th><td><input type="text" name="newuser" id="newuser"></td><td><a href="javascript:doSearch();">Search</a></td></tr>
-<tr><td></td><td colspan='2'><div style='display:none; height: 60px; width: 200px; overflow: auto; border: 1px solid #ccc; background: #eee; margin: 5px; padding: 5px;' id="searchresults"><?php _e( 'Search Results' ) ?></div></td> </tr>
+<tr><th scope="row">User&nbsp;Login: </th><td><input type="text" name="newuser" id="newuser"></td></tr>
 	<tr>
 		<th scope="row"><?php _e('Role:') ?></th>
 		<td><select name="new_role" id="new_role"><?php 
@@ -364,7 +337,6 @@ $role_select .= '</select>';
 	</tr>
 </table>
 <br />
-<?php AJAX_search_box( "users.php?action=searchusers&search=", "newuser", "searchresults" ); ?>
 
     </td>
     </table>
@@ -374,53 +346,7 @@ $role_select .= '</select>';
   </form>
 </div>
 
-<?php /*
-<div class="wrap">
-<h2><?php _e('Add New User') ?></h2>
-<?php printf(__('<p>Users can <a href="%s/wp-register.php">register themselves</a> or you can manually create users here.</p>'), get_settings('siteurl')); ?>
-<form action="" method="post" name="adduser" id="adduser">
-  <table class="editform" width="100%" cellspacing="2" cellpadding="5">
-    <tr>
-      <th scope="row" width="33%"><?php _e('Nickname') ?>
-      <input name="action" type="hidden" id="action" value="adduser" /></th>
-      <td width="66%"><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
-    </tr>
-    <tr>
-      <th scope="row"><?php _e('First Name') ?> </th>
-      <td><input name="first_name" type="text" id="first_name" value="<?php echo $new_user_firstname; ?>" /></td>
-    </tr>
-    <tr>
-      <th scope="row"><?php _e('Last Name') ?> </th>
-      <td><input name="last_name" type="text" id="last_name" value="<?php echo $new_user_lastname; ?>" /></td>
-    </tr>
-    <tr>
-      <th scope="row"><?php _e('E-mail') ?></th>
-      <td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
-    </tr>
-    <tr>
-      <th scope="row"><?php _e('Website') ?></th>
-      <td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
-    </tr>
 <?php
-$show_password_fields = apply_filters('show_password_fields', true);
-if ( $show_password_fields ) :
-?>
-    <tr>
-      <th scope="row"><?php _e('Password (twice)') ?> </th>
-      <td><input name="pass1" type="password" id="pass1" />
-      <br />
-      <input name="pass2" type="password" id="pass2" /></td>
-    </tr>
-<?php endif; ?>
-  </table>
-  <p class="submit">
-    <input name="adduser" type="submit" id="adduser" value="<?php _e('Add User') ?> &raquo;" />
-  </p>
-  </form>
-</div>
-*/ ?>
-	<?php
-
 break;
 }