ntwb / wordpress

src/wp-admin/load-styles.php

Spacing +30 added lines, -30 removed lines

@@ -8,8 +8,8 @@ 
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
-define( 'WPINC', 'wp-includes' );
+define('ABSPATH', dirname(dirname(__FILE__)).'/');
+define('WPINC', 'wp-includes');
 
 /**
  * @ignore
@@ -64,7 +64,7 @@ 
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function is_admin() {return true; }
 
 /**
  * @ignore
@@ -88,69 +88,69 @@ 
  */
 function get_file($path) {
 
-	if ( function_exists('realpath') )
+	if (function_exists('realpath'))
 		$path = realpath($path);
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file($path))
 		return '';
 
 	return @file_get_contents($path);
 }
 
-require( ABSPATH . WPINC . '/script-loader.php' );
-require( ABSPATH . WPINC . '/version.php' );
+require(ABSPATH.WPINC.'/script-loader.php');
+require(ABSPATH.WPINC.'/version.php');
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
-$load = array_unique( explode( ',', $load ) );
+$load = preg_replace('/[^a-z0-9,_-]+/i', '', $_GET['load']);
+$load = array_unique(explode(',', $load));
 
-if ( empty($load) )
+if (empty($load))
 	exit;
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
-$rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
+$compress = (isset($_GET['c']) && $_GET['c']);
+$force_gzip = ($compress && 'gzip' == $_GET['c']);
+$rtl = (isset($_GET['dir']) && 'rtl' == $_GET['dir']);
 $expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_styles = new WP_Styles();
 wp_default_styles($wp_styles);
 
-foreach( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_styles->registered) )
+foreach ($load as $handle) {
+	if ( ! array_key_exists($handle, $wp_styles->registered))
 		continue;
 
 	$style = $wp_styles->registered[$handle];
-	$path = ABSPATH . $style->src;
+	$path = ABSPATH.$style->src;
 
-	if ( $rtl && ! empty( $style->extra['rtl'] ) ) {
+	if ($rtl && ! empty($style->extra['rtl'])) {
 		// All default styles have fully independent RTL files.
-		$path = str_replace( '.min.css', '-rtl.min.css', $path );
+		$path = str_replace('.min.css', '-rtl.min.css', $path);
 	}
 
-	$content = get_file( $path ) . "\n";
+	$content = get_file($path)."\n";
 
-	if ( strpos( $style->src, '/' . WPINC . '/css/' ) === 0 ) {
-		$content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
-		$content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
-		$content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content );
+	if (strpos($style->src, '/'.WPINC.'/css/') === 0) {
+		$content = str_replace('../images/', '../'.WPINC.'/images/', $content);
+		$content = str_replace('../js/tinymce/', '../'.WPINC.'/js/tinymce/', $content);
+		$content = str_replace('../fonts/', '../'.WPINC.'/fonts/', $content);
 		$out .= $content;
 	} else {
-		$out .= str_replace( '../images/', 'images/', $content );
+		$out .= str_replace('../images/', 'images/', $content);
 	}
 }
 
 header('Content-Type: text/css; charset=UTF-8');
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+if ($compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	header('Vary: Accept-Encoding'); // Handle proxies
-	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+	if (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip) {
 		header('Content-Encoding: deflate');
-		$out = gzdeflate( $out, 3 );
-	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+		$out = gzdeflate($out, 3);
+	} elseif (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode')) {
 		header('Content-Encoding: gzip');
-		$out = gzencode( $out, 3 );
+		$out = gzencode($out, 3);
 	}
 }
 

Braces +11 added lines, -7 removed lines

@@ -88,11 +88,13 @@ 
  */
 function get_file($path) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists('realpath') ) {
+			$path = realpath($path);
+	}
 
-	if ( ! $path || ! @is_file($path) )
-		return '';
+	if ( ! $path || ! @is_file($path) ) {
+			return '';
+	}
 
 	return @file_get_contents($path);
 }
@@ -103,8 +105,9 @@ 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty($load) ) {
 	exit;
+}
 
 $compress = ( isset($_GET['c']) && $_GET['c'] );
 $force_gzip = ( $compress && 'gzip' == $_GET['c'] );
@@ -116,8 +119,9 @@ 
 wp_default_styles($wp_styles);
 
 foreach( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_styles->registered) )
-		continue;
+	if ( !array_key_exists($handle, $wp_styles->registered) ) {
+			continue;
+	}
 
 	$style = $wp_styles->registered[$handle];
 	$path = ABSPATH . $style->src;

src/wp-admin/async-upload.php

Spacing +42 added lines, -42 removed lines

@@ -6,67 +6,67 @@ 
  * @subpackage Administration
  */
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	define( 'DOING_AJAX', true );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	define('DOING_AJAX', true);
 }
 
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
+if (defined('ABSPATH'))
+	require_once(ABSPATH.'wp-load.php');
 else
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
+if ( ! (isset($_REQUEST['action']) && 'upload-attachment' == $_REQUEST['action'])) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	if (is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	elseif (empty($_COOKIE[AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
+	if (empty($_COOKIE[LOGGED_IN_COOKIE]) && ! empty($_REQUEST['logged_in_cookie']))
 		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
 	unset($current_user);
 }
 
-require_once( ABSPATH . 'wp-admin/admin.php' );
+require_once(ABSPATH.'wp-admin/admin.php');
 
-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+header('Content-Type: text/html; charset='.get_option('blog_charset'));
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	include(ABSPATH.'wp-admin/includes/ajax-actions.php');
 
 	send_nosniff_header();
 	nocache_headers();
 
 	wp_ajax_upload_attachment();
-	die( '0' );
+	die('0');
 }
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'You do not have permission to upload files.' ) );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('You do not have permission to upload files.'));
 }
 
 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
-
-	switch ( $_REQUEST['fetch'] ) {
+if (isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch']) {
+	$post = get_post($id);
+	if ('attachment' != $post->post_type)
+		wp_die(__('Unknown post type.'));
+	if ( ! current_user_can('edit_post', $id))
+		wp_die(__('You are not allowed to edit this item.'));
+
+	switch ($_REQUEST['fetch']) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
-			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
-			$title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // Title shouldn't ever be empty, but use filename just in case.
-			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
+			if ($thumb_url = wp_get_attachment_image_src($id, 'thumbnail', true))
+				echo '<img class="pinkynail" src="'.esc_url($thumb_url[0]).'" alt="" />';
+			echo '<a class="edit-attachment" href="'.esc_url(get_edit_post_link($id)).'" target="_blank">'._x('Edit', 'media item').'</a>';
+			$title = $post->post_title ? $post->post_title : wp_basename($post->guid); // Title shouldn't ever be empty, but use filename just in case.
+			echo '<div class="filename new"><span class="title">'.esc_html(wp_html_excerpt($title, 60, '&hellip;')).'</span></div>';
 			break;
 		case 2 :
 			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+			echo get_media_item($id, array('send' => false, 'delete' => true));
 			break;
 		default:
 			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
@@ -79,22 +79,22 @@ 
 check_admin_referer('media-form');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-$id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+$id = media_handle_upload('async-upload', $post_id);
+if (is_wp_error($id)) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss').'</a>
+	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name'])).'</strong><br />'.
+	esc_html($id->get_error_message()).'</div>';
 	exit;
 }
 
-if ( $_REQUEST['short'] ) {
+if ($_REQUEST['short']) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
@@ -111,5 +111,5 @@ 
 	 *
 	 * @param int $id Uploaded attachment ID.
 	 */
-	echo apply_filters( "async_upload_{$type}", $id );
+	echo apply_filters("async_upload_{$type}", $id);
 }

Braces +24 added lines, -17 removed lines

@@ -14,19 +14,22 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( defined('ABSPATH') )
+if ( defined('ABSPATH') ) {
 	require_once(ABSPATH . 'wp-load.php');
-else
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
 
 if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	} elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	}
+	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) ) {
+			$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	}
 	unset($current_user);
 }
 
@@ -51,15 +54,18 @@ 
 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
+	if ( 'attachment' != $post->post_type ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
+			wp_die( __( 'You are not allowed to edit this item.' ) );
+	}
 
 	switch ( $_REQUEST['fetch'] ) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
+							echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
 			$title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // Title shouldn't ever be empty, but use filename just in case.
 			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
@@ -81,9 +87,10 @@ 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {

src/wp-admin/options-media.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Media settings administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Media settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +21 added lines, -21 removed lines

@@ -7,46 +7,46 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
 $title = __('Media Settings');
 $parent_file = 'options-general.php';
 
-$media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>';
+$media_options_help = '<p>'.__('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.').'</p>';
 
-if ( ! is_multisite() && ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) ) {
-	$media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
+if ( ! is_multisite() && (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path')))) {
+	$media_options_help .= '<p>'.__('Uploading Files allows you to choose the folder and path for storing your uploaded files.').'</p>';
 }
 
-$media_options_help .= '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
+$media_options_help .= '<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $media_options_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Media_Screen" target="_blank">Documentation on Media Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Media_Screen" target="_blank">Documentation on Media Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form action="options.php" method="post">
 <?php settings_fields('media'); ?>
 
 <h3 class="title"><?php _e('Image sizes') ?></h3>
-<p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
+<p><?php _e('The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.'); ?></p>
 
 <table class="form-table">
 <tr>
@@ -88,19 +88,19 @@ 
 /**
  * @global array $wp_settings
  */
-if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) : ?>
+if (isset($GLOBALS['wp_settings']['media']['embeds'])) : ?>
 <h3 class="title"><?php _e('Embeds') ?></h3>
 <table class="form-table">
-<?php do_settings_fields( 'media', 'embeds' ); ?>
+<?php do_settings_fields('media', 'embeds'); ?>
 </table>
 <?php endif; ?>
 
-<?php if ( !is_multisite() ) : ?>
+<?php if ( ! is_multisite()) : ?>
 <h3 class="title"><?php _e('Uploading Files'); ?></h3>
 <table class="form-table">
 <?php
 // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
-if ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) :
+if (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path'))) :
 ?>
 <tr>
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
@@ -111,7 +111,7 @@ 
 
 <tr>
 <th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
+<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr(get_option('upload_url_path')); ?>" class="regular-text code" />
 <p class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></p>
 </td>
 </tr>
@@ -137,4 +137,4 @@ 
 
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +2 added lines, -1 removed lines

@@ -9,8 +9,9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('Media Settings');
 $parent_file = 'options-general.php';

src/wp-admin/media-new.php

Spacing +25 added lines, -25 removed lines

@@ -10,64 +10,64 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if (!current_user_can('upload_files'))
+if ( ! current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-if ( $_POST ) {
+if ($_POST) {
 	$location = 'upload.php';
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+	if (isset($_POST['html-upload']) && ! empty($_FILES)) {
 		check_admin_referer('media-form');
 		// Upload File button was clicked
-		$id = media_handle_upload( 'async-upload', $post_id );
-		if ( is_wp_error( $id ) )
+		$id = media_handle_upload('async-upload', $post_id);
+		if (is_wp_error($id))
 			$location .= '?message=3';
 	}
-	wp_redirect( admin_url( $location ) );
+	wp_redirect(admin_url($location));
 	exit;
 }
 
 $title = __('Upload New Media');
 $parent_file = 'upload.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-	'<ul>' .
-		'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-		'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-		'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
+	'<p>'.__('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:').'</p>'.
+	'<ul>'.
+		'<li>'.__('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.').'</li>'.
+		'<li>'.__('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.').'</li>'.
+		'<li>'.__('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.').'</li>'.
 	'</ul>'
-) );
+));
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if (get_user_setting('uploader') || isset($_GET['browser-uploader']))
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr($form_class); ?>" id="file-form">
 
 	<?php media_upload_form(); ?>
 
@@ -81,4 +81,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +11 added lines, -7 removed lines

@@ -12,17 +12,19 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
+if (!current_user_can('upload_files')) {
 	wp_die(__('You do not have permission to upload files.'));
+}
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 if ( $_POST ) {
 	$location = 'upload.php';
@@ -30,8 +32,9 @@ 
 		check_admin_referer('media-form');
 		// Upload File button was clicked
 		$id = media_handle_upload( 'async-upload', $post_id );
-		if ( is_wp_error( $id ) )
-			$location .= '?message=3';
+		if ( is_wp_error( $id ) ) {
+					$location .= '?message=3';
+		}
 	}
 	wp_redirect( admin_url( $location ) );
 	exit;
@@ -61,8 +64,9 @@ 
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) ) {
 	$form_class .= ' html-uploader';
+}
 ?>
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>

src/wp-admin/users.php

Indentation +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Users administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Users administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -57,10 +57,10 @@ 
 unset( $help );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 if ( empty($_REQUEST) ) {

Switch Indentation +242 added lines, -242 removed lines

@@ -97,88 +97,88 @@ 
 switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */
-case 'promote':
-	check_admin_referer('bulk-users');
+	case 'promote':
+		check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can’t edit that user.' ) );
+		if ( ! current_user_can( 'promote_users' ) )
+			wp_die( __( 'You can’t edit that user.' ) );
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
-
-	$editable_roles = get_editable_roles();
-	if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
-		wp_die(__('You can’t give users that role.'));
-
-	$userids = $_REQUEST['users'];
-	$update = 'promote';
-	foreach ( $userids as $id ) {
-		$id = (int) $id;
-
-		if ( ! current_user_can('promote_user', $id) )
-			wp_die(__('You can’t edit that user.'));
-		// The new role of the current user must also have the promote_users cap or be a multisite super admin
-		if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
-			&& ! ( is_multisite() && is_super_admin() ) ) {
-				$update = 'err_admin_role';
-				continue;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
 		}
 
-		// If the user doesn't already belong to the blog, bail.
-		if ( is_multisite() && !is_user_member_of_blog( $id ) )
-			wp_die( __( 'Cheatin’ uh?' ), 403 );
-
-		$user = get_userdata( $id );
-		$user->set_role($_REQUEST['new_role']);
-	}
+		$editable_roles = get_editable_roles();
+		if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
+			wp_die(__('You can’t give users that role.'));
 
-	wp_redirect(add_query_arg('update', $update, $redirect));
-	exit();
+		$userids = $_REQUEST['users'];
+		$update = 'promote';
+		foreach ( $userids as $id ) {
+			$id = (int) $id;
+
+			if ( ! current_user_can('promote_user', $id) )
+				wp_die(__('You can’t edit that user.'));
+			// The new role of the current user must also have the promote_users cap or be a multisite super admin
+			if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
+				&& ! ( is_multisite() && is_super_admin() ) ) {
+					$update = 'err_admin_role';
+					continue;
+			}
 
-case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+			// If the user doesn't already belong to the blog, bail.
+			if ( is_multisite() && !is_user_member_of_blog( $id ) )
+				wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	check_admin_referer('delete-users');
+			$user = get_userdata( $id );
+			$user->set_role($_REQUEST['new_role']);
+		}
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
+		wp_redirect(add_query_arg('update', $update, $redirect));
 		exit();
-	}
-
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-	if ( empty( $_REQUEST['delete_option'] ) ) {
-		$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-		$url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) );
-		wp_redirect( $url );
-		exit;
-	}
+	case 'dodelete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	if ( ! current_user_can( 'delete_users' ) )
-		wp_die(__('You can’t delete users.'));
+		check_admin_referer('delete-users');
 
-	$update = 'del';
-	$delete_count = 0;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can’t delete that user.' ) );
+		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-		if ( $id == $current_user->ID ) {
-			$update = 'err_admin_del';
-			continue;
-		}
-		switch ( $_REQUEST['delete_option'] ) {
-		case 'delete':
-			wp_delete_user( $id );
-			break;
-		case 'reassign':
-			wp_delete_user( $id, $_REQUEST['reassign_user'] );
-			break;
+		if ( empty( $_REQUEST['delete_option'] ) ) {
+			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
+			$url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) );
+			wp_redirect( $url );
+			exit;
 		}
+
+		if ( ! current_user_can( 'delete_users' ) )
+			wp_die(__('You can’t delete users.'));
+
+		$update = 'del';
+		$delete_count = 0;
+
+		foreach ( $userids as $id ) {
+			if ( ! current_user_can( 'delete_user', $id ) )
+				wp_die(__( 'You can’t delete that user.' ) );
+
+			if ( $id == $current_user->ID ) {
+				$update = 'err_admin_del';
+				continue;
+			}
+			switch ( $_REQUEST['delete_option'] ) {
+				case 'delete':
+					wp_delete_user( $id );
+					break;
+				case 'reassign':
+					wp_delete_user( $id, $_REQUEST['reassign_user'] );
+					break;
+			}
 		++$delete_count;
 	}
 
@@ -186,250 +186,250 @@ 
 	wp_redirect($redirect);
 	exit();
 
-case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	case 'delete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
+		if ( ! current_user_can( 'delete_users' ) )
+			$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		if ( empty($_REQUEST['users']) )
+			$userids = array( intval( $_REQUEST['user'] ) );
+		else
+			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-	add_action( 'admin_head', 'delete_users_add_js' );
+		add_action( 'admin_head', 'delete_users_add_js' );
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('delete-users') ?>
-<?php echo $referer; ?>
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field('delete-users') ?>
+	<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+	<?php if ( isset( $_REQUEST['error'] ) ) : ?>
 	<div class="error">
 		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
 	</div>
 <?php endif; ?>
-
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
-<?php endif; ?>
+	
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_delete = 0;
-	foreach ( $userids as $id ) {
-		$user = get_userdata( $id );
-		if ( $id == $current_user->ID ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
-		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
-			$go_delete++;
+		$go_delete = 0;
+		foreach ( $userids as $id ) {
+			$user = get_userdata( $id );
+			if ( $id == $current_user->ID ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
+			} else {
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+				$go_delete++;
+			}
 		}
-	}
-	?>
-	</ul>
-<?php if ( $go_delete ) : ?>
-	<?php if ( 1 == $go_delete ) : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+		?>
+		</ul>
+	<?php if ( $go_delete ) : ?>
+		<?php if ( 1 == $go_delete ) : ?>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
 	<?php else : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
 	<?php endif; ?>
 	<ul style="list-style:none;">
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
 		<?php _e('Delete all content.'); ?></label></li>
 		<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
 		<?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-		wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
+			wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
 	</ul></fieldset>
 	<?php
-	/**
+		/**
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param WP_User $current_user WP_User object for the user being deleted.
 	 */
-	do_action( 'delete_user_form', $current_user );
-	?>
-	<input type="hidden" name="action" value="dodelete" />
+		do_action( 'delete_user_form', $current_user );
+		?>
+		<input type="hidden" name="action" value="dodelete" />
 	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
-<?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; ?>
 </div>
 </form>
 <?php
 
-break;
+	break;
 
-case 'doremove':
-	check_admin_referer('remove-users');
+	case 'doremove':
+		check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit;
-	}
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit;
+		}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! current_user_can( 'remove_users' ) )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	$userids = $_REQUEST['users'];
+		$userids = $_REQUEST['users'];
 
-	$update = 'remove';
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			$update = 'err_admin_remove';
-			continue;
-		}
-		if ( !current_user_can('remove_user', $id) ) {
-			$update = 'err_admin_remove';
-			continue;
+		$update = 'remove';
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			if ( !current_user_can('remove_user', $id) ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			remove_user_from_blog($id, $blog_id);
 		}
-		remove_user_from_blog($id, $blog_id);
-	}
 
-	$redirect = add_query_arg( array('update' => $update), $redirect);
-	wp_redirect($redirect);
-	exit;
+		$redirect = add_query_arg( array('update' => $update), $redirect);
+		wp_redirect($redirect);
+		exit;
 
-case 'remove':
+	case 'remove':
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+		if ( !current_user_can('remove_users') )
+			$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
-		$userids = $_REQUEST['users'];
+		if ( empty($_REQUEST['users']) )
+			$userids = array(intval($_REQUEST['user']));
+		else
+			$userids = $_REQUEST['users'];
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('remove-users') ?>
-<?php echo $referer; ?>
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field('remove-users') ?>
+	<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
-<?php endif; ?>
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_remove = false;
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
- 		$user = get_userdata( $id );
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-		} elseif ( !current_user_can('remove_user', $id) ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
-		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
-			$go_remove = true;
-		}
- 	}
- 	?>
-</ul>
-<?php if ( $go_remove ) : ?>
-		<input type="hidden" name="action" value="doremove" />
+		$go_remove = false;
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+ 			$user = get_userdata( $id );
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
+			} elseif ( !current_user_can('remove_user', $id) ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+			} else {
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+				$go_remove = true;
+			}
+ 		}
+ 		?>
+	</ul>
+	<?php if ( $go_remove ) : ?>
+			<input type="hidden" name="action" value="doremove" />
 		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
-<?php else : ?>
-	<p><?php _e('There are no valid users selected for removal.'); ?></p>
-<?php endif; ?>
+	<?php else : ?>
+		<p><?php _e('There are no valid users selected for removal.'); ?></p>
+	<?php endif; ?>
 </div>
 </form>
 <?php
 
-break;
-
-default:
+	break;
 
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-		exit;
-	}
+	default:
 
-	$wp_list_table->prepare_items();
-	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-	if ( $pagenum > $total_pages && $total_pages > 0 ) {
-		wp_redirect( add_query_arg( 'paged', $total_pages ) );
-		exit;
-	}
+		if ( !empty($_GET['_wp_http_referer']) ) {
+			wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+			exit;
+		}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+		$wp_list_table->prepare_items();
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
+			wp_redirect( add_query_arg( 'paged', $total_pages ) );
+			exit;
+		}
 
-	$messages = array();
-	if ( isset($_GET['update']) ) :
-		switch($_GET['update']) {
-		case 'del':
-		case 'del_many':
-			$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
-			if ( 1 == $delete_count ) {
-				$message = __( 'User deleted.' );
-			} else {
-				$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$messages = array();
+		if ( isset($_GET['update']) ) :
+			switch($_GET['update']) {
+				case 'del':
+				case 'del_many':
+					$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
+					if ( 1 == $delete_count ) {
+						$message = __( 'User deleted.' );
+					} else {
+						$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+					}
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+					break;
+				case 'add':
+					if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
+							esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+								self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
+					} else {
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
+					}
+					break;
+				case 'promote':
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
+					break;
+				case 'err_admin_role':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
+					break;
+				case 'err_admin_del':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
+					break;
+				case 'remove':
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
+					break;
+				case 'err_admin_remove':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
+					break;
 			}
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
-			break;
-		case 'add':
-			if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
-					esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-						self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
-			} else {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
-			}
-			break;
-		case 'promote':
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
-			break;
-		case 'err_admin_role':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
-			break;
-		case 'err_admin_del':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
-			break;
-		case 'remove':
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
-			break;
-		case 'err_admin_remove':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
-			break;
-		}
 	endif; ?>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>

Spacing +157 added lines, -157 removed lines

@@ -7,67 +7,67 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'list_users' ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('list_users'))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $title = __('Users');
 $parent_file = 'users.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
 // contextual help - choose Help on the top right of admin panel to preview this.
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
-				 '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
-) ) ;
+	'content' => '<p>'.__('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.').'</p>'.
+				 '<p>'.__('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.').'</p>'
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'screen-display',
 	'title'   => __('Screen Display'),
-	'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
-					'<ul>' .
-					'<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
-					'<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
-					'<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
+	'content' => '<p>'.__('You can customize the display of this screen in a number of ways:').'</p>'.
+					'<ul>'.
+					'<li>'.__('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.').'</li>'.
+					'<li>'.__('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.').'</li>'.
+					'<li>'.__('You can view all posts made by a user by clicking on the number under the Posts column.').'</li>'.
 					'</ul>'
-) );
+));
 
-$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
-	'<ul>' .
-	'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
+$help = '<p>'.__('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:').'</p>'.
+	'<ul>'.
+	'<li>'.__('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.').'</li>';
 
-if ( is_multisite() )
-	$help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
+if (is_multisite())
+	$help .= '<li>'.__('Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.').'</li>';
 else
-	$help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
+	$help .= '<li>'.__('Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.').'</li>';
 
 $help .= '</ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'actions',
 	'title'   => __('Actions'),
 	'content' => $help,
-) );
-unset( $help );
+));
+unset($help);
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>').'</p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( empty($_REQUEST) ) {
-	$referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
-} elseif ( isset($_REQUEST['wp_http_referer']) ) {
-	$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash( $_REQUEST['wp_http_referer'] ) );
-	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr($redirect) . '" />';
+if (empty($_REQUEST)) {
+	$referer = '<input type="hidden" name="wp_http_referer" value="'.esc_attr(wp_unslash($_SERVER['REQUEST_URI'])).'" />';
+} elseif (isset($_REQUEST['wp_http_referer'])) {
+	$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash($_REQUEST['wp_http_referer']));
+	$referer = '<input type="hidden" name="wp_http_referer" value="'.esc_attr($redirect).'" />';
 } else {
 	$redirect = 'users.php';
 	$referer = '';
@@ -94,43 +94,43 @@ 
 <?php
 }
 
-switch ( $wp_list_table->current_action() ) {
+switch ($wp_list_table->current_action()) {
 
 /* Bulk Dropdown menu Role changes */
 case 'promote':
 	check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can&#8217;t edit that user.' ) );
+	if ( ! current_user_can('promote_users'))
+		wp_die(__('You can&#8217;t edit that user.'));
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
 	$editable_roles = get_editable_roles();
-	if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
+	if (empty($editable_roles[$_REQUEST['new_role']]))
 		wp_die(__('You can&#8217;t give users that role.'));
 
 	$userids = $_REQUEST['users'];
 	$update = 'promote';
-	foreach ( $userids as $id ) {
+	foreach ($userids as $id) {
 		$id = (int) $id;
 
-		if ( ! current_user_can('promote_user', $id) )
+		if ( ! current_user_can('promote_user', $id))
 			wp_die(__('You can&#8217;t edit that user.'));
 		// The new role of the current user must also have the promote_users cap or be a multisite super admin
-		if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
-			&& ! ( is_multisite() && is_super_admin() ) ) {
+		if ($id == $current_user->ID && ! $wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('promote_users')
+			&& ! (is_multisite() && is_super_admin())) {
 				$update = 'err_admin_role';
 				continue;
 		}
 
 		// If the user doesn't already belong to the blog, bail.
-		if ( is_multisite() && !is_user_member_of_blog( $id ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if (is_multisite() && ! is_user_member_of_blog($id))
+			wp_die(__('Cheatin&#8217; uh?'), 403);
 
-		$user = get_userdata( $id );
+		$user = get_userdata($id);
 		$user->set_role($_REQUEST['new_role']);
 	}
 
@@ -138,121 +138,121 @@ 
 	exit();
 
 case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if (is_multisite())
+		wp_die(__('User deletion is not allowed from this screen.'));
 
 	check_admin_referer('delete-users');
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+	$userids = array_map('intval', (array) $_REQUEST['users']);
 
-	if ( empty( $_REQUEST['delete_option'] ) ) {
-		$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-		$url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
-		wp_redirect( $url );
+	if (empty($_REQUEST['delete_option'])) {
+		$url = self_admin_url('users.php?action=delete&users[]='.implode('&users[]=', $userids).'&error=true');
+		$url = str_replace('&amp;', '&', wp_nonce_url($url, 'bulk-users'));
+		wp_redirect($url);
 		exit;
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
+	if ( ! current_user_can('delete_users'))
 		wp_die(__('You can&#8217;t delete users.'));
 
 	$update = 'del';
 	$delete_count = 0;
 
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can&#8217;t delete that user.' ) );
+	foreach ($userids as $id) {
+		if ( ! current_user_can('delete_user', $id))
+			wp_die(__('You can&#8217;t delete that user.'));
 
-		if ( $id == $current_user->ID ) {
+		if ($id == $current_user->ID) {
 			$update = 'err_admin_del';
 			continue;
 		}
-		switch ( $_REQUEST['delete_option'] ) {
+		switch ($_REQUEST['delete_option']) {
 		case 'delete':
-			wp_delete_user( $id );
+			wp_delete_user($id);
 			break;
 		case 'reassign':
-			wp_delete_user( $id, $_REQUEST['reassign_user'] );
+			wp_delete_user($id, $_REQUEST['reassign_user']);
 			break;
 		}
 		++$delete_count;
 	}
 
-	$redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
+	$redirect = add_query_arg(array('delete_count' => $delete_count, 'update' => $update), $redirect);
 	wp_redirect($redirect);
 	exit();
 
 case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if (is_multisite())
+		wp_die(__('User deletion is not allowed from this screen.'));
 
 	check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+	if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_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.'));
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
+	if (empty($_REQUEST['users']))
+		$userids = array(intval($_REQUEST['user']));
 	else
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$userids = array_map('intval', (array) $_REQUEST['users']);
 
-	add_action( 'admin_head', 'delete_users_add_js' );
+	add_action('admin_head', 'delete_users_add_js');
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+	include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <form method="post" name="updateusers" id="updateusers">
 <?php wp_nonce_field('delete-users') ?>
 <?php echo $referer; ?>
 
 <div class="wrap">
-<h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+<h1><?php _e('Delete Users'); ?></h1>
+<?php if (isset($_REQUEST['error'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+		<p><strong><?php _e('ERROR:'); ?></strong> <?php _e('Please select an option.'); ?></p>
 	</div>
 <?php endif; ?>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+<?php if (1 == count($userids)) : ?>
+	<p><?php _e('You have specified this user for deletion:'); ?></p>
 <?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<p><?php _e('You have specified these users for deletion:'); ?></p>
 <?php endif; ?>
 
 <ul>
 <?php
 	$go_delete = 0;
-	foreach ( $userids as $id ) {
-		$user = get_userdata( $id );
-		if ( $id == $current_user->ID ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
+	foreach ($userids as $id) {
+		$user = get_userdata($id);
+		if ($id == $current_user->ID) {
+			echo "<li>".sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login)."</li>\n";
 		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"".esc_attr($id)."\" />".sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login)."</li>\n";
 			$go_delete++;
 		}
 	}
 	?>
 	</ul>
-<?php if ( $go_delete ) : ?>
-	<?php if ( 1 == $go_delete ) : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+<?php if ($go_delete) : ?>
+	<?php if (1 == $go_delete) : ?>
+		<fieldset><p><legend><?php _e('What should be done with content owned by this user?'); ?></legend></p>
 	<?php else : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+		<fieldset><p><legend><?php _e('What should be done with content owned by these users?'); ?></legend></p>
 	<?php endif; ?>
 	<ul style="list-style:none;">
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
 		<?php _e('Delete all content.'); ?></label></li>
 		<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-		<?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-		wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
+		<?php echo '<label for="delete_option1">'.__('Attribute all content to:').'</label> ';
+		wp_dropdown_users(array('name' => 'reassign_user', 'exclude' => array_diff($userids, array($current_user->ID)))); ?></li>
 	</ul></fieldset>
 	<?php
 	/**
@@ -262,10 +262,10 @@ 
 	 *
 	 * @param WP_User $current_user WP_User object for the user being deleted.
 	 */
-	do_action( 'delete_user_form', $current_user );
+	do_action('delete_user_form', $current_user);
 	?>
 	<input type="hidden" name="action" value="dodelete" />
-	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
+	<?php submit_button(__('Confirm Deletion'), 'secondary'); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -278,34 +278,34 @@ 
 case 'doremove':
 	check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite())
+		wp_die(__('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit;
 	}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! current_user_can('remove_users'))
+		wp_die(__('You can&#8217;t remove users.'));
 
 	$userids = $_REQUEST['users'];
 
 	$update = 'remove';
- 	foreach ( $userids as $id ) {
+ 	foreach ($userids as $id) {
 		$id = (int) $id;
-		if ( $id == $current_user->ID && !is_super_admin() ) {
+		if ($id == $current_user->ID && ! is_super_admin()) {
 			$update = 'err_admin_remove';
 			continue;
 		}
-		if ( !current_user_can('remove_user', $id) ) {
+		if ( ! current_user_can('remove_user', $id)) {
 			$update = 'err_admin_remove';
 			continue;
 		}
 		remove_user_from_blog($id, $blog_id);
 	}
 
-	$redirect = add_query_arg( array('update' => $update), $redirect);
+	$redirect = add_query_arg(array('update' => $update), $redirect);
 	wp_redirect($redirect);
 	exit;
 
@@ -313,57 +313,57 @@ 
 
 	check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite())
+		wp_die(__('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+	if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( !current_user_can('remove_users') )
+	if ( ! current_user_can('remove_users'))
 		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) )
+	if (empty($_REQUEST['users']))
 		$userids = array(intval($_REQUEST['user']));
 	else
 		$userids = $_REQUEST['users'];
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+	include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <form method="post" name="updateusers" id="updateusers">
 <?php wp_nonce_field('remove-users') ?>
 <?php echo $referer; ?>
 
 <div class="wrap">
-<h1><?php _e( 'Remove Users from Site' ); ?></h1>
+<h1><?php _e('Remove Users from Site'); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+<?php if (1 == count($userids)) : ?>
+	<p><?php _e('You have specified this user for removal:'); ?></p>
 <?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<p><?php _e('You have specified these users for removal:'); ?></p>
 <?php endif; ?>
 
 <ul>
 <?php
 	$go_remove = false;
- 	foreach ( $userids as $id ) {
+ 	foreach ($userids as $id) {
 		$id = (int) $id;
- 		$user = get_userdata( $id );
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-		} elseif ( !current_user_can('remove_user', $id) ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+ 		$user = get_userdata($id);
+		if ($id == $current_user->ID && ! is_super_admin()) {
+			echo "<li>".sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login)."</li>\n";
+		} elseif ( ! current_user_can('remove_user', $id)) {
+			echo "<li>".sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login)."</li>\n";
 		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />".sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login)."</li>\n";
 			$go_remove = true;
 		}
  	}
  	?>
 </ul>
-<?php if ( $go_remove ) : ?>
+<?php if ($go_remove) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
+		<?php submit_button(__('Confirm Removal'), 'secondary'); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for removal.'); ?></p>
 <?php endif; ?>
@@ -375,98 +375,98 @@ 
 
 default:
 
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+	if ( ! empty($_GET['_wp_http_referer'])) {
+		wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 		exit;
 	}
 
 	$wp_list_table->prepare_items();
-	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-	if ( $pagenum > $total_pages && $total_pages > 0 ) {
-		wp_redirect( add_query_arg( 'paged', $total_pages ) );
+	$total_pages = $wp_list_table->get_pagination_arg('total_pages');
+	if ($pagenum > $total_pages && $total_pages > 0) {
+		wp_redirect(add_query_arg('paged', $total_pages));
 		exit;
 	}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+	include(ABSPATH.'wp-admin/admin-header.php');
 
 	$messages = array();
-	if ( isset($_GET['update']) ) :
-		switch($_GET['update']) {
+	if (isset($_GET['update'])) :
+		switch ($_GET['update']) {
 		case 'del':
 		case 'del_many':
 			$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
-			if ( 1 == $delete_count ) {
-				$message = __( 'User deleted.' );
+			if (1 == $delete_count) {
+				$message = __('User deleted.');
 			} else {
-				$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+				$message = _n('%s user deleted.', '%s users deleted.', $delete_count);
 			}
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($delete_count)).'</p></div>';
 			break;
 		case 'add':
-			if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
-					esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-						self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
+			if (isset($_GET['id']) && ($user_id = $_GET['id']) && current_user_can('edit_user', $user_id)) {
+				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.sprintf(__('New user created. <a href="%s">Edit user</a>'),
+					esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+						self_admin_url('user-edit.php?user_id='.$user_id)))).'</p></div>';
 			} else {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
+				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('New user created.').'</p></div>';
 			}
 			break;
 		case 'promote':
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Changed roles.').'</p></div>';
 			break;
 		case 'err_admin_role':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('The current user&#8217;s role must have user editing capabilities.').'</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Other user roles have been changed.').'</p></div>';
 			break;
 		case 'err_admin_del':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('You can&#8217;t delete the current user.').'</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Other users have been deleted.').'</p></div>';
 			break;
 		case 'remove':
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>'.__('User removed from this site.').'</p></div>';
 			break;
 		case 'err_admin_remove':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__("You can't remove the current user.").'</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>'.__('Other users have been removed.').'</p></div>';
 			break;
 		}
 	endif; ?>
 
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-if ( ! empty($messages) ) {
-	foreach ( $messages as $msg )
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
 		echo $msg;
 } ?>
 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-if ( current_user_can( 'create_users' ) ) { ?>
-	<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-	<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+echo esc_html($title);
+if (current_user_can('create_users')) { ?>
+	<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+	<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 <?php }
 
-if ( $usersearch )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
+if ($usersearch)
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($usersearch)); ?>
 </h1>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+<?php $wp_list_table->search_box(__('Search Users'), 'user'); ?>
 
 <?php $wp_list_table->display(); ?>
 </form>
@@ -478,4 +478,4 @@ 
 
 } // end of the $doaction switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +90 added lines, -54 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'list_users' ) )
+if ( ! current_user_can( 'list_users' ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -42,10 +43,11 @@ 
 	'<ul>' .
 	'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
 
-if ( is_multisite() )
+if ( is_multisite() ) {
 	$help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
-else
+} else {
 	$help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
+}
 
 $help .= '</ul>';
 
@@ -100,8 +102,9 @@ 
 case 'promote':
 	check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can&#8217;t edit that user.' ) );
+	if ( ! current_user_can( 'promote_users' ) ) {
+			wp_die( __( 'You can&#8217;t edit that user.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
@@ -109,16 +112,18 @@ 
 	}
 
 	$editable_roles = get_editable_roles();
-	if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
-		wp_die(__('You can&#8217;t give users that role.'));
+	if ( empty( $editable_roles[$_REQUEST['new_role']] ) ) {
+			wp_die(__('You can&#8217;t give users that role.'));
+	}
 
 	$userids = $_REQUEST['users'];
 	$update = 'promote';
 	foreach ( $userids as $id ) {
 		$id = (int) $id;
 
-		if ( ! current_user_can('promote_user', $id) )
-			wp_die(__('You can&#8217;t edit that user.'));
+		if ( ! current_user_can('promote_user', $id) ) {
+					wp_die(__('You can&#8217;t edit that user.'));
+		}
 		// The new role of the current user must also have the promote_users cap or be a multisite super admin
 		if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
 			&& ! ( is_multisite() && is_super_admin() ) ) {
@@ -127,8 +132,9 @@ 
 		}
 
 		// If the user doesn't already belong to the blog, bail.
-		if ( is_multisite() && !is_user_member_of_blog( $id ) )
-			wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		if ( is_multisite() && !is_user_member_of_blog( $id ) ) {
+					wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+		}
 
 		$user = get_userdata( $id );
 		$user->set_role($_REQUEST['new_role']);
@@ -138,8 +144,9 @@ 
 	exit();
 
 case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if ( is_multisite() ) {
+			wp_die( __('User deletion is not allowed from this screen.') );
+	}
 
 	check_admin_referer('delete-users');
 
@@ -157,15 +164,17 @@ 
 		exit;
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		wp_die(__('You can&#8217;t delete users.'));
+	if ( ! current_user_can( 'delete_users' ) ) {
+			wp_die(__('You can&#8217;t delete users.'));
+	}
 
 	$update = 'del';
 	$delete_count = 0;
 
 	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can&#8217;t delete that user.' ) );
+		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';
@@ -187,8 +196,9 @@ 
 	exit();
 
 case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if ( is_multisite() ) {
+			wp_die( __('User deletion is not allowed from this screen.') );
+	}
 
 	check_admin_referer('bulk-users');
 
@@ -197,13 +207,15 @@ 
 		exit();
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_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.' ) );
+	}
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+	if ( empty($_REQUEST['users']) ) {
+			$userids = array( intval( $_REQUEST['user'] ) );
+	} else {
+			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+	}
 
 	add_action( 'admin_head', 'delete_users_add_js' );
 
@@ -223,8 +235,11 @@ 
 
 <?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e( 'You have specified these users for deletion:' );
+}
+?></p>
 <?php endif; ?>
 
 <ul>
@@ -244,8 +259,11 @@ 
 <?php if ( $go_delete ) : ?>
 	<?php if ( 1 == $go_delete ) : ?>
 		<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-	<?php else : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+	<?php else {
+	: ?>
+		<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' );
+}
+?></legend></p>
 	<?php endif; ?>
 	<ul style="list-style:none;">
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
@@ -266,8 +284,11 @@ 
 	?>
 	<input type="hidden" name="action" value="dodelete" />
 	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
-<?php else : ?>
-	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e('There are no valid users selected for deletion.');
+}
+?></p>
 <?php endif; ?>
 </div>
 </form>
@@ -278,16 +299,18 @@ 
 case 'doremove':
 	check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
 		exit;
 	}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! current_user_can( 'remove_users' ) ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	$userids = $_REQUEST['users'];
 
@@ -313,21 +336,24 @@ 
 
 	check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+	if ( !current_user_can('remove_users') ) {
+			$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+	}
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
-		$userids = $_REQUEST['users'];
+	if ( empty($_REQUEST['users']) ) {
+			$userids = array(intval($_REQUEST['user']));
+	} else {
+			$userids = $_REQUEST['users'];
+	}
 
 	include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
@@ -340,8 +366,11 @@ 
 
 <?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e( 'You have specified these users for removal:' );
+}
+?></p>
 <?php endif; ?>
 
 <ul>
@@ -364,8 +393,11 @@ 
 <?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
 		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
-<?php else : ?>
-	<p><?php _e('There are no valid users selected for removal.'); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e('There are no valid users selected for removal.');
+}
+?></p>
 <?php endif; ?>
 </div>
 </form>
@@ -436,17 +468,19 @@ 
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
-				echo "<li>$err</li>\n";
+			foreach ( $errors->get_error_messages() as $err ) {
+							echo "<li>$err</li>\n";
+			}
 		?>
 		</ul>
 	</div>
 <?php endif;
 
 if ( ! empty($messages) ) {
-	foreach ( $messages as $msg )
-		echo $msg;
-} ?>
+	foreach ( $messages as $msg ) {
+			echo $msg;
+	}
+	} ?>
 
 <div class="wrap">
 <h1>
@@ -458,8 +492,10 @@ 
 	<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 <?php }
 
-if ( $usersearch )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
+if ( $usersearch ) {
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) );
+}
+?>
 </h1>
 
 <?php $wp_list_table->views(); ?>

src/wp-admin/user-edit.php

Indentation +20 added lines, -20 removed lines

@@ -50,9 +50,9 @@ 
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 $wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer );
@@ -276,12 +276,12 @@ 
 </tr>
 <?php
 /**
- * Fires at the end of the 'Personal Options' settings table on the user editing screen.
- *
- * @since 2.7.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
+	 * Fires at the end of the 'Personal Options' settings table on the user editing screen.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param WP_User $profileuser The current WP_User object.
+	 */
 do_action( 'personal_options', $profileuser );
 ?>
 
@@ -564,17 +564,17 @@ 
 
 <?php
 /**
- * Filter whether to display additional capabilities for the user.
- *
- * The 'Additional Capabilities' section will only be enabled if
- * the number of the user's capabilities exceeds their number of
- * of roles.
- *
- * @since 2.8.0
- *
- * @param bool    $enable      Whether to display the capabilities. Default true.
- * @param WP_User $profileuser The current WP_User object.
- */
+	 * Filter whether to display additional capabilities for the user.
+	 *
+	 * The 'Additional Capabilities' section will only be enabled if
+	 * the number of the user's capabilities exceeds their number of
+	 * of roles.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param bool    $enable      Whether to display the capabilities. Default true.
+	 * @param WP_User $profileuser The current WP_User object.
+	 */
 if ( count( $profileuser->caps ) > count( $profileuser->roles )
 	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
 ) : ?>

Spacing +157 added lines, -157 removed lines

@@ -7,57 +7,57 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
+wp_reset_vars(array('action', 'user_id', 'wp_http_referer'));
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
-	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+if ( ! defined('IS_PROFILE_PAGE'))
+	define('IS_PROFILE_PAGE', ($user_id == $current_user->ID));
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE)
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
-	wp_die( __('Invalid user ID.') );
+elseif ( ! $user_id && ! IS_PROFILE_PAGE)
+	wp_die(__('Invalid user ID.'));
+elseif ( ! get_userdata($user_id))
+	wp_die(__('Invalid user ID.'));
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if (current_user_can('edit_users') && ! IS_PROFILE_PAGE)
 	$submenu_file = 'users.php';
 else
 	$submenu_file = 'profile.php';
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if (current_user_can('edit_users') && ! is_user_admin())
 	$parent_file = 'users.php';
 else
 	$parent_file = 'profile.php';
 
-$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
-	'<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
-	'<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-	'<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+$profile_help = '<p>'.__('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.').'</p>'.
+	'<p>'.__('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.').'</p>'.
+	'<p>'.__('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.').'</p>'.
+	'<p>'.__('You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.').'</p>'.
+	'<p>'.__('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.').'</p>'.
+	'<p>'.__('Remember to click the Update Profile button when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $profile_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer);
 
-$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+$user_can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 /**
  * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
@@ -88,43 +88,43 @@ 
  *
  * @param bool $allow Whether to allow editing of any user. Default true.
  */
-if ( is_multisite()
-	&& ! current_user_can( 'manage_network_users' )
+if (is_multisite()
+	&& ! current_user_can('manage_network_users')
 	&& $user_id != $current_user->ID
-	&& ! apply_filters( 'enable_edit_any_user_configuration', true )
+	&& ! apply_filters('enable_edit_any_user_configuration', true)
 ) {
-	wp_die( __( 'You do not have permission to edit this user.' ) );
+	wp_die(__('You do not have permission to edit this user.'));
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
-if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-	$new_email = get_option( $current_user->ID . '_new_email' );
-	if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+if (is_multisite() && IS_PROFILE_PAGE && isset($_GET['newuseremail']) && $current_user->ID) {
+	$new_email = get_option($current_user->ID.'_new_email');
+	if ($new_email['hash'] == $_GET['newuseremail']) {
 		$user = new stdClass;
 		$user->ID = $current_user->ID;
-		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
-		wp_update_user( $user );
-		delete_option( $current_user->ID . '_new_email' );
-		wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+		$user->user_email = esc_html(trim($new_email['newemail']));
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login)))
+			$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login));
+		wp_update_user($user);
+		delete_option($current_user->ID.'_new_email');
+		wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 		die();
 	}
-} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
-	delete_option( $current_user->ID . '_new_email' );
-	wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+} elseif (is_multisite() && IS_PROFILE_PAGE && ! empty($_GET['dismiss']) && $current_user->ID.'_new_email' == $_GET['dismiss']) {
+	delete_option($current_user->ID.'_new_email');
+	wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 	die();
 }
 
 switch ($action) {
 case 'update':
 
-check_admin_referer('update-user_' . $user_id);
+check_admin_referer('update-user_'.$user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('You do not have permission to edit this user.'));
 
-if ( IS_PROFILE_PAGE ) {
+if (IS_PROFILE_PAGE) {
 	/**
 	 * Fires before the page loads on the 'Your Profile' editing screen.
 	 *
@@ -134,7 +134,7 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'personal_options_update', $user_id );
+	do_action('personal_options_update', $user_id);
 } else {
 	/**
 	 * Fires before the page loads on the 'Edit User' screen.
@@ -143,29 +143,29 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'edit_user_profile_update', $user_id );
+	do_action('edit_user_profile_update', $user_id);
 }
 
 // Update the email address in signups, if present.
-if ( is_multisite() ) {
-	$user = get_userdata( $user_id );
+if (is_multisite()) {
+	$user = get_userdata($user_id);
 
-	if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-		$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+	if ($user->user_login && isset($_POST['email']) && is_email($_POST['email']) && $wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login))) {
+		$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login));
 	}
 }
 
 // Update the user.
-$errors = edit_user( $user_id );
+$errors = edit_user($user_id);
 
 // Grant or revoke super admin status if requested.
-if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-	empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins) && empty($_POST['super_admin']) == is_super_admin($user_id)) {
+	empty($_POST['super_admin']) ? revoke_super_admin($user_id) : grant_super_admin($user_id);
 }
 
-if ( !is_wp_error( $errors ) ) {
-	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
+if ( ! is_wp_error($errors)) {
+	$redirect = add_query_arg('updated', true, get_edit_user_link($user_id));
+	if ($wp_http_referer)
 		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
 	wp_redirect($redirect);
 	exit;
@@ -174,55 +174,55 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('You do not have permission to edit this user.'));
 
-$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
+$sessions = WP_Session_Tokens::get_instance($profileuser->ID);
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
-<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
+<?php if ( ! IS_PROFILE_PAGE && is_super_admin($profileuser->ID) && current_user_can('manage_network_options')) { ?>
 	<div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['updated']) ) : ?>
+<?php if (isset($_GET['updated'])) : ?>
 <div id="message" class="updated notice is-dismissible">
-	<?php if ( IS_PROFILE_PAGE ) : ?>
+	<?php if (IS_PROFILE_PAGE) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
 	<?php else: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
 	<?php endif; ?>
-	<?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
+	<?php if ($wp_http_referer && ! IS_PROFILE_PAGE) : ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
+<div class="error"><p><?php echo implode("</p>\n<p>", $errors->get_error_messages()); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
 <h1>
 <?php
-echo esc_html( $title );
-if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+echo esc_html($title);
+if ( ! IS_PROFILE_PAGE) {
+	if (current_user_can('create_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+	<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 	<?php }
 } ?>
 </h1>
-<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
+<form id="your-profile" action="<?php echo esc_url(self_admin_url(IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php')); ?>" method="post" novalidate="novalidate"<?php
 	/**
 	 * Fires inside the your-profile form tag on the user editing screen.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_edit_form_tag' );
+	do_action('user_edit_form_tag');
 ?>>
-<?php wp_nonce_field('update-user_' . $user_id) ?>
-<?php if ( $wp_http_referer ) : ?>
+<?php wp_nonce_field('update-user_'.$user_id) ?>
+<?php if ($wp_http_referer) : ?>
 	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
@@ -233,13 +233,13 @@ 
 <h3><?php _e('Personal Options'); ?></h3>
 
 <table class="form-table">
-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
+<?php if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 	<tr class="user-rich-editing-wrap">
-		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<th scope="row"><?php _e('Visual Editor'); ?></th>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty($profileuser->rich_editing)) checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
 	</tr>
 <?php endif; ?>
-<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
+<?php if (count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker')) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php
@@ -254,23 +254,23 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'admin_color_scheme_picker', $user_id );
+	do_action('admin_color_scheme_picker', $user_id);
 ?></td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
+if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 <tr class="user-comment-shortcuts-wrap">
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<th scope="row"><?php _e('Keyboard Shortcuts'); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty($profileuser->comment_shortcuts)) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><?php _e( 'Toolbar' ); ?></th>
+<th scope="row"><?php _e('Toolbar'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
 <label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked(_get_admin_bar_pref('front', $profileuser->ID)); ?> />
+<?php _e('Show Toolbar when viewing site'); ?></label><br />
 </fieldset>
 </td>
 </tr>
@@ -282,12 +282,12 @@ 
  *
  * @param WP_User $profileuser The current WP_User object.
  */
-do_action( 'personal_options', $profileuser );
+do_action('personal_options', $profileuser);
 ?>
 
 </table>
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
 		 *
@@ -297,7 +297,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'profile_personal_options', $profileuser );
+		do_action('profile_personal_options', $profileuser);
 	}
 ?>
 
@@ -309,33 +309,33 @@ 
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
 	</tr>
 
-<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
+<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin()) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
 <td><select name="role" id="role">
 <?php
 // Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = reset( $user_roles );
+$user_roles = array_intersect(array_values($profileuser->roles), array_keys(get_editable_roles()));
+$user_role  = reset($user_roles);
 
 // print the full list of roles with the primary one selected.
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
-	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
+if ($user_role)
+	echo '<option value="">'.__('&mdash; No role for this site &mdash;').'</option>';
 else
-	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+	echo '<option value="" selected="selected">'.__('&mdash; No role for this site &mdash;').'</option>';
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins)) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
-<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
+<?php if ($profileuser->user_email != get_site_option('admin_email') || ! is_super_admin($profileuser->ID)) : ?>
+<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked(is_super_admin($profileuser->ID)); ?> /> <?php _e('Grant this user super admin privileges for the Network.'); ?></label></p>
 <?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<p><?php _e('Super admin privileges cannot be removed because this user has the network admin email.'); ?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -364,26 +364,26 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
+			if ( ! empty($profileuser->first_name))
 				$public_display['display_firstname'] = $profileuser->first_name;
 
-			if ( !empty($profileuser->last_name) )
+			if ( ! empty($profileuser->last_name))
 				$public_display['display_lastname'] = $profileuser->last_name;
 
-			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			if ( ! empty($profileuser->first_name) && ! empty($profileuser->last_name)) {
+				$public_display['display_firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+				$public_display['display_lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			if ( ! in_array($profileuser->display_name, $public_display)) // Only add this if it isn't duplicated elsewhere
+				$public_display = array('display_displayname' => $profileuser->display_name) + $public_display;
 
-			$public_display = array_map( 'trim', $public_display );
-			$public_display = array_unique( $public_display );
+			$public_display = array_map('trim', $public_display);
+			$public_display = array_unique($public_display);
 
-			foreach ( $public_display as $id => $item ) {
+			foreach ($public_display as $id => $item) {
 		?>
-			<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+			<option <?php selected($profileuser->display_name, $item); ?>><?php echo $item; ?></option>
 		<?php
 			}
 		?>
@@ -397,16 +397,16 @@ 
 <table class="form-table">
 <tr class="user-email-wrap">
 	<th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
+	<td><input type="email" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text ltr" />
 	<?php
-	$new_email = get_option( $current_user->ID . '_new_email' );
-	if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
+	$new_email = get_option($current_user->ID.'_new_email');
+	if ($new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID) : ?>
 	<div class="updated inline">
 	<p><?php
 		printf(
-			__( 'There is a pending change of your e-mail to %1$s. <a href="%2$s">Cancel</a>' ),
-			'<code>' . $new_email['newemail'] . '</code>',
-			esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) )
+			__('There is a pending change of your e-mail to %1$s. <a href="%2$s">Cancel</a>'),
+			'<code>'.$new_email['newemail'].'</code>',
+			esc_url(self_admin_url('profile.php?dismiss='.$current_user->ID.'_new_email'))
 	); ?></p>
 	</div>
 	<?php endif; ?>
@@ -415,11 +415,11 @@ 
 
 <tr class="user-url-wrap">
 	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
+	<td><input type="url" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
 </tr>
 
 <?php
-	foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+	foreach (wp_get_user_contact_methods($profileuser) as $name => $desc) {
 ?>
 <tr class="user-<?php echo $name; ?>-wrap">
 	<th><label for="<?php echo $name; ?>">
@@ -434,7 +434,7 @@ 
 		 *
 		 * @param string $desc The translatable label for the contactmethod.
 		 */
-		echo apply_filters( "user_{$name}_label", $desc );
+		echo apply_filters("user_{$name}_label", $desc);
 		?>
 	</label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
@@ -455,81 +455,81 @@ 
 
 <?php
 /** This filter is documented in wp-admin/user-new.php */
-$show_password_fields = apply_filters( 'show_password_fields', true, $profileuser );
-if ( $show_password_fields ) :
+$show_password_fields = apply_filters('show_password_fields', true, $profileuser);
+if ($show_password_fields) :
 ?>
 </table>
 
 <h3><?php _e('Account Management'); ?></h3>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
 	<td>
 		<input class="hidden" value=" " /><!-- #24364 workaround -->
-		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Generate Password'); ?></button>
 		<div class="wp-pwd hide-if-js">
 			<span class="password-input-wrapper">
-				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr(wp_generate_password(24)); ?>" aria-describedby="pass-strength-result" />
 			</span>
-			<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+			<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 				<span class="dashicons dashicons-hidden"></span>
-				<span class="text"><?php _e( 'Hide' ); ?></span>
+				<span class="text"><?php _e('Hide'); ?></span>
 			</button>
-			<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-				<span class="text"><?php _e( 'Cancel' ); ?></span>
+			<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+				<span class="text"><?php _e('Cancel'); ?></span>
 			</button>
 			<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 		</div>
 	</td>
 </tr>
 <tr class="user-pass2-wrap hide-if-js">
-	<th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+	<th scope="row"><label for="pass2"><?php _e('Repeat New Password'); ?></label></th>
 	<td>
 	<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
-	<p class="description"><?php _e( 'Type your new password again.' ); ?></p>
+	<p class="description"><?php _e('Type your new password again.'); ?></p>
 	</td>
 </tr>
 <tr class="pw-weak">
-	<th><?php _e( 'Confirm Password' ); ?></th>
+	<th><?php _e('Confirm Password'); ?></th>
 	<td>
 		<label>
 			<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-			<?php _e( 'Confirm use of weak password' ); ?>
+			<?php _e('Confirm use of weak password'); ?>
 		</label>
 	</td>
 </tr>
 <?php endif; ?>
 
 <?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
+if (IS_PROFILE_PAGE && count($sessions->get_all()) === 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'You are only logged in at this location.' ); ?>
+				<?php _e('You are only logged in at this location.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
+<?php elseif (IS_PROFILE_PAGE && count($sessions->get_all()) > 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
+				<?php _e('Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
+<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all()) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td>
-			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
+			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere'); ?></button></p>
 			<p class="description">
 				<?php
 				/* translators: 1: User's display name. */
-				printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
+				printf(__('Log %s out of all locations.'), $profileuser->display_name);
 				?>
 			</p>
 		</td>
@@ -539,7 +539,7 @@ 
 </table>
 
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
 		 *
@@ -549,7 +549,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'show_user_profile', $profileuser );
+		do_action('show_user_profile', $profileuser);
 	} else {
 		/**
 		 * Fires after the 'About the User' settings table on the 'Edit User' screen.
@@ -558,7 +558,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'edit_user_profile', $profileuser );
+		do_action('edit_user_profile', $profileuser);
 	}
 ?>
 
@@ -575,21 +575,21 @@ 
  * @param bool    $enable      Whether to display the capabilities. Default true.
  * @param WP_User $profileuser The current WP_User object.
  */
-if ( count( $profileuser->caps ) > count( $profileuser->roles )
-	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
+if (count($profileuser->caps) > count($profileuser->roles)
+	&& apply_filters('additional_capabilities_display', true, $profileuser)
 ) : ?>
-<h3><?php _e( 'Additional Capabilities' ); ?></h3>
+<h3><?php _e('Additional Capabilities'); ?></h3>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
-	<th scope="row"><?php _e( 'Capabilities' ); ?></th>
+	<th scope="row"><?php _e('Capabilities'); ?></th>
 	<td>
 <?php
 	$output = '';
-	foreach ( $profileuser->caps as $cap => $value ) {
-		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
+	foreach ($profileuser->caps as $cap => $value) {
+		if ( ! $wp_roles->is_role($cap)) {
+			if ('' != $output)
 				$output .= ', ';
-			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+			$output .= $value ? $cap : sprintf(__('Denied: %s'), $cap);
 		}
 	}
 	echo $output;
@@ -602,7 +602,7 @@ 
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
 
-<?php submit_button( IS_PROFILE_PAGE ? __('Update Profile') : __('Update User') ); ?>
+<?php submit_button(IS_PROFILE_PAGE ? __('Update Profile') : __('Update User')); ?>
 
 </form>
 </div>
@@ -616,4 +616,4 @@ 
 	}
 </script>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +55 added lines, -29 removed lines

@@ -13,28 +13,32 @@ 
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
+if ( ! defined( 'IS_PROFILE_PAGE' ) ) {
 	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+}
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE ) {
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
+} elseif ( ! $user_id && ! IS_PROFILE_PAGE ) {
 	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
+} elseif ( ! get_userdata( $user_id ) ) {
 	wp_die( __('Invalid user ID.') );
+}
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if ( current_user_can('edit_users') && !IS_PROFILE_PAGE ) {
 	$submenu_file = 'users.php';
-else
+} else {
 	$submenu_file = 'profile.php';
+}
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if ( current_user_can('edit_users') && !is_user_admin() ) {
 	$parent_file = 'users.php';
-else
+} else {
 	$parent_file = 'profile.php';
+}
 
 $profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
 	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
@@ -103,8 +107,9 @@ 
 		$user = new stdClass;
 		$user->ID = $current_user->ID;
 		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
+					$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		}
 		wp_update_user( $user );
 		delete_option( $current_user->ID . '_new_email' );
 		wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
@@ -121,8 +126,9 @@ 
 
 check_admin_referer('update-user_' . $user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 if ( IS_PROFILE_PAGE ) {
 	/**
@@ -165,8 +171,9 @@ 
 
 if ( !is_wp_error( $errors ) ) {
 	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
-		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	if ( $wp_http_referer ) {
+			$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	}
 	wp_redirect($redirect);
 	exit;
 }
@@ -174,8 +181,9 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
 
@@ -189,9 +197,12 @@ 
 <div id="message" class="updated notice is-dismissible">
 	<?php if ( IS_PROFILE_PAGE ) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
-	<?php else: ?>
+	<?php else {
+	: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
 	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
@@ -236,7 +247,10 @@ 
 <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 	<tr class="user-rich-editing-wrap">
 		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) {
+	checked( 'false', $profileuser->rich_editing );
+}
+?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
 	</tr>
 <?php endif; ?>
 <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
@@ -262,7 +276,10 @@ 
 if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <tr class="user-comment-shortcuts-wrap">
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) {
+	checked( 'true', $profileuser->comment_shortcuts );
+}
+?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
@@ -321,10 +338,11 @@ 
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
+if ( $user_role ) {
 	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
-else
+} else {
 	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+}
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
@@ -334,8 +352,11 @@ 
 <td>
 <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
-<?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<?php else {
+	: ?>
+<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' );
+}
+?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -364,19 +385,23 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
-				$public_display['display_firstname'] = $profileuser->first_name;
+			if ( !empty($profileuser->first_name) ) {
+							$public_display['display_firstname'] = $profileuser->first_name;
+			}
 
-			if ( !empty($profileuser->last_name) )
-				$public_display['display_lastname'] = $profileuser->last_name;
+			if ( !empty($profileuser->last_name) ) {
+							$public_display['display_lastname'] = $profileuser->last_name;
+			}
 
 			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
 				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
 				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
+			if ( !in_array( $profileuser->display_name, $public_display ) ) {
+				// Only add this if it isn't duplicated elsewhere
 				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			}
 
 			$public_display = array_map( 'trim', $public_display );
 			$public_display = array_unique( $public_display );
@@ -587,8 +612,9 @@ 
 	$output = '';
 	foreach ( $profileuser->caps as $cap => $value ) {
 		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
-				$output .= ', ';
+			if ( '' != $output ) {
+							$output .= ', ';
+			}
 			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
 		}
 	}

src/wp-admin/ms-upgrade-network.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite upgrade administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite upgrade administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('upgrade.php') );
+wp_redirect(network_admin_url('upgrade.php'));
 exit;

src/wp-admin/network/sites.php

Spacing +111 added lines, -111 removed lines

@@ -8,166 +8,166 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/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.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('You do not have permission to access this page.'), 403);
 
-$wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
+$wp_list_table = _get_list_table('WP_MS_Sites_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
-$title = __( 'Sites' );
+$title = __('Sites');
 $parent_file = 'sites.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
-		'<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
-		'<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
-		'<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
-		'<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
-		'<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
-		'<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
-		'<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
-		'<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
-		'<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
-) );
+		'<p>'.__('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.').'</p>'.
+		'<p>'.__('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.').'</p>'.
+		'<p>'.__('Hovering over each site reveals seven options (three for the primary site):').'</p>'.
+		'<ul><li>'.__('An Edit link to a separate Edit Site screen.').'</li>'.
+		'<li>'.__('Dashboard leads to the Dashboard for that site.').'</li>'.
+		'<li>'.__('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.').'</li>'.
+		'<li>'.__('Delete which is a permanent action after the confirmation screens.').'</li>'.
+		'<li>'.__('Visit to go to the frontend site live.').'</li></ul>'.
+		'<p>'.__('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.').'</p>'.
+		'<p>'.__('Clicking on bold headings can re-sort this table.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></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>'
+	'<p><strong>'.__('For more information:').'</strong></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>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( isset( $_GET['action'] ) ) {
+if (isset($_GET['action'])) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
 	// A list of valid actions and their associated messaging for confirmation output.
 	$manage_actions = array(
-		'activateblog'   => __( 'You are about to activate the site %s' ),
-		'deactivateblog' => __( 'You are about to deactivate the site %s' ),
-		'unarchiveblog'  => __( 'You are about to unarchive the site %s.' ),
-		'archiveblog'    => __( 'You are about to archive the site %s.' ),
-		'unspamblog'     => __( 'You are about to unspam the site %s.' ),
-		'spamblog'       => __( 'You are about to mark the site %s as spam.' ),
-		'deleteblog'     => __( 'You are about to delete the site %s.' ),
-		'unmatureblog'   => __( 'You are about to mark the site %s as mature.' ),
-		'matureblog'     => __( 'You are about to mark the site %s as not mature.' ),
+		'activateblog'   => __('You are about to activate the site %s'),
+		'deactivateblog' => __('You are about to deactivate the site %s'),
+		'unarchiveblog'  => __('You are about to unarchive the site %s.'),
+		'archiveblog'    => __('You are about to archive the site %s.'),
+		'unspamblog'     => __('You are about to unspam the site %s.'),
+		'spamblog'       => __('You are about to mark the site %s as spam.'),
+		'deleteblog'     => __('You are about to delete the site %s.'),
+		'unmatureblog'   => __('You are about to mark the site %s as mature.'),
+		'matureblog'     => __('You are about to mark the site %s as not mature.'),
 	);
 
-	if ( 'confirm' === $_GET['action'] ) {
+	if ('confirm' === $_GET['action']) {
 		// The action2 parameter contains the action being taken on the site.
 		$site_action = $_GET['action2'];
 
-		if ( ! array_key_exists( $site_action, $manage_actions ) ) {
-			wp_die( __( 'The requested action is not valid.' ) );
+		if ( ! array_key_exists($site_action, $manage_actions)) {
+			wp_die(__('The requested action is not valid.'));
 		}
 
 		// The mature/unmature UI exists only as external code. Check the "confirm" nonce for backward compatibility.
-		if ( 'matureblog' === $site_action || 'unmatureblog' === $site_action ) {
-			check_admin_referer( 'confirm' );
+		if ('matureblog' === $site_action || 'unmatureblog' === $site_action) {
+			check_admin_referer('confirm');
 		} else {
-			check_admin_referer( $site_action . '_' . $id );
+			check_admin_referer($site_action.'_'.$id);
 		}
 
-		if ( ! headers_sent() ) {
+		if ( ! headers_sent()) {
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=utf-8' );
+			header('Content-Type: text/html; charset=utf-8');
 		}
 
-		if ( $current_site->blog_id == $id ) {
-			wp_die( __( 'You are not allowed to change the current site.' ) );
+		if ($current_site->blog_id == $id) {
+			wp_die(__('You are not allowed to change the current site.'));
 		}
 
-		$site_details = get_blog_details( $id );
-		$site_address = untrailingslashit( $site_details->domain . $site_details->path );
+		$site_details = get_blog_details($id);
+		$site_address = untrailingslashit($site_details->domain.$site_details->path);
 
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 		?>
 			<div class="wrap">
-				<h1><?php _e( 'Confirm your action' ); ?></h1>
-				<form action="sites.php?action=<?php echo esc_attr( $site_action ); ?>" method="post">
-					<input type="hidden" name="action" value="<?php echo esc_attr( $site_action ); ?>" />
-					<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
-					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
-					<?php wp_nonce_field( $site_action . '_' . $id, '_wpnonce', false ); ?>
-					<p><?php echo sprintf( $manage_actions[ $site_action ], $site_address ); ?></p>
-					<?php submit_button( __( 'Confirm' ), 'button' ); ?>
+				<h1><?php _e('Confirm your action'); ?></h1>
+				<form action="sites.php?action=<?php echo esc_attr($site_action); ?>" method="post">
+					<input type="hidden" name="action" value="<?php echo esc_attr($site_action); ?>" />
+					<input type="hidden" name="id" value="<?php echo esc_attr($id); ?>" />
+					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr(wp_get_referer()); ?>" />
+					<?php wp_nonce_field($site_action.'_'.$id, '_wpnonce', false); ?>
+					<p><?php echo sprintf($manage_actions[$site_action], $site_address); ?></p>
+					<?php submit_button(__('Confirm'), 'button'); ?>
 				</form>
 			</div>
 		<?php
-		require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+		require_once(ABSPATH.'wp-admin/admin-footer.php');
 		exit();
-	} elseif ( array_key_exists( $_GET['action'], $manage_actions ) ) {
+	} elseif (array_key_exists($_GET['action'], $manage_actions)) {
 		$action = $_GET['action'];
-		check_admin_referer( $action . '_' . $id );
-	} elseif ( 'allblogs' === $_GET['action'] ) {
-		check_admin_referer( 'bulk-sites' );
+		check_admin_referer($action.'_'.$id);
+	} elseif ('allblogs' === $_GET['action']) {
+		check_admin_referer('bulk-sites');
 	}
 
 	$updated_action = '';
 
-	switch ( $_GET['action'] ) {
+	switch ($_GET['action']) {
 
 		case 'deleteblog':
-			if ( ! current_user_can( 'delete_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
+			if ( ! current_user_can('delete_sites'))
+				wp_die(__('You do not have permission to access this page.'), '', array('response' => 403));
 
 			$updated_action = 'not_deleted';
-			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
-				wpmu_delete_blog( $id, true );
+			if ($id != '0' && $id != $current_site->blog_id && current_user_can('delete_site', $id)) {
+				wpmu_delete_blog($id, true);
 				$updated_action = 'delete';
 			}
 		break;
 
 		case 'allblogs':
-			if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
+			if ((isset($_POST['action']) || isset($_POST['action2'])) && isset($_POST['allblogs'])) {
 				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 
-				foreach ( (array) $_POST['allblogs'] as $key => $val ) {
-					if ( $val != '0' && $val != $current_site->blog_id ) {
-						switch ( $doaction ) {
+				foreach ((array) $_POST['allblogs'] as $key => $val) {
+					if ($val != '0' && $val != $current_site->blog_id) {
+						switch ($doaction) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_site', $val ) )
-									wp_die( __( 'You are not allowed to delete the site.' ) );
+								if ( ! current_user_can('delete_site', $val))
+									wp_die(__('You are not allowed to delete the site.'));
 
 								$updated_action = 'all_delete';
-								wpmu_delete_blog( $val, true );
+								wpmu_delete_blog($val, true);
 							break;
 
 							case 'spam':
 							case 'notspam':
-								$updated_action = ( 'spam' === $doaction ) ? 'all_spam' : 'all_notspam';
-								update_blog_status( $val, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
+								$updated_action = ('spam' === $doaction) ? 'all_spam' : 'all_notspam';
+								update_blog_status($val, 'spam', ('spam' === $doaction) ? '1' : '0');
 							break;
 						}
 					} else {
-						wp_die( __( 'You are not allowed to change the current site.' ) );
+						wp_die(__('You are not allowed to change the current site.'));
 					}
 				}
 			} else {
-				wp_redirect( network_admin_url( 'sites.php' ) );
+				wp_redirect(network_admin_url('sites.php'));
 				exit();
 			}
 		break;
 
 		case 'archiveblog':
 		case 'unarchiveblog':
-			update_blog_status( $id, 'archived', ( 'archiveblog' === $_GET['action'] ) ? '1' : '0' );
+			update_blog_status($id, 'archived', ('archiveblog' === $_GET['action']) ? '1' : '0');
 		break;
 
 		case 'activateblog':
-			update_blog_status( $id, 'deleted', '0' );
+			update_blog_status($id, 'deleted', '0');
 
 			/**
 			 * Fires after a network site is activated.
@@ -176,7 +176,7 @@ 
 			 *
 			 * @param string $id The ID of the activated site.
 			 */
-			do_action( 'activate_blog', $id );
+			do_action('activate_blog', $id);
 		break;
 
 		case 'deactivateblog':
@@ -187,66 +187,66 @@ 
 			 *
 			 * @param string $id The ID of the site being deactivated.
 			 */
-			do_action( 'deactivate_blog', $id );
-			update_blog_status( $id, 'deleted', '1' );
+			do_action('deactivate_blog', $id);
+			update_blog_status($id, 'deleted', '1');
 		break;
 
 		case 'unspamblog':
 		case 'spamblog':
-			update_blog_status( $id, 'spam', ( 'spamblog' === $_GET['action'] ) ? '1' : '0' );
+			update_blog_status($id, 'spam', ('spamblog' === $_GET['action']) ? '1' : '0');
 		break;
 
 		case 'unmatureblog':
 		case 'matureblog':
-			update_blog_status( $id, 'mature', ( 'matureblog' === $_GET['action'] ) ? '1' : '0' );
+			update_blog_status($id, 'mature', ('matureblog' === $_GET['action']) ? '1' : '0');
 		break;
 	}
 
-	if ( empty( $updated_action ) && array_key_exists( $_GET['action'], $manage_actions ) ) {
+	if (empty($updated_action) && array_key_exists($_GET['action'], $manage_actions)) {
 		$updated_action = $_GET['action'];
 	}
 
-	if ( ! empty( $updated_action ) ) {
-		wp_safe_redirect( add_query_arg( array( 'updated' => $updated_action ), wp_get_referer() ) );
+	if ( ! empty($updated_action)) {
+		wp_safe_redirect(add_query_arg(array('updated' => $updated_action), wp_get_referer()));
 		exit();
 	}
 }
 
 $msg = '';
-if ( isset( $_GET['updated'] ) ) {
-	switch ( $_GET['updated'] ) {
+if (isset($_GET['updated'])) {
+	switch ($_GET['updated']) {
 		case 'all_notspam':
-			$msg = __( 'Sites removed from spam.' );
+			$msg = __('Sites removed from spam.');
 		break;
 		case 'all_spam':
-			$msg = __( 'Sites marked as spam.' );
+			$msg = __('Sites marked as spam.');
 		break;
 		case 'all_delete':
-			$msg = __( 'Sites deleted.' );
+			$msg = __('Sites deleted.');
 		break;
 		case 'delete':
-			$msg = __( 'Site deleted.' );
+			$msg = __('Site deleted.');
 		break;
 		case 'not_deleted':
-			$msg = __( 'You do not have permission to delete that site.' );
+			$msg = __('You do not have permission to delete that site.');
 		break;
 		case 'archiveblog':
-			$msg = __( 'Site archived.' );
+			$msg = __('Site archived.');
 		break;
 		case 'unarchiveblog':
-			$msg = __( 'Site unarchived.' );
+			$msg = __('Site unarchived.');
 		break;
 		case 'activateblog':
-			$msg = __( 'Site activated.' );
+			$msg = __('Site activated.');
 		break;
 		case 'deactivateblog':
-			$msg = __( 'Site deactivated.' );
+			$msg = __('Site deactivated.');
 		break;
 		case 'unspamblog':
-			$msg = __( 'Site removed from spam.' );
+			$msg = __('Site removed from spam.');
 		break;
 		case 'spamblog':
-			$msg = __( 'Site marked as spam.' );
+			$msg = __('Site marked as spam.');
 		break;
 		default:
 			/**
@@ -259,35 +259,35 @@ 
 			 *
 			 * @param string $msg The update message. Default 'Settings saved'.
 			 */
-			$msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
+			$msg = apply_filters('network_sites_updated_message_'.$_GET['updated'], __('Settings saved.'));
 		break;
 	}
 
-	if ( ! empty( $msg ) )
-		$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
+	if ( ! empty($msg))
+		$msg = '<div class="updated" id="message notice is-dismissible"><p>'.$msg.'</p></div>';
 }
 
 $wp_list_table->prepare_items();
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php _e( 'Sites' ); ?>
+<h1><?php _e('Sites'); ?>
 
-<?php if ( current_user_can( 'create_sites') ) : ?>
-	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
+<?php if (current_user_can('create_sites')) : ?>
+	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'site'); ?></a>
 <?php endif; ?>
 
-<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+<?php if (isset($_REQUEST['s']) && $_REQUEST['s']) {
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($s));
 } ?>
 </h1>
 
 <?php echo $msg; ?>
 
 <form method="get" id="ms-search">
-<?php $wp_list_table->search_box( __( 'Search Sites' ), 'site' ); ?>
+<?php $wp_list_table->search_box(__('Search Sites'), 'site'); ?>
 <input type="hidden" name="action" value="blogs" />
 </form>
 
@@ -297,4 +297,4 @@ 
 </div>
 <?php
 
-require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+require_once(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +14 added lines, -9 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
 $pagenum = $wp_list_table->get_pagenum();
@@ -120,8 +122,9 @@ 
 	switch ( $_GET['action'] ) {
 
 		case 'deleteblog':
-			if ( ! current_user_can( 'delete_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
+			if ( ! current_user_can( 'delete_sites' ) ) {
+							wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
+			}
 
 			$updated_action = 'not_deleted';
 			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
@@ -138,8 +141,9 @@ 
 					if ( $val != '0' && $val != $current_site->blog_id ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_site', $val ) )
-									wp_die( __( 'You are not allowed to delete the site.' ) );
+								if ( ! current_user_can( 'delete_site', $val ) ) {
+																	wp_die( __( 'You are not allowed to delete the site.' ) );
+								}
 
 								$updated_action = 'all_delete';
 								wpmu_delete_blog( $val, true );
@@ -263,9 +267,10 @@ 
 		break;
 	}
 
-	if ( ! empty( $msg ) )
-		$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
-}
+	if ( ! empty( $msg ) ) {
+			$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	}
 
 $wp_list_table->prepare_items();
 

src/wp-admin/network/users.php

Spacing +136 added lines, -136 removed lines

@@ -8,89 +8,89 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/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.'));
 
-if ( ! current_user_can( 'manage_network_users' ) )
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! current_user_can('manage_network_users'))
+	wp_die(__('You do not have permission to access this page.'), 403);
 
 /**
  *
  * @param array $users
  */
-function confirm_delete_users( $users ) {
+function confirm_delete_users($users) {
 	$current_user = wp_get_current_user();
-	if ( ! is_array( $users ) || empty( $users ) ) {
+	if ( ! is_array($users) || empty($users)) {
 		return false;
 	}
 	?>
-	<h1><?php esc_html_e( 'Users' ); ?></h1>
+	<h1><?php esc_html_e('Users'); ?></h1>
 
-	<?php if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
+	<?php if (1 == count($users)) : ?>
+		<p><?php _e('You have chosen to delete the user from all networks and sites.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+		<p><?php _e('You have chosen to delete the following users from all networks and sites.'); ?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
 	<input type="hidden" name="dodelete" />
 	<?php
-	wp_nonce_field( 'ms-users-delete' );
+	wp_nonce_field('ms-users-delete');
 	$site_admins = get_super_admins();
-	$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+	$admin_out = '<option value="'.esc_attr($current_user->ID).'">'.$current_user->user_login.'</option>'; ?>
 	<table class="form-table">
-	<?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
-		if ( $user_id != '' && $user_id != '0' ) {
-			$delete_user = get_userdata( $user_id );
+	<?php foreach (($allusers = (array) $_POST['allusers']) as $user_id) {
+		if ($user_id != '' && $user_id != '0') {
+			$delete_user = get_userdata($user_id);
 
-			if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
-				wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+			if ( ! current_user_can('delete_user', $delete_user->ID)) {
+				wp_die(sprintf(__('Warning! User %s cannot be deleted.'), $delete_user->user_login));
 			}
 
-			if ( in_array( $delete_user->user_login, $site_admins ) ) {
-				wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+			if (in_array($delete_user->user_login, $site_admins)) {
+				wp_die(sprintf(__('Warning! User cannot be deleted. The user %s is a network administrator.'), '<em>'.$delete_user->user_login.'</em>'));
 			}
 			?>
 			<tr>
 				<th scope="row"><?php echo $delete_user->user_login; ?>
-					<?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
+					<?php echo '<input type="hidden" name="user[]" value="'.esc_attr($user_id).'" />'."\n"; ?>
 				</th>
-			<?php $blogs = get_blogs_of_user( $user_id, true );
+			<?php $blogs = get_blogs_of_user($user_id, true);
 
-			if ( ! empty( $blogs ) ) {
+			if ( ! empty($blogs)) {
 				?>
 				<td><fieldset><p><legend><?php printf(
 					/* translators: user login */
-					__( 'What should be done with content owned by %s?' ),
-					'<em>' . $delete_user->user_login . '</em>'
+					__('What should be done with content owned by %s?'),
+					'<em>'.$delete_user->user_login.'</em>'
 				); ?></legend></p>
 				<?php
-				foreach ( (array) $blogs as $key => $details ) {
-					$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
-					if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
-						$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+				foreach ((array) $blogs as $key => $details) {
+					$blog_users = get_users(array('blog_id' => $details->userblog_id, 'fields' => array('ID', 'user_login')));
+					if (is_array($blog_users) && ! empty($blog_users)) {
+						$user_site = "<a href='".esc_url(get_home_url($details->userblog_id))."'>{$details->blogname}</a>";
+						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">'.__('Select a user').'</label>';
 						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
 						$user_list = '';
-						foreach ( $blog_users as $user ) {
-							if ( ! in_array( $user->ID, $allusers ) ) {
+						foreach ($blog_users as $user) {
+							if ( ! in_array($user->ID, $allusers)) {
 								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
 							}
 						}
-						if ( '' == $user_list ) {
+						if ('' == $user_list) {
 							$user_list = $admin_out;
 						}
 						$user_dropdown .= $user_list;
 						$user_dropdown .= "</select>\n";
 						?>
 						<ul style="list-style:none;">
-							<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-							<?php _e( 'Attribute all content to:' ) . "</label>\n" . $user_dropdown; ?></li>
+							<li><?php printf(__('Site: %s'), $user_site); ?></li>
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="delete" checked="checked" />
+							<?php _e('Delete all content.'); ?></label></li>
+							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="reassign" />
+							<?php _e('Attribute all content to:')."</label>\n".$user_dropdown; ?></li>
 						</ul>
 						<?php
 					}
@@ -98,7 +98,7 @@ 
 				echo "</fieldset></td></tr>";
 			} else {
 				?>
-				<td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
+				<td><fieldset><p><legend><?php _e('User has no sites or content and will be deleted.'); ?></legend></p>
 			<?php } ?>
 			</tr>
 		<?php
@@ -109,141 +109,141 @@ 
 	</table>
 	<?php
 	/** This action is documented in wp-admin/users.php */
-	do_action( 'delete_user_form', $current_user );
+	do_action('delete_user_form', $current_user);
 
-	if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
+	if (1 == count($users)) : ?>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.'); ?></p>
 	<?php endif;
 
-	submit_button( __('Confirm Deletion'), 'delete' );
+	submit_button(__('Confirm Deletion'), 'delete');
 	?>
 	</form>
 	<?php
 	return true;
 }
 
-if ( isset( $_GET['action'] ) ) {
+if (isset($_GET['action'])) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
-	switch ( $_GET['action'] ) {
+	switch ($_GET['action']) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('You do not have permission to access this page.'), 403);
 
-			check_admin_referer( 'deleteuser' );
+			check_admin_referer('deleteuser');
 
-			$id = intval( $_GET['id'] );
-			if ( $id != '0' && $id != '1' ) {
-				$_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
-				$title = __( 'Users' );
+			$id = intval($_GET['id']);
+			if ($id != '0' && $id != '1') {
+				$_POST['allusers'] = array($id); // confirm_delete_users() can only handle with arrays
+				$title = __('Users');
 				$parent_file = 'users.php';
-				require_once( ABSPATH . 'wp-admin/admin-header.php' );
+				require_once(ABSPATH.'wp-admin/admin-header.php');
 				echo '<div class="wrap">';
-				confirm_delete_users( $_POST['allusers'] );
+				confirm_delete_users($_POST['allusers']);
 				echo '</div>';
-				require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+				require_once(ABSPATH.'wp-admin/admin-footer.php');
 			} else {
-				wp_redirect( network_admin_url( 'users.php' ) );
+				wp_redirect(network_admin_url('users.php'));
 			}
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('You do not have permission to access this page.'), 403);
 
-			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
-				check_admin_referer( 'bulk-users-network' );
+			if ((isset($_POST['action']) || isset($_POST['action2'])) && isset($_POST['allusers'])) {
+				check_admin_referer('bulk-users-network');
 
 				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 				$userfunction = '';
 
-				foreach ( (array) $_POST['allusers'] as $user_id ) {
-					if ( !empty( $user_id ) ) {
-						switch ( $doaction ) {
+				foreach ((array) $_POST['allusers'] as $user_id) {
+					if ( ! empty($user_id)) {
+						switch ($doaction) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
-									wp_die( __( 'You do not have permission to access this page.' ), 403 );
-								$title = __( 'Users' );
+								if ( ! current_user_can('delete_users'))
+									wp_die(__('You do not have permission to access this page.'), 403);
+								$title = __('Users');
 								$parent_file = 'users.php';
-								require_once( ABSPATH . 'wp-admin/admin-header.php' );
+								require_once(ABSPATH.'wp-admin/admin-header.php');
 								echo '<div class="wrap">';
-								confirm_delete_users( $_POST['allusers'] );
+								confirm_delete_users($_POST['allusers']);
 								echo '</div>';
-								require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+								require_once(ABSPATH.'wp-admin/admin-footer.php');
 								exit();
 
 							case 'spam':
-								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
-									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								$user = get_userdata($user_id);
+								if (is_super_admin($user->ID))
+									wp_die(sprintf(__('Warning! User cannot be modified. The user %s is a network administrator.'), esc_html($user->user_login)));
 
 								$userfunction = 'all_spam';
-								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
-										update_blog_status( $details->userblog_id, 'spam', '1' );
+								$blogs = get_blogs_of_user($user_id, true);
+								foreach ((array) $blogs as $details) {
+									if ($details->userblog_id != $current_site->blog_id) // main blog not a spam !
+										update_blog_status($details->userblog_id, 'spam', '1');
 								}
-								update_user_status( $user_id, 'spam', '1' );
+								update_user_status($user_id, 'spam', '1');
 							break;
 
 							case 'notspam':
 								$userfunction = 'all_notspam';
-								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
-									update_blog_status( $details->userblog_id, 'spam', '0' );
+								$blogs = get_blogs_of_user($user_id, true);
+								foreach ((array) $blogs as $details)
+									update_blog_status($details->userblog_id, 'spam', '0');
 
-								update_user_status( $user_id, 'spam', '0' );
+								update_user_status($user_id, 'spam', '0');
 							break;
 						}
 					}
 				}
 
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
+				wp_safe_redirect(add_query_arg(array('updated' => 'true', 'action' => $userfunction), wp_get_referer()));
 			} else {
-				$location = network_admin_url( 'users.php' );
+				$location = network_admin_url('users.php');
 
-				if ( ! empty( $_REQUEST['paged'] ) )
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
-				wp_redirect( $location );
+				if ( ! empty($_REQUEST['paged']))
+					$location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
+				wp_redirect($location);
 			}
 			exit();
 
 		case 'dodelete':
-			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
-
-			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
-				foreach ( $_POST['blog'] as $id => $users ) {
-					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
+			check_admin_referer('ms-users-delete');
+			if ( ! (current_user_can('manage_network_users') && current_user_can('delete_users')))
+				wp_die(__('You do not have permission to access this page.'), 403);
+
+			if ( ! empty($_POST['blog']) && is_array($_POST['blog'])) {
+				foreach ($_POST['blog'] as $id => $users) {
+					foreach ($users as $blogid => $user_id) {
+						if ( ! current_user_can('delete_user', $id))
 							continue;
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
-							remove_user_from_blog( $id, $blogid, $user_id );
+						if ( ! empty($_POST['delete']) && 'reassign' == $_POST['delete'][$blogid][$id])
+							remove_user_from_blog($id, $blogid, $user_id);
 						else
-							remove_user_from_blog( $id, $blogid );
+							remove_user_from_blog($id, $blogid);
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
-				foreach( $_POST['user'] as $id ) {
-					if ( ! current_user_can( 'delete_user', $id ) )
+			if (is_array($_POST['user']) && ! empty($_POST['user']))
+				foreach ($_POST['user'] as $id) {
+					if ( ! current_user_can('delete_user', $id))
 						continue;
-					wpmu_delete_user( $id );
+					wpmu_delete_user($id);
 					$i++;
 				}
 
-			if ( $i == 1 )
+			if ($i == 1)
 				$deletefunction = 'delete';
 			else
 				$deletefunction = 'all_delete';
 
-			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
+			wp_redirect(add_query_arg(array('updated' => 'true', 'action' => $deletefunction), network_admin_url('users.php')));
 			exit();
 	}
 }
@@ -251,56 +251,56 @@ 
 $wp_list_table = _get_list_table('WP_MS_Users_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
 
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
-$title = __( 'Users' );
+$title = __('Users');
 $parent_file = 'users.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
-		'<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
-		'<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
-		'<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' .
-		'<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
-		'<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>'
-) );
+		'<p>'.__('This table shows all users across the network and the sites to which they are assigned.').'</p>'.
+		'<p>'.__('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.').'</p>'.
+		'<p>'.__('You can also go to the user&#8217;s profile page by clicking on the individual username.').'</p>'.
+		'<p>'.__('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.').'</p>'.
+		'<p>'.__('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.').'</p>'.
+		'<p>'.__('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
+if (isset($_REQUEST['updated']) && $_REQUEST['updated'] == 'true' && ! empty($_REQUEST['action'])) {
 	?>
 	<div id="message" class="updated notice is-dismissible"><p>
 		<?php
-		switch ( $_REQUEST['action'] ) {
+		switch ($_REQUEST['action']) {
 			case 'delete':
-				_e( 'User deleted.' );
+				_e('User deleted.');
 			break;
 			case 'all_spam':
-				_e( 'Users marked as spam.' );
+				_e('Users marked as spam.');
 			break;
 			case 'all_notspam':
-				_e( 'Users removed from spam.' );
+				_e('Users removed from spam.');
 			break;
 			case 'all_delete':
-				_e( 'Users deleted.' );
+				_e('Users deleted.');
 			break;
 			case 'add':
-				_e( 'User added.' );
+				_e('User added.');
 			break;
 		}
 		?>
@@ -309,20 +309,20 @@ 
 }
 	?>
 <div class="wrap">
-	<h1><?php esc_html_e( 'Users' );
-	if ( current_user_can( 'create_users') ) : ?>
-		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
+	<h1><?php esc_html_e('Users');
+	if (current_user_can('create_users')) : ?>
+		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a><?php
 	endif;
 
-	if ( !empty( $usersearch ) )
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+	if ( ! empty($usersearch))
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($usersearch));
 	?>
 	</h1>
 
 	<?php $wp_list_table->views(); ?>
 
 	<form method="get" class="search-form">
-		<?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
+		<?php $wp_list_table->search_box(__('Search Users'), 'all-user'); ?>
 	</form>
 
 	<form id="form-user-list" action="users.php?action=allusers" method="post">
@@ -330,4 +330,4 @@ 
 	</form>
 </div>
 
-<?php require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require_once(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +57 added lines, -35 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_network_users' ) )
+if ( ! current_user_can( 'manage_network_users' ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 /**
  *
@@ -30,8 +32,11 @@ 
 
 	<?php if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' );
+}
+?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
@@ -113,8 +118,11 @@ 
 
 	if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' );
+}
+?></p>
 	<?php endif;
 
 	submit_button( __('Confirm Deletion'), 'delete' );
@@ -130,8 +138,9 @@ 
 
 	switch ( $_GET['action'] ) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			}
 
 			check_admin_referer( 'deleteuser' );
 
@@ -151,8 +160,9 @@ 
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			if ( !current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			}
 
 			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
 				check_admin_referer( 'bulk-users-network' );
@@ -164,8 +174,9 @@ 
 					if ( !empty( $user_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
-									wp_die( __( 'You do not have permission to access this page.' ), 403 );
+								if ( ! current_user_can( 'delete_users' ) ) {
+																	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+								}
 								$title = __( 'Users' );
 								$parent_file = 'users.php';
 								require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -177,14 +188,17 @@ 
 
 							case 'spam':
 								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
-									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								if ( is_super_admin( $user->ID ) ) {
+																	wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								}
 
 								$userfunction = 'all_spam';
 								$blogs = get_blogs_of_user( $user_id, true );
 								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
+									if ( $details->userblog_id != $current_site->blog_id ) {
+										// main blog not a spam !
 										update_blog_status( $details->userblog_id, 'spam', '1' );
+									}
 								}
 								update_user_status( $user_id, 'spam', '1' );
 							break;
@@ -192,8 +206,9 @@ 
 							case 'notspam':
 								$userfunction = 'all_notspam';
 								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
-									update_blog_status( $details->userblog_id, 'spam', '0' );
+								foreach ( (array) $blogs as $details ) {
+																	update_blog_status( $details->userblog_id, 'spam', '0' );
+								}
 
 								update_user_status( $user_id, 'spam', '0' );
 							break;
@@ -205,43 +220,49 @@ 
 			} else {
 				$location = network_admin_url( 'users.php' );
 
-				if ( ! empty( $_REQUEST['paged'] ) )
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				if ( ! empty( $_REQUEST['paged'] ) ) {
+									$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				}
 				wp_redirect( $location );
 			}
 			exit();
 
 		case 'dodelete':
 			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
-				wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) ) {
+							wp_die( __( 'You do not have permission to access this page.' ), 403 );
+			}
 
 			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
 				foreach ( $_POST['blog'] as $id => $users ) {
 					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
-							continue;
+						if ( ! current_user_can( 'delete_user', $id ) ) {
+													continue;
+						}
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
-							remove_user_from_blog( $id, $blogid, $user_id );
-						else
-							remove_user_from_blog( $id, $blogid );
+						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] ) {
+													remove_user_from_blog( $id, $blogid, $user_id );
+						} else {
+													remove_user_from_blog( $id, $blogid );
+						}
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
-				foreach( $_POST['user'] as $id ) {
+			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) ) {
+							foreach( $_POST['user'] as $id ) {
 					if ( ! current_user_can( 'delete_user', $id ) )
 						continue;
+			}
 					wpmu_delete_user( $id );
 					$i++;
 				}
 
-			if ( $i == 1 )
-				$deletefunction = 'delete';
-			else
-				$deletefunction = 'all_delete';
+			if ( $i == 1 ) {
+							$deletefunction = 'delete';
+			} else {
+							$deletefunction = 'all_delete';
+			}
 
 			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
 			exit();
@@ -314,8 +335,9 @@ 
 		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
 	endif;
 
-	if ( !empty( $usersearch ) )
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+	if ( !empty( $usersearch ) ) {
+		printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+	}
 	?>
 	</h1>