X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..312084b5d95c21feb519ff03decf948420e1f6fa:/wp-admin/users.php

diff --git a/wp-admin/users.php b/wp-admin/users.php
index d8089b4c..d11ee53d 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -1,5 +1,15 @@
 <?php
+/**
+ * Users administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
 require_once('admin.php');
+
+/** WordPress Registration API */
 require_once( ABSPATH . WPINC . '/registration.php');
 
 if ( !current_user_can('edit_users') )
@@ -8,27 +18,28 @@ if ( !current_user_can('edit_users') )
 $title = __('Users');
 $parent_file = 'users.php';
 
-$action = $_REQUEST['action'];
-$update = '';
+$update = $doaction = '';
+if ( isset($_REQUEST['action']) )
+	$doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2'];
 
-if ( empty($action) ) {
-	if ( isset($_GET['deleteit']) )
-		$action = 'delete';
-	elseif ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
-		$action = 'promote';
+if ( empty($doaction) ) {
+	if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
+		$doaction = 'promote';
 }
 
 if ( empty($_REQUEST) ) {
-	$referer = '<input type="hidden" name="wp_http_referer" value="'. attribute_escape(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
+	$referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
 } elseif ( isset($_REQUEST['wp_http_referer']) ) {
 	$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), stripslashes($_REQUEST['wp_http_referer']));
-	$referer = '<input type="hidden" name="wp_http_referer" value="' . attribute_escape($redirect) . '" />';
+	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr($redirect) . '" />';
 } else {
 	$redirect = 'users.php';
+	$referer = '';
 }
 
-switch ($action) {
+switch ($doaction) {
 
+/* Bulk Dropdown menu Role changes */
 case 'promote':
 	check_admin_referer('bulk-users');
 
@@ -37,8 +48,9 @@ case 'promote':
 		exit();
 	}
 
-	if ( !current_user_can('edit_users') )
-		wp_die(__('You can&#8217;t edit users.'));
+	$editable_roles = get_editable_roles();
+	if (!$editable_roles[$_REQUEST['new_role']])
+		wp_die(__('You can&#8217;t give users that role.'));
 
 	$userids = $_REQUEST['users'];
 	$update = 'promote';
@@ -105,7 +117,7 @@ case 'delete':
 
 	check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) ) {
+	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
 		exit();
 	}
@@ -113,7 +125,10 @@ case 'delete':
 	if ( !current_user_can('delete_users') )
 		$errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
 
-	$userids = $_REQUEST['users'];
+	if ( empty($_REQUEST['users']) )
+		$userids = array(intval($_REQUEST['user']));
+	else
+		$userids = $_REQUEST['users'];
 
 	include ('admin-header.php');
 ?>
@@ -122,17 +137,19 @@ case 'delete':
 <?php echo $referer; ?>
 
 <div class="wrap">
+<?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>
 <p><?php _e('You have specified these users for deletion:'); ?></p>
 <ul>
 <?php
 	$go_delete = false;
 	foreach ( (array) $userids as $id ) {
+		$id = (int) $id;
 		$user = new WP_User($id);
 		if ( $id == $current_user->ID ) {
 			echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
 		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
 			$go_delete = true;
 		}
 	}
@@ -140,20 +157,20 @@ case 'delete':
 	$user_dropdown = '<select name="reassign_user">';
 	foreach ( (array) $all_logins as $login )
 		if ( $login->ID == $current_user->ID || !in_array($login->ID, $userids) )
-			$user_dropdown .= "<option value=\"{$login->ID}\">{$login->user_login}</option>";
+			$user_dropdown .= "<option value=\"" . esc_attr($login->ID) . "\">{$login->user_login}</option>";
 	$user_dropdown .= '</select>';
 	?>
 	</ul>
 <?php if ( $go_delete ) : ?>
-	<p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
+	<fieldset><p><legend><?php _e('What should be done with posts and links owned by this user?'); ?></legend></p>
 	<ul style="list-style:none;">
 		<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 '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
-	</ul>
+	</ul></fieldset>
 	<input type="hidden" name="action" value="dodelete" />
-	<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" class="button-secondary" /></p>
+	<p class="submit"><input type="submit" name="submit" value="<?php esc_attr_e('Confirm Deletion'); ?>" class="button-secondary" /></p>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -163,23 +180,6 @@ case 'delete':
 
 break;
 
-case 'adduser':
-	check_admin_referer('add-user');
-
-	if ( ! current_user_can('create_users') )
-		wp_die(__('You can&#8217;t create users.'));
-
-	$user_id = add_user();
-	$update = 'add';
-	if ( is_wp_error( $user_id ) )
-		$add_user_errors = $user_id;
-	else {
-		$new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
-		$redirect = add_query_arg( array('usersearch' => urlencode($new_user_login), 'update' => $update), $redirect );
-		wp_redirect( $redirect . '#user-' . $user_id );
-		die();
-	}
-
 default:
 
 	if ( !empty($_GET['_wp_http_referer']) ) {
@@ -187,73 +187,71 @@ default:
 		exit;
 	}
 
-	wp_enqueue_script('admin-users');
-	wp_enqueue_script('admin-forms');
-
 	include('admin-header.php');
 
+	$usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
+	$userspage = isset($_GET['userspage']) ? $_GET['userspage'] : null;
+	$role = isset($_GET['role']) ? $_GET['role'] : null;
+
 	// Query the users
-	$wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage'], $_GET['role']);
+	$wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
 
+	$messages = array();
 	if ( isset($_GET['update']) ) :
 		switch($_GET['update']) {
 		case 'del':
 		case 'del_many':
-		?>
-			<?php $delete_count = (int) $_GET['delete_count']; ?>
-			<div id="message" class="updated fade"><p><?php printf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count); ?></p></div>
-		<?php
+			$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
+			$messages[] = '<div id="message" class="updated fade"><p>' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>';
 			break;
 		case 'add':
-		?>
-			<div id="message" class="updated fade"><p><?php _e('New user created.'); ?></p></div>
-		<?php
+			$messages[] = '<div id="message" class="updated fade"><p>' . __('New user created.') . '</p></div>';
 			break;
 		case 'promote':
-		?>
-			<div id="message" class="updated fade"><p><?php _e('Changed roles.'); ?></p></div>
-		<?php
+			$messages[] = '<div id="message" class="updated fade"><p>' . __('Changed roles.') . '</p></div>';
 			break;
 		case 'err_admin_role':
-		?>
-			<div id="message" class="error"><p><?php _e("The current user's role must have user editing capabilities."); ?></p></div>
-			<div id="message" class="updated fade"><p><?php _e('Other user roles have been changed.'); ?></p></div>
-		<?php
+			$messages[] = '<div id="message" class="error"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
+			$messages[] = '<div id="message" class="updated fade"><p>' . __('Other user roles have been changed.') . '</p></div>';
 			break;
 		case 'err_admin_del':
-		?>
-			<div id="message" class="error"><p><?php _e("You can't delete the current user."); ?></p></div>
-			<div id="message" class="updated fade"><p><?php _e('Other users have been deleted.'); ?></p></div>
-		<?php
+			$messages[] = '<div id="message" class="error"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
+			$messages[] = '<div id="message" class="updated fade"><p>' . __('Other users have been deleted.') . '</p></div>';
 			break;
 		}
 	endif; ?>
 
-<?php if ( is_wp_error( $errors ) ) : ?>
+<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $message )
-				echo "<li>$message</li>";
+			foreach ( $errors->get_error_messages() as $err )
+				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
-<?php endif; ?>
+<?php endif;
 
-<div class="wrap">
-<form id="posts-filter" action="" method="get">
-	<?php if ( $wp_user_search->is_search() ) : ?>
-		<h2><?php printf(__('Users Matching "%s"'), wp_specialchars($wp_user_search->search_term)); ?></h2>
-	<?php else : ?>
-		<h2><?php _e('Manage Users'); ?></h2>
-	<?php endif; ?>
+if ( ! empty($messages) ) {
+	foreach ( $messages as $msg )
+		echo $msg;
+} ?>
 
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?>  <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a> <?php
+if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
+</h2>
+
+<div class="filter">
+<form id="list-filter" action="" method="get">
 <ul class="subsubsub">
 <?php
 $role_links = array();
 $avail_roles = array();
 $users_of_blog = get_users_of_blog();
-//var_dump($users_of_blog);
+$total_users = count( $users_of_blog );
 foreach ( (array) $users_of_blog as $b_user ) {
 	$b_roles = unserialize($b_user->meta_value);
 	foreach ( (array) $b_roles as $b_role => $val ) {
@@ -265,50 +263,60 @@ foreach ( (array) $users_of_blog as $b_user ) {
 unset($users_of_blog);
 
 $current_role = false;
-$class = empty($_GET['role']) ? ' class="current"' : '';
-$role_links[] = "<li><a href=\"users.php\"$class>" . __('All Users') . "</a>";
-foreach ( $wp_roles->get_names() as $role => $name ) {
-	if ( !isset($avail_roles[$role]) )
+$class = empty($role) ? ' class="current"' : '';
+$role_links[] = "<li><a href='users.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+foreach ( $wp_roles->get_names() as $this_role => $name ) {
+	if ( !isset($avail_roles[$this_role]) )
 		continue;
 
 	$class = '';
 
-	if ( $role == $_GET['role'] ) {
-		$current_role = $_GET['role'];
+	if ( $this_role == $role ) {
+		$current_role = $role;
 		$class = ' class="current"';
 	}
 
-	$name = translate_with_context($name);
-	$name = sprintf(_c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$role]);
-	$role_links[] = "<li><a href=\"users.php?role=$role\"$class>" . $name . '</a>';
+	$name = translate_user_role( $name );
+	/* translators: User role name with count */
+	$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, $avail_roles[$this_role] );
+	$role_links[] = "<li><a href='users.php?role=$this_role'$class>$name</a>";
 }
-echo implode(' |</li>', $role_links) . '</li>';
+echo implode( " |</li>\n", $role_links) . '</li>';
 unset($role_links);
 ?>
 </ul>
-	<p id="post-search">
-	<input type="text" id="post-search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
-	<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
-	</p>
+</form>
+</div>
+
+<form class="search-form" action="" method="get">
+<p class="search-box">
+	<label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
+	<input type="text" id="user-search-input" name="usersearch" value="<?php echo esc_attr($wp_user_search->search_term); ?>" />
+	<input type="submit" value="<?php esc_attr_e( 'Search Users' ); ?>" class="button" />
+</p>
+</form>
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
 <?php if ( $wp_user_search->results_are_paged() ) : ?>
 	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-<div class="alignleft">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
-<select name="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option>"<?php wp_dropdown_roles(); ?></select>
-<input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />
+<div class="alignleft actions">
+<select name="action">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<label class="screen-reader-text" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option><?php wp_dropdown_roles(); ?></select>
+<input type="submit" value="<?php esc_attr_e('Change'); ?>" name="changeit" class="button-secondary" />
 <?php wp_nonce_field('bulk-users'); ?>
 </div>
 
 <br class="clear" />
 </div>
 
-<br class="clear" />
-
 	<?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
 		<div class="error">
 			<ul>
@@ -324,20 +332,22 @@ unset($role_links);
 <?php if ( $wp_user_search->get_results() ) : ?>
 
 	<?php if ( $wp_user_search->is_search() ) : ?>
-		<p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p>
+		<p><a href="users.php"><?php _e('&larr; Back to All Users'); ?></a></p>
 	<?php endif; ?>
 
-<table class="widefat">
+<table class="widefat fixed" cellspacing="0">
 <thead>
 <tr class="thead">
-	<th scope="col" class="check-column"><input type="checkbox" onclick="checkAll(document.getElementById('posts-filter'));" /> </th>
-	<th><?php _e('Username') ?></th>
-	<th><?php _e('Name') ?></th>
-	<th><?php _e('E-mail') ?></th>
-	<th><?php _e('Role') ?></th>
-	<th class="num"><?php _e('Posts') ?></th>
+<?php print_column_headers('users') ?>
 </tr>
 </thead>
+
+<tfoot>
+<tr class="thead">
+<?php print_column_headers('users', false) ?>
+</tr>
+</tfoot>
+
 <tbody id="users" class="list:user user-list">
 <?php
 $style = '';
@@ -359,104 +369,27 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 	<div class="tablenav-pages"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-<br class="clear" />
-</div>
-
-<?php endif; ?>
-
-</form>
+<div class="alignleft actions">
+<select name="action2">
+<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
 </div>
 
-<?php
-	if ( is_wp_error($add_user_errors) ) {
-		foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
-			$var = 'new_' . $var;
-			$$var = attribute_escape(stripslashes($_REQUEST[$formpost]));
-		}
-		unset($name);
-	}
-?>
-
 <br class="clear" />
-<?php if ( current_user_can('create_users') ) { ?>
-
-<div class="wrap">
-<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
-
-<?php if ( is_wp_error( $add_user_errors ) ) : ?>
-	<div class="error">
-		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
-		?>
-	</div>
-<?php endif; ?>
-<div id="ajax-response"></div>
+</div>
 
-<?php
-	if ( get_option('users_can_register') )
-		echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '</p>';
-	else
-	        echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '</p>';
-?>
-<form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate">
-<?php wp_nonce_field('add-user') ?>
-<table class="form-table">
-	<tr class="form-field form-required">
-		<th scope="row"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
-		<td ><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
-	</tr>
-	<tr class="form-field">
-		<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 class="form-field">
-		<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 class="form-field form-required">
-		<th scope="row"><?php _e('E-mail (required)') ?></th>
-		<td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
-	</tr>
-	<tr class="form-field">
-		<th scope="row"><?php _e('Website') ?></th>
-		<td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
-	</tr>
-
-<?php if ( apply_filters('show_password_fields', true) ) : ?>
-	<tr class="form-field form-required">
-		<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; ?>
 
-	<tr class="form-field">
-		<th scope="row"><?php _e('Role'); ?></th>
-		<td><select name="role" id="role">
-			<?php
-			if ( !$new_user_role )
-				$new_user_role = $current_role ? $current_role : get_option('default_role');
-			wp_dropdown_roles($new_user_role);
-			?>
-			</select>
-		</td>
-	</tr>
-</table>
-<p class="submit">
-	<?php echo $referer; ?>
-	<input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User') ?>" />
-</p>
 </form>
-
 </div>
 
+<br class="clear" />
 <?php
-}
 break;
 
-} // end of the $action switch
+} // end of the $doaction switch
 
 include('admin-footer.php');
 ?>