ntwb / wordpress

src/wp-admin/includes/ms-admin-filters.php

Spacing +15 added lines, -15 removed lines

@@ -8,36 +8,36 @@
  */
 
 // Media Hooks.
-add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
+add_filter('wp_handle_upload_prefilter', 'check_upload_size');
 
 // User Hooks
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
-add_action( 'user_admin_notices', 'new_user_email_admin_notice' );
+add_action('admin_notices', 'new_user_email_admin_notice');
+add_action('user_admin_notices', 'new_user_email_admin_notice');
 
-add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
+add_action('admin_page_access_denied', '_access_denied_splash', 99);
 
-add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+add_action('add_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
-add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
+add_action('personal_options_update', 'send_confirmation_on_profile_email');
 
-add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
 // Site Hooks.
-add_action( 'wpmueditblogaction', 'upload_space_setting' );
+add_action('wpmueditblogaction', 'upload_space_setting');
 
 // Taxonomy Hooks
-add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
+add_filter('get_term', 'sync_category_tag_slugs', 10, 2);
 
 // Post Hooks.
-add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
+add_filter('wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2);
 
 // Tools Hooks.
-add_filter( 'import_allow_create_users', 'check_import_new_users' );
+add_filter('import_allow_create_users', 'check_import_new_users');
 
 // Notices Hooks
-add_action( 'admin_notices',         'site_admin_notice' );
-add_action( 'network_admin_notices', 'site_admin_notice' );
+add_action('admin_notices', 'site_admin_notice');
+add_action('network_admin_notices', 'site_admin_notice');
 
 // Update Hooks
-add_action( 'network_admin_notices', 'update_nag',      3  );
-add_action( 'network_admin_notices', 'maintenance_nag', 10 );
+add_action('network_admin_notices', 'update_nag', 3);
+add_action('network_admin_notices', 'maintenance_nag', 10);

src/wp-admin/media-upload.php

Braces +2 added lines, -1 removed lines

@@ -9,8 +9,9 @@
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
+if ( ! isset( $_GET['inline'] ) ) {
 	define( 'IFRAME_REQUEST' , true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +22 added lines, -22 removed lines

@@ -9,47 +9,47 @@ 
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
-	define( 'IFRAME_REQUEST' , true );
+if ( ! isset($_GET['inline']))
+	define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ), 403 );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('Sorry, you are not allowed to upload files.'), 403);
 }
 
 wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
-wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_script('set-post-thumbnail');
 wp_enqueue_style('imgareaselect');
-wp_enqueue_script( 'media-gallery' );
+wp_enqueue_script('media-gallery');
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 // IDs should be integers
 $ID = isset($ID) ? (int) $ID : 0;
-$post_id = isset($post_id)? (int) $post_id : 0;
+$post_id = isset($post_id) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && $action == 'edit' && !$ID ) {
+if (isset($action) && $action == 'edit' && ! $ID) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Invalid item ID.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Invalid item ID.').'</p>',
 		403
 	);
 }
 
-if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+if ( ! empty($_REQUEST['post_id']) && ! current_user_can('edit_post', $_REQUEST['post_id'])) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 		403
 	);
 }
 
 // Upload type: image, video, file, ..?
-if ( isset($_GET['type']) ) {
+if (isset($_GET['type'])) {
 	$type = strval($_GET['type']);
 } else {
 	/**
@@ -60,11 +60,11 @@ 
 	 * @param string $type The default media upload type. Possible values include
 	 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
 	 */
-	$type = apply_filters( 'media_upload_default_type', 'file' );
+	$type = apply_filters('media_upload_default_type', 'file');
 }
 
 // Tab: gallery, library, or type-specific.
-if ( isset($_GET['tab']) ) {
+if (isset($_GET['tab'])) {
 	$tab = strval($_GET['tab']);
 } else {
 	/**
@@ -74,13 +74,13 @@ 
 	 *
 	 * @param string $type The default media popup tab. Default 'type' (From Computer).
 	 */
-	$tab = apply_filters( 'media_upload_default_tab', 'type' );
+	$tab = apply_filters('media_upload_default_tab', 'type');
 }
 
 $body_id = 'media-upload';
 
 // Let the action code decide how to handle the request.
-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+if ($tab == 'type' || $tab == 'type_url' || ! array_key_exists($tab, media_upload_tabs())) {
 	/**
 	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
 	 * media popup based on the current tab.
@@ -95,7 +95,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_{$type}" );
+	do_action("media_upload_{$type}");
 } else {
 	/**
 	 * Fires inside limited and specific upload-tab views in the legacy
@@ -107,6 +107,6 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_{$tab}" );
+	do_action("media_upload_{$tab}");
 }
 

src/wp-admin/credits.php

Braces +7 added lines, -4 removed lines

@@ -62,8 +62,10 @@ 
 		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty( $group_data['shuffle'] ) ) {
+			shuffle( $group_data['data'] );
+	}
+	// We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
 	switch ( $group_data['type'] ) {
 		case 'list' :
@@ -87,8 +89,9 @@ 
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				if ( ! $compact ) {
+									echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";

Spacing +55 added lines, -55 removed lines

@@ -7,89 +7,89 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require_once( dirname( __FILE__ ) . '/includes/credits.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require_once(dirname(__FILE__).'/includes/credits.php');
 
-$title = __( 'Credits' );
+$title = __('Credits');
 
-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+list($display_version) = explode('-', get_bloginfo('version'));
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap about-wrap">
 
-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+<h1><?php printf(__('Welcome to WordPress %s'), $display_version); ?></h1>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf(__('Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.'), $display_version); ?></p>
 
-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 <h2 class="nav-tab-wrapper wp-clearfix">
-	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+	<a href="about.php" class="nav-tab"><?php _e('What&#8217;s New'); ?></a>
+	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e('Credits'); ?></a>
+	<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 </h2>
 
 <?php
 
 $credits = wp_credits();
 
-if ( ! $credits ) {
+if ( ! $credits) {
 	echo '<p class="about-description">';
 	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(__('WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.'),
 		'https://wordpress.org/about/',
-		__( 'https://make.wordpress.org/' )
+		__('https://make.wordpress.org/')
 	);
 	echo '</p>';
 	echo '</div>';
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
+echo '<p class="about-description">'.__('WordPress is created by a worldwide team of passionate individuals.')."</p>\n";
 
-foreach ( $credits['groups'] as $group_slug => $group_data ) {
-	if ( $group_data['name'] ) {
-		if ( 'Translators' == $group_data['name'] ) {
+foreach ($credits['groups'] as $group_slug => $group_data) {
+	if ($group_data['name']) {
+		if ('Translators' == $group_data['name']) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+			$title = _x('Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section');
+		} elseif (isset($group_data['placeholders'])) {
+			$title = vsprintf(translate($group_data['name']), $group_data['placeholders']);
 		} else {
-			$title = translate( $group_data['name'] );
+			$title = translate($group_data['name']);
 		}
 
-		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+		echo '<h3 class="wp-people-group">'.esc_html($title)."</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty($group_data['shuffle']))
+		shuffle($group_data['data']); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
-	switch ( $group_data['type'] ) {
+	switch ($group_data['type']) {
 		case 'list' :
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles']);
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		case 'libraries' :
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_build_object_link');
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		default:
 			$compact = 'compact' == $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
+			$classes = 'wp-people-group '.($compact ? 'compact' : '');
+			echo '<ul class="'.$classes.'" id="wp-people-group-'.$group_slug.'">'."\n";
+			foreach ($group_data['data'] as $person_data) {
+				echo '<li class="wp-person" id="wp-person-'.esc_attr($person_data[2]).'">'."\n\t";
+				echo '<a href="'.esc_url(sprintf($credits['data']['profiles'], $person_data[2])).'" class="web">';
 				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$data = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
 				$size *= 2;
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
-				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				$data2x = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
+				echo '<img src="'.esc_url($data['url']).'" srcset="'.esc_url($data2x['url']).' 2x" class="gravatar" alt="" />'."\n";
+				echo esc_html($person_data[0])."</a>\n\t";
+				if ( ! $compact)
+					echo '<span class="title">'.translate($person_data[3])."</span>\n";
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
@@ -100,26 +100,26 @@ 
 ?>
 <p class="clear"><?php
 	/* translators: %s: https://make.wordpress.org/ */
-	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-		__( 'https://make.wordpress.org/' )
+	printf(__('Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.'),
+		__('https://make.wordpress.org/')
 	);
 ?></p>
 
 </div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 return;
 
 // These are strings returned by the API that we want to be translatable
-__( 'Project Leaders' );
-__( 'Core Contributors to WordPress %s' );
-__( 'Contributing Developers' );
-__( 'Cofounder, Project Lead' );
-__( 'Lead Developer' );
-__( 'Release Lead' );
-__( 'Release Design Lead' );
-__( 'Release Deputy' );
-__( 'Core Developer' );
-__( 'External Libraries' );
+__('Project Leaders');
+__('Core Contributors to WordPress %s');
+__('Contributing Developers');
+__('Cofounder, Project Lead');
+__('Lead Developer');
+__('Release Lead');
+__('Release Design Lead');
+__('Release Deputy');
+__('Core Developer');
+__('External Libraries');

src/wp-admin/load-scripts.php

Braces +7 added lines, -4 removed lines

@@ -12,14 +12,16 @@ 
 define( 'WPINC', 'wp-includes' );
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
+if ( is_array( $load ) ) {
 	$load = implode( '', $load );
+}
 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty($load) ) {
 	exit;
+}
 
 require( ABSPATH . 'wp-admin/includes/noop.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
@@ -43,8 +45,9 @@ 
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
-		continue;
+	if ( !array_key_exists($handle, $wp_scripts->registered) ) {
+			continue;
+	}
 
 	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
 	$out .= get_file($path) . "\n";

Spacing +26 added lines, -26 removed lines

@@ -8,64 +8,64 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-if ( ! defined( 'ABSPATH' ) ) {
-	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined('ABSPATH')) {
+	define('ABSPATH', dirname(dirname(__FILE__)).'/');
 }
 
-define( 'WPINC', 'wp-includes' );
+define('WPINC', 'wp-includes');
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
-	$load = implode( '', $load );
+if (is_array($load))
+	$load = implode('', $load);
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
-$load = array_unique( explode( ',', $load ) );
+$load = preg_replace('/[^a-z0-9,_-]+/i', '', $load);
+$load = array_unique(explode(',', $load));
 
-if ( empty($load) )
+if (empty($load))
 	exit;
 
-require( ABSPATH . 'wp-admin/includes/noop.php' );
-require( ABSPATH . WPINC . '/script-loader.php' );
-require( ABSPATH . WPINC . '/version.php' );
+require(ABSPATH.'wp-admin/includes/noop.php');
+require(ABSPATH.WPINC.'/script-loader.php');
+require(ABSPATH.WPINC.'/version.php');
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
+$compress = (isset($_GET['c']) && $_GET['c']);
+$force_gzip = ($compress && 'gzip' == $_GET['c']);
 $expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_scripts = new WP_Scripts();
 wp_default_scripts($wp_scripts);
 
-if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) === $wp_version) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
-	header( "$protocol 304 Not Modified" );
+	header("$protocol 304 Not Modified");
 	exit();
 }
 
-foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
+foreach ($load as $handle) {
+	if ( ! array_key_exists($handle, $wp_scripts->registered))
 		continue;
 
-	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
-	$out .= get_file($path) . "\n";
+	$path = ABSPATH.$wp_scripts->registered[$handle]->src;
+	$out .= get_file($path)."\n";
 }
 
 header("Etag: $wp_version");
 header('Content-Type: application/javascript; 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);
 	}
 }
 

src/wp-admin/edit.php

Indentation +2 added lines, -2 removed lines

@@ -268,7 +268,7 @@ 
 $bulk_messages['post'] = array(
 	'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
@@ -276,7 +276,7 @@ 
 $bulk_messages['page'] = array(
 	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),

Braces +40 added lines, -26 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $typenow )
+if ( ! $typenow ) {
 	wp_die( __( 'Invalid post type.' ) );
+}
 
 if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
@@ -31,8 +32,9 @@ 
 $post_type = $typenow;
 $post_type_object = get_post_type_object( $post_type );
 
-if ( ! $post_type_object )
+if ( ! $post_type_object ) {
 	wp_die( __( 'Invalid post type.' ) );
+}
 
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die(
@@ -70,11 +72,13 @@ 
 	check_admin_referer('bulk-posts');
 
 	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
+	if ( ! $sendback ) {
+			$sendback = admin_url( $parent_file );
+	}
 	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url($post_new_file);
+	if ( strpos($sendback, 'post.php') !== false ) {
+			$sendback = admin_url($post_new_file);
+	}
 
 	if ( 'delete_all' == $doaction ) {
 		// Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
@@ -102,16 +106,18 @@ 
 			$trashed = $locked = 0;
 
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
+				}
 
 				if ( wp_check_post_lock( $post_id ) ) {
 					$locked++;
 					continue;
 				}
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to Trash.') );
+				if ( !wp_trash_post($post_id) ) {
+									wp_die( __('Error in moving to Trash.') );
+				}
 
 				$trashed++;
 			}
@@ -121,11 +127,13 @@ 
 		case 'untrash':
 			$untrashed = 0;
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
+				}
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from Trash.') );
+				if ( !wp_untrash_post($post_id) ) {
+									wp_die( __('Error in restoring from Trash.') );
+				}
 
 				$untrashed++;
 			}
@@ -136,15 +144,18 @@ 
 			foreach ( (array) $post_ids as $post_id ) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('Sorry, you are not allowed to delete this item.') );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __('Sorry, you are not allowed to delete this item.') );
+				}
 
 				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_attachment($post_id) ) {
+											wp_die( __('Error in deleting.') );
+					}
 				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( !wp_delete_post($post_id) ) {
+											wp_die( __('Error in deleting.') );
+					}
 				}
 				$deleted++;
 			}
@@ -324,10 +335,11 @@ 
 // If we have a bulk message to issue:
 $messages = array();
 foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	if ( isset( $bulk_messages[ $post_type ][ $message ] ) ) {
+			$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
+	} elseif ( isset( $bulk_messages['post'][ $message ] ) ) {
+			$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	}
 
 	if ( $message == 'trashed' && isset( $_REQUEST['ids'] ) ) {
 		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
@@ -335,8 +347,9 @@ 
 	}
 }
 
-if ( $messages )
+if ( $messages ) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
+}
 unset( $messages );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
@@ -359,8 +372,9 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ( $wp_list_table->has_items() ) {
 	$wp_list_table->inline_edit();
+}
 ?>
 
 <div id="ajax-response"></div>

Spacing +148 added lines, -150 removed lines

@@ -7,17 +7,17 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $typenow )
-	wp_die( __( 'Invalid post type.' ) );
+if ( ! $typenow)
+	wp_die(__('Invalid post type.'));
 
-if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-	wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+if ( ! in_array($typenow, get_post_types(array('show_ui' => true)))) {
+	wp_die(__('Sorry, you are not allowed to edit posts in this post type.'));
 }
 
-if ( 'attachment' === $typenow ) {
-	if ( wp_redirect( admin_url( 'upload.php' ) ) ) {
+if ('attachment' === $typenow) {
+	if (wp_redirect(admin_url('upload.php'))) {
 		exit;
 	}
 }
@@ -29,15 +29,15 @@ 
 global $post_type, $post_type_object;
 
 $post_type = $typenow;
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( ! $post_type_object )
-	wp_die( __( 'Invalid post type.' ) );
+if ( ! $post_type_object)
+	wp_die(__('Invalid post type.'));
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
+if ( ! current_user_can($post_type_object->cap->edit_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit posts in this post type.').'</p>',
 		403
 	);
 }
@@ -46,15 +46,15 @@ 
 $pagenum = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
-foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
-	if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
+foreach (array('p', 'attachment_id', 'page_id') as $_redirect) {
+	if ( ! empty($_REQUEST[$_redirect])) {
+		wp_redirect(admin_url('edit-comments.php?p='.absint($_REQUEST[$_redirect])));
 		exit;
 	}
 }
-unset( $_redirect );
+unset($_redirect);
 
-if ( 'post' != $post_type ) {
+if ('post' != $post_type) {
 	$parent_file = "edit.php?post_type=$post_type";
 	$submenu_file = "edit.php?post_type=$post_type";
 	$post_new_file = "post-new.php?post_type=$post_type";
@@ -66,66 +66,66 @@ 
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-posts');
 
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
-	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
+	$sendback = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer());
+	if ( ! $sendback)
+		$sendback = admin_url($parent_file);
+	$sendback = add_query_arg('paged', $pagenum, $sendback);
+	if (strpos($sendback, 'post.php') !== false)
 		$sendback = admin_url($post_new_file);
 
-	if ( 'delete_all' == $doaction ) {
+	if ('delete_all' == $doaction) {
 		// Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
 		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
 		// Validate the post status exists.
-		if ( get_post_status_object( $post_status ) ) {
-			$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
+		if (get_post_status_object($post_status)) {
+			$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status));
 		}
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
-	} elseif ( !empty( $_REQUEST['post'] ) ) {
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
+	} elseif ( ! empty($_REQUEST['post'])) {
 		$post_ids = array_map('intval', $_REQUEST['post']);
 	}
 
-	if ( !isset( $post_ids ) ) {
-		wp_redirect( $sendback );
+	if ( ! isset($post_ids)) {
+		wp_redirect($sendback);
 		exit;
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'trash':
 			$trashed = $locked = 0;
 
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to move this item to the Trash.'));
 
-				if ( wp_check_post_lock( $post_id ) ) {
+				if (wp_check_post_lock($post_id)) {
 					$locked++;
 					continue;
 				}
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to Trash.') );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 
 				$trashed++;
 			}
 
-			$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked ), $sendback );
+			$sendback = add_query_arg(array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked), $sendback);
 			break;
 		case 'untrash':
 			$untrashed = 0;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to restore this item from the Trash.'));
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from Trash.') );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 
 				$untrashed++;
 			}
@@ -133,47 +133,47 @@ 
 			break;
 		case 'delete':
 			$deleted = 0;
-			foreach ( (array) $post_ids as $post_id ) {
+			foreach ((array) $post_ids as $post_id) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('Sorry, you are not allowed to delete this item.') );
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to delete this item.'));
 
-				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting.') );
+				if ($post_del->post_type == 'attachment') {
+					if ( ! wp_delete_attachment($post_id))
+						wp_die(__('Error in deleting.'));
 				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_post($post_id))
+						wp_die(__('Error in deleting.'));
 				}
 				$deleted++;
 			}
 			$sendback = add_query_arg('deleted', $deleted, $sendback);
 			break;
 		case 'edit':
-			if ( isset($_REQUEST['bulk_edit']) ) {
+			if (isset($_REQUEST['bulk_edit'])) {
 				$done = bulk_edit_posts($_REQUEST);
 
-				if ( is_array($done) ) {
-					$done['updated'] = count( $done['updated'] );
-					$done['skipped'] = count( $done['skipped'] );
-					$done['locked'] = count( $done['locked'] );
-					$sendback = add_query_arg( $done, $sendback );
+				if (is_array($done)) {
+					$done['updated'] = count($done['updated']);
+					$done['skipped'] = count($done['skipped']);
+					$done['locked'] = count($done['locked']);
+					$sendback = add_query_arg($done, $sendback);
 				}
 			}
 			break;
 		default:
 			/** This action is documented in wp-admin/edit-comments.php */
-			$sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $post_ids );
+			$sendback = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $sendback, $doaction, $post_ids);
 			break;
 	}
 
-	$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
+	$sendback = remove_query_arg(array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback);
 
 	wp_redirect($sendback);
 	exit();
-} elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
-	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ) );
+} elseif ( ! empty($_REQUEST['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -184,106 +184,104 @@ 
 
 $title = $post_type_object->labels->name;
 
-if ( 'post' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+if ('post' == $post_type) {
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
+		'<p>'.__('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.').'</p>'
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'screen-content',
 	'title'		=> __('Screen Content'),
 	'content'	=>
-		'<p>' . __('You can customize the display of this screen&#8217;s contents in a number of ways:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
-			'<li>' . __( 'You can filter the list of posts by post status using the text links above the posts list to only show posts with that status. The default view is to show all posts.' ) . '</li>' .
-			'<li>' . __('You can view posts in a simple title list or with an excerpt using the Screen Options tab.') . '</li>' .
-			'<li>' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '</li>' .
+		'<p>'.__('You can customize the display of this screen&#8217;s contents in a number of ways:').'</p>'.
+		'<ul>'.
+			'<li>'.__('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.').'</li>'.
+			'<li>'.__('You can filter the list of posts by post status using the text links above the posts list to only show posts with that status. The default view is to show all posts.').'</li>'.
+			'<li>'.__('You can view posts in a simple title list or with an excerpt using the Screen Options tab.').'</li>'.
+			'<li>'.__('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.').'</li>'.
 		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'action-links',
 	'title'		=> __('Available Actions'),
 	'content'	=>
-		'<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.') . '</li>' .
-			'<li>' . __('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.') . '</li>' .
-			'<li>' . __('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.') . '</li>' .
-			'<li>' . __('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
+		'<p>'.__('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:').'</p>'.
+		'<ul>'.
+			'<li>'.__('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.').'</li>'.
+			'<li>'.__('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.').'</li>'.
+			'<li>'.__('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.').'</li>'.
+			'<li>'.__('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.').'</li>'.
 		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'bulk-actions',
 	'title'		=> __('Bulk Actions'),
 	'content'	=>
-		'<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
-				'<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
-	) );
+		'<p>'.__('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.').'</p>'.
+				'<p>'.__('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Posts_Screen">Documentation on Managing Posts</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Posts_Screen">Documentation on Managing Posts</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 
-} elseif ( 'page' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+} elseif ('page' == $post_type) {
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
+		'<p>'.__('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.').'</p>'
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'managing-pages',
 	'title'		=> __('Managing Pages'),
 	'content'	=>
-		'<p>' . __('Managing pages is very similar to managing posts, and the screens can be customized in the same way.') . '</p>' .
-		'<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.') . '</p>'
-	) );
+		'<p>'.__('Managing pages is very similar to managing posts, and the screens can be customized in the same way.').'</p>'.
+		'<p>'.__('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen">Documentation on Managing Pages</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Pages_Screen">Documentation on Managing Pages</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 
 }
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_views'      => $post_type_object->labels->filter_items_list,
 	'heading_pagination' => $post_type_object->labels->items_list_navigation,
 	'heading_list'       => $post_type_object->labels->items_list,
-) );
+));
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
+add_screen_option('per_page', array('default' => 20, 'option' => 'edit_'.$post_type.'_per_page'));
 
 $bulk_counts = array(
-	'updated'   => isset( $_REQUEST['updated'] )   ? absint( $_REQUEST['updated'] )   : 0,
-	'locked'    => isset( $_REQUEST['locked'] )    ? absint( $_REQUEST['locked'] )    : 0,
-	'deleted'   => isset( $_REQUEST['deleted'] )   ? absint( $_REQUEST['deleted'] )   : 0,
-	'trashed'   => isset( $_REQUEST['trashed'] )   ? absint( $_REQUEST['trashed'] )   : 0,
-	'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0,
+	'updated'   => isset($_REQUEST['updated']) ? absint($_REQUEST['updated']) : 0,
+	'locked'    => isset($_REQUEST['locked']) ? absint($_REQUEST['locked']) : 0,
+	'deleted'   => isset($_REQUEST['deleted']) ? absint($_REQUEST['deleted']) : 0,
+	'trashed'   => isset($_REQUEST['trashed']) ? absint($_REQUEST['trashed']) : 0,
+	'untrashed' => isset($_REQUEST['untrashed']) ? absint($_REQUEST['untrashed']) : 0,
 );
 
 $bulk_messages = array();
 $bulk_messages['post'] = array(
-	'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
-	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s post updated.', '%s posts updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 post not updated, somebody is editing it.') : _n('%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed']),
 );
 $bulk_messages['page'] = array(
-	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
-	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s page updated.', '%s pages updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 page not updated, somebody is editing it.') : _n('%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed']),
 );
 
 /**
@@ -297,24 +295,24 @@ 
  *                             keyed with 'updated', 'locked', 'deleted', 'trashed', and 'untrashed'.
  * @param array $bulk_counts   Array of item counts for each message, used to build internationalized strings.
  */
-$bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $bulk_counts );
-$bulk_counts = array_filter( $bulk_counts );
+$bulk_messages = apply_filters('bulk_post_updated_messages', $bulk_messages, $bulk_counts);
+$bulk_counts = array_filter($bulk_counts);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $post_type_object->labels->name );
+echo esc_html($post_type_object->labels->name);
 ?></h1>
 
 <?php
-if ( current_user_can( $post_type_object->cap->create_posts ) ) {
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+if (current_user_can($post_type_object->cap->create_posts)) {
+	echo ' <a href="'.esc_url(admin_url($post_new_file)).'" class="page-title-action">'.esc_html($post_type_object->labels->add_new).'</a>';
 }
 
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( ' <span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+	printf(' <span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 }
 ?>
 
@@ -323,39 +321,39 @@ 
 <?php
 // If we have a bulk message to issue:
 $messages = array();
-foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
-
-	if ( $message == 'trashed' && isset( $_REQUEST['ids'] ) ) {
-		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
-		$messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a>';
+foreach ($bulk_counts as $message => $count) {
+	if (isset($bulk_messages[$post_type][$message]))
+		$messages[] = sprintf($bulk_messages[$post_type][$message], number_format_i18n($count));
+	elseif (isset($bulk_messages['post'][$message]))
+		$messages[] = sprintf($bulk_messages['post'][$message], number_format_i18n($count));
+
+	if ($message == 'trashed' && isset($_REQUEST['ids'])) {
+		$ids = preg_replace('/[^0-9,]/', '', $_REQUEST['ids']);
+		$messages[] = '<a href="'.esc_url(wp_nonce_url("edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts")).'">'.__('Undo').'</a>';
 	}
 }
 
-if ( $messages )
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
-unset( $messages );
+if ($messages)
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.join(' ', $messages).'</p></div>';
+unset($messages);
 
-$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI']);
 ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
+<?php $wp_list_table->search_box($post_type_object->labels->search_items, 'post'); ?>
 
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
+<input type="hidden" name="post_status" class="post_status_page" value="<?php echo ! empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
 <input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
 
-<?php if ( ! empty( $_REQUEST['author'] ) ) { ?>
-<input type="hidden" name="author" value="<?php echo esc_attr( $_REQUEST['author'] ); ?>" />
+<?php if ( ! empty($_REQUEST['author'])) { ?>
+<input type="hidden" name="author" value="<?php echo esc_attr($_REQUEST['author']); ?>" />
 <?php } ?>
 
-<?php if ( ! empty( $_REQUEST['show_sticky'] ) ) { ?>
+<?php if ( ! empty($_REQUEST['show_sticky'])) { ?>
 <input type="hidden" name="show_sticky" value="1" />
 <?php } ?>
 
@@ -364,7 +362,7 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ($wp_list_table->has_items())
 	$wp_list_table->inline_edit();
 ?>
 
@@ -373,4 +371,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/post-new.php

Braces +9 added lines, -6 removed lines

@@ -29,9 +29,10 @@ 
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
-		exit;
-} else {
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
+			exit;
+	}
+	} else {
 	$submenu_file = "post-new.php?post_type=$post_type";
 	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
 		$parent_file = $post_type_object->show_in_menu;
@@ -63,8 +64,9 @@ 
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+}
 
 wp_enqueue_script( 'autosave' );
 
@@ -73,8 +75,9 @@ 
 } else {
 	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if ( count( $check_users ) > 1 ) {
+			add_action( 'admin_footer', '_admin_notice_post_locked' );
+	}
 
 	unset( $check_users );
 }

Spacing +26 added lines, -26 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /**
  * @global string  $post_type
@@ -16,28 +16,28 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( ! isset( $_GET['post_type'] ) ) {
+if ( ! isset($_GET['post_type'])) {
 	$post_type = 'post';
-} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
+} elseif (in_array($_GET['post_type'], get_post_types(array('show_ui' => true)))) {
 	$post_type = $_GET['post_type'];
 } else {
-	wp_die( __( 'Invalid post type.' ) );
+	wp_die(__('Invalid post type.'));
 }
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( 'post' == $post_type ) {
+if ('post' == $post_type) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
-} elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+} elseif ('attachment' == $post_type) {
+	if (wp_redirect(admin_url('media-new.php')))
 		exit;
 } else {
 	$submenu_file = "post-new.php?post_type=$post_type";
-	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+	if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true) {
 		$parent_file = $post_type_object->show_in_menu;
 		// What if there isn't a post-new.php item for this post type?
-		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
-			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+		if ( ! isset($_registered_pages[get_plugin_page_hookname("post-new.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
+			if (isset($_registered_pages[get_plugin_page_hookname("edit.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -54,33 +54,33 @@ 
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
+if ( ! current_user_can($post_type_object->cap->edit_posts) || ! current_user_can($post_type_object->cap->create_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to create posts as this user.').'</p>',
 		403
 	);
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+if ( ! wp_next_scheduled('wp_scheduled_auto_draft_delete'))
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_auto_draft_delete');
 
-wp_enqueue_script( 'autosave' );
+wp_enqueue_script('autosave');
 
-if ( is_multisite() ) {
-	add_action( 'admin_footer', '_admin_notice_post_locked' );
+if (is_multisite()) {
+	add_action('admin_footer', '_admin_notice_post_locked');
 } else {
-	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+	$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (count($check_users) > 1)
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-	unset( $check_users );
+	unset($check_users);
 }
 
 // Show post form.
-$post = get_default_post_to_edit( $post_type, true );
+$post = get_default_post_to_edit($post_type, true);
 $post_ID = $post->ID;
-include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/edit-form-advanced.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network/site-info.php

Braces +5 added lines, -2 removed lines

@@ -177,9 +177,12 @@
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
-		else : ?>
+		else {
+			: ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
+			<th scope="row"><?php _e( 'Site Address (URL)' );
+		}
+		?></th>
 			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
 		</tr>
 		<?php endif; ?>

Spacing +87 added lines, -87 removed lines

@@ -8,74 +8,74 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_sites' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
+if ( ! current_user_can('manage_sites')) {
+	wp_die(__('Sorry, you are not allowed to edit this site.'));
 }
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '</p>' .
-		'<p>' . __( '<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
-		'<p>' . __( '<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
-		'<p>' . sprintf( __( '<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-		'<p>' . __( '<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>'
-) );
+		'<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
+		'<p>'.__('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
+		'<p>'.sprintf(__('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
+		'<p>'.__('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id ) {
-	wp_die( __('Invalid site ID.') );
+if ( ! $id) {
+	wp_die(__('Invalid site ID.'));
 }
 
-$details = get_site( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_site($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( ! can_edit_network( $details->site_id ) ) {
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id)) {
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
-$parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
-$is_main_site = is_main_site( $id );
+$parsed_scheme = parse_url($details->siteurl, PHP_URL_SCHEME);
+$is_main_site = is_main_site($id);
 
-if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'edit-site' );
+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action']) {
+	check_admin_referer('edit-site');
 
-	switch_to_blog( $id );
+	switch_to_blog($id);
 
 	// Rewrite rules can't be flushed during switch to blog.
-	delete_option( 'rewrite_rules' );
+	delete_option('rewrite_rules');
 
-	$blog_data = wp_unslash( $_POST['blog'] );
+	$blog_data = wp_unslash($_POST['blog']);
 	$blog_data['scheme'] = $parsed_scheme;
 
-	if ( $is_main_site ) {
+	if ($is_main_site) {
 		// On the network's main site, don't allow the domain or path to change.
 		$blog_data['domain'] = $details->domain;
 		$blog_data['path'] = $details->path;
 	} else {
 		// For any other site, the scheme, domain, and path can all be changed. We first
 		// need to ensure a scheme has been provided, otherwise fallback to the existing.
-		$new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME );
+		$new_url_scheme = parse_url($blog_data['url'], PHP_URL_SCHEME);
 
-		if ( ! $new_url_scheme ) {
-			$blog_data['url'] = esc_url( $parsed_scheme . '://' . $blog_data['url'] );
+		if ( ! $new_url_scheme) {
+			$blog_data['url'] = esc_url($parsed_scheme.'://'.$blog_data['url']);
 		}
-		$update_parsed_url = parse_url( $blog_data['url'] );
+		$update_parsed_url = parse_url($blog_data['url']);
 
 		// If a path is not provided, use the default of `/`.
-		if ( ! isset( $update_parsed_url['path'] ) ) {
+		if ( ! isset($update_parsed_url['path'])) {
 			$update_parsed_url['path'] = '/';
 		}
 
@@ -84,119 +84,119 @@ 
 		$blog_data['path'] = $update_parsed_url['path'];
 	}
 
-	$existing_details = get_site( $id );
-	$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
-	foreach ( $blog_data_checkboxes as $c ) {
-		if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
-			$blog_data[ $c ] = $existing_details->$c;
+	$existing_details = get_site($id);
+	$blog_data_checkboxes = array('public', 'archived', 'spam', 'mature', 'deleted');
+	foreach ($blog_data_checkboxes as $c) {
+		if ( ! in_array($existing_details->$c, array(0, 1))) {
+			$blog_data[$c] = $existing_details->$c;
 		} else {
-			$blog_data[ $c ] = isset( $_POST['blog'][ $c ] ) ? 1 : 0;
+			$blog_data[$c] = isset($_POST['blog'][$c]) ? 1 : 0;
 		}
 	}
 
-	update_blog_details( $id, $blog_data );
+	update_blog_details($id, $blog_data);
 
 	// Maybe update home and siteurl options.
-	$new_details = get_site( $id );
+	$new_details = get_site($id);
 
-	$old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
-	$old_home_parsed = parse_url( $old_home_url );
+	$old_home_url = trailingslashit(esc_url(get_option('home')));
+	$old_home_parsed = parse_url($old_home_url);
 
-	if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
-		$new_home_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'home', $new_home_url );
+	if ($old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path) {
+		$new_home_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('home', $new_home_url);
 	}
 
-	$old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
-	$old_site_parsed = parse_url( $old_site_url );
+	$old_site_url = trailingslashit(esc_url(get_option('siteurl')));
+	$old_site_parsed = parse_url($old_site_url);
 
-	if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
-		$new_site_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'siteurl', $new_site_url );
+	if ($old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path) {
+		$new_site_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('siteurl', $new_site_url);
 	}
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
+	wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-info.php'));
 	exit;
 }
 
-if ( isset( $_GET['update'] ) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] ) {
-		$messages[] = __( 'Site info updated.' );
+	if ('updated' == $_GET['update']) {
+		$messages[] = __('Site info updated.');
 	}
 }
 
 /* translators: %s: site name */
-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
-<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+<p class="edit-site-actions"><a href="<?php echo esc_url(get_home_url($id, '/')); ?>"><?php _e('Visit'); ?></a> | <a href="<?php echo esc_url(get_admin_url($id)); ?>"><?php _e('Dashboard'); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
+network_edit_site_nav(array(
 	'blog_id'  => $id,
 	'selected' => 'site-info'
-) );
+));
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg) {
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 	}
 }
 ?>
 <form method="post" action="site-info.php?action=update-site">
-	<?php wp_nonce_field( 'edit-site' ); ?>
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<?php wp_nonce_field('edit-site'); ?>
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 	<table class="form-table">
 		<?php
 		// The main site of the network should not be updated on this page.
-		if ( $is_main_site ) : ?>
+		if ($is_main_site) : ?>
 		<tr class="form-field">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><?php echo esc_url( $parsed_scheme . '://' . $details->domain . $details->path ); ?></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><?php echo esc_url($parsed_scheme.'://'.$details->domain.$details->path); ?></td>
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
 		else : ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme.'://'.esc_attr($details->domain).esc_attr($details->path); ?>" /></td>
 		</tr>
 		<?php endif; ?>
 
 		<tr class="form-field">
-			<th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
-			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
+			<th scope="row"><label for="blog_registered"><?php _ex('Registered', 'site') ?></label></th>
+			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details->registered) ?>" /></td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
-			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
+			<th scope="row"><label for="blog_last_updated"><?php _e('Last Updated'); ?></label></th>
+			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details->last_updated) ?>" /></td>
 		</tr>
 		<?php
-		$attribute_fields = array( 'public' => __( 'Public' ) );
-		if ( ! $is_main_site ) {
-			$attribute_fields['archived'] = __( 'Archived' );
-			$attribute_fields['spam']     = _x( 'Spam', 'site' );
-			$attribute_fields['deleted']  = __( 'Deleted' );
+		$attribute_fields = array('public' => __('Public'));
+		if ( ! $is_main_site) {
+			$attribute_fields['archived'] = __('Archived');
+			$attribute_fields['spam']     = _x('Spam', 'site');
+			$attribute_fields['deleted']  = __('Deleted');
 		}
-		$attribute_fields['mature'] = __( 'Mature' );
+		$attribute_fields['mature'] = __('Mature');
 		?>
 		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
+			<th scope="row"><?php _e('Attributes'); ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
-			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+			<legend class="screen-reader-text"><?php _e('Set site attributes') ?></legend>
+			<?php foreach ($attribute_fields as $field_key => $field_label) : ?>
+				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked((bool) $details->$field_key, true); disabled( ! in_array($details->$field_key, array(0, 1))); ?> />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
 			<fieldset>
@@ -208,4 +208,4 @@ 
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network/site-new.php

Indentation +6 added lines, -6 removed lines

@@ -115,12 +115,12 @@
 		}
 
 		/**
-		  * Fires after a new user has been created via the network site-new.php page.
-		  *
-		  * @since 4.4.0
-		  *
-		  * @param int $user_id ID of the newly created user.
-		  */
+		 * Fires after a new user has been created via the network site-new.php page.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int $user_id ID of the newly created user.
+		 */
 		do_action( 'network_site_new_created_user', $user_id );
 	}
 

Spacing +90 added lines, -90 removed lines

@@ -8,49 +8,49 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-if ( ! current_user_can( 'create_sites' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
+if ( ! current_user_can('create_sites')) {
+	wp_die(__('Sorry, you are not allowed to add sites to this network.'));
 }
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
-		'<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
-) );
+		'<p>'.__('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.').'</p>'.
+		'<p>'.__('If the admin email for the new site does not exist in the database, a new user will also be created.').'</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">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
+if (isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action']) {
+	check_admin_referer('add-blog', '_wpnonce_add-blog');
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can&#8217;t create an empty site.' ) );
+	if ( ! is_array($_POST['blog']))
+		wp_die(__('Can&#8217;t create an empty site.'));
 
 	$blog = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
-		$domain = strtolower( $blog['domain'] );
+	if (preg_match('|^([a-zA-Z0-9-])+$|', $blog['domain']))
+		$domain = strtolower($blog['domain']);
 
 	// If not a subdomain install, make sure the domain isn't a reserved word
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 		$subdirectory_reserved_names = get_subdirectory_reserved_names();
 
-		if ( in_array( $domain, $subdirectory_reserved_names ) ) {
+		if (in_array($domain, $subdirectory_reserved_names)) {
 			wp_die(
 				/* translators: %s: reserved names list */
-				sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
-					'<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
+				sprintf(__('The following words are reserved for use by WordPress functions and cannot be used as blog names: %s'),
+					'<code>'.implode('</code>, <code>', $subdirectory_reserved_names).'</code>'
 				)
 			);
 		}
@@ -63,40 +63,40 @@ 
 	);
 
 	// Handle translation install for the new site.
-	if ( isset( $_POST['WPLANG'] ) ) {
-		if ( '' === $_POST['WPLANG'] ) {
+	if (isset($_POST['WPLANG'])) {
+		if ('' === $_POST['WPLANG']) {
 			$meta['WPLANG'] = ''; // en_US
-		} elseif ( wp_can_install_language_pack() ) {
-			$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
-			if ( $language ) {
+		} elseif (wp_can_install_language_pack()) {
+			$language = wp_download_language_pack(wp_unslash($_POST['WPLANG']));
+			if ($language) {
 				$meta['WPLANG'] = $language;
 			}
 		}
 	}
 
-	if ( empty( $domain ) )
-		wp_die( __( 'Missing or invalid site address.' ) );
+	if (empty($domain))
+		wp_die(__('Missing or invalid site address.'));
 
-	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
-		wp_die( __( 'Missing email address.' ) );
+	if (isset($blog['email']) && '' === trim($blog['email'])) {
+		wp_die(__('Missing email address.'));
 	}
 
-	$email = sanitize_email( $blog['email'] );
-	if ( ! is_email( $email ) ) {
-		wp_die( __( 'Invalid email address.' ) );
+	$email = sanitize_email($blog['email']);
+	if ( ! is_email($email)) {
+		wp_die(__('Invalid email address.'));
 	}
 
-	if ( is_subdomain_install() ) {
-		$newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
+	if (is_subdomain_install()) {
+		$newdomain = $domain.'.'.preg_replace('|^www\.|', '', get_network()->domain);
 		$path      = get_network()->path;
 	} else {
 		$newdomain = get_network()->domain;
-		$path      = get_network()->path . $domain . '/';
+		$path      = get_network()->path.$domain.'/';
 	}
 
 	$password = 'N/A';
 	$user_id = email_exists($email);
-	if ( !$user_id ) { // Create a new user with a random password
+	if ( ! $user_id) { // Create a new user with a random password
 		/**
 		 * Fires immediately before a new user is created via the network site-new.php page.
 		 *
@@ -104,16 +104,16 @@ 
 		 *
 		 * @param string $email Email of the non-existent user.
 		 */
-		do_action( 'pre_network_site_new_created_user', $email );
+		do_action('pre_network_site_new_created_user', $email);
 
-		$user_id = username_exists( $domain );
-		if ( $user_id ) {
-			wp_die( __( 'The domain or path entered conflicts with an existing username.' ) );
+		$user_id = username_exists($domain);
+		if ($user_id) {
+			wp_die(__('The domain or path entered conflicts with an existing username.'));
 		}
-		$password = wp_generate_password( 12, false );
-		$user_id = wpmu_create_user( $domain, $password, $email );
-		if ( false === $user_id ) {
-			wp_die( __( 'There was an error creating the user.' ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user($domain, $password, $email);
+		if (false === $user_id) {
+			wp_die(__('There was an error creating the user.'));
 		}
 
 		/**
@@ -123,129 +123,129 @@ 
 		  *
 		  * @param int $user_id ID of the newly created user.
 		  */
-		do_action( 'network_site_new_created_user', $user_id );
+		do_action('network_site_new_created_user', $user_id);
 	}
 
 	$wpdb->hide_errors();
-	$id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
+	$id = wpmu_create_blog($newdomain, $path, $title, $user_id, $meta, get_current_network_id());
 	$wpdb->show_errors();
-	if ( ! is_wp_error( $id ) ) {
-		if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
-			update_user_option( $user_id, 'primary_blog', $id, true );
+	if ( ! is_wp_error($id)) {
+		if ( ! is_super_admin($user_id) && ! get_user_option('primary_blog', $user_id)) {
+			update_user_option($user_id, 'primary_blog', $id, true);
 		}
 
 		wp_mail(
-			get_site_option( 'admin_email' ),
+			get_site_option('admin_email'),
 			sprintf(
 				/* translators: %s: network name */
-				__( '[%s] New Site Created' ),
+				__('[%s] New Site Created'),
 				get_network()->site_name
 			),
 			sprintf(
 				/* translators: 1: user login, 2: site url, 3: site name/title */
-				__( 'New site created by %1$s
+				__('New site created by %1$s
 
 Address: %2$s
 Name: %3$s' ),
 				$current_user->user_login,
-				get_site_url( $id ),
-				wp_unslash( $title )
+				get_site_url($id),
+				wp_unslash($title)
 			),
 			sprintf(
 				'From: "%1$s" <%2$s>',
-				_x( 'Site Admin', 'email "From" field' ),
-				get_site_option( 'admin_email' )
+				_x('Site Admin', 'email "From" field'),
+				get_site_option('admin_email')
 			)
 		);
-		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
-		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
+		wpmu_welcome_notification($id, $user_id, $password, $title, array('public' => 1));
+		wp_redirect(add_query_arg(array('update' => 'added', 'id' => $id), 'site-new.php'));
 		exit;
 	} else {
-		wp_die( $id->get_error_message() );
+		wp_die($id->get_error_message());
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
+	if ('added' == $_GET['update'])
 		$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
-			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
-			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
-			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
+			__('Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>'),
+			esc_url(get_admin_url(absint($_GET['id']))),
+			network_admin_url('site-info.php?id='.absint($_GET['id']))
 		);
 }
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
 
-wp_enqueue_script( 'user-suggest' );
+wp_enqueue_script('user-suggest');
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
+<h1 id="add-new-site"><?php _e('Add New Site'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
-<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
-<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
+<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>" novalidate="novalidate">
+<?php wp_nonce_field('add-blog', '_wpnonce_add-blog') ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
+			<th scope="row"><label for="site-address"><?php _e('Site Address (URL)') ?></label></th>
 			<td>
-			<?php if ( is_subdomain_install() ) { ?>
-				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
+			<?php if (is_subdomain_install()) { ?>
+				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace('|^www\.|', '', get_network()->domain); ?></span>
 			<?php } else {
-				echo get_network()->domain . get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
+				echo get_network()->domain.get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
 			<?php }
-			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
+			echo '<p class="description" id="site-address-desc">'.__('Only lowercase letters (a-z), numbers, and hyphens are allowed.').'</p>';
 			?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
+			<th scope="row"><label for="site-title"><?php _e('Site Title') ?></label></th>
 			<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
 		</tr>
 		<?php
 		$languages    = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) :
+		if ( ! empty($languages) || ! empty($translations)) :
 			?>
 			<tr class="form-field form-required">
-				<th scope="row"><label for="site-language"><?php _e( 'Site Language' ); ?></label></th>
+				<th scope="row"><label for="site-language"><?php _e('Site Language'); ?></label></th>
 				<td>
 					<?php
 					// Network default.
-					$lang = get_site_option( 'WPLANG' );
+					$lang = get_site_option('WPLANG');
 
 					// Use English if the default isn't available.
-					if ( ! in_array( $lang, $languages ) ) {
+					if ( ! in_array($lang, $languages)) {
 						$lang = '';
 					}
 
-					wp_dropdown_languages( array(
+					wp_dropdown_languages(array(
 						'name'                        => 'WPLANG',
 						'id'                          => 'site-language',
 						'selected'                    => $lang,
 						'languages'                   => $languages,
 						'translations'                => $translations,
 						'show_available_translations' => wp_can_install_language_pack(),
-					) );
+					));
 					?>
 				</td>
 			</tr>
 		<?php endif; // Languages. ?>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
+			<th scope="row"><label for="admin-email"><?php _e('Admin Email') ?></label></th>
 			<td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
+			<td colspan="2"><?php _e('A new user will be created if the above email address is not in the database.') ?><br /><?php _e('The username and password will be mailed to this email address.') ?></td>
 		</tr>
 	</table>
 
@@ -255,11 +255,11 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_site_new_form' );
+	do_action('network_site_new_form');
 
-	submit_button( __( 'Add Site' ), 'primary', 'add-site' );
+	submit_button(__('Add Site'), 'primary', 'add-site');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +17 added lines, -12 removed lines

@@ -34,13 +34,15 @@ 
 if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can’t create an empty site.' ) );
+	if ( ! is_array( $_POST['blog'] ) ) {
+			wp_die( __( 'Can’t create an empty site.' ) );
+	}
 
 	$blog = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
-		$domain = strtolower( $blog['domain'] );
+	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) {
+			$domain = strtolower( $blog['domain'] );
+	}
 
 	// If not a subdomain install, make sure the domain isn't a reserved word
 	if ( ! is_subdomain_install() ) {
@@ -74,8 +76,9 @@ 
 		}
 	}
 
-	if ( empty( $domain ) )
-		wp_die( __( 'Missing or invalid site address.' ) );
+	if ( empty( $domain ) ) {
+			wp_die( __( 'Missing or invalid site address.' ) );
+	}
 
 	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
 		wp_die( __( 'Missing email address.' ) );
@@ -167,14 +170,15 @@ 
 
 if ( isset($_GET['update']) ) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
-		$messages[] = sprintf(
+	if ( 'added' == $_GET['update'] ) {
+			$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
 			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
 			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
 			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
 		);
-}
+	}
+	}
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
@@ -189,9 +193,10 @@ 
 <h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	} ?>
 <form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
 <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
 	<table class="form-table">

src/wp-admin/network.php

Braces +5 added lines, -4 removed lines

@@ -97,10 +97,11 @@
 	if ( ! network_domain_check() ) {
 		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
 		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
-			else
-				network_step1( $result );
+			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) {
+							network_step2( $result );
+			} else {
+							network_step1( $result );
+			}
 		} else {
 			network_step2();
 		}

Spacing +47 added lines, -47 removed lines

@@ -10,104 +10,104 @@ 
  * @subpackage Administration
  */
 
-define( 'WP_INSTALLING_NETWORK', true );
+define('WP_INSTALLING_NETWORK', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'setup_network' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('setup_network')) {
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 }
 
-if ( is_multisite() ) {
-	if ( ! is_network_admin() ) {
-		wp_redirect( network_admin_url( 'setup.php' ) );
+if (is_multisite()) {
+	if ( ! is_network_admin()) {
+		wp_redirect(network_admin_url('setup.php'));
 		exit;
 	}
 
-	if ( ! defined( 'MULTISITE' ) ) {
-		wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+	if ( ! defined('MULTISITE')) {
+		wp_die(__('The Network creation panel is not for WordPress MU networks.'));
 	}
 }
 
-require_once( dirname( __FILE__ ) . '/includes/network.php' );
+require_once(dirname(__FILE__).'/includes/network.php');
 
 // We need to create references to ms global tables to enable Network.
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table) {
 	$wpdb->$table = $prefixed_table;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
+if ( ! network_domain_check() && ( ! defined('WP_ALLOW_MULTISITE') || ! WP_ALLOW_MULTISITE)) {
 	wp_die(
 		printf(
 			/* translators: 1: WP_ALLOW_MULTISITE 2: wp-config.php */
-			__( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ),
+			__('You must define the %1$s constant as true in your %2$s file to allow creation of a Network.'),
 			'<code>WP_ALLOW_MULTISITE</code>',
 			'<code>wp-config.php</code>'
 		)
 	);
 }
 
-if ( is_network_admin() ) {
-	$title = __( 'Network Setup' );
+if (is_network_admin()) {
+	$title = __('Network Setup');
 	$parent_file = 'settings.php';
 } else {
-	$title = __( 'Create a Network of WordPress Sites' );
+	$title = __('Create a Network of WordPress Sites');
 	$parent_file = 'tools.php';
 }
 
-$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
-	'<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
-	'<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
-	'<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
-	'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
-	'<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>';
-
-get_current_screen()->add_help_tab( array(
+$network_help = '<p>'.__('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.').'</p>'.
+	'<p>'.__('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).').'</p>'.
+	'<p>'.__('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.').'</p>'.
+	'<p>'.__('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).').'</p>'.
+	'<p>'.__('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.').'</p>'.
+	'<p>'.__('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.').'</p>'.
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>').'</p>';
+
+get_current_screen()->add_help_tab(array(
 	'id'      => 'network',
 	'title'   => __('Network'),
 	'content' => $network_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">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>
 
 <?php
-if ( $_POST ) {
+if ($_POST) {
 
-	check_admin_referer( 'install-network-1' );
+	check_admin_referer('install-network-1');
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 	// Create network tables.
 	install_network();
-	$base              = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
-	$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
-	if ( ! network_domain_check() ) {
-		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
-		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
+	$base              = parse_url(trailingslashit(get_option('home')), PHP_URL_PATH);
+	$subdomain_install = allow_subdomain_install() ? ! empty($_POST['subdomain_install']) : false;
+	if ( ! network_domain_check()) {
+		$result = populate_network(1, get_clean_basedomain(), sanitize_email($_POST['email']), wp_unslash($_POST['sitename']), $base, $subdomain_install);
+		if (is_wp_error($result)) {
+			if (1 == count($result->get_error_codes()) && 'no_wildcard_dns' == $result->get_error_code())
+				network_step2($result);
 			else
-				network_step1( $result );
+				network_step1($result);
 		} else {
 			network_step2();
 		}
 	} else {
 		network_step2();
 	}
-} elseif ( is_multisite() || network_domain_check() ) {
+} elseif (is_multisite() || network_domain_check()) {
 	network_step2();
 } else {
 	network_step1();
@@ -115,4 +115,4 @@ 
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>