ntwb / wordpress

src/wp-admin/network/setup.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** 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/network.php' );
+require(ABSPATH.'wp-admin/network.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** 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/about.php' );

src/wp-admin/network/theme-editor.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** 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/theme-editor.php' );
+require(ABSPATH.'wp-admin/theme-editor.php');

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Theme editor network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+		 * Theme editor network administration panel.
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.1.0
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** 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/about.php' );

src/wp-admin/network/index.php

Spacing +33 added lines, -33 removed lines

@@ -8,64 +8,64 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** Load WordPress dashboard API */
-require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
+require_once(ABSPATH.'wp-admin/includes/dashboard.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' ) )
-	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);
 
-$title = __( 'Dashboard' );
+$title = __('Dashboard');
 $parent_file = 'index.php';
 
-$overview = '<p>' . __( 'Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network.' ) . '</p>';
-$overview .= '<p>' . __( 'From here you can:' ) . '</p>';
-$overview .= '<ul><li>' . __( 'Add and manage sites or users' ) . '</li>';
-$overview .= '<li>' . __( 'Install and activate themes or plugins' ) . '</li>';
-$overview .= '<li>' . __( 'Update your network' ) . '</li>';
-$overview .= '<li>' . __( 'Modify global network settings' ) . '</li></ul>';
+$overview = '<p>'.__('Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network.').'</p>';
+$overview .= '<p>'.__('From here you can:').'</p>';
+$overview .= '<ul><li>'.__('Add and manage sites or users').'</li>';
+$overview .= '<li>'.__('Install and activate themes or plugins').'</li>';
+$overview .= '<li>'.__('Update your network').'</li>';
+$overview .= '<li>'.__('Modify global network settings').'</li></ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $overview
-) );
+));
 
-$quick_tasks = '<p>' . __( 'The Right Now widget on this screen provides current user and site counts on your network.' ) . '</p>';
-$quick_tasks .= '<ul><li>' . __( 'To add a new user, <strong>click Create a New User</strong>.' ) . '</li>';
-$quick_tasks .= '<li>' . __( 'To add a new site, <strong>click Create a New Site</strong>.' ) . '</li></ul>';
-$quick_tasks .= '<p>' . __( 'To search for a user or site, use the search boxes.' ) . '</p>';
-$quick_tasks .= '<ul><li>' . __( 'To search for a user, <strong>enter an email address or username</strong>. Use a wildcard to search for a partial username, such as user&#42;.' ) . '</li>';
-$quick_tasks .= '<li>' . __( 'To search for a site, <strong>enter the path or domain</strong>.' ) . '</li></ul>';
+$quick_tasks = '<p>'.__('The Right Now widget on this screen provides current user and site counts on your network.').'</p>';
+$quick_tasks .= '<ul><li>'.__('To add a new user, <strong>click Create a New User</strong>.').'</li>';
+$quick_tasks .= '<li>'.__('To add a new site, <strong>click Create a New Site</strong>.').'</li></ul>';
+$quick_tasks .= '<p>'.__('To search for a user or site, use the search boxes.').'</p>';
+$quick_tasks .= '<ul><li>'.__('To search for a user, <strong>enter an email address or username</strong>. Use a wildcard to search for a partial username, such as user&#42;.').'</li>';
+$quick_tasks .= '<li>'.__('To search for a site, <strong>enter the path or domain</strong>.').'</li></ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'quick-tasks',
-	'title'   => __( 'Quick Tasks' ),
+	'title'   => __('Quick Tasks'),
 	'content' => $quick_tasks
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin" target="_blank">Documentation on the Network Admin</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" target="_blank">Documentation on the Network Admin</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
 wp_dashboard_setup();
 
-wp_enqueue_script( 'dashboard' );
-wp_enqueue_script( 'plugin-install' );
+wp_enqueue_script('dashboard');
+wp_enqueue_script('plugin-install');
 add_thickbox();
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <div id="dashboard-widgets-wrap">
 
@@ -76,4 +76,4 @@ 
 
 </div><!-- wrap -->
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +4 added lines, -2 removed lines

@@ -13,11 +13,13 @@
 /** Load WordPress dashboard API */
 require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
 
-if ( !is_multisite() )
+if ( !is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_network' ) )
+if ( ! current_user_can( 'manage_network' ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 $title = __( 'Dashboard' );
 $parent_file = 'index.php';

src/wp-admin/network/theme-install.php

Spacing +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
-	define( 'IFRAME_REQUEST', true );
+if (isset($_GET['tab']) && ('theme-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/theme-install.php' );
+require(ABSPATH.'wp-admin/theme-install.php');

Braces +4 added lines, -2 removed lines

@@ -7,13 +7,15 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
+if ( isset( $_GET['tab'] ) && ( 'theme-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/theme-install.php' );

src/wp-admin/network/edit.php

Spacing +8 added lines, -8 removed lines

@@ -8,13 +8,13 @@ 
  */
 
 /** 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 ( empty( $_GET['action'] ) ) {
-	wp_redirect( network_admin_url() );
+if (empty($_GET['action'])) {
+	wp_redirect(network_admin_url());
 	exit;
 }
 
@@ -26,7 +26,7 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'wpmuadminedit' );
+do_action('wpmuadminedit');
 
 /**
  * Fires the requested handler action.
@@ -36,7 +36,7 @@ 
  *
  * @since 3.1.0
  */
-do_action( 'network_admin_edit_' . $_GET['action'] );
+do_action('network_admin_edit_'.$_GET['action']);
 
-wp_redirect( network_admin_url() );
+wp_redirect(network_admin_url());
 exit();

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** 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/about.php' );

src/wp-admin/network/menu.php

Spacing +27 added lines, -27 removed lines

@@ -10,53 +10,53 @@
 /* translators: Network menu item */
 $menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
 
-$submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' );
+$submenu['index.php'][0] = array(__('Home'), 'read', 'index.php');
 
 $update_data = wp_get_update_data();
-if ( $update_data['counts']['total'] ) {
-	$submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . "</span></span>" ), 'update_core', 'update-core.php' );
+if ($update_data['counts']['total']) {
+	$submenu['index.php'][10] = array(sprintf(__('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>".number_format_i18n($update_data['counts']['total'])."</span></span>"), 'update_core', 'update-core.php');
 } else {
-	$submenu['index.php'][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' );
+	$submenu['index.php'][10] = array(__('Updates'), 'update_core', 'update-core.php');
 }
 
-$submenu['index.php'][15] = array( __( 'Upgrade Network' ), 'manage_network', 'upgrade.php' );
+$submenu['index.php'][15] = array(__('Upgrade Network'), 'manage_network', 'upgrade.php');
 
-$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
+$menu[4] = array('', 'read', 'separator1', '', 'wp-menu-separator');
 
 /* translators: Sites menu item */
 $menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-network');
-$submenu['sites.php'][5]  = array( __('All Sites'), 'manage_sites', 'sites.php' );
-$submenu['sites.php'][10]  = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
+$submenu['sites.php'][5] = array(__('All Sites'), 'manage_sites', 'sites.php');
+$submenu['sites.php'][10] = array(_x('Add New', 'site'), 'create_sites', 'site-new.php');
 
 $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
-$submenu['users.php'][5]  = array( __('All Users'), 'manage_network_users', 'users.php' );
-$submenu['users.php'][10]  = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
+$submenu['users.php'][5] = array(__('All Users'), 'manage_network_users', 'users.php');
+$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
 
-if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) {
-	$menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
+if (current_user_can('update_themes') && $update_data['counts']['themes']) {
+	$menu[15] = array(sprintf(__('Themes %s'), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>".number_format_i18n($update_data['counts']['themes'])."</span></span>"), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance');
 } else {
-	$menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
+	$menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance');
 }
-$submenu['themes.php'][5]  = array( __('Installed Themes'), 'manage_network_themes', 'themes.php' );
-$submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'install_themes', 'theme-install.php' );
-$submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
+$submenu['themes.php'][5]  = array(__('Installed Themes'), 'manage_network_themes', 'themes.php');
+$submenu['themes.php'][10] = array(_x('Add New', 'theme'), 'install_themes', 'theme-install.php');
+$submenu['themes.php'][15] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
 
-if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) {
-	$menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins');
+if (current_user_can('update_plugins') && $update_data['counts']['plugins']) {
+	$menu[20] = array(sprintf(__('Plugins %s'), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>".number_format_i18n($update_data['counts']['plugins'])."</span></span>"), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins');
 } else {
-	$menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
+	$menu[20] = array(__('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins');
 }
-$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
-$submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
-$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
+$submenu['plugins.php'][5]  = array(__('Installed Plugins'), 'manage_network_plugins', 'plugins.php');
+$submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
+$submenu['plugins.php'][15] = array(_x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php');
 
 $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
-if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
-	$submenu['settings.php'][5]  = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
-	$submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
+if (defined('MULTISITE') && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE) {
+	$submenu['settings.php'][5]  = array(__('Network Settings'), 'manage_network_options', 'settings.php');
+	$submenu['settings.php'][10] = array(__('Network Setup'), 'manage_network_options', 'setup.php');
 }
 unset($update_data);
 
-$menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator' );
+$menu[99] = array('', 'exist', 'separator-last', '', 'wp-menu-separator');
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
\ No newline at end of file
+require_once(ABSPATH.'wp-admin/includes/menu.php');
\ No newline at end of file

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Build Network Administration Menu.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * Build Network Administration Menu.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 /* translators: Network menu item */
 $menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');

src/wp-admin/network/update.php

Spacing +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@
  * @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');

Braces +4 added lines, -2 removed lines

@@ -7,13 +7,15 @@
  * @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' );

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Update/Install Plugin/Theme network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * Update/Install Plugin/Theme network administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
 	define( 'IFRAME_REQUEST', true );

src/wp-admin/network/upgrade.php

Braces +4 added lines, -2 removed lines

@@ -10,8 +10,9 @@ 
 /** 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 @@ 
 
 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>';

Spacing +43 added lines, -43 removed lines

@@ -8,75 +8,75 @@ 
  */
 
 /** 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 @@ 
 			 *
 			 * @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 @@ 
 			 *
 			 * @param int $blog_id The Site ID.
 			 */
-			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 @@ 
 	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']) :
 		?>
-		<h2><?php _e( 'Database Update Required' ); ?></h2>
-		<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>
+		<h2><?php _e('Database Update Required'); ?></h2>
+		<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 update process may take a little while, so please be patient.' ); ?></p>
-		<p><a class="button button-primary" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
+		<p><?php _e('The database update process may take a little while, so please be patient.'); ?></p>
+		<p><a class="button button-primary" 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'); ?>

src/wp-admin/network/settings.php

Braces +16 added lines, -10 removed lines

@@ -13,11 +13,13 @@ 
 /** 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 @@ 
 
 	$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 @@ 
 	}
 
 	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 @@ 
 			<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 @@ 
 			<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>

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?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
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +123 added lines, -123 removed lines

@@ -8,51 +8,51 @@ 
  */
 
 /** 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';
 
-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;
 	}
 
@@ -65,18 +65,18 @@ 
 	);
 
 	// 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);
 	}
 
 	/**
@@ -84,62 +84,62 @@ 
 	 *
 	 * @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' ); ?>
-		<h2><?php _e( 'Operational Settings' ); ?></h2>
+		<?php wp_nonce_field('siteoptions'); ?>
+		<h2><?php _e('Operational Settings'); ?></h2>
 		<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>
-		<h2><?php _e( 'Registration Settings' ); ?></h2>
+		<h2><?php _e('Registration Settings'); ?></h2>
 		<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() ) {
+					<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">';
 						/* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
-						printf( __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
+						printf(__('If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.'),
 							'<code>NOBLOGREDIRECT</code>',
 							'<code>wp-config.php</code>'
 						);
@@ -150,42 +150,42 @@ 
 			</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>
@@ -194,114 +194,114 @@ 
 				<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>
 
 		</table>
-		<h2><?php _e( 'New Site Settings' ); ?></h2>
+		<h2><?php _e('New Site Settings'); ?></h2>
 		<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>
-		<h2><?php _e( 'Upload Settings' ); ?></h2>
+		<h2><?php _e('Upload Settings'); ?></h2>
 		<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( (bool) get_site_option( 'upload_space_check_disabled' ), false ) ?>/> <?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((bool) get_site_option('upload_space_check_disabled'), false) ?>/> <?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>
@@ -310,27 +310,27 @@ 
 		<?php
 		$languages = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) {
+		if ( ! empty($languages) || ! empty($translations)) {
 			?>
-			<h2><?php _e( 'Language Settings' ); ?></h2>
+			<h2><?php _e('Language Settings'); ?></h2>
 			<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>
@@ -339,13 +339,13 @@ 
 		}
 		?>
 
-		<h2><?php _e( 'Menu Settings' ); ?></h2>
+		<h2><?php _e('Menu Settings'); ?></h2>
 		<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.
 			 *
@@ -361,14 +361,14 @@ 
 			 *
 			 * @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;
 			?>
@@ -382,9 +382,9 @@ 
 		 *
 		 * @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'); ?>