*/
/** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
$wp_list_table = _get_list_table('WP_Users_List_Table');
$wp_list_table->prepare_items();
-$action = $wp_list_table->current_action();
-
-add_contextual_help($current_screen,
- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
- '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
- '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
- '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
- '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>' .
+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
+ '<p>' . __('<strong>Info</strong> - The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
+ '<p>' . __('<strong>Users</strong> - This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
+ '<p>' . sprintf( __('<strong>Themes</strong> - This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+ '<p>' . __('<strong>Settings</strong> - This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screens" target="_blank">Documentation on Site Management</a>') . '</p>' .
+ '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
'<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
);
+$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
+$referer = remove_query_arg( 'update', wp_get_referer() );
+
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
if ( ! $id )
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);
check_admin_referer( 'add-user', '_wpnonce_add-user' );
if ( !empty( $_POST['newuser'] ) ) {
$update = 'adduser';
- $newuser = $_POST['newuser'];
- $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
- if ( $userid ) {
- $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'] );
+ $newuser = $_POST['newuser'];
+ $user = get_user_by( 'login', $newuser );
+ if ( $user && $user->exists() ) {
+ if ( ! is_user_member_of_blog( $user->ID, $id ) )
+ add_user_to_blog( $id, $user->ID, $_POST['new_role'] );
else
$update = 'err_add_member';
} else {
$update = 'err_add_notfound';
}
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' );
-
+
$update = 'remove';
if ( isset( $_REQUEST['users'] ) ) {
$userids = $_REQUEST['users'];
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 {
}
break;
}
-
- restore_current_blog();
- wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
+
+ wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
exit();
}
+restore_current_blog();
+
if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
- wp_redirect( wp_get_referer() );
+ wp_safe_redirect( $referer );
exit();
}
add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
-$title = sprintf( __('Edit Site: %s'), get_blogaddress_by_id($id));
+$site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
+$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
+$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+
$parent_file = 'sites.php';
$submenu_file = 'sites.php';
-require('../admin-header.php'); ?>
+if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
+ wp_enqueue_script( 'user-suggest' );
+
+require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+
+<script type='text/javascript'>
+/* <![CDATA[ */
+var current_site_id = <?php echo $id; ?>;
+/* ]]> */
+</script>
+
<div class="wrap">
<?php screen_icon('ms-admin'); ?>
-<h2 id="edit-site"><?php echo $title ?></h2>
+<h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
<h3 class="nav-tab-wrapper">
<?php
$tabs = array(
);
foreach ( $tabs as $tab_id => $tab ) {
$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
+ echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
}
?>
</h3><?php
<?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(); ?>
<?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>
<th scope="row"><?php _e( 'Username' ); ?></th>
- <td><input type="text" class="regular-text" name="newuser" id="newuser" /></td>
+ <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' ); ?>
+ <?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>
<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>
</tr>
</table>
<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
- <?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
+ <?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
</form>
<?php endif; ?>
</div>
<?php
-require('../admin-footer.php');
+require( ABSPATH . 'wp-admin/admin-footer.php' );
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff