Wordpress 2.9.2-scripts

[autoinstalls/wordpress.git] / wp-admin / users.php

diff --git a/wp-admin/users.php b/wp-admin/users.php
index fcd4fe03e8a0f3da33775ee3324dee947f27e04c..d11ee53d949ef69a0aa1761aec0972b01c0d5cee 100644 (file)
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -1,40 +1,73 @@
 <?php
 <?php

+/**
+ * Users administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */

 require_once('admin.php');
 require_once('admin.php');

-require_once( ABSPATH . WPINC . '/registration-functions.php');
+
+/** WordPress Registration API */
+require_once( ABSPATH . WPINC . '/registration.php');
+
+if ( !current_user_can('edit_users') )
+       wp_die(__('Cheatin&#8217; uh?'));

 
 $title = __('Users');
 
 $title = __('Users');

-$parent_file = 'profile.php';
-       
-$action = $_REQUEST['action'];
-$update = '';
+$parent_file = 'users.php';
+
+$update = $doaction = '';
+if ( isset($_REQUEST['action']) )
+       $doaction = $_REQUEST['action'] ? $_REQUEST['action'] : $_REQUEST['action2'];
+
+if ( empty($doaction) ) {
+       if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
+               $doaction = 'promote';
+}

 
 

-switch ($action) {
+if ( empty($_REQUEST) ) {
+       $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="' . esc_attr($redirect) . '" />';
+} else {
+       $redirect = 'users.php';
+       $referer = '';
+}
+
+switch ($doaction) {

 
 

+/* Bulk Dropdown menu Role changes */

 case 'promote':
        check_admin_referer('bulk-users');
 
 case 'promote':
        check_admin_referer('bulk-users');
 

-       if (empty($_POST['users'])) {
-               wp_redirect('users.php');
+       if (empty($_REQUEST['users'])) {
+               wp_redirect($redirect);

                exit();
        }
 
                exit();
        }
 

-       if ( !current_user_can('edit_users') )
-               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 = $_POST['users'];
+       $userids = $_REQUEST['users'];

        $update = 'promote';
        $update = 'promote';

-       foreach($userids as $id) {
+       foreach($userids as $id) {
+               if ( ! current_user_can('edit_user', $id) )
+                       wp_die(__('You can&#8217;t edit that user.'));

                // The new role of the current user must also have edit_users caps
                // The new role of the current user must also have edit_users caps

-               if($id == $current_user->id && !$wp_roles->role_objects[$_POST['new_role']]->has_cap('edit_users')) {
+               if($id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users')) {

                        $update = 'err_admin_role';
                        continue;
                }
 
                        $update = 'err_admin_role';
                        continue;
                }
 

-               $user = new WP_User($id);
-               $user->set_role($_POST['new_role']);
-       }
-               
-       wp_redirect('users.php?update=' . $update);
+               $user = new WP_User($id);
+               $user->set_role($_REQUEST['new_role']);
+       }
+
+       wp_redirect(add_query_arg('update', $update, $redirect));

        exit();
 
 break;
        exit();
 
 break;


@@ -43,89 +76,101 @@ case 'dodelete':
 
        check_admin_referer('delete-users');
 
 
        check_admin_referer('delete-users');
 

-       if ( empty($_POST['users']) ) {
-               wp_redirect('users.php');
+       if ( empty($_REQUEST['users']) ) {
+               wp_redirect($redirect);

                exit();
        }
 
                exit();
        }
 

-       if ( !current_user_can('edit_users') )
-               die(__('You can&#8217;t delete users.'));
+       if ( !current_user_can('delete_users') )
+               wp_die(__('You can&#8217;t delete users.'));

 
 

-       $userids = $_POST['users'];
-       
+       $userids = $_REQUEST['users'];

        $update = 'del';
        $update = 'del';

-       foreach ($userids as $id) {
-               if($id == $current_user->id) {
+       $delete_count = 0;
+
+       foreach ( (array) $userids as $id) {
+               if ( ! current_user_can('delete_user', $id) )
+                       wp_die(__('You can&#8217;t delete that user.'));
+
+               if($id == $current_user->ID) {

                        $update = 'err_admin_del';
                        continue;
                }
                        $update = 'err_admin_del';
                        continue;
                }

-               switch($_POST['delete_option']) {
+               switch($_REQUEST['delete_option']) {

                case 'delete':
                        wp_delete_user($id);
                        break;
                case 'reassign':
                case 'delete':
                        wp_delete_user($id);
                        break;
                case 'reassign':

-                       wp_delete_user($id, $_POST['reassign_user']);
+                       wp_delete_user($id, $_REQUEST['reassign_user']);

                        break;
                }
                        break;
                }

+               ++$delete_count;

        }
 
        }
 

-       wp_redirect('users.php?update=' . $update);
+       $redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
+       wp_redirect($redirect);

        exit();
        exit();

+

 break;
 
 case 'delete':
 
        check_admin_referer('bulk-users');
 
 break;
 
 case 'delete':
 
        check_admin_referer('bulk-users');
 

-       if ( empty($_POST['users']) ) {
-               wp_redirect('users.php');
+       if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+               wp_redirect($redirect);

                exit();
        }
 
                exit();
        }
 

-       if ( !current_user_can('edit_users') )
-               $error['edit_users'] = __('You can&#8217;t delete users.');
+       if ( !current_user_can('delete_users') )
+               $errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));

 
 

-       $userids = $_POST['users'];
+       if ( empty($_REQUEST['users']) )
+               $userids = array(intval($_REQUEST['user']));
+       else
+               $userids = $_REQUEST['users'];

 
        include ('admin-header.php');
 ?>
 <form action="" method="post" name="updateusers" id="updateusers">
 <?php wp_nonce_field('delete-users') ?>
 
        include ('admin-header.php');
 ?>
 <form action="" method="post" name="updateusers" id="updateusers">
 <?php wp_nonce_field('delete-users') ?>

+<?php echo $referer; ?>
+

 <div class="wrap">
 <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;
 <h2><?php _e('Delete Users'); ?></h2>
 <p><?php _e('You have specified these users for deletion:'); ?></p>
 <ul>
 <?php
        $go_delete = false;

-       foreach ($userids as $id) {
-               $user = new WP_User($id);
-               if ($id == $current_user->id) {
+       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>" . 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;
                }
                        $go_delete = true;
                }

-       }
-       $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
-       $user_dropdown = '<select name="reassign_user">';
-       foreach ($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 .= '</select>';
-       ?>
-       </ul>
-<?php if($go_delete) : ?>
-       <p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
+       }
+       $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
+       $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=\"" . esc_attr($login->ID) . "\">{$login->user_login}</option>";
+       $user_dropdown .= '</select>';
+       ?>
+       </ul>
+<?php if ( $go_delete ) : ?>
+       <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 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" />
        <input type="hidden" name="action" value="dodelete" />

-       <p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" /></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; ?>
 <?php else : ?>
        <p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>


@@ -135,201 +180,216 @@ case 'delete':
 
 break;
 
 
 break;
 

-case 'adduser':
-       check_admin_referer('add-user');
-       
-       $errors = add_user();
-       
-       if ( count($errors) == 0 ) {
-               wp_redirect('users.php?update=add');
-               exit();
+default:
+
+       if ( !empty($_GET['_wp_http_referer']) ) {
+               wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
+               exit;

        }
 
        }
 

-default:
-       
-       include ('admin-header.php');
-       
-       $userids = $wpdb->get_col("SELECT ID FROM $wpdb->users;");
-       
-       foreach($userids as $userid) {
-               $tmp_user = new WP_User($userid);
-               $roles = $tmp_user->roles;
-               $role = array_shift($roles);
-               $roleclasses[$role][$tmp_user->user_login] = $tmp_user;
-       }       
-       
-       ?>
+       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;

 
 

-       <?php 
-       if (isset($_GET['update'])) : 
+       // Query the users
+       $wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
+
+       $messages = array();
+       if ( isset($_GET['update']) ) :

                switch($_GET['update']) {
                case 'del':
                switch($_GET['update']) {
                case 'del':

-               ?>
-                       <div id="message" class="updated fade"><p><?php _e('User deleted.'); ?></p></div>
-               <?php
+               case 'del_many':
+                       $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':
                        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':
                        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':
                        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':
                        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;
                }
                        break;
                }

-       endif; 
-       if ( isset($errors) ) : ?>
+       endif; ?>
+
+<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>

        <div class="error">
                <ul>
                <?php
        <div class="error">
                <ul>
                <?php

-               foreach($errors as $error) echo "<li>$error</li>";
+                       foreach ( $errors->get_error_messages() as $err )
+                               echo "<li>$err</li>\n";

                ?>
                </ul>
        </div>
                ?>
                </ul>
        </div>

-       <?php 
-       endif;
-       ?>
-       
-<form action="" method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('bulk-users') ?>
-<div class="wrap">
-       <h2><?php _e('User List by Role'); ?></h2>
-  <table cellpadding="3" cellspacing="3" width="100%">
-       <?php
-       foreach($roleclasses as $role => $roleclass) {
-               uksort($roleclass, "strnatcasecmp");
-               ?>
+<?php endif;

 
 

-       <tr>
-       <th colspan="8" align="left">
-  <h3><?php echo $wp_roles->role_names[$role]; ?></h3>
-  </th></tr>
-
-       <tr>
-       <th><?php _e('ID') ?></th>
-       <th><?php _e('Username') ?></th>
-       <th><?php _e('Name') ?></th>
-       <th><?php _e('E-mail') ?></th>
-       <th><?php _e('Website') ?></th>
-       <th><?php _e('Posts') ?></th>
-       <th>&nbsp;</th>
-       </tr>
-       <?php
-       $style = '';
-       foreach ($roleclass as $user_object) {
-               $email = $user_object->user_email;
-               $url = $user_object->user_url;
-               $short_url = str_replace('http://', '', $url);
-               $short_url = str_replace('www.', '', $short_url);
-               if ('/' == substr($short_url, -1))
-                       $short_url = substr($short_url, 0, -1);
-               if (strlen($short_url) > 35)
-               $short_url =  substr($short_url, 0, 32).'...';
-               $style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
-               $numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$user_object->ID' and post_status = 'publish'");
-               if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_object->ID' title='" . __('View posts') . "'>$numposts</a>";
-               echo "
-<tr $style>
-       <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
-       <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><a href='$url' title='website: $url'>$short_url</a></td>";
-       echo "<td align='right'>$numposts</td>";
-       echo '<td>';
-       if (current_user_can('edit_users'))
-               echo "<a href='user-edit.php?user_id=$user_object->ID' class='edit'>".__('Edit')."</a>";
-       echo '</td>';
-       echo '</tr>';
-       }
-       
-       ?>
-       
+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
 <?php

+$role_links = array();
+$avail_roles = array();
+$users_of_blog = get_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 ) {
+               if ( !isset($avail_roles[$b_role]) )
+                       $avail_roles[$b_role] = 0;
+               $avail_roles[$b_role]++;

        }
        }

-?>
-  </table>
+}
+unset($users_of_blog);

 
 

+$current_role = false;
+$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;

 
 

-       <h2><?php _e('Update Users'); ?></h2>
-<?php
-$role_select = '<select name="new_role">';
-foreach($wp_roles->role_names as $role => $name) {
-       $role_select .= "<option value=\"{$role}\">{$name}</option>";
+       $class = '';
+
+       if ( $this_role == $role ) {
+               $current_role = $role;
+               $class = ' class="current"';
+       }
+
+       $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>";

 }
 }

-$role_select .= '</select>';
-?>  
-  <ul style="list-style:none;">
-       <li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></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>
+echo implode( " |</li>\n", $role_links) . '</li>';
+unset($role_links);
+?>
+</ul>
+</form>

 </div>
 </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>
 

-<div class="wrap">
-<h2><?php _e('Add New User') ?></h2>
-<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
-<form action="" method="post" name="adduser" id="adduser">
-  <?php wp_nonce_field('add-user') ?>
-  <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>
+<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 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>
+
+       <?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
+               <div class="error">
+                       <ul>
+                       <?php
+                               foreach ( $wp_user_search->search_errors->get_error_messages() as $message )
+                                       echo "<li>$message</li>";
+                       ?>
+                       </ul>
+               </div>
+       <?php endif; ?>
+
+
+<?php if ( $wp_user_search->get_results() ) : ?>
+
+       <?php if ( $wp_user_search->is_search() ) : ?>
+               <p><a href="users.php"><?php _e('&larr; Back to All Users'); ?></a></p>
+       <?php endif; ?>
+
+<table class="widefat fixed" cellspacing="0">
+<thead>
+<tr class="thead">
+<?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
 <?php

-$show_password_fields = apply_filters('show_password_fields', true);
-if ( $show_password_fields ) :
+$style = '';
+foreach ( $wp_user_search->get_results() as $userid ) {
+       $user_object = new WP_User($userid);
+       $roles = $user_object->roles;
+       $role = array_shift($roles);
+
+       $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+       echo "\n\t" . user_row($user_object, $style, $role);
+}

 ?>
 ?>

-    <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>
+</tbody>
+</table>
+
+<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 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>
+
+<br class="clear" />
+</div>
+

 <?php endif; ?>
 <?php endif; ?>

-  </table>
-  <p class="submit">
-    <input name="adduser" type="submit" id="adduser" value="<?php _e('Add User') ?> &raquo;" />
-  </p>
-  </form>
+
+</form>

 </div>
 </div>

-       <?php

 
 

+<br class="clear" />
+<?php

 break;
 break;

-}
+
+} // end of the $doaction switch

 
 include('admin-footer.php');
 ?>
 
 include('admin-footer.php');
 ?>