--- a/web/wp-admin/network/site-users.php Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-admin/network/site-users.php Wed Dec 19 17:46:52 2012 -0800
@@ -45,33 +45,26 @@
wp_die( __('Invalid site ID.') );
$details = get_blog_details( $id );
-if ( !can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) )
wp_die( __( 'You do not have permission to access this page.' ) );
$is_main_site = is_main_site( $id );
-// get blog prefix
-$blog_prefix = $wpdb->get_blog_prefix( $id );
+switch_to_blog( $id );
-// @todo This is a hack. Eventually, add API to WP_Roles allowing retrieval of roles for a particular blog.
-if ( ! empty($wp_roles->use_db) ) {
- $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
-} else {
- // Roles are stored in memory, not the DB.
- $editblog_roles = $wp_roles->roles;
-}
-$default_role = get_blog_option( $id, 'default_role' );
+$editblog_roles = $wp_roles->roles;
+
+$default_role = get_option( 'default_role' );
$action = $wp_list_table->current_action();
if ( $action ) {
- switch_to_blog( $id );
switch ( $action ) {
case 'newuser':
check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
$user = $_POST['user'];
- if ( !is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
+ if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
$update = 'err_new';
} else {
$password = wp_generate_password( 12, false);
@@ -94,6 +87,7 @@
$newuser = $_POST['newuser'];
$userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
if ( $userid ) {
+ $blog_prefix = $wpdb->get_blog_prefix( $id );
$user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
if ( $user == false )
add_user_to_blog( $id, $userid, $_POST['new_role'] );
@@ -108,7 +102,7 @@
break;
case 'remove':
- if ( !current_user_can('remove_users') )
+ if ( ! current_user_can( 'remove_users' ) )
die(__('You can’t remove users.'));
check_admin_referer( 'bulk-users' );
@@ -143,7 +137,7 @@
if ( !is_user_member_of_blog( $user_id ) )
wp_die(__('Cheatin’ uh?'));
- $user = new WP_User( $user_id );
+ $user = get_userdata( $user_id );
$user->set_role( $_REQUEST['new_role'] );
}
} else {
@@ -152,11 +146,12 @@
break;
}
- restore_current_blog();
wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
exit();
}
+restore_current_blog();
+
if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
wp_safe_redirect( $referer );
exit();
@@ -244,7 +239,6 @@
<?php $wp_list_table->views(); ?>
<form method="post" action="site-users.php?action=update-site">
- <?php wp_nonce_field( 'edit-site' ); ?>
<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
<?php $wp_list_table->display(); ?>
@@ -254,15 +248,8 @@
<?php do_action( 'network_site_users_after_list_table', '' );?>
<?php if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
-<h4 id="add-user"><?php _e('Add User to This Site') ?></h4>
- <?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
-<p><?php _e( 'You may add from existing network users, or set up a new user to add to this site.' ); ?></p>
- <?php else : ?>
-<p><?php _e( 'You may add from existing network users to this site.' ); ?></p>
- <?php endif; ?>
-<h5 id="add-existing-user"><?php _e('Add Existing User') ?></h5>
+<h3 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h3>
<form action="site-users.php?action=adduser" id="adduser" method="post">
- <?php wp_nonce_field( 'edit-site' ); ?>
<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
<table class="form-table">
<tr>
@@ -270,28 +257,26 @@
<td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
</tr>
<tr>
- <th scope="row"><?php _e( 'Role'); ?></th>
+ <th scope="row"><?php _e( 'Role' ); ?></th>
<td><select name="new_role" id="new_role_0">
<?php
reset( $editblog_roles );
- foreach ( $editblog_roles as $role => $role_assoc ){
+ foreach ( $editblog_roles as $role => $role_assoc ) {
$name = translate_user_role( $role_assoc['name'] );
- $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
- echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
+ echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
}
?>
</select></td>
</tr>
</table>
<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
- <?php submit_button( __('Add User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-existing-user' ) ); ?>
+ <?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
</form>
<?php endif; ?>
<?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
-<h5 id="add-new-user"><?php _e('Add New User') ?></h5>
+<h3 id="add-new-user"><?php _e( 'Add New User' ); ?></h3>
<form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
- <?php wp_nonce_field( 'edit-site' ); ?>
<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
<table class="form-table">
<tr>
@@ -303,14 +288,13 @@
<td><input type="text" class="regular-text" name="user[email]" /></td>
</tr>
<tr>
- <th scope="row"><?php _e( 'Role'); ?></th>
+ <th scope="row"><?php _e( 'Role' ); ?></th>
<td><select name="new_role" id="new_role_0">
<?php
reset( $editblog_roles );
- foreach ( $editblog_roles as $role => $role_assoc ){
+ foreach ( $editblog_roles as $role => $role_assoc ) {
$name = translate_user_role( $role_assoc['name'] );
- $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
- echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
+ echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
}
?>
</select></td>
@@ -320,7 +304,7 @@
</tr>
</table>
<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
- <?php submit_button( __('Add New User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-user' ) ); ?>
+ <?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
</form>
<?php endif; ?>
</div>