WordPress 4.2.3

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

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 743e9053e0b6ec5136466a50bb11f9e86029a3fd..57a189b7ae512701e837c76399370b11910c71d1 100644 (file)
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -8,7 +8,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
  */
 
 /** Load WordPress Administration Bootstrap */

-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );


@@ -32,46 +32,39 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></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://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
+       '<p>' . __('<a href="https://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() );
 
 );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
 $referer = remove_query_arg( 'update', wp_get_referer() );
 

+if ( ! empty( $_REQUEST['paged'] ) ) {
+       $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
+}
+

 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
 if ( ! $id )
        wp_die( __('Invalid site ID.') );
 
 $details = get_blog_details( $id );
 $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 ) )
-       wp_die( __( 'You do not have permission to access this page.' ) );
+if ( ! can_edit_network( $details->site_id ) )
+       wp_die( __( 'You do not have permission to access this page.' ), 403 );

 
 $is_main_site = is_main_site( $id );
 
 
 $is_main_site = is_main_site( $id );
 

-// get blog prefix
-$blog_prefix = $wpdb->get_blog_prefix( $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' );
+switch_to_blog( $id );

 
 $action = $wp_list_table->current_action();
 
 if ( $action ) {
 
 $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'];
 
        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);
                                $update = 'err_new';
                        } else {
                                $password = wp_generate_password( 12, false);


@@ -92,11 +85,10 @@ if ( $action ) {
                        if ( !empty( $_POST['newuser'] ) ) {
                                $update = 'adduser';
                                $newuser = $_POST['newuser'];
                        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'] );
+                               $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 {
                                        else
                                                $update = 'err_add_member';
                                } else {


@@ -108,7 +100,7 @@ if ( $action ) {
                        break;
 
                case 'remove':
                        break;
 
                case 'remove':

-                       if ( !current_user_can('remove_users')  )
+                       if ( ! current_user_can( 'remove_users' )  )

                                die(__('You can&#8217;t remove users.'));
                        check_admin_referer( 'bulk-users' );
 
                                die(__('You can&#8217;t remove users.'));
                        check_admin_referer( 'bulk-users' );
 


@@ -141,9 +133,9 @@ if ( $action ) {
 
                                        // If the user doesn't already belong to the blog, bail.
                                        if ( !is_user_member_of_blog( $user_id ) )
 
                                        // If the user doesn't already belong to the blog, bail.
                                        if ( !is_user_member_of_blog( $user_id ) )

-                                               wp_die(__('Cheatin&#8217; uh?'));
+                                               wp_die( __( 'Cheatin&#8217; uh?' ), 403 );

 
 

-                                       $user = new WP_User( $user_id );
+                                       $user = get_userdata( $user_id );

                                        $user->set_role( $_REQUEST['new_role'] );
                                }
                        } else {
                                        $user->set_role( $_REQUEST['new_role'] );
                                }
                        } else {


@@ -152,29 +144,44 @@ if ( $action ) {
                        break;
        }
 
                        break;
        }
 

-       restore_current_blog();

        wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
        exit();
 }
 
        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();
 }
 
 if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
        wp_safe_redirect( $referer );
        exit();
 }
 

-add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
+add_screen_option( 'per_page' );

 
 $site_url_no_http = preg_replace( '#^http(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 );
+$title_site_url_linked = sprintf( __( 'Edit Site: %s' ), '<a href="' . get_blogaddress_by_id( $id ) . '">' . $site_url_no_http . '</a>' );
+$title = sprintf( __( 'Edit Site: %s' ), $site_url_no_http );

 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 

-require('../admin-header.php'); ?>
+/**
+ * Filter whether to show the Add Existing User form on the Multisite Users screen.
+ *
+ * @since 3.1.0
+ *
+ * @param bool $bool Whether to show the Add Existing User form. Default true.
+ */
+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">
+var current_site_id = <?php echo $id; ?>;
+</script>
+

 
 <div class="wrap">
 
 <div class="wrap">

-<?php screen_icon('ms-admin'); ?>

 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php


@@ -186,7 +193,7 @@ $tabs = array(
 );
 foreach ( $tabs as $tab_id => $tab ) {
        $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
 );
 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
 }
 ?>
 </h3><?php


@@ -194,39 +201,39 @@ foreach ( $tabs as $tab_id => $tab ) {
 if ( isset($_GET['update']) ) :
        switch($_GET['update']) {
        case 'adduser':
 if ( isset($_GET['update']) ) :
        switch($_GET['update']) {
        case 'adduser':

-               echo '<div id="message" class="updated"><p>' . __( 'User added.' ) . '</p></div>';
+               echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';

                break;
        case 'err_add_member':
                break;
        case 'err_add_member':

-               echo '<div id="message" class="error"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';

                break;
        case 'err_add_notfound':
                break;
        case 'err_add_notfound':

-               echo '<div id="message" class="error"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';

                break;
        case 'promote':
                break;
        case 'promote':

-               echo '<div id="message" class="updated"><p>' . __( 'Changed roles.' ) . '</p></div>';
+               echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';

                break;
        case 'err_promote':
                break;
        case 'err_promote':

-               echo '<div id="message" class="error"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';

                break;
        case 'remove':
                break;
        case 'remove':

-               echo '<div id="message" class="updated"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+               echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';

                break;
        case 'err_remove':
                break;
        case 'err_remove':

-               echo '<div id="message" class="error"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';

                break;
        case 'newuser':
                break;
        case 'newuser':

-               echo '<div id="message" class="updated"><p>' . __( 'User created.' ) . '</p></div>';
+               echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';

                break;
        case 'err_new':
                break;
        case 'err_new':

-               echo '<div id="message" class="error"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';

                break;
        case 'err_new_dup':
                break;
        case 'err_new_dup':

-               echo '<div id="message" class="error"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+               echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';

                break;
        }
 endif; ?>
 
                break;
        }
 endif; ?>
 

-<form class="search-form" action="" method="get">
+<form class="search-form" method="get">

 <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
 <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
 </form>
 <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
 <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
 </form>


@@ -234,75 +241,67 @@ endif; ?>
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-users.php?action=update-site">
 <?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(); ?>
 
 </form>
 
        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
 
 <?php $wp_list_table->display(); ?>
 
 </form>
 

-<?php do_action( 'network_site_users_after_list_table', '' );?>
+<?php
+/**
+ * Fires after the list table on the Users screen in the Multisite Network Admin.
+ *
+ * @since 3.1.0
+ */
+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>
+/** This filter is documented in wp-admin/network/site-users.php */
+if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
+<h3 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h3>

 <form action="site-users.php?action=adduser" id="adduser" method="post">
 <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>
        <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>
+                       <th scope="row"><label for="newuser"><?php _e( 'Username' ); ?></label></th>
+                       <td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>

                </tr>
                <tr>
                </tr>
                <tr>

-                       <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 ){
-                               $name = translate_user_role( $role_assoc['name'] );
-                               $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
-                               echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
-                       }
-                       ?>
+                       <th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th>
+                       <td><select name="new_role" id="new_role_adduser">
+                       <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>

                        </select></td>
                </tr>
        </table>
        <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
                        </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; ?>
 
 </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>
+<?php
+/**
+ * Filter whether to show the Add New User form on the Multisite Users screen.
+ *
+ * @since 3.1.0
+ *
+ * @param bool $bool Whether to show the Add New User form. Default true.
+ */
+if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
+<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">
 <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>
        <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="user[username]" /></td>
+                       <th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
+                       <td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>

                </tr>
                <tr>
                </tr>
                <tr>

-                       <th scope="row"><?php _e( 'Email' ) ?></th>
-                       <td><input type="text" class="regular-text" name="user[email]" /></td>
+                       <th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
+                       <td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>

                </tr>
                <tr>
                </tr>
                <tr>

-                       <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 ){
-                               $name = translate_user_role( $role_assoc['name'] );
-                               $selected = ( $role == $default_role ) ? 'selected="selected"' : '';
-                               echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
-                       }
-                       ?>
+                       <th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th>
+                       <td><select name="new_role" id="new_role_newuser">
+                       <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>

                        </select></td>
                </tr>
                <tr class="form-field">
                        </select></td>
                </tr>
                <tr class="form-field">


@@ -310,9 +309,9 @@ endif; ?>
                </tr>
        </table>
        <?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
                </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>
 <?php
 </form>
 <?php endif; ?>
 </div>
 <?php

-require('../admin-footer.php');
+require( ABSPATH . 'wp-admin/admin-footer.php' );