diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/network/site-users.php
--- a/wp/wp-admin/network/site-users.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/network/site-users.php	Mon Oct 14 18:28:13 2019 +0200
@@ -10,23 +10,26 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('manage_sites') )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit this site.' ), 403 );
+}
 
-$wp_list_table = _get_list_table('WP_Users_List_Table');
+$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
 $wp_list_table->prepare_items();
 
 get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
 get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter site users list' ),
-	'heading_pagination' => __( 'Site users list navigation' ),
-	'heading_list'       => __( 'Site users list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter site users list' ),
+		'heading_pagination' => __( 'Site users list navigation' ),
+		'heading_list'       => __( 'Site users list' ),
+	)
+);
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( 'update', wp_get_referer() );
+$referer                = remove_query_arg( 'update', wp_get_referer() );
 
 if ( ! empty( $_REQUEST['paged'] ) ) {
 	$referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
@@ -34,16 +37,18 @@
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id ) {
+	wp_die( __( 'Invalid site ID.' ) );
+}
 
 $details = get_site( $id );
 if ( ! $details ) {
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( ! can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
@@ -60,11 +65,11 @@
 			if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
 				$update = 'err_new';
 			} else {
-				$password = wp_generate_password( 12, false);
-				$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+				$password = wp_generate_password( 12, false );
+				$user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
 				if ( false === $user_id ) {
-		 			$update = 'err_new_dup';
+					$update = 'err_new_dup';
 				} else {
 					$result = add_user_to_blog( $id, $user_id, $_POST['new_role'] );
 
@@ -73,12 +78,12 @@
 					} else {
 						$update = 'newuser';
 						/**
-						  * Fires after a user has been created via the network site-users.php page.
-						  *
-						  * @since 4.4.0
-						  *
-						  * @param int $user_id ID of the newly created user.
-						  */
+						 * Fires after a user has been created via the network site-users.php page.
+						 *
+						 * @since 4.4.0
+						 *
+						 * @param int $user_id ID of the newly created user.
+						 */
 						do_action( 'network_site_users_created_user', $user_id );
 					}
 				}
@@ -87,10 +92,10 @@
 
 		case 'adduser':
 			check_admin_referer( 'add-user', '_wpnonce_add-user' );
-			if ( !empty( $_POST['newuser'] ) ) {
-				$update = 'adduser';
+			if ( ! empty( $_POST['newuser'] ) ) {
+				$update  = 'adduser';
 				$newuser = $_POST['newuser'];
-				$user = get_user_by( 'login', $newuser );
+				$user    = get_user_by( 'login', $newuser );
 				if ( $user && $user->exists() ) {
 					if ( ! is_user_member_of_blog( $user->ID, $id ) ) {
 						$result = add_user_to_blog( $id, $user->ID, $_POST['new_role'] );
@@ -134,7 +139,7 @@
 		case 'promote':
 			check_admin_referer( 'bulk-users' );
 			$editable_roles = get_editable_roles();
-			$role = false;
+			$role           = false;
 			if ( ! empty( $_REQUEST['new_role2'] ) ) {
 				$role = $_REQUEST['new_role2'];
 			} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
@@ -147,7 +152,7 @@
 
 			if ( isset( $_REQUEST['users'] ) ) {
 				$userids = $_REQUEST['users'];
-				$update = 'promote';
+				$update  = 'promote';
 				foreach ( $userids as $user_id ) {
 					$user_id = (int) $user_id;
 
@@ -175,7 +180,7 @@
 			$userids = $_REQUEST['users'];
 			/** This action is documented in wp-admin/network/site-themes.php */
 			$referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id );
-			$update = $action;
+			$update  = $action;
 			break;
 	}
 
@@ -195,7 +200,7 @@
 /* translators: %s: site name */
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
-$parent_file = 'sites.php';
+$parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
 /**
@@ -205,8 +210,9 @@
  *
  * @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 ) )
+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' ); ?>
 
@@ -220,58 +226,61 @@
 <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
-	'blog_id'  => $id,
-	'selected' => 'site-users'
-) );
+network_edit_site_nav(
+	array(
+		'blog_id'  => $id,
+		'selected' => 'site-users',
+	)
+);
 
-if ( isset($_GET['update']) ) :
-	switch($_GET['update']) {
-	case 'adduser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
-		break;
-	case 'err_add_member':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
-		break;
-	case 'err_add_fail':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
-		break;
-	case 'err_add_notfound':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
-		break;
-	case 'promote':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
-		break;
-	case 'err_promote':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
-		break;
-	case 'remove':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
-		break;
-	case 'err_remove':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
-		break;
-	case 'newuser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
-		break;
-	case 'err_new':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
-		break;
-	case 'err_new_dup':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
-		break;
+if ( isset( $_GET['update'] ) ) :
+	switch ( $_GET['update'] ) {
+		case 'adduser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
+			break;
+		case 'err_add_member':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+			break;
+		case 'err_add_fail':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
+			break;
+		case 'err_add_notfound':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+			break;
+		case 'promote':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+			break;
+		case 'err_promote':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+			break;
+		case 'remove':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+			break;
+		case 'err_remove':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+			break;
+		case 'newuser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
+			break;
+		case 'err_new':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+			break;
+		case 'err_new_dup':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+			break;
 	}
-endif; ?>
+endif;
+?>
 
 <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 ) ?>" />
+<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 </form>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-users.php?action=update-site">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 
 <?php $wp_list_table->display(); ?>
 
@@ -286,11 +295,12 @@
 do_action( 'network_site_users_after_list_table' );
 
 /** 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 ) ) : ?>
+if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) :
+	?>
 <h2 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h2>
 <form action="site-users.php?action=adduser" id="adduser" method="post">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
+	<table class="form-table" role="presentation">
 		<tr>
 			<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>
@@ -306,7 +316,7 @@
 			</select></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
+	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
 	<?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
 </form>
 <?php endif; ?>
@@ -319,17 +329,18 @@
  *
  * @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 ) ) : ?>
+if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) :
+	?>
 <h2 id="add-new-user"><?php _e( 'Add New User' ); ?></h2>
-<form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
+<form action="<?php echo network_admin_url( 'site-users.php?action=newuser' ); ?>" id="newuser" method="post">
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
+	<table class="form-table" role="presentation">
 		<tr>
-			<th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
+			<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>
-			<th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
+			<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>
@@ -343,10 +354,10 @@
 			</select></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2" class="td-full"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
+	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ); ?>
 	<?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
 </form>
 <?php endif; ?>