Inspection of "Merge branch 'master' of git://develop.git.wordpre..." - ntwb/wordpress - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( d488ab...6453e7 )

by Stephen

created 2015-12-17 03:45 UTC

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -7,13 +7,13 @@
 block discarded – undo
  * @since 3.1.0
  */
 
-if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
-	define( 'IFRAME_REQUEST', true );
+if (isset($_GET['action']) && in_array($_GET['action'], array('update-selected', 'activate-plugin', 'update-selected-themes')))
+	define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/update.php' );
+require(ABSPATH.'wp-admin/update.php');

Please login to merge, or discard this patch.

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -7,13 +7,15 @@
 block discarded – undo
  * @since 3.1.0
  */
 
-if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/update.php' );

Please login to merge, or discard this patch.

src/wp-admin/network/upgrade.php 2 patches

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -8,75 +8,75 @@  discard block
 block discarded – undo
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require_once( ABSPATH . WPINC . '/http.php' );
+require_once(ABSPATH.WPINC.'/http.php');
 
-$title = __( 'Upgrade Network' );
+$title = __('Upgrade Network');
 $parent_file = 'upgrade.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
-		'<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
-		'<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
-) );
+		'<p>'.__('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.').'</p>'.
+		'<p>'.__('If a version update to core has not happened, clicking this button won&#8217;t affect anything.').'</p>'.
+		'<p>'.__('If this process fails for any reason, users logging in to their sites will force the same update.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! current_user_can( 'manage_network' ) )
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! current_user_can('manage_network'))
+	wp_die(__('You do not have permission to access this page.'), 403);
 
 echo '<div class="wrap">';
-echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
+echo '<h1>'.__('Upgrade Network').'</h1>';
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'show';
 
-switch ( $action ) {
+switch ($action) {
 	case "upgrade":
-		$n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
+		$n = (isset($_GET['n'])) ? intval($_GET['n']) : 0;
 
-		if ( $n < 5 ) {
+		if ($n < 5) {
 			/**
 			 * @global string $wp_db_version
 			 */
 			global $wp_db_version;
-			update_site_option( 'wpmu_upgrade_site', $wp_db_version );
+			update_site_option('wpmu_upgrade_site', $wp_db_version);
 		}
 
-		$blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
-		if ( empty( $blogs ) ) {
-			echo '<p>' . __( 'All done!' ) . '</p>';
+		$blogs = $wpdb->get_results("SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A);
+		if (empty($blogs)) {
+			echo '<p>'.__('All done!').'</p>';
 			break;
 		}
 		echo "<ul>";
-		foreach ( (array) $blogs as $details ) {
-			switch_to_blog( $details['blog_id'] );
+		foreach ((array) $blogs as $details) {
+			switch_to_blog($details['blog_id']);
 			$siteurl = site_url();
-			$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+			$upgrade_url = admin_url('upgrade.php?step=upgrade_db');
 			restore_current_blog();
 
 			echo "<li>$siteurl</li>";
 
-			$response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
-			if ( is_wp_error( $response ) ) {
-				wp_die( sprintf(
+			$response = wp_remote_get($upgrade_url, array('timeout' => 120, 'httpversion' => '1.1'));
+			if (is_wp_error($response)) {
+				wp_die(sprintf(
 					/* translators: 1: site url, 2: server error message */
-					__( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
+					__('Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s'),
 					$siteurl,
-					'<em>' . $response->get_error_message() . '</em>'
-				) );
+					'<em>'.$response->get_error_message().'</em>'
+				));
 			}
 
 			/**
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 			 *
 			 * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
 			 */
-			do_action( 'after_mu_upgrade', $response );
+			do_action('after_mu_upgrade', $response);
 			/**
 			 * Fires after each site has been upgraded.
 			 *
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
 			 *
 			 * @param int $blog_id The id of the blog.
 			 */
-			do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+			do_action('wpmu_upgrade_site', $details['blog_id']);
 		}
 		echo "</ul>";
-		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+		?><p><?php _e('If your browser doesn&#8217;t start loading the next page automatically, click this link:'); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
 		<script type="text/javascript">
 		<!--
 		function nextpage() {
@@ -109,24 +109,24 @@  discard block
 block discarded – undo
 	break;
 	case 'show':
 	default:
-		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
+		if (get_site_option('wpmu_upgrade_site') != $GLOBALS['wp_db_version']) :
 		?>
-		<h3><?php _e( 'Database Upgrade Required' ); ?></h3>
-		<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
+		<h3><?php _e('Database Upgrade Required'); ?></h3>
+		<p><?php _e('WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.'); ?></p>
 		<?php endif; ?>
 
-		<p><?php _e( 'The database upgrade process may take a little while, so please be patient.' ); ?></p>
-		<p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
+		<p><?php _e('The database upgrade process may take a little while, so please be patient.'); ?></p>
+		<p><a class="button" href="upgrade.php?action=upgrade"><?php _e('Upgrade Network'); ?></a></p>
 		<?php
 		/**
 		 * Fires before the footer on the network upgrade screen.
 		 *
 		 * @since MU
 		 */
-		do_action( 'wpmu_upgrade_page' );
+		do_action('wpmu_upgrade_page');
 	break;
 }
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Please login to merge, or discard this patch.

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -10,8 +10,9 @@  discard block
 block discarded – undo
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require_once( ABSPATH . WPINC . '/http.php' );
 
@@ -35,8 +36,9 @@  discard block
 block discarded – undo
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can( 'manage_network' ) )
+if ( ! current_user_can( 'manage_network' ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 echo '<div class="wrap">';
 echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';

Please login to merge, or discard this patch.

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

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Edit Site Info Administration Screen
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * Edit Site Info Administration Screen
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +93 added lines, -93 removed lines patch added patch discarded remove patch

@@ -8,201 +8,201 @@  discard block
 block discarded – undo
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() ) {
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite()) {
+	wp_die(__('Multisite support is not enabled.'));
 }
 
-if ( ! current_user_can( 'manage_sites' ) ) {
-	wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
+if ( ! current_user_can('manage_sites')) {
+	wp_die(__('You do not have sufficient permissions 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 domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
-		'<p>' . __( '<strong>Users</strong> &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 domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &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" target="_blank">Documentation on Site Management</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id ) {
-	wp_die( __('Invalid site ID.') );
+if ( ! $id) {
+	wp_die(__('Invalid site ID.'));
 }
 
-$details = get_blog_details( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_blog_details($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( ! can_edit_network( $details->site_id ) ) {
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id)) {
+	wp_die(__('You do not have permission 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']);
 
 		$blog_data['scheme'] = $update_parsed_url['scheme'];
 		$blog_data['domain'] = $update_parsed_url['host'];
 		$blog_data['path'] = $update_parsed_url['path'];
 	}
 
-	$existing_details = get_blog_details( $id, false );
-	$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_blog_details($id, false);
+	$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_blog_details( $id, false );
+	$new_details = get_blog_details($id, false);
 
-	$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.');
 	}
 }
 
-$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>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
-	'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-	'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-	'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-	'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
+	'site-info'     => array('label' => __('Info'), 'url' => 'site-info.php'),
+	'site-users'    => array('label' => __('Users'), 'url' => 'site-users.php'),
+	'site-themes'   => array('label' => __('Themes'), 'url' => 'site-themes.php'),
+	'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
 );
-foreach ( $tabs as $tab_id => $tab ) {
-	$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-	echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
+foreach ($tabs as $tab_id => $tab) {
+	$class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
+	echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
 }
 ?>
 </h3>
 <?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="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 URL' ); ?></th>
-			<td><?php echo esc_url( $details->siteurl ); ?></td>
+			<th scope="row"><?php _e('Site URL'); ?></th>
+			<td><?php echo esc_url($details->siteurl); ?></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 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 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>
@@ -214,4 +214,4 @@  discard block
 block discarded – undo
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -172,9 +172,12 @@
 block discarded – undo
 		</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 URL' ); ?></th>
+			<th scope="row"><?php _e( 'Site 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; ?>

Please login to merge, or discard this patch.

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

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Add Site Administration Screen
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+		 * Add Site Administration Screen
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.1.0
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +72 added lines, -72 removed lines patch added patch discarded remove patch

@@ -8,163 +8,163 @@
 block discarded – undo
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('You do not have sufficient permissions 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" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-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()) {
 		/** This filter is documented in wp-includes/ms-functions.php */
-		$subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
-		if ( in_array( $domain, $subdirectory_reserved_names ) )
-			wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
+		$subdirectory_reserved_names = apply_filters('subdirectory_reserved_names', array('page', 'comments', 'blog', 'files', 'feed'));
+		if (in_array($domain, $subdirectory_reserved_names))
+			wp_die(sprintf(__('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>'), implode('</code>, <code>', $subdirectory_reserved_names)));
 	}
 
 	$title = $blog['title'];
 
-	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\.|', '', $current_site->domain );
+	if (is_subdomain_install()) {
+		$newdomain = $domain.'.'.preg_replace('|^www\.|', '', $current_site->domain);
 		$path      = $current_site->path;
 	} else {
 		$newdomain = $current_site->domain;
-		$path      = $current_site->path . $domain . '/';
+		$path      = $current_site->path.$domain.'/';
 	}
 
 	$password = 'N/A';
 	$user_id = email_exists($email);
-	if ( !$user_id ) { // Create a new user with a random password
-		$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.' ) );
+	if ( ! $user_id) { // Create a new user with a random password
+		$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.'));
 		else
-			wp_new_user_notification( $user_id, 'both' );
+			wp_new_user_notification($user_id, 'both');
 	}
 
 	$wpdb->hide_errors();
-	$id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
+	$id = wpmu_create_blog($newdomain, $path, $title, $user_id, array('public' => 1), $current_site->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);
 		}
 
 		$content_mail = 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)
 		);
-		wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . 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' ) );
+		wp_mail(get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <'.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'));
 		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' ) ?></label></th>
+			<th scope="row"><label for="site-address"><?php _e('Site Address') ?></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\.|', '', $current_site->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\.|', '', $current_site->domain); ?></span>
 			<?php } else {
-				echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
+				echo $current_site->domain.$current_site->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 id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
+			echo '<p id="site-address-desc">'.__('Only lowercase letters (a-z) and numbers 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>
 		<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>
-	<?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
+	<?php submit_button(__('Add Site'), 'primary', 'add-site'); ?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

Braces +29 added lines, -20 removed lines patch added patch discarded remove patch

@@ -10,11 +10,13 @@  discard block
 block discarded – undo
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
+}
 
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'overview',
@@ -33,26 +35,30 @@  discard block
 block discarded – undo
 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() ) {
 		/** This filter is documented in wp-includes/ms-functions.php */
 		$subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
-		if ( in_array( $domain, $subdirectory_reserved_names ) )
-			wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
+		if ( in_array( $domain, $subdirectory_reserved_names ) ) {
+					wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
+		}
 	}
 
 	$title = $blog['title'];
 
-	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.' ) );
@@ -76,10 +82,11 @@  discard block
 block discarded – undo
 	if ( !$user_id ) { // Create a new user with a random password
 		$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.' ) );
-		else
-			wp_new_user_notification( $user_id, 'both' );
+		if ( false === $user_id ) {
+					wp_die( __( 'There was an error creating the user.' ) );
+		} else {
+					wp_new_user_notification( $user_id, 'both' );
+		}
 	}
 
 	$wpdb->hide_errors();
@@ -111,14 +118,15 @@  discard block
 block discarded – undo
 
 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';
@@ -133,9 +141,10 @@  discard block
 block discarded – undo
 <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">

Please login to merge, or discard this patch.

src/wp-admin/network/settings.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Multisite network settings administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+			 * Multisite network settings administration panel.
+			 *
+			 * @package WordPress
+			 * @subpackage Multisite
+			 * @since 3.0.0
+			 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -8,18 +8,18 @@  discard block
 block discarded – undo
  */
 
 /** 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 ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_network_options' ) )
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! current_user_can('manage_network_options'))
+	wp_die(__('You do not have permission to access this page.'), 403);
 
-$title = __( 'Network Settings' );
+$title = __('Network Settings');
 $parent_file = 'settings.php';
 
 /**
@@ -43,37 +43,37 @@  discard block
 block discarded – undo
 </script>
 <?php
 }
-add_action( 'admin_head', 'network_settings_add_js' );
+add_action('admin_head', 'network_settings_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
-			'<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-			'<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
-			'<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
-			'<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
-			'<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
-			'<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
-			'<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
-) );
+			'<p>'.__('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.').'</p>'.
+			'<p>'.__('Operational settings has fields for the network&#8217;s name and admin email.').'</p>'.
+			'<p>'.__('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.').'</p>'.
+			'<p>'.__('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.').'</p>'.
+			'<p>'.__('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).').'</p>'.
+			'<p>'.__('You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).').'</p>'.
+			'<p>'.__('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.').'</p>'.
+			'<p>'.__('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( $_POST ) {
+if ($_POST) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
-	check_admin_referer( 'siteoptions' );
+	check_admin_referer('siteoptions');
 
-	$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
-	foreach ( $checked_options as $option_name => $option_unchecked_value ) {
-		if ( ! isset( $_POST[$option_name] ) )
+	$checked_options = array('menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0);
+	foreach ($checked_options as $option_name => $option_unchecked_value) {
+		if ( ! isset($_POST[$option_name]))
 			$_POST[$option_name] = $option_unchecked_value;
 	}
 
@@ -86,18 +86,18 @@  discard block
 block discarded – undo
 	);
 
 	// Handle translation install.
-	if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) {  // @todo: Skip if already installed
-		$language = wp_download_language_pack( $_POST['WPLANG'] );
-		if ( $language ) {
+	if ( ! empty($_POST['WPLANG']) && wp_can_install_language_pack()) {  // @todo: Skip if already installed
+		$language = wp_download_language_pack($_POST['WPLANG']);
+		if ($language) {
 			$_POST['WPLANG'] = $language;
 		}
 	}
 
-	foreach ( $options as $option_name ) {
-		if ( ! isset($_POST[$option_name]) )
+	foreach ($options as $option_name) {
+		if ( ! isset($_POST[$option_name]))
 			continue;
-		$value = wp_unslash( $_POST[$option_name] );
-		update_site_option( $option_name, $value );
+		$value = wp_unslash($_POST[$option_name]);
+		update_site_option($option_name, $value);
 	}
 
 	/**
@@ -105,102 +105,102 @@  discard block
 block discarded – undo
 	 *
 	 * @since MU
 	 */
-	do_action( 'update_wpmu_options' );
+	do_action('update_wpmu_options');
 
-	wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
+	wp_redirect(add_query_arg('updated', 'true', network_admin_url('settings.php')));
 	exit();
 }
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset( $_GET['updated'] ) ) {
-	?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Options saved.' ) ?></p></div><?php
+if (isset($_GET['updated'])) {
+	?><div id="message" class="updated notice is-dismissible"><p><?php _e('Options saved.') ?></p></div><?php
 }
 ?>
 
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<form method="post" action="settings.php" novalidate="novalidate">
-		<?php wp_nonce_field( 'siteoptions' ); ?>
-		<h3><?php _e( 'Operational Settings' ); ?></h3>
+		<?php wp_nonce_field('siteoptions'); ?>
+		<h3><?php _e('Operational Settings'); ?></h3>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
+				<th scope="row"><label for="site_name"><?php _e('Network Title') ?></label></th>
 				<td>
-					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
+					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr($current_site->site_name) ?>" />
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
+				<th scope="row"><label for="admin_email"><?php _e('Network Admin Email') ?></label></th>
 				<td>
-					<input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
+					<input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr(get_site_option('admin_email')) ?>" />
 					<p class="description" id="admin-email-desc">
-						<?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
+						<?php _e('This email address will receive notifications. Registration and support emails will also come from this address.'); ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<h3><?php _e( 'Registration Settings' ); ?></h3>
+		<h3><?php _e('Registration Settings'); ?></h3>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
+				<th scope="row"><?php _e('Allow new registrations') ?></th>
 				<?php
-				if ( !get_site_option( 'registration' ) )
-					update_site_option( 'registration', 'none' );
-				$reg = get_site_option( 'registration' );
+				if ( ! get_site_option('registration'))
+					update_site_option('registration', 'none');
+				$reg = get_site_option('registration');
 				?>
 				<td>
 					<fieldset>
-					<legend class="screen-reader-text"><?php _e( 'New registrations settings' ) ?></legend>
-					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
-					<?php if ( is_subdomain_install() ) {
-						echo '<p class="description">' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
+					<legend class="screen-reader-text"><?php _e('New registrations settings') ?></legend>
+					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked($reg, 'none') ?> /> <?php _e('Registration is disabled.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked($reg, 'user') ?> /> <?php _e('User accounts may be registered.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked($reg, 'blog') ?> /> <?php _e('Logged in users may register new sites.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked($reg, 'all') ?> /> <?php _e('Both sites and user accounts can be registered.'); ?></label>
+					<?php if (is_subdomain_install()) {
+						echo '<p class="description">'.__('If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.').'</p>';
 					} ?>
 					</fieldset>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
+				<th scope="row"><?php _e('Registration notification') ?></th>
 				<?php
-				if ( !get_site_option( 'registrationnotification' ) )
-					update_site_option( 'registrationnotification', 'yes' );
+				if ( ! get_site_option('registrationnotification'))
+					update_site_option('registrationnotification', 'yes');
 				?>
 				<td>
-					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
+					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked(get_site_option('registrationnotification'), 'yes') ?> /> <?php _e('Send the network admin an email notification every time someone registers a site or user account.') ?></label>
 				</td>
 			</tr>
 
 			<tr id="addnewusers">
-				<th scope="row"><?php _e( 'Add New Users' ) ?></th>
+				<th scope="row"><?php _e('Add New Users') ?></th>
 				<td>
-					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.' ); ?></label>
+					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked(get_site_option('add_new_users')) ?> /> <?php _e('Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.'); ?></label>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
+				<th scope="row"><label for="illegal_names"><?php _e('Banned Names') ?></label></th>
 				<td>
-					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr(implode(" ", (array) get_site_option('illegal_names'))); ?>" size="45" />
 					<p class="description" id="illegal-names-desc">
-						<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+						<?php _e('Users are not allowed to register these sites. Separate names by spaces.') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
+				<th scope="row"><label for="limited_email_domains"><?php _e('Limited Email Registrations') ?></label></th>
 				<td>
-					<?php $limited_email_domains = get_site_option( 'limited_email_domains' );
-					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
+					<?php $limited_email_domains = get_site_option('limited_email_domains');
+					$limited_email_domains = str_replace(' ', "\n", $limited_email_domains); ?>
 					<textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
-<?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
+<?php echo esc_textarea($limited_email_domains == '' ? '' : implode("\n", (array) $limited_email_domains)); ?></textarea>
 					<p class="description" id="limited-email-domains-desc">
-						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+						<?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?>
 					</p>
 				</td>
 			</tr>
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
 				<th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
 				<td>
 					<textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
-<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
+<?php echo esc_textarea(get_site_option('banned_email_domains') == '' ? '' : implode("\n", (array) get_site_option('banned_email_domains'))); ?></textarea>
 					<p class="description" id="banned-email-domains-desc">
-						<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+						<?php _e('If you want to ban domains from site registrations. One domain per line.') ?>
 					</p>
 				</td>
 			</tr>
@@ -221,102 +221,102 @@  discard block
 block discarded – undo
 		<table class="form-table">
 
 			<tr>
-				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_email"><?php _e('Welcome Email') ?></label></th>
 				<td>
 					<textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('welcome_email')) ?></textarea>
 					<p class="description" id="welcome-email-desc">
-						<?php _e( 'The welcome email sent to new site owners.' ) ?>
+						<?php _e('The welcome email sent to new site owners.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_user_email"><?php _e('Welcome User Email') ?></label></th>
 				<td>
 					<textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('welcome_user_email')) ?></textarea>
 					<p class="description" id="welcome-user-email-desc">
-						<?php _e( 'The welcome email sent to new users.' ) ?>
+						<?php _e('The welcome email sent to new users.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
+				<th scope="row"><label for="first_post"><?php _e('First Post') ?></label></th>
 				<td>
 					<textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_post')) ?></textarea>
 					<p class="description" id="first-post-desc">
-						<?php _e( 'The first post on a new site.' ) ?>
+						<?php _e('The first post on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
+				<th scope="row"><label for="first_page"><?php _e('First Page') ?></label></th>
 				<td>
 					<textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_page')) ?></textarea>
 					<p class="description" id="first-page-desc">
-						<?php _e( 'The first page on a new site.' ) ?>
+						<?php _e('The first page on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
+				<th scope="row"><label for="first_comment"><?php _e('First Comment') ?></label></th>
 				<td>
 					<textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_comment')) ?></textarea>
 					<p class="description" id="first-comment-desc">
-						<?php _e( 'The first comment on a new site.' ) ?>
+						<?php _e('The first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
+				<th scope="row"><label for="first_comment_author"><?php _e('First Comment Author') ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_site_option('first_comment_author') ?>" />
 					<p class="description" id="first-comment-author-desc">
-						<?php _e( 'The author of the first comment on a new site.' ) ?>
+						<?php _e('The author of the first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
+				<th scope="row"><label for="first_comment_url"><?php _e('First Comment URL') ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
+					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" />
 					<p class="description" id="first-comment-url-desc">
-						<?php _e( 'The URL for the first comment on a new site.' ) ?>
+						<?php _e('The URL for the first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<h3><?php _e( 'Upload Settings' ); ?></h3>
+		<h3><?php _e('Upload Settings'); ?></h3>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Site upload space' ) ?></th>
+				<th scope="row"><?php _e('Site upload space') ?></th>
 				<td>
-					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked(get_site_option('upload_space_check_disabled'), 0) ?>/> <?php printf(__('Limit total size of files uploaded to %s MB'), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="'.esc_attr(get_site_option('blog_upload_space', 100)).'" />'); ?></label><br />
 					<p class="screen-reader-text" id="blog-upload-space-desc">
-						<?php _e( 'Size in megabytes' ) ?>
+						<?php _e('Size in megabytes') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
+				<th scope="row"><label for="upload_filetypes"><?php _e('Upload file types') ?></label></th>
 				<td>
-					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
+					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr(get_site_option('upload_filetypes', 'jpg jpeg png gif')) ?>" size="45" />
 					<p class="description" id="upload-filetypes-desc">
-						<?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
+						<?php _e('Allowed file types. Separate types by spaces.') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
+				<th scope="row"><label for="fileupload_maxk"><?php _e('Max upload file size') ?></label></th>
 				<td>
-					<?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
+					<?php printf(_x('%s KB', 'File size in kilobytes'), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="'.esc_attr(get_site_option('fileupload_maxk', 300)).'" />'); ?>
 					<p class="screen-reader-text" id="fileupload-maxk-desc">
-						<?php _e( 'Size in kilobytes' ) ?>
+						<?php _e('Size in kilobytes') ?>
 					</p>
 				</td>
 			</tr>
@@ -325,27 +325,27 @@  discard block
 block discarded – undo
 		<?php
 		$languages = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) {
+		if ( ! empty($languages) || ! empty($translations)) {
 			?>
-			<h3><?php _e( 'Language Settings' ); ?></h3>
+			<h3><?php _e('Language Settings'); ?></h3>
 			<table class="form-table">
 				<tr>
-					<th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
+					<th><label for="WPLANG"><?php _e('Default Language'); ?></label></th>
 					<td>
 						<?php
-						$lang = get_site_option( 'WPLANG' );
-						if ( ! in_array( $lang, $languages ) ) {
+						$lang = get_site_option('WPLANG');
+						if ( ! in_array($lang, $languages)) {
 							$lang = '';
 						}
 
-						wp_dropdown_languages( array(
+						wp_dropdown_languages(array(
 							'name'         => 'WPLANG',
 							'id'           => 'WPLANG',
 							'selected'     => $lang,
 							'languages'    => $languages,
 							'translations' => $translations,
 							'show_available_translations' => wp_can_install_language_pack(),
-						) );
+						));
 						?>
 					</td>
 				</tr>
@@ -354,13 +354,13 @@  discard block
 block discarded – undo
 		}
 		?>
 
-		<h3><?php _e( 'Menu Settings' ); ?></h3>
+		<h3><?php _e('Menu Settings'); ?></h3>
 		<table id="menu" class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
+				<th scope="row"><?php _e('Enable administration menus'); ?></th>
 				<td>
 			<?php
-			$menu_perms = get_site_option( 'menu_items' );
+			$menu_perms = get_site_option('menu_items');
 			/**
 			 * Filter available network-wide administration menu options.
 			 *
@@ -376,14 +376,14 @@  discard block
 block discarded – undo
 			 *
 			 * @param array $admin_menus The menu items available.
 			 */
-			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
+			$menu_items = apply_filters('mu_menu_items', array('plugins' => __('Plugins')));
 			$fieldset_end = '';
-			if ( count( (array) $menu_items ) > 1 ) {
-				echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable menus' ) . '</legend>';
+			if (count((array) $menu_items) > 1) {
+				echo '<fieldset><legend class="screen-reader-text">'.__('Enable menus').'</legend>';
 				$fieldset_end = '</fieldset>';
 			}
-			foreach ( (array) $menu_items as $key => $val ) {
-				echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
+			foreach ((array) $menu_items as $key => $val) {
+				echo "<label><input type='checkbox' name='menu_items[".$key."]' value='1'".(isset($menu_perms[$key]) ? checked($menu_perms[$key], '1', false) : '')." /> ".esc_html($val)."</label><br/>";
 			}
 			echo $fieldset_end;
 			?>
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
 		 *
 		 * @since MU
 		 */
-		do_action( 'wpmu_options' ); ?>
+		do_action('wpmu_options'); ?>
 		<?php submit_button(); ?>
 	</form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Please login to merge, or discard this patch.

Braces +16 added lines, -10 removed lines patch added patch discarded remove patch

@@ -13,11 +13,13 @@  discard block
 block discarded – undo
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_network_options' ) )
+if ( ! current_user_can( 'manage_network_options' ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 $title = __( 'Network Settings' );
 $parent_file = 'settings.php';
@@ -73,8 +75,9 @@  discard block
 block discarded – undo
 
 	$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
 	foreach ( $checked_options as $option_name => $option_unchecked_value ) {
-		if ( ! isset( $_POST[$option_name] ) )
-			$_POST[$option_name] = $option_unchecked_value;
+		if ( ! isset( $_POST[$option_name] ) ) {
+					$_POST[$option_name] = $option_unchecked_value;
+		}
 	}
 
 	$options = array(
@@ -94,8 +97,9 @@  discard block
 block discarded – undo
 	}
 
 	foreach ( $options as $option_name ) {
-		if ( ! isset($_POST[$option_name]) )
-			continue;
+		if ( ! isset($_POST[$option_name]) ) {
+					continue;
+		}
 		$value = wp_unslash( $_POST[$option_name] );
 		update_site_option( $option_name, $value );
 	}
@@ -146,8 +150,9 @@  discard block
 block discarded – undo
 			<tr>
 				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
 				<?php
-				if ( !get_site_option( 'registration' ) )
-					update_site_option( 'registration', 'none' );
+				if ( !get_site_option( 'registration' ) ) {
+									update_site_option( 'registration', 'none' );
+				}
 				$reg = get_site_option( 'registration' );
 				?>
 				<td>
@@ -167,8 +172,9 @@  discard block
 block discarded – undo
 			<tr>
 				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
 				<?php
-				if ( !get_site_option( 'registrationnotification' ) )
-					update_site_option( 'registrationnotification', 'yes' );
+				if ( !get_site_option( 'registrationnotification' ) ) {
+									update_site_option( 'registrationnotification', 'yes' );
+				}
 				?>
 				<td>
 					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>

Please login to merge, or discard this patch.

src/wp-admin/network/site-settings.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Edit Site Settings Administration Screen
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+		 * Edit Site Settings Administration Screen
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.1.0
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -8,58 +8,58 @@  discard block
 block discarded – undo
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('You do not have sufficient permissions to edit this site.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
-		'<p>' . __('<strong>Info</strong> &mdash; The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
-		'<p>' . __('<strong>Users</strong> &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 domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &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" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id)
+	wp_die(__('Invalid site ID.'));
 
-$details = get_blog_details( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_blog_details($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( !can_edit_network( $details->site_id ) )
-	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id))
+	wp_die(__('You do not have permission to access this page.'), 403);
 
-$is_main_site = is_main_site( $id );
+$is_main_site = is_main_site($id);
 
-if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
-	check_admin_referer( 'edit-site' );
+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array($_POST['option'])) {
+	check_admin_referer('edit-site');
 
-	switch_to_blog( $id );
+	switch_to_blog($id);
 
-	$skip_options = array( 'allowedthemes' ); // Don't update these options since they are handled elsewhere in the form.
-	foreach ( (array) $_POST['option'] as $key => $val ) {
-		$key = wp_unslash( $key );
-		$val = wp_unslash( $val );
-		if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) )
+	$skip_options = array('allowedthemes'); // Don't update these options since they are handled elsewhere in the form.
+	foreach ((array) $_POST['option'] as $key => $val) {
+		$key = wp_unslash($key);
+		$val = wp_unslash($val);
+		if ($key === 0 || is_array($val) || in_array($key, $skip_options))
 			continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
-		update_option( $key, $val );
+		update_option($key, $val);
 	}
 
 /**
@@ -67,92 +67,92 @@  discard block
 block discarded – undo
  *
  * @since 3.0.0
  */
-	do_action( 'wpmu_update_blog_options' );
+	do_action('wpmu_update_blog_options');
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
+	wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-settings.php'));
 	exit;
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] )
+	if ('updated' == $_GET['update'])
 		$messages[] = __('Site options updated.');
 }
 
-$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>
 <h3 class="nav-tab-wrapper">
 <?php
 $tabs = array(
-	'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-	'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-	'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-	'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
+	'site-info'     => array('label' => __('Info'), 'url' => 'site-info.php'),
+	'site-users'    => array('label' => __('Users'), 'url' => 'site-users.php'),
+	'site-themes'   => array('label' => __('Themes'), 'url' => 'site-themes.php'),
+	'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
 );
-foreach ( $tabs as $tab_id => $tab ) {
-	$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-	echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
+foreach ($tabs as $tab_id => $tab) {
+	$class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
+	echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
 }
 ?>
 </h3>
 <?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="site-settings.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
-		$blog_prefix = $wpdb->get_blog_prefix( $id );
+		$blog_prefix = $wpdb->get_blog_prefix($id);
 		$sql = "SELECT * FROM {$blog_prefix}options
 			WHERE option_name NOT LIKE %s
 			AND option_name NOT LIKE %s";
-		$query = $wpdb->prepare( $sql,
-			$wpdb->esc_like( '_' ) . '%',
-			'%' . $wpdb->esc_like( 'user_roles' )
+		$query = $wpdb->prepare($sql,
+			$wpdb->esc_like('_').'%',
+			'%'.$wpdb->esc_like('user_roles')
 		);
-		$options = $wpdb->get_results( $query );
-		foreach ( $options as $option ) {
-			if ( $option->option_name == 'default_role' )
+		$options = $wpdb->get_results($query);
+		foreach ($options as $option) {
+			if ($option->option_name == 'default_role')
 				$editblog_default_role = $option->option_value;
 			$disabled = false;
 			$class = 'all-options';
-			if ( is_serialized( $option->option_value ) ) {
-				if ( is_serialized_string( $option->option_value ) ) {
-					$option->option_value = esc_html( maybe_unserialize( $option->option_value ) );
+			if (is_serialized($option->option_value)) {
+				if (is_serialized_string($option->option_value)) {
+					$option->option_value = esc_html(maybe_unserialize($option->option_value));
 				} else {
 					$option->option_value = 'SERIALIZED DATA';
 					$disabled = true;
 					$class = 'all-options disabled';
 				}
 			}
-			if ( strpos( $option->option_value, "\n" ) !== false ) {
+			if (strpos($option->option_value, "\n") !== false) {
 			?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>
-					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
+					<th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo ucwords(str_replace("_", " ", $option->option_name)) ?></label></th>
+					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr($option->option_name) ?>]" id="<?php echo esc_attr($option->option_name) ?>"<?php disabled($disabled) ?>><?php echo esc_textarea($option->option_value) ?></textarea></td>
 				</tr>
 			<?php
 			} else {
 			?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>
-					<?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
-					<td><code><?php echo esc_html( $option->option_value ) ?></code></td>
+					<th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo esc_html(ucwords(str_replace("_", " ", $option->option_name))); ?></label></th>
+					<?php if ($is_main_site && in_array($option->option_name, array('siteurl', 'home'))) { ?>
+					<td><code><?php echo esc_html($option->option_value) ?></code></td>
 					<?php } else { ?>
-					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ) ?>]" type="text" id="<?php echo esc_attr( $option->option_name ) ?>" value="<?php echo esc_attr( $option->option_value ) ?>" size="40" <?php disabled( $disabled ) ?> /></td>
+					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr($option->option_name) ?>]" type="text" id="<?php echo esc_attr($option->option_name) ?>" value="<?php echo esc_attr($option->option_value) ?>" size="40" <?php disabled($disabled) ?> /></td>
 					<?php } ?>
 				</tr>
 			<?php
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
 		 *
 		 * @param int $id Site ID.
 		 */
-		do_action( 'wpmueditblogaction', $id );
+		do_action('wpmueditblogaction', $id);
 		?>
 	</table>
 	<?php submit_button(); ?>
@@ -173,4 +173,4 @@  discard block
 block discarded – undo
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

Braces +23 added lines, -14 removed lines patch added patch discarded remove patch

@@ -10,11 +10,13 @@  discard block
 block discarded – undo
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -35,16 +37,18 @@  discard block
 block discarded – undo
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
+if ( ! $id ) {
 	wp_die( __('Invalid site ID.') );
+}
 
 $details = get_blog_details( $id );
 if ( ! $details ) {
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( !can_edit_network( $details->site_id ) )
+if ( !can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
@@ -57,8 +61,10 @@  discard block
 block discarded – undo
 	foreach ( (array) $_POST['option'] as $key => $val ) {
 		$key = wp_unslash( $key );
 		$val = wp_unslash( $val );
-		if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) )
-			continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
+		if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) ) {
+					continue;
+		}
+		// Avoids "0 is a protected WP option and may not be modified" error when edit blog options
 		update_option( $key, $val );
 	}
 
@@ -75,9 +81,10 @@  discard block
 block discarded – undo
 
 if ( isset($_GET['update']) ) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] )
-		$messages[] = __('Site options updated.');
-}
+	if ( 'updated' == $_GET['update'] ) {
+			$messages[] = __('Site options updated.');
+	}
+	}
 
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
@@ -107,9 +114,10 @@  discard block
 block discarded – undo
 </h3>
 <?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="site-settings.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
@@ -125,8 +133,9 @@  discard block
 block discarded – undo
 		);
 		$options = $wpdb->get_results( $query );
 		foreach ( $options as $option ) {
-			if ( $option->option_name == 'default_role' )
-				$editblog_default_role = $option->option_value;
+			if ( $option->option_name == 'default_role' ) {
+							$editblog_default_role = $option->option_value;
+			}
 			$disabled = false;
 			$class = 'all-options';
 			if ( is_serialized( $option->option_value ) ) {

Please login to merge, or discard this patch.

src/wp-admin/network/user-new.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Add New User network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+		 * Add New User network administration panel.
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.1.0
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -8,79 +8,79 @@  discard block
 block discarded – undo
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users'))
 	wp_die(__('You do not have sufficient permissions to add users to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
-		'<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-) );
+		'<p>'.__('Add User will set up a new user account on the network and send that person an email with username and password.').'</p>'.
+		'<p>'.__('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'You do not have permission to access this page.' ), 403 );
+	if ( ! current_user_can('manage_network_users'))
+		wp_die(__('You do not have permission to access this page.'), 403);
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array($_POST['user']))
+		wp_die(__('Cannot create an empty user.'));
 
-	$user = wp_unslash( $_POST['user'] );
+	$user = wp_unslash($_POST['user']);
 
-	$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
-	if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
-		$add_user_errors = $user_details[ 'errors' ];
+	$user_details = wpmu_validate_user_signup($user['username'], $user['email']);
+	if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+		$add_user_errors = $user_details['errors'];
 	} else {
-		$password = wp_generate_password( 12, false);
-		$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, sanitize_email($user['email']));
 
-		if ( ! $user_id ) {
-	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+		if ( ! $user_id) {
+	 		$add_user_errors = new WP_Error('add_user_fail', __('Cannot add user.'));
 		} else {
-			wp_new_user_notification( $user_id, 'both' );
-			wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
+			wp_new_user_notification($user_id, 'both');
+			wp_redirect(add_query_arg(array('update' => 'added'), 'user-new.php'));
 			exit;
 		}
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
+	if ('added' == $_GET['update'])
 		$messages[] = __('User added.');
 }
 
 $title = __('Add New User');
 $parent_file = 'users.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
+<h1 id="add-new-user"><?php _e('Add New User'); ?></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>';
 }
 
-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+if (isset($add_user_errors) && is_wp_error($add_user_errors)) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -88,20 +88,20 @@  discard block
 block discarded – undo
 	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="email"><?php _e('Email') ?></label></th>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e('A password reset link will be sent to the user via email.') ?></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
-	<?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
+	<?php wp_nonce_field('add-user', '_wpnonce_add-user'); ?>
+	<?php submit_button(__('Add User'), 'primary', 'add-user'); ?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

Braces +21 added lines, -14 removed lines patch added patch discarded remove patch

@@ -10,11 +10,13 @@  discard block
 block discarded – undo
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users') ) {
 	wp_die(__('You do not have sufficient permissions to add users to this network.'));
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -33,11 +35,13 @@  discard block
 block discarded – undo
 if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'You do not have permission to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'You do not have permission to access this page.' ), 403 );
+	}
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array( $_POST['user'] ) ) {
+			wp_die( __( 'Cannot create an empty user.' ) );
+	}
 
 	$user = wp_unslash( $_POST['user'] );
 
@@ -60,9 +64,10 @@  discard block
 block discarded – undo
 
 if ( isset($_GET['update']) ) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
-		$messages[] = __('User added.');
-}
+	if ( 'added' == $_GET['update'] ) {
+			$messages[] = __('User added.');
+	}
+	}
 
 $title = __('Add New User');
 $parent_file = 'users.php';
@@ -73,15 +78,17 @@  discard block
 block discarded – undo
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></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>';
+	}
+	}
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php } ?>

Please login to merge, or discard this patch.

src/wp-admin/network/admin.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * WordPress Network Administration Bootstrap
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+		 * WordPress Network Administration Bootstrap
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.1.0
+		 */
 
 define( 'WP_NETWORK_ADMIN', true );
 

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -7,15 +7,15 @@  discard block
 block discarded – undo
  * @since 3.1.0
  */
 
-define( 'WP_NETWORK_ADMIN', true );
+define('WP_NETWORK_ADMIN', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
+require_once(dirname(dirname(__FILE__)).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-$redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path );
+$redirect_network_admin_request = 0 !== strcasecmp($current_blog->domain, $current_site->domain) || 0 !== strcasecmp($current_blog->path, $current_site->path);
 
 /**
  * Filter whether to redirect the request to the Network Admin.
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
  *
  * @param bool $redirect_network_admin_request Whether the request should be redirected.
  */
-$redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
-if ( $redirect_network_admin_request ) {
-	wp_redirect( network_admin_url() );
+$redirect_network_admin_request = apply_filters('redirect_network_admin_request', $redirect_network_admin_request);
+if ($redirect_network_admin_request) {
+	wp_redirect(network_admin_url());
 	exit;
 }
-unset( $redirect_network_admin_request );
+unset($redirect_network_admin_request);

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,8 +12,9 @@
 block discarded – undo
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 $redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path );
 

Please login to merge, or discard this patch.

src/wp-admin/network/plugin-install.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Install plugin network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * Install plugin network administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
 	define( 'IFRAME_REQUEST', true );

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -7,13 +7,13 @@
 block discarded – undo
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
-	define( 'IFRAME_REQUEST', true );
+if (isset($_GET['tab']) && ('plugin-information' == $_GET['tab']))
+	define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/plugin-install.php' );
+require(ABSPATH.'wp-admin/plugin-install.php');

Please login to merge, or discard this patch.

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -7,13 +7,15 @@
 block discarded – undo
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/plugin-install.php' );

Please login to merge, or discard this patch.

		@@ -7,13 +7,13 @@
		block discarded – undo
7	7	* @since 3.1.0
8	8	*/
9	9
10		-if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
11		- define( 'IFRAME_REQUEST', true );
	10	+if (isset($_GET['action']) && in_array($_GET['action'], array('update-selected', 'activate-plugin', 'update-selected-themes')))
	11	+ define('IFRAME_REQUEST', true);
12	12
13	13	/** Load WordPress Administration Bootstrap */
14		-require_once( dirname( __FILE__ ) . '/admin.php' );
	14	+require_once(dirname(__FILE__).'/admin.php');
15	15
16		-if ( ! is_multisite() )
17		- wp_die( __( 'Multisite support is not enabled.' ) );
	16	+if ( ! is_multisite())
	17	+ wp_die(__('Multisite support is not enabled.'));
18	18
19		-require( ABSPATH . 'wp-admin/update.php' );
	19	+require(ABSPATH.'wp-admin/update.php');

		@@ -7,13 +7,15 @@
		block discarded – undo
7	7	* @since 3.1.0
8	8	*/
9	9
10		-if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
	10	+if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
11	11	define( 'IFRAME_REQUEST', true );
	12	+}
12	13
13	14	/** Load WordPress Administration Bootstrap */
14	15	require_once( dirname( __FILE__ ) . '/admin.php' );
15	16
16		-if ( ! is_multisite() )
	17	+if ( ! is_multisite() ) {
17	18	wp_die( __( 'Multisite support is not enabled.' ) );
	19	+}
18	20
19	21	require( ABSPATH . 'wp-admin/update.php' );

		@@ -8,75 +8,75 @@ discard block
		block discarded – undo
8	8	*/
9	9
10	10	/** Load WordPress Administration Bootstrap */
11		-require_once( dirname( __FILE__ ) . '/admin.php' );
	11	+require_once(dirname(__FILE__).'/admin.php');
12	12
13		-if ( ! is_multisite() )
14		- wp_die( __( 'Multisite support is not enabled.' ) );
	13	+if ( ! is_multisite())
	14	+ wp_die(__('Multisite support is not enabled.'));
15	15
16		-require_once( ABSPATH . WPINC . '/http.php' );
	16	+require_once(ABSPATH.WPINC.'/http.php');
17	17
18		-$title = __( 'Upgrade Network' );
	18	+$title = __('Upgrade Network');
19	19	$parent_file = 'upgrade.php';
20	20
21		-get_current_screen()->add_help_tab( array(
	21	+get_current_screen()->add_help_tab(array(
22	22	'id' => 'overview',
23	23	'title' => __('Overview'),
24	24	'content' =>
25		- '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
26		- '<p>' . __('If a version update to core has not happened, clicking this button won’t affect anything.') . '</p>' .
27		- '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
28		-) );
	25	+ '<p>'.__('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.').'</p>'.
	26	+ '<p>'.__('If a version update to core has not happened, clicking this button won’t affect anything.').'</p>'.
	27	+ '<p>'.__('If this process fails for any reason, users logging in to their sites will force the same update.').'</p>'
	28	+));
29	29
30	30	get_current_screen()->set_help_sidebar(
31		- '<p><strong>' . __('For more information:') . '</strong></p>' .
32		- '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>') . '</p>' .
33		- '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
	31	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	32	+ '<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>').'</p>'.
	33	+ '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
34	34	);
35	35
36		-require_once( ABSPATH . 'wp-admin/admin-header.php' );
	36	+require_once(ABSPATH.'wp-admin/admin-header.php');
37	37
38		-if ( ! current_user_can( 'manage_network' ) )
39		- wp_die( __( 'You do not have permission to access this page.' ), 403 );
	38	+if ( ! current_user_can('manage_network'))
	39	+ wp_die(__('You do not have permission to access this page.'), 403);
40	40
41	41	echo '<div class="wrap">';
42		-echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
	42	+echo '<h1>'.__('Upgrade Network').'</h1>';
43	43
44	44	$action = isset($_GET['action']) ? $_GET['action'] : 'show';
45	45
46		-switch ( $action ) {
	46	+switch ($action) {
47	47	case "upgrade":
48		- $n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
	48	+ $n = (isset($_GET['n'])) ? intval($_GET['n']) : 0;
49	49
50		- if ( $n < 5 ) {
	50	+ if ($n < 5) {
51	51	/**
52	52	* @global string $wp_db_version
53	53	*/
54	54	global $wp_db_version;
55		- update_site_option( 'wpmu_upgrade_site', $wp_db_version );
	55	+ update_site_option('wpmu_upgrade_site', $wp_db_version);
56	56	}
57	57
58		- $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
59		- if ( empty( $blogs ) ) {
60		- echo '<p>' . __( 'All done!' ) . '</p>';
	58	+ $blogs = $wpdb->get_results("SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A);
	59	+ if (empty($blogs)) {
	60	+ echo '<p>'.__('All done!').'</p>';
61	61	break;
62	62	}
63	63	echo "<ul>";
64		- foreach ( (array) $blogs as $details ) {
65		- switch_to_blog( $details['blog_id'] );
	64	+ foreach ((array) $blogs as $details) {
	65	+ switch_to_blog($details['blog_id']);
66	66	$siteurl = site_url();
67		- $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
	67	+ $upgrade_url = admin_url('upgrade.php?step=upgrade_db');
68	68	restore_current_blog();
69	69
70	70	echo "<li>$siteurl</li>";
71	71
72		- $response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
73		- if ( is_wp_error( $response ) ) {
74		- wp_die( sprintf(
	72	+ $response = wp_remote_get($upgrade_url, array('timeout' => 120, 'httpversion' => '1.1'));
	73	+ if (is_wp_error($response)) {
	74	+ wp_die(sprintf(
75	75	/* translators: 1: site url, 2: server error message */
76		- __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
	76	+ __('Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s'),
77	77	$siteurl,
78		- '<em>' . $response->get_error_message() . '</em>'
79		- ) );
	78	+ '<em>'.$response->get_error_message().'</em>'
	79	+ ));
80	80	}
81	81
82	82	/**
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	*
87	87	* @param array\|WP_Error $response The upgrade response array or WP_Error on failure.
88	88	*/
89		- do_action( 'after_mu_upgrade', $response );
	89	+ do_action('after_mu_upgrade', $response);
90	90	/**
91	91	* Fires after each site has been upgraded.
92	92	*
		@@ -94,10 +94,10 @@ discard block
		block discarded – undo
94	94	*
95	95	* @param int $blog_id The id of the blog.
96	96	*/
97		- do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
	97	+ do_action('wpmu_upgrade_site', $details['blog_id']);
98	98	}
99	99	echo "</ul>";
100		- ?><p><?php _e( 'If your browser doesn’t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
	100	+ ?><p><?php _e('If your browser doesn’t start loading the next page automatically, click this link:'); ?> <a class="button" href="upgrade.php?action=upgrade&n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
101	101	<script type="text/javascript">
102	102	<!--
103	103	function nextpage() {
		@@ -109,24 +109,24 @@ discard block
		block discarded – undo
109	109	break;
110	110	case 'show':
111	111	default:
112		- if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
	112	+ if (get_site_option('wpmu_upgrade_site') != $GLOBALS['wp_db_version']) :
113	113	?>
114		- <h3><?php _e( 'Database Upgrade Required' ); ?></h3>
115		- <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
	114	+ <h3><?php _e('Database Upgrade Required'); ?></h3>
	115	+ <p><?php _e('WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.'); ?></p>
116	116	<?php endif; ?>
117	117
118		- <p><?php _e( 'The database upgrade process may take a little while, so please be patient.' ); ?></p>
119		- <p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
	118	+ <p><?php _e('The database upgrade process may take a little while, so please be patient.'); ?></p>
	119	+ <p><a class="button" href="upgrade.php?action=upgrade"><?php _e('Upgrade Network'); ?></a></p>
120	120	<?php
121	121	/**
122	122	* Fires before the footer on the network upgrade screen.
123	123	*
124	124	* @since MU
125	125	*/
126		- do_action( 'wpmu_upgrade_page' );
	126	+ do_action('wpmu_upgrade_page');
127	127	break;
128	128	}
129	129	?>
130	130	</div>
131	131
132		-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
	132	+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

		@@ -10,8 +10,9 @@ discard block
		block discarded – undo
10	10	/** Load WordPress Administration Bootstrap */
11	11	require_once( dirname( __FILE__ ) . '/admin.php' );
12	12
13		-if ( ! is_multisite() )
	13	+if ( ! is_multisite() ) {
14	14	wp_die( __( 'Multisite support is not enabled.' ) );
	15	+}
15	16
16	17	require_once( ABSPATH . WPINC . '/http.php' );
17	18
		@@ -35,8 +36,9 @@ discard block
		block discarded – undo
35	36
36	37	require_once( ABSPATH . 'wp-admin/admin-header.php' );
37	38
38		-if ( ! current_user_can( 'manage_network' ) )
	39	+if ( ! current_user_can( 'manage_network' ) ) {
39	40	wp_die( __( 'You do not have permission to access this page.' ), 403 );
	41	+}
40	42
41	43	echo '<div class="wrap">';
42	44	echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';

		@@ -1,11 +1,11 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * Edit Site Info Administration Screen
4		- *
5		- * @package WordPress
6		- * @subpackage Multisite
7		- * @since 3.1.0
8		- */
	3	+ * Edit Site Info Administration Screen
	4	+ *
	5	+ * @package WordPress
	6	+ * @subpackage Multisite
	7	+ * @since 3.1.0
	8	+ */
9	9
10	10	/** Load WordPress Administration Bootstrap */
11	11	require_once( dirname( __FILE__ ) . '/admin.php' );

		@@ -8,201 +8,201 @@ discard block
		block discarded – undo
8	8	*/
9	9
10	10	/** Load WordPress Administration Bootstrap */
11		-require_once( dirname( __FILE__ ) . '/admin.php' );
	11	+require_once(dirname(__FILE__).'/admin.php');
12	12
13		-if ( ! is_multisite() ) {
14		- wp_die( __( 'Multisite support is not enabled.' ) );
	13	+if ( ! is_multisite()) {
	14	+ wp_die(__('Multisite support is not enabled.'));
15	15	}
16	16
17		-if ( ! current_user_can( 'manage_sites' ) ) {
18		- wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
	17	+if ( ! current_user_can('manage_sites')) {
	18	+ wp_die(__('You do not have sufficient permissions to edit this site.'));
19	19	}
20	20
21		-get_current_screen()->add_help_tab( array(
	21	+get_current_screen()->add_help_tab(array(
22	22	'id' => 'overview',
23		- 'title' => __( 'Overview' ),
	23	+ 'title' => __('Overview'),
24	24	'content' =>
25		- '<p>' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '</p>' .
26		- '<p>' . __( '<strong>Info</strong> — The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
27		- '<p>' . __( '<strong>Users</strong> — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
28		- '<p>' . sprintf( __( '<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
29		- '<p>' . __( '<strong>Settings</strong> — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>'
30		-) );
	25	+ '<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
	26	+ '<p>'.__('<strong>Info</strong> — The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
	27	+ '<p>'.__('<strong>Users</strong> — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
	28	+ '<p>'.sprintf(__('<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
	29	+ '<p>'.__('<strong>Settings</strong> — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
	30	+));
31	31
32	32	get_current_screen()->set_help_sidebar(
33		- '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
34		- '<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>' ) . '</p>' .
35		- '<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>' ) . '</p>'
	33	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	34	+ '<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
	35	+ '<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
36	36	);
37	37
38		-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
	38	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
39	39
40		-if ( ! $id ) {
41		- wp_die( __('Invalid site ID.') );
	40	+if ( ! $id) {
	41	+ wp_die(__('Invalid site ID.'));
42	42	}
43	43
44		-$details = get_blog_details( $id );
45		-if ( ! $details ) {
46		- wp_die( __( 'The requested site does not exist.' ) );
	44	+$details = get_blog_details($id);
	45	+if ( ! $details) {
	46	+ wp_die(__('The requested site does not exist.'));
47	47	}
48	48
49		-if ( ! can_edit_network( $details->site_id ) ) {
50		- wp_die( __( 'You do not have permission to access this page.' ), 403 );
	49	+if ( ! can_edit_network($details->site_id)) {
	50	+ wp_die(__('You do not have permission to access this page.'), 403);
51	51	}
52	52
53		-$parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
54		-$is_main_site = is_main_site( $id );
	53	+$parsed_scheme = parse_url($details->siteurl, PHP_URL_SCHEME);
	54	+$is_main_site = is_main_site($id);
55	55
56		-if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
57		- check_admin_referer( 'edit-site' );
	56	+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action']) {
	57	+ check_admin_referer('edit-site');
58	58
59		- switch_to_blog( $id );
	59	+ switch_to_blog($id);
60	60
61	61	// Rewrite rules can't be flushed during switch to blog.
62		- delete_option( 'rewrite_rules' );
	62	+ delete_option('rewrite_rules');
63	63
64		- $blog_data = wp_unslash( $_POST['blog'] );
	64	+ $blog_data = wp_unslash($_POST['blog']);
65	65	$blog_data['scheme'] = $parsed_scheme;
66	66
67		- if ( $is_main_site ) {
	67	+ if ($is_main_site) {
68	68	// On the network's main site, don't allow the domain or path to change.
69	69	$blog_data['domain'] = $details->domain;
70	70	$blog_data['path'] = $details->path;
71	71	} else {
72	72	// For any other site, the scheme, domain, and path can all be changed. We first
73	73	// need to ensure a scheme has been provided, otherwise fallback to the existing.
74		- $new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME );
	74	+ $new_url_scheme = parse_url($blog_data['url'], PHP_URL_SCHEME);
75	75
76		- if ( ! $new_url_scheme ) {
77		- $blog_data['url'] = esc_url( $parsed_scheme . '://' . $blog_data['url'] );
	76	+ if ( ! $new_url_scheme) {
	77	+ $blog_data['url'] = esc_url($parsed_scheme.'://'.$blog_data['url']);
78	78	}
79		- $update_parsed_url = parse_url( $blog_data['url'] );
	79	+ $update_parsed_url = parse_url($blog_data['url']);
80	80
81	81	$blog_data['scheme'] = $update_parsed_url['scheme'];
82	82	$blog_data['domain'] = $update_parsed_url['host'];
83	83	$blog_data['path'] = $update_parsed_url['path'];
84	84	}
85	85
86		- $existing_details = get_blog_details( $id, false );
87		- $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
88		- foreach ( $blog_data_checkboxes as $c ) {
89		- if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
90		- $blog_data[ $c ] = $existing_details->$c;
	86	+ $existing_details = get_blog_details($id, false);
	87	+ $blog_data_checkboxes = array('public', 'archived', 'spam', 'mature', 'deleted');
	88	+ foreach ($blog_data_checkboxes as $c) {
	89	+ if ( ! in_array($existing_details->$c, array(0, 1))) {
	90	+ $blog_data[$c] = $existing_details->$c;
91	91	} else {
92		- $blog_data[ $c ] = isset( $_POST['blog'][ $c ] ) ? 1 : 0;
	92	+ $blog_data[$c] = isset($_POST['blog'][$c]) ? 1 : 0;
93	93	}
94	94	}
95	95
96		- update_blog_details( $id, $blog_data );
	96	+ update_blog_details($id, $blog_data);
97	97
98	98	// Maybe update home and siteurl options.
99		- $new_details = get_blog_details( $id, false );
	99	+ $new_details = get_blog_details($id, false);
100	100
101		- $old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
102		- $old_home_parsed = parse_url( $old_home_url );
	101	+ $old_home_url = trailingslashit(esc_url(get_option('home')));
	102	+ $old_home_parsed = parse_url($old_home_url);
103	103
104		- if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
105		- $new_home_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
106		- update_option( 'home', $new_home_url );
	104	+ if ($old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path) {
	105	+ $new_home_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
	106	+ update_option('home', $new_home_url);
107	107	}
108	108
109		- $old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
110		- $old_site_parsed = parse_url( $old_site_url );
	109	+ $old_site_url = trailingslashit(esc_url(get_option('siteurl')));
	110	+ $old_site_parsed = parse_url($old_site_url);
111	111
112		- if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
113		- $new_site_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
114		- update_option( 'siteurl', $new_site_url );
	112	+ if ($old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path) {
	113	+ $new_site_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
	114	+ update_option('siteurl', $new_site_url);
115	115	}
116	116
117	117	restore_current_blog();
118		- wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
	118	+ wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-info.php'));
119	119	exit;
120	120	}
121	121
122		-if ( isset( $_GET['update'] ) ) {
	122	+if (isset($_GET['update'])) {
123	123	$messages = array();
124		- if ( 'updated' == $_GET['update'] ) {
125		- $messages[] = __( 'Site info updated.' );
	124	+ if ('updated' == $_GET['update']) {
	125	+ $messages[] = __('Site info updated.');
126	126	}
127	127	}
128	128
129		-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
	129	+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
130	130
131	131	$parent_file = 'sites.php';
132	132	$submenu_file = 'sites.php';
133	133
134		-require( ABSPATH . 'wp-admin/admin-header.php' );
	134	+require(ABSPATH.'wp-admin/admin-header.php');
135	135
136	136	?>
137	137
138	138	<div class="wrap">
139	139	<h1 id="edit-site"><?php echo $title; ?></h1>
140		-<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>
	140	+<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>
141	141	<h3 class="nav-tab-wrapper">
142	142	<?php
143	143	$tabs = array(
144		- 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
145		- 'site-users' => array( 'label' => __( 'Users' ), 'url' => 'site-users.php' ),
146		- 'site-themes' => array( 'label' => __( 'Themes' ), 'url' => 'site-themes.php' ),
147		- 'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
	144	+ 'site-info' => array('label' => __('Info'), 'url' => 'site-info.php'),
	145	+ 'site-users' => array('label' => __('Users'), 'url' => 'site-users.php'),
	146	+ 'site-themes' => array('label' => __('Themes'), 'url' => 'site-themes.php'),
	147	+ 'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
148	148	);
149		-foreach ( $tabs as $tab_id => $tab ) {
150		- $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
151		- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
	149	+foreach ($tabs as $tab_id => $tab) {
	150	+ $class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
	151	+ echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
152	152	}
153	153	?>
154	154	</h3>
155	155	<?php
156		-if ( ! empty( $messages ) ) {
157		- foreach ( $messages as $msg ) {
158		- echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
	156	+if ( ! empty($messages)) {
	157	+ foreach ($messages as $msg) {
	158	+ echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
159	159	}
160	160	}
161	161	?>
162	162	<form method="post" action="site-info.php?action=update-site">
163		- <?php wp_nonce_field( 'edit-site' ); ?>
164		- <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
	163	+ <?php wp_nonce_field('edit-site'); ?>
	164	+ <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
165	165	<table class="form-table">
166	166	<?php
167	167	// The main site of the network should not be updated on this page.
168		- if ( $is_main_site ) : ?>
	168	+ if ($is_main_site) : ?>
169	169	<tr class="form-field">
170		- <th scope="row"><?php _e( 'Site URL' ); ?></th>
171		- <td><?php echo esc_url( $details->siteurl ); ?></td>
	170	+ <th scope="row"><?php _e('Site URL'); ?></th>
	171	+ <td><?php echo esc_url($details->siteurl); ?></td>
172	172	</tr>
173	173	<?php
174	174	// For any other site, the scheme, domain, and path can all be changed.
175	175	else : ?>
176	176	<tr class="form-field form-required">
177		- <th scope="row"><?php _e( 'Site URL' ); ?></th>
178		- <td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
	177	+ <th scope="row"><?php _e('Site URL'); ?></th>
	178	+ <td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme.'://'.esc_attr($details->domain).esc_attr($details->path); ?>" /></td>
179	179	</tr>
180	180	<?php endif; ?>
181	181
182	182	<tr class="form-field">
183		- <th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
184		- <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
	183	+ <th scope="row"><label for="blog_registered"><?php _ex('Registered', 'site') ?></label></th>
	184	+ <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details->registered) ?>" /></td>
185	185	</tr>
186	186	<tr class="form-field">
187		- <th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
188		- <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
	187	+ <th scope="row"><label for="blog_last_updated"><?php _e('Last Updated'); ?></label></th>
	188	+ <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details->last_updated) ?>" /></td>
189	189	</tr>
190	190	<?php
191		- $attribute_fields = array( 'public' => __( 'Public' ) );
192		- if ( ! $is_main_site ) {
193		- $attribute_fields['archived'] = __( 'Archived' );
194		- $attribute_fields['spam'] = _x( 'Spam', 'site' );
195		- $attribute_fields['deleted'] = __( 'Deleted' );
	191	+ $attribute_fields = array('public' => __('Public'));
	192	+ if ( ! $is_main_site) {
	193	+ $attribute_fields['archived'] = __('Archived');
	194	+ $attribute_fields['spam'] = _x('Spam', 'site');
	195	+ $attribute_fields['deleted'] = __('Deleted');
196	196	}
197		- $attribute_fields['mature'] = __( 'Mature' );
	197	+ $attribute_fields['mature'] = __('Mature');
198	198	?>
199	199	<tr>
200		- <th scope="row"><?php _e( 'Attributes' ); ?></th>
	200	+ <th scope="row"><?php _e('Attributes'); ?></th>
201	201	<td>
202	202	<fieldset>
203		- <legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
204		- <?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
205		- <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 ) ) ); ?> />
	203	+ <legend class="screen-reader-text"><?php _e('Set site attributes') ?></legend>
	204	+ <?php foreach ($attribute_fields as $field_key => $field_label) : ?>
	205	+ <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))); ?> />
206	206	<?php echo $field_label; ?></label><br/>
207	207	<?php endforeach; ?>
208	208	<fieldset>
		@@ -214,4 +214,4 @@ discard block
		block discarded – undo
214	214
215	215	</div>
216	216	<?php
217		-require( ABSPATH . 'wp-admin/admin-footer.php' );
	217	+require(ABSPATH.'wp-admin/admin-footer.php');

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

		@@ -8,163 +8,163 @@
		block discarded – undo
8	8	*/
9	9
10	10	/** Load WordPress Administration Bootstrap */
11		-require_once( dirname( __FILE__ ) . '/admin.php' );
	11	+require_once(dirname(__FILE__).'/admin.php');
12	12
13		-if ( ! is_multisite() )
14		- wp_die( __( 'Multisite support is not enabled.' ) );
	13	+if ( ! is_multisite())
	14	+ wp_die(__('Multisite support is not enabled.'));
15	15
16		-if ( ! current_user_can( 'manage_sites' ) )
17		- wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
	16	+if ( ! current_user_can('manage_sites'))
	17	+ wp_die(__('You do not have sufficient permissions to add sites to this network.'));
18	18
19		- get_current_screen()->add_help_tab( array(
	19	+ get_current_screen()->add_help_tab(array(
20	20	'id' => 'overview',
21	21	'title' => __('Overview'),
22	22	'content' =>
23		- '<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
24		- '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
25		-) );
	23	+ '<p>'.__('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.').'</p>'.
	24	+ '<p>'.__('If the admin email for the new site does not exist in the database, a new user will also be created.').'</p>'
	25	+));
26	26
27	27	get_current_screen()->set_help_sidebar(
28		- '<p><strong>' . __('For more information:') . '</strong></p>' .
29		- '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
30		- '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
	28	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	29	+ '<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
	30	+ '<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
31	31	);
32	32
33		-if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
34		- check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
	33	+if (isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action']) {
	34	+ check_admin_referer('add-blog', '_wpnonce_add-blog');
35	35
36		- if ( ! is_array( $_POST['blog'] ) )
37		- wp_die( __( 'Can’t create an empty site.' ) );
	36	+ if ( ! is_array($_POST['blog']))
	37	+ wp_die(__('Can’t create an empty site.'));
38	38
39	39	$blog = $_POST['blog'];
40	40	$domain = '';
41		- if ( preg_match( '\|^([a-zA-Z0-9-])+$\|', $blog['domain'] ) )
42		- $domain = strtolower( $blog['domain'] );
	41	+ if (preg_match('\|^([a-zA-Z0-9-])+$\|', $blog['domain']))
	42	+ $domain = strtolower($blog['domain']);
43	43
44	44	// If not a subdomain install, make sure the domain isn't a reserved word
45		- if ( ! is_subdomain_install() ) {
	45	+ if ( ! is_subdomain_install()) {
46	46	/** This filter is documented in wp-includes/ms-functions.php */
47		- $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
48		- if ( in_array( $domain, $subdirectory_reserved_names ) )
49		- wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
	47	+ $subdirectory_reserved_names = apply_filters('subdirectory_reserved_names', array('page', 'comments', 'blog', 'files', 'feed'));
	48	+ if (in_array($domain, $subdirectory_reserved_names))
	49	+ wp_die(sprintf(__('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>'), implode('</code>, <code>', $subdirectory_reserved_names)));
50	50	}
51	51
52	52	$title = $blog['title'];
53	53
54		- if ( empty( $domain ) )
55		- wp_die( __( 'Missing or invalid site address.' ) );
	54	+ if (empty($domain))
	55	+ wp_die(__('Missing or invalid site address.'));
56	56
57		- if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
58		- wp_die( __( 'Missing email address.' ) );
	57	+ if (isset($blog['email']) && '' === trim($blog['email'])) {
	58	+ wp_die(__('Missing email address.'));
59	59	}
60	60
61		- $email = sanitize_email( $blog['email'] );
62		- if ( ! is_email( $email ) ) {
63		- wp_die( __( 'Invalid email address.' ) );
	61	+ $email = sanitize_email($blog['email']);
	62	+ if ( ! is_email($email)) {
	63	+ wp_die(__('Invalid email address.'));
64	64	}
65	65
66		- if ( is_subdomain_install() ) {
67		- $newdomain = $domain . '.' . preg_replace( '\|^www\.\|', '', $current_site->domain );
	66	+ if (is_subdomain_install()) {
	67	+ $newdomain = $domain.'.'.preg_replace('\|^www\.\|', '', $current_site->domain);
68	68	$path = $current_site->path;
69	69	} else {
70	70	$newdomain = $current_site->domain;
71		- $path = $current_site->path . $domain . '/';
	71	+ $path = $current_site->path.$domain.'/';
72	72	}
73	73
74	74	$password = 'N/A';
75	75	$user_id = email_exists($email);
76		- if ( !$user_id ) { // Create a new user with a random password
77		- $password = wp_generate_password( 12, false );
78		- $user_id = wpmu_create_user( $domain, $password, $email );
79		- if ( false === $user_id )
80		- wp_die( __( 'There was an error creating the user.' ) );
	76	+ if ( ! $user_id) { // Create a new user with a random password
	77	+ $password = wp_generate_password(12, false);
	78	+ $user_id = wpmu_create_user($domain, $password, $email);
	79	+ if (false === $user_id)
	80	+ wp_die(__('There was an error creating the user.'));
81	81	else
82		- wp_new_user_notification( $user_id, 'both' );
	82	+ wp_new_user_notification($user_id, 'both');
83	83	}
84	84
85	85	$wpdb->hide_errors();
86		- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
	86	+ $id = wpmu_create_blog($newdomain, $path, $title, $user_id, array('public' => 1), $current_site->id);
87	87	$wpdb->show_errors();
88		- if ( ! is_wp_error( $id ) ) {
89		- if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
90		- update_user_option( $user_id, 'primary_blog', $id, true );
	88	+ if ( ! is_wp_error($id)) {
	89	+ if ( ! is_super_admin($user_id) && ! get_user_option('primary_blog', $user_id)) {
	90	+ update_user_option($user_id, 'primary_blog', $id, true);
91	91	}
92	92
93	93	$content_mail = sprintf(
94	94	/* translators: 1: user login, 2: site url, 3: site name/title */
95		- __( 'New site created by %1$s
	95	+ __('New site created by %1$s
96	96
97	97	Address: %2$s
98	98	Name: %3$s' ),
99	99	$current_user->user_login,
100		- get_site_url( $id ),
101		- wp_unslash( $title )
	100	+ get_site_url($id),
	101	+ wp_unslash($title)
102	102	);
103		- wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
104		- wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
105		- wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
	103	+ wp_mail(get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <'.get_site_option('admin_email').'>');
	104	+ wpmu_welcome_notification($id, $user_id, $password, $title, array('public' => 1));
	105	+ wp_redirect(add_query_arg(array('update' => 'added', 'id' => $id), 'site-new.php'));
106	106	exit;
107	107	} else {
108		- wp_die( $id->get_error_message() );
	108	+ wp_die($id->get_error_message());
109	109	}
110	110	}
111	111
112		-if ( isset($_GET['update']) ) {
	112	+if (isset($_GET['update'])) {
113	113	$messages = array();
114		- if ( 'added' == $_GET['update'] )
	114	+ if ('added' == $_GET['update'])
115	115	$messages[] = sprintf(
116	116	/* translators: 1: dashboard url, 2: network admin edit url */
117		- __( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
118		- esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
119		- network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
	117	+ __('Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>'),
	118	+ esc_url(get_admin_url(absint($_GET['id']))),
	119	+ network_admin_url('site-info.php?id='.absint($_GET['id']))
120	120	);
121	121	}
122	122
123	123	$title = __('Add New Site');
124	124	$parent_file = 'sites.php';
125	125
126		-wp_enqueue_script( 'user-suggest' );
	126	+wp_enqueue_script('user-suggest');
127	127
128		-require( ABSPATH . 'wp-admin/admin-header.php' );
	128	+require(ABSPATH.'wp-admin/admin-header.php');
129	129
130	130	?>
131	131
132	132	<div class="wrap">
133		-<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
	133	+<h1 id="add-new-site"><?php _e('Add New Site'); ?></h1>
134	134	<?php
135		-if ( ! empty( $messages ) ) {
136		- foreach ( $messages as $msg )
137		- echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
	135	+if ( ! empty($messages)) {
	136	+ foreach ($messages as $msg)
	137	+ echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
138	138	} ?>
139		-<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
140		-<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
	139	+<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>" novalidate="novalidate">
	140	+<?php wp_nonce_field('add-blog', '_wpnonce_add-blog') ?>
141	141	<table class="form-table">
142	142	<tr class="form-field form-required">
143		- <th scope="row"><label for="site-address"><?php _e( 'Site Address' ) ?></label></th>
	143	+ <th scope="row"><label for="site-address"><?php _e('Site Address') ?></label></th>
144	144	<td>
145		- <?php if ( is_subdomain_install() ) { ?>
146		- <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\.\|', '', $current_site->domain ); ?></span>
	145	+ <?php if (is_subdomain_install()) { ?>
	146	+ <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\.\|', '', $current_site->domain); ?></span>
147	147	<?php } else {
148		- echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" />
	148	+ echo $current_site->domain.$current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" />
149	149	<?php }
150		- echo '<p id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
	150	+ echo '<p id="site-address-desc">'.__('Only lowercase letters (a-z) and numbers are allowed.').'</p>';
151	151	?>
152	152	</td>
153	153	</tr>
154	154	<tr class="form-field form-required">
155		- <th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
	155	+ <th scope="row"><label for="site-title"><?php _e('Site Title') ?></label></th>
156	156	<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
157	157	</tr>
158	158	<tr class="form-field form-required">
159		- <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
	159	+ <th scope="row"><label for="admin-email"><?php _e('Admin Email') ?></label></th>
160	160	<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>
161	161	</tr>
162	162	<tr class="form-field">
163		- <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>
	163	+ <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>
164	164	</tr>
165	165	</table>
166		- <?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
	166	+ <?php submit_button(__('Add Site'), 'primary', 'add-site'); ?>
167	167	</form>
168	168	</div>
169	169	<?php
170		-require( ABSPATH . 'wp-admin/admin-footer.php' );
	170	+require(ABSPATH.'wp-admin/admin-footer.php');

		@@ -10,11 +10,13 @@ discard block
		block discarded – undo
10	10	/** Load WordPress Administration Bootstrap */
11	11	require_once( dirname( __FILE__ ) . '/admin.php' );
12	12
13		-if ( ! is_multisite() )
	13	+if ( ! is_multisite() ) {
14	14	wp_die( __( 'Multisite support is not enabled.' ) );
	15	+}
15	16
16		-if ( ! current_user_can( 'manage_sites' ) )
	17	+if ( ! current_user_can( 'manage_sites' ) ) {
17	18	wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
	19	+}
18	20
19	21	get_current_screen()->add_help_tab( array(
20	22	'id' => 'overview',
		@@ -33,26 +35,30 @@ discard block
		block discarded – undo
33	35	if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
34	36	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
35	37
36		- if ( ! is_array( $_POST['blog'] ) )
37		- wp_die( __( 'Can’t create an empty site.' ) );
	38	+ if ( ! is_array( $_POST['blog'] ) ) {
	39	+ wp_die( __( 'Can’t create an empty site.' ) );
	40	+ }
38	41
39	42	$blog = $_POST['blog'];
40	43	$domain = '';
41		- if ( preg_match( '\|^([a-zA-Z0-9-])+$\|', $blog['domain'] ) )
42		- $domain = strtolower( $blog['domain'] );
	44	+ if ( preg_match( '\|^([a-zA-Z0-9-])+$\|', $blog['domain'] ) ) {
	45	+ $domain = strtolower( $blog['domain'] );
	46	+ }
43	47
44	48	// If not a subdomain install, make sure the domain isn't a reserved word
45	49	if ( ! is_subdomain_install() ) {
46	50	/** This filter is documented in wp-includes/ms-functions.php */
47	51	$subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
48		- if ( in_array( $domain, $subdirectory_reserved_names ) )
49		- wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
	52	+ if ( in_array( $domain, $subdirectory_reserved_names ) ) {
	53	+ wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
	54	+ }
50	55	}
51	56
52	57	$title = $blog['title'];
53	58
54		- if ( empty( $domain ) )
55		- wp_die( __( 'Missing or invalid site address.' ) );
	59	+ if ( empty( $domain ) ) {
	60	+ wp_die( __( 'Missing or invalid site address.' ) );
	61	+ }
56	62
57	63	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
58	64	wp_die( __( 'Missing email address.' ) );
		@@ -76,10 +82,11 @@ discard block
		block discarded – undo
76	82	if ( !$user_id ) { // Create a new user with a random password
77	83	$password = wp_generate_password( 12, false );
78	84	$user_id = wpmu_create_user( $domain, $password, $email );
79		- if ( false === $user_id )
80		- wp_die( __( 'There was an error creating the user.' ) );
81		- else
82		- wp_new_user_notification( $user_id, 'both' );
	85	+ if ( false === $user_id ) {
	86	+ wp_die( __( 'There was an error creating the user.' ) );
	87	+ } else {
	88	+ wp_new_user_notification( $user_id, 'both' );
	89	+ }
83	90	}
84	91
85	92	$wpdb->hide_errors();
		@@ -111,14 +118,15 @@ discard block
		block discarded – undo
111	118
112	119	if ( isset($_GET['update']) ) {
113	120	$messages = array();
114		- if ( 'added' == $_GET['update'] )
115		- $messages[] = sprintf(
	121	+ if ( 'added' == $_GET['update'] ) {
	122	+ $messages[] = sprintf(
116	123	/* translators: 1: dashboard url, 2: network admin edit url */
117	124	__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
118	125	esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
119	126	network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
120	127	);
121		-}
	128	+ }
	129	+ }
122	130
123	131	$title = __('Add New Site');
124	132	$parent_file = 'sites.php';
		@@ -133,9 +141,10 @@ discard block
		block discarded – undo
133	141	<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
134	142	<?php
135	143	if ( ! empty( $messages ) ) {
136		- foreach ( $messages as $msg )
137		- echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
138		-} ?>
	144	+ foreach ( $messages as $msg ) {
	145	+ echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
	146	+ }
	147	+ } ?>
139	148	<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
140	149	<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
141	150	<table class="form-table">

		@@ -13,11 +13,13 @@ discard block
		block discarded – undo
13	13	/** WordPress Translation Install API */
14	14	require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
15	15
16		-if ( ! is_multisite() )
	16	+if ( ! is_multisite() ) {
17	17	wp_die( __( 'Multisite support is not enabled.' ) );
	18	+}
18	19
19		-if ( ! current_user_can( 'manage_network_options' ) )
	20	+if ( ! current_user_can( 'manage_network_options' ) ) {
20	21	wp_die( __( 'You do not have permission to access this page.' ), 403 );
	22	+}
21	23
22	24	$title = __( 'Network Settings' );
23	25	$parent_file = 'settings.php';
		@@ -73,8 +75,9 @@ discard block
		block discarded – undo
73	75
74	76	$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
75	77	foreach ( $checked_options as $option_name => $option_unchecked_value ) {
76		- if ( ! isset( $_POST[$option_name] ) )
77		- $_POST[$option_name] = $option_unchecked_value;
	78	+ if ( ! isset( $_POST[$option_name] ) ) {
	79	+ $_POST[$option_name] = $option_unchecked_value;
	80	+ }
78	81	}
79	82
80	83	$options = array(
		@@ -94,8 +97,9 @@ discard block
		block discarded – undo
94	97	}
95	98
96	99	foreach ( $options as $option_name ) {
97		- if ( ! isset($_POST[$option_name]) )
98		- continue;
	100	+ if ( ! isset($_POST[$option_name]) ) {
	101	+ continue;
	102	+ }
99	103	$value = wp_unslash( $_POST[$option_name] );
100	104	update_site_option( $option_name, $value );
101	105	}
		@@ -146,8 +150,9 @@ discard block
		block discarded – undo
146	150	<tr>
147	151	<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
148	152	<?php
149		- if ( !get_site_option( 'registration' ) )
150		- update_site_option( 'registration', 'none' );
	153	+ if ( !get_site_option( 'registration' ) ) {
	154	+ update_site_option( 'registration', 'none' );
	155	+ }
151	156	$reg = get_site_option( 'registration' );
152	157	?>
153	158	<td>
		@@ -167,8 +172,9 @@ discard block
		block discarded – undo
167	172	<tr>
168	173	<th scope="row"><?php _e( 'Registration notification' ) ?></th>
169	174	<?php
170		- if ( !get_site_option( 'registrationnotification' ) )
171		- update_site_option( 'registrationnotification', 'yes' );
	175	+ if ( !get_site_option( 'registrationnotification' ) ) {
	176	+ update_site_option( 'registrationnotification', 'yes' );
	177	+ }
172	178	?>
173	179	<td>
174	180	<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>

		@@ -8,58 +8,58 @@ discard block
		block discarded – undo
8	8	*/
9	9
10	10	/** Load WordPress Administration Bootstrap */
11		-require_once( dirname( __FILE__ ) . '/admin.php' );
	11	+require_once(dirname(__FILE__).'/admin.php');
12	12
13		-if ( ! is_multisite() )
14		- wp_die( __( 'Multisite support is not enabled.' ) );
	13	+if ( ! is_multisite())
	14	+ wp_die(__('Multisite support is not enabled.'));
15	15
16		-if ( ! current_user_can( 'manage_sites' ) )
17		- wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
	16	+if ( ! current_user_can('manage_sites'))
	17	+ wp_die(__('You do not have sufficient permissions to edit this site.'));
18	18
19		-get_current_screen()->add_help_tab( array(
	19	+get_current_screen()->add_help_tab(array(
20	20	'id' => 'overview',
21	21	'title' => __('Overview'),
22	22	'content' =>
23		- '<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
24		- '<p>' . __('<strong>Info</strong> — The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
25		- '<p>' . __('<strong>Users</strong> — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
26		- '<p>' . sprintf( __('<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
27		- '<p>' . __('<strong>Settings</strong> — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
28		-) );
	23	+ '<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
	24	+ '<p>'.__('<strong>Info</strong> — The domain and path are rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
	25	+ '<p>'.__('<strong>Users</strong> — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
	26	+ '<p>'.sprintf(__('<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
	27	+ '<p>'.__('<strong>Settings</strong> — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
	28	+));
29	29
30	30	get_current_screen()->set_help_sidebar(
31		- '<p><strong>' . __('For more information:') . '</strong></p>' .
32		- '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
33		- '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
	31	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	32	+ '<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
	33	+ '<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
34	34	);
35	35
36		-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
	36	+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
37	37
38		-if ( ! $id )
39		- wp_die( __('Invalid site ID.') );
	38	+if ( ! $id)
	39	+ wp_die(__('Invalid site ID.'));
40	40
41		-$details = get_blog_details( $id );
42		-if ( ! $details ) {
43		- wp_die( __( 'The requested site does not exist.' ) );
	41	+$details = get_blog_details($id);
	42	+if ( ! $details) {
	43	+ wp_die(__('The requested site does not exist.'));
44	44	}
45	45
46		-if ( !can_edit_network( $details->site_id ) )
47		- wp_die( __( 'You do not have permission to access this page.' ), 403 );
	46	+if ( ! can_edit_network($details->site_id))
	47	+ wp_die(__('You do not have permission to access this page.'), 403);
48	48
49		-$is_main_site = is_main_site( $id );
	49	+$is_main_site = is_main_site($id);
50	50
51		-if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
52		- check_admin_referer( 'edit-site' );
	51	+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array($_POST['option'])) {
	52	+ check_admin_referer('edit-site');
53	53
54		- switch_to_blog( $id );
	54	+ switch_to_blog($id);
55	55
56		- $skip_options = array( 'allowedthemes' ); // Don't update these options since they are handled elsewhere in the form.
57		- foreach ( (array) $_POST['option'] as $key => $val ) {
58		- $key = wp_unslash( $key );
59		- $val = wp_unslash( $val );
60		- if ( $key === 0 \|\| is_array( $val ) \|\| in_array($key, $skip_options) )
	56	+ $skip_options = array('allowedthemes'); // Don't update these options since they are handled elsewhere in the form.
	57	+ foreach ((array) $_POST['option'] as $key => $val) {
	58	+ $key = wp_unslash($key);
	59	+ $val = wp_unslash($val);
	60	+ if ($key === 0 \|\| is_array($val) \|\| in_array($key, $skip_options))
61	61	continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
62		- update_option( $key, $val );
	62	+ update_option($key, $val);
63	63	}
64	64
65	65	/**
		@@ -67,92 +67,92 @@ discard block
		block discarded – undo
67	67	*
68	68	* @since 3.0.0
69	69	*/
70		- do_action( 'wpmu_update_blog_options' );
	70	+ do_action('wpmu_update_blog_options');
71	71	restore_current_blog();
72		- wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
	72	+ wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-settings.php'));
73	73	exit;
74	74	}
75	75
76		-if ( isset($_GET['update']) ) {
	76	+if (isset($_GET['update'])) {
77	77	$messages = array();
78		- if ( 'updated' == $_GET['update'] )
	78	+ if ('updated' == $_GET['update'])
79	79	$messages[] = __('Site options updated.');
80	80	}
81	81
82		-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
	82	+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
83	83
84	84	$parent_file = 'sites.php';
85	85	$submenu_file = 'sites.php';
86	86
87		-require( ABSPATH . 'wp-admin/admin-header.php' );
	87	+require(ABSPATH.'wp-admin/admin-header.php');
88	88
89	89	?>
90	90
91	91	<div class="wrap">
92	92	<h1 id="edit-site"><?php echo $title; ?></h1>
93		-<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>
	93	+<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>
94	94	<h3 class="nav-tab-wrapper">
95	95	<?php
96	96	$tabs = array(
97		- 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
98		- 'site-users' => array( 'label' => __( 'Users' ), 'url' => 'site-users.php' ),
99		- 'site-themes' => array( 'label' => __( 'Themes' ), 'url' => 'site-themes.php' ),
100		- 'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
	97	+ 'site-info' => array('label' => __('Info'), 'url' => 'site-info.php'),
	98	+ 'site-users' => array('label' => __('Users'), 'url' => 'site-users.php'),
	99	+ 'site-themes' => array('label' => __('Themes'), 'url' => 'site-themes.php'),
	100	+ 'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
101	101	);
102		-foreach ( $tabs as $tab_id => $tab ) {
103		- $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
104		- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
	102	+foreach ($tabs as $tab_id => $tab) {
	103	+ $class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
	104	+ echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
105	105	}
106	106	?>
107	107	</h3>
108	108	<?php
109		-if ( ! empty( $messages ) ) {
110		- foreach ( $messages as $msg )
111		- echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
	109	+if ( ! empty($messages)) {
	110	+ foreach ($messages as $msg)
	111	+ echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
112	112	} ?>
113	113	<form method="post" action="site-settings.php?action=update-site">
114		- <?php wp_nonce_field( 'edit-site' ); ?>
115		- <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
	114	+ <?php wp_nonce_field('edit-site'); ?>
	115	+ <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
116	116	<table class="form-table">
117	117	<?php
118		- $blog_prefix = $wpdb->get_blog_prefix( $id );
	118	+ $blog_prefix = $wpdb->get_blog_prefix($id);
119	119	$sql = "SELECT * FROM {$blog_prefix}options
120	120	WHERE option_name NOT LIKE %s
121	121	AND option_name NOT LIKE %s";
122		- $query = $wpdb->prepare( $sql,
123		- $wpdb->esc_like( '_' ) . '%',
124		- '%' . $wpdb->esc_like( 'user_roles' )
	122	+ $query = $wpdb->prepare($sql,
	123	+ $wpdb->esc_like('_').'%',
	124	+ '%'.$wpdb->esc_like('user_roles')
125	125	);
126		- $options = $wpdb->get_results( $query );
127		- foreach ( $options as $option ) {
128		- if ( $option->option_name == 'default_role' )
	126	+ $options = $wpdb->get_results($query);
	127	+ foreach ($options as $option) {
	128	+ if ($option->option_name == 'default_role')
129	129	$editblog_default_role = $option->option_value;
130	130	$disabled = false;
131	131	$class = 'all-options';
132		- if ( is_serialized( $option->option_value ) ) {
133		- if ( is_serialized_string( $option->option_value ) ) {
134		- $option->option_value = esc_html( maybe_unserialize( $option->option_value ) );
	132	+ if (is_serialized($option->option_value)) {
	133	+ if (is_serialized_string($option->option_value)) {
	134	+ $option->option_value = esc_html(maybe_unserialize($option->option_value));
135	135	} else {
136	136	$option->option_value = 'SERIALIZED DATA';
137	137	$disabled = true;
138	138	$class = 'all-options disabled';
139	139	}
140	140	}
141		- if ( strpos( $option->option_value, "\n" ) !== false ) {
	141	+ if (strpos($option->option_value, "\n") !== false) {
142	142	?>
143	143	<tr class="form-field">
144		- <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>
145		- <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
	144	+ <th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo ucwords(str_replace("_", " ", $option->option_name)) ?></label></th>
	145	+ <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr($option->option_name) ?>]" id="<?php echo esc_attr($option->option_name) ?>"<?php disabled($disabled) ?>><?php echo esc_textarea($option->option_value) ?></textarea></td>
146	146	</tr>
147	147	<?php
148	148	} else {
149	149	?>
150	150	<tr class="form-field">
151		- <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>
152		- <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
153		- <td><code><?php echo esc_html( $option->option_value ) ?></code></td>
	151	+ <th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo esc_html(ucwords(str_replace("_", " ", $option->option_name))); ?></label></th>
	152	+ <?php if ($is_main_site && in_array($option->option_name, array('siteurl', 'home'))) { ?>
	153	+ <td><code><?php echo esc_html($option->option_value) ?></code></td>
154	154	<?php } else { ?>
155		- <td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ) ?>]" type="text" id="<?php echo esc_attr( $option->option_name ) ?>" value="<?php echo esc_attr( $option->option_value ) ?>" size="40" <?php disabled( $disabled ) ?> /></td>
	155	+ <td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr($option->option_name) ?>]" type="text" id="<?php echo esc_attr($option->option_name) ?>" value="<?php echo esc_attr($option->option_value) ?>" size="40" <?php disabled($disabled) ?> /></td>
156	156	<?php } ?>
157	157	</tr>
158	158	<?php
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	*
166	166	* @param int $id Site ID.
167	167	*/
168		- do_action( 'wpmueditblogaction', $id );
	168	+ do_action('wpmueditblogaction', $id);
169	169	?>
170	170	</table>
171	171	<?php submit_button(); ?>
		@@ -173,4 +173,4 @@ discard block
		block discarded – undo
173	173
174	174	</div>
175	175	<?php
176		-require( ABSPATH . 'wp-admin/admin-footer.php' );
	176	+require(ABSPATH.'wp-admin/admin-footer.php');

		@@ -8,79 +8,79 @@ discard block
		block discarded – undo
8	8	*/
9	9
10	10	/** Load WordPress Administration Bootstrap */
11		-require_once( dirname( __FILE__ ) . '/admin.php' );
	11	+require_once(dirname(__FILE__).'/admin.php');
12	12
13		-if ( ! is_multisite() )
14		- wp_die( __( 'Multisite support is not enabled.' ) );
	13	+if ( ! is_multisite())
	14	+ wp_die(__('Multisite support is not enabled.'));
15	15
16		-if ( ! current_user_can('create_users') )
	16	+if ( ! current_user_can('create_users'))
17	17	wp_die(__('You do not have sufficient permissions to add users to this network.'));
18	18
19		-get_current_screen()->add_help_tab( array(
	19	+get_current_screen()->add_help_tab(array(
20	20	'id' => 'overview',
21	21	'title' => __('Overview'),
22	22	'content' =>
23		- '<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
24		- '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
25		-) );
	23	+ '<p>'.__('Add User will set up a new user account on the network and send that person an email with username and password.').'</p>'.
	24	+ '<p>'.__('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.').'</p>'
	25	+));
26	26
27	27	get_current_screen()->set_help_sidebar(
28		- '<p><strong>' . __('For more information:') . '</strong></p>' .
29		- '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
30		- '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
	28	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	29	+ '<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>').'</p>'.
	30	+ '<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
31	31	);
32	32
33		-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
34		- check_admin_referer( 'add-user', '_wpnonce_add-user' );
	33	+if (isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action']) {
	34	+ check_admin_referer('add-user', '_wpnonce_add-user');
35	35
36		- if ( ! current_user_can( 'manage_network_users' ) )
37		- wp_die( __( 'You do not have permission to access this page.' ), 403 );
	36	+ if ( ! current_user_can('manage_network_users'))
	37	+ wp_die(__('You do not have permission to access this page.'), 403);
38	38
39		- if ( ! is_array( $_POST['user'] ) )
40		- wp_die( __( 'Cannot create an empty user.' ) );
	39	+ if ( ! is_array($_POST['user']))
	40	+ wp_die(__('Cannot create an empty user.'));
41	41
42		- $user = wp_unslash( $_POST['user'] );
	42	+ $user = wp_unslash($_POST['user']);
43	43
44		- $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
45		- if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
46		- $add_user_errors = $user_details[ 'errors' ];
	44	+ $user_details = wpmu_validate_user_signup($user['username'], $user['email']);
	45	+ if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
	46	+ $add_user_errors = $user_details['errors'];
47	47	} else {
48		- $password = wp_generate_password( 12, false);
49		- $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
	48	+ $password = wp_generate_password(12, false);
	49	+ $user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, sanitize_email($user['email']));
50	50
51		- if ( ! $user_id ) {
52		- $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
	51	+ if ( ! $user_id) {
	52	+ $add_user_errors = new WP_Error('add_user_fail', __('Cannot add user.'));
53	53	} else {
54		- wp_new_user_notification( $user_id, 'both' );
55		- wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
	54	+ wp_new_user_notification($user_id, 'both');
	55	+ wp_redirect(add_query_arg(array('update' => 'added'), 'user-new.php'));
56	56	exit;
57	57	}
58	58	}
59	59	}
60	60
61		-if ( isset($_GET['update']) ) {
	61	+if (isset($_GET['update'])) {
62	62	$messages = array();
63		- if ( 'added' == $_GET['update'] )
	63	+ if ('added' == $_GET['update'])
64	64	$messages[] = __('User added.');
65	65	}
66	66
67	67	$title = __('Add New User');
68	68	$parent_file = 'users.php';
69	69
70		-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
	70	+require(ABSPATH.'wp-admin/admin-header.php'); ?>
71	71
72	72	<div class="wrap">
73		-<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
	73	+<h1 id="add-new-user"><?php _e('Add New User'); ?></h1>
74	74	<?php
75		-if ( ! empty( $messages ) ) {
76		- foreach ( $messages as $msg )
77		- echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
	75	+if ( ! empty($messages)) {
	76	+ foreach ($messages as $msg)
	77	+ echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
78	78	}
79	79
80		-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
	80	+if (isset($add_user_errors) && is_wp_error($add_user_errors)) { ?>
81	81	<div class="error">
82	82	<?php
83		- foreach ( $add_user_errors->get_error_messages() as $message )
	83	+ foreach ($add_user_errors->get_error_messages() as $message)
84	84	echo "<p>$message</p>";
85	85	?>
86	86	</div>
		@@ -88,20 +88,20 @@ discard block
		block discarded – undo
88	88	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
89	89	<table class="form-table">
90	90	<tr class="form-field form-required">
91		- <th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
	91	+ <th scope="row"><label for="username"><?php _e('Username') ?></label></th>
92	92	<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" /></td>
93	93	</tr>
94	94	<tr class="form-field form-required">
95		- <th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
	95	+ <th scope="row"><label for="email"><?php _e('Email') ?></label></th>
96	96	<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
97	97	</tr>
98	98	<tr class="form-field">
99		- <td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
	99	+ <td colspan="2"><?php _e('A password reset link will be sent to the user via email.') ?></td>
100	100	</tr>
101	101	</table>
102		- <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
103		- <?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
	102	+ <?php wp_nonce_field('add-user', '_wpnonce_add-user'); ?>
	103	+ <?php submit_button(__('Add User'), 'primary', 'add-user'); ?>
104	104	</form>
105	105	</div>
106	106	<?php
107		-require( ABSPATH . 'wp-admin/admin-footer.php' );
	107	+require(ABSPATH.'wp-admin/admin-footer.php');

		@@ -7,15 +7,15 @@ discard block
		block discarded – undo
7	7	* @since 3.1.0
8	8	*/
9	9
10		-define( 'WP_NETWORK_ADMIN', true );
	10	+define('WP_NETWORK_ADMIN', true);
11	11
12	12	/** Load WordPress Administration Bootstrap */
13		-require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
	13	+require_once(dirname(dirname(__FILE__)).'/admin.php');
14	14
15		-if ( ! is_multisite() )
16		- wp_die( __( 'Multisite support is not enabled.' ) );
	15	+if ( ! is_multisite())
	16	+ wp_die(__('Multisite support is not enabled.'));
17	17
18		-$redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) \|\| 0 !== strcasecmp( $current_blog->path, $current_site->path );
	18	+$redirect_network_admin_request = 0 !== strcasecmp($current_blog->domain, $current_site->domain) \|\| 0 !== strcasecmp($current_blog->path, $current_site->path);
19	19
20	20	/**
21	21	* Filter whether to redirect the request to the Network Admin.
		@@ -24,9 +24,9 @@ discard block
		block discarded – undo
24	24	*
25	25	* @param bool $redirect_network_admin_request Whether the request should be redirected.
26	26	*/
27		-$redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
28		-if ( $redirect_network_admin_request ) {
29		- wp_redirect( network_admin_url() );
	27	+$redirect_network_admin_request = apply_filters('redirect_network_admin_request', $redirect_network_admin_request);
	28	+if ($redirect_network_admin_request) {
	29	+ wp_redirect(network_admin_url());
30	30	exit;
31	31	}
32		-unset( $redirect_network_admin_request );
	32	+unset($redirect_network_admin_request);

		@@ -12,8 +12,9 @@
		block discarded – undo
12	12	/** Load WordPress Administration Bootstrap */
13	13	require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
14	14
15		-if ( ! is_multisite() )
	15	+if ( ! is_multisite() ) {
16	16	wp_die( __( 'Multisite support is not enabled.' ) );
	17	+}
17	18
18	19	$redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) \|\| 0 !== strcasecmp( $current_blog->path, $current_site->path );
19	20

ntwb / wordpress

Push — master ( d488ab...6453e7 )

Category

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +93 added lines, -93 removed lines patch added patch discarded remove patch

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +72 added lines, -72 removed lines patch added patch discarded remove patch

Braces +29 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +122 added lines, -122 removed lines patch added patch discarded remove patch

Braces +16 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

Braces +23 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Braces +21 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch