ntwb / wordpress

src/wp-admin/update.php

Braces +52 added lines, -37 removed lines

@@ -6,8 +6,9 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -20,17 +21,19 @@ 
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
 	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		if ( ! current_user_can( 'update_plugins' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-plugins' );
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$plugins = (array) $_POST['checked'];
-		else
-			$plugins = array();
+		if ( isset( $_GET['plugins'] ) ) {
+					$plugins = explode( ',', stripslashes($_GET['plugins']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$plugins = (array) $_POST['checked'];
+		} else {
+					$plugins = array();
+		}
 
 		$plugins = array_map('urldecode', $plugins);
 
@@ -46,8 +49,9 @@ 
 		iframe_footer();
 
 	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('upgrade-plugin_' . $plugin);
 
@@ -67,8 +71,9 @@ 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('activate-plugin_' . $plugin);
 		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
@@ -78,8 +83,9 @@ 
 			die();
 		}
 		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		if ( isset($_GET['success']) ) {
+					echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		}
 
 		if ( isset($_GET['failure']) ){
 			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
@@ -92,8 +98,9 @@ 
 		iframe_footer();
 	} elseif ( 'install-plugin' == $action ) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins') ) {
+					wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
@@ -128,8 +135,9 @@ 
 		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
 		$nonce = 'install-plugin_' . $plugin;
 		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		if ( isset($_GET['from']) ) {
+					$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		}
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
@@ -161,15 +169,17 @@ 
 		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ( 'upgrade-theme' == $action ) {
 
-		if ( ! current_user_can('update_themes') )
-			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		if ( ! current_user_can('update_themes') ) {
+					wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		}
 
 		check_admin_referer('upgrade-theme_' . $theme);
 
@@ -189,17 +199,19 @@ 
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		if ( ! current_user_can( 'update_themes' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-themes' );
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$themes = (array) $_POST['checked'];
-		else
-			$themes = array();
+		if ( isset( $_GET['themes'] ) ) {
+					$themes = explode( ',', stripslashes($_GET['themes']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$themes = (array) $_POST['checked'];
+		} else {
+					$themes = array();
+		}
 
 		$themes = array_map('urldecode', $themes);
 
@@ -215,16 +227,18 @@ 
 		iframe_footer();
 	} elseif ( 'install-theme' == $action ) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes') ) {
+					wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
-	 		wp_die($api);
+		if ( is_wp_error($api) ) {
+			 		wp_die($api);
+		}
 
 		wp_enqueue_script( 'customize-loader' );
 
@@ -269,8 +283,9 @@ 
 		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 

src/wp-admin/plugins.php

Braces +52 added lines, -36 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('activate_plugins') )
+if ( ! current_user_can('activate_plugins') ) {
 	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Plugins_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -29,8 +30,9 @@ 
 
 	switch ( $action ) {
 		case 'activate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
 				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
@@ -68,8 +70,9 @@ 
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -121,12 +124,13 @@ 
 
 			check_admin_referer( 'bulk-plugins' );
 
-			if ( isset( $_GET['plugins'] ) )
-				$plugins = explode( ',', $_GET['plugins'] );
-			elseif ( isset( $_POST['checked'] ) )
-				$plugins = (array) $_POST['checked'];
-			else
-				$plugins = array();
+			if ( isset( $_GET['plugins'] ) ) {
+							$plugins = explode( ',', $_GET['plugins'] );
+			} elseif ( isset( $_POST['checked'] ) ) {
+							$plugins = (array) $_POST['checked'];
+			} else {
+							$plugins = array();
+			}
 
 			$title = __( 'Update Plugins' );
 			$parent_file = 'plugins.php';
@@ -146,14 +150,16 @@ 
 			exit;
 
 		case 'error_scrape':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('plugin-activation-error_' . $plugin);
 
 			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
-				wp_die($valid);
+			if ( is_wp_error($valid) ) {
+							wp_die($valid);
+			}
 
 			if ( ! WP_DEBUG ) {
 				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
@@ -167,8 +173,9 @@ 
 			exit;
 
 		case 'deactivate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('deactivate-plugin_' . $plugin);
 
@@ -185,15 +192,17 @@ 
 				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
 			}
 
-			if ( headers_sent() )
-				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
-			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			if ( headers_sent() ) {
+							echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
+			} else {
+							wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			}
 			exit;
 
 		case 'deactivate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -290,8 +299,11 @@ 
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
-				<?php else: ?>
-					<h1><?php _e( 'Delete Plugins' ); ?></h1>
+				<?php else {
+	: ?>
+					<h1><?php _e( 'Delete Plugins' );
+}
+?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
@@ -313,10 +325,11 @@ 
 						?>
 					</ul>
 				<p><?php
-				if ( $data_to_delete )
-					_e('Are you sure you wish to delete these files and data?');
-				else
-					_e('Are you sure you wish to delete these files?');
+				if ( $data_to_delete ) {
+									_e('Are you sure you wish to delete these files and data?');
+				} else {
+									_e('Are you sure you wish to delete these files?');
+				}
 				?></p>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
@@ -423,12 +436,13 @@ 
 
 <?php if ( isset($_GET['error']) ) :
 
-	if ( isset( $_GET['main'] ) )
-		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
-		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
-	else
-		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	if ( isset( $_GET['main'] ) ) {
+			$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
+	} elseif ( isset($_GET['charsout']) ) {
+			$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
+	} else {
+			$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	}
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
@@ -451,12 +465,14 @@ 
 
 		if ( is_wp_error($delete_result) ) : ?>
 		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
 				<?php
 				if ( 1 == (int) $_GET['deleted'] ) {
 					_e( 'The selected plugin has been <strong>deleted</strong>.' );
+}
 				} else {
 					_e( 'The selected plugins have been <strong>deleted</strong>.' );
 				}

src/wp-admin/import.php

Braces +8 added lines, -5 removed lines

@@ -73,10 +73,12 @@ 
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
-		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
-		continue;
+	if ( isset( $importers[ $pop_importer ] ) ) {
+			continue;
+	}
+	if ( isset( $importers[ $pop_data['importer-id'] ] ) ) {
+			continue;
+	}
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
 	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
@@ -193,8 +195,9 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
+if ( current_user_can('install_plugins') ) {
 	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+}
 ?>
 
 </div>

src/wp-admin/options.php

Braces +38 added lines, -24 removed lines

@@ -93,8 +93,9 @@ 
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	$whitelist_options['reading'][] = 'blog_charset';
+}
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
 	$whitelist_options['writing'][] = 'use_smilies';
@@ -102,10 +103,12 @@ 
 }
 
 if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
-		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
-		$whitelist_options['general'][] = 'home';
+	if ( !defined( 'WP_SITEURL' ) ) {
+			$whitelist_options['general'][] = 'siteurl';
+	}
+	if ( !defined( 'WP_HOME' ) ) {
+			$whitelist_options['general'][] = 'home';
+	}
 
 	$whitelist_options['general'][] = 'admin_email';
 	$whitelist_options['general'][] = 'users_can_register';
@@ -131,9 +134,10 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-}
+	if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+			$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	}
+	}
 
 /**
  * Filters the options white list.
@@ -156,12 +160,14 @@ 
 		check_admin_referer( $option_page . '-options' );
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( !isset( $whitelist_options[ $option_page ] ) ) {
+			wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	}
 
 	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
+		if ( is_multisite() && ! is_super_admin() ) {
+					wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
+		}
 		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
 	} else {
 		$options = $whitelist_options[ $option_page ];
@@ -169,10 +175,12 @@ 
 
 	if ( 'general' == $option_page ) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
-			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
-			$_POST['time_format'] = $_POST['time_format_custom'];
+		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
+					$_POST['date_format'] = $_POST['date_format_custom'];
+		}
+		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
+					$_POST['time_format'] = $_POST['time_format_custom'];
+		}
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
 		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
@@ -209,8 +217,9 @@ 
 			$value = null;
 			if ( isset( $_POST[ $option ] ) ) {
 				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
+				if ( ! is_array( $value ) ) {
+									$value = trim( $value );
+				}
 				$value = wp_unslash( $value );
 			}
 			update_option( $option, $value );
@@ -229,8 +238,9 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
-		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	if ( !count( get_settings_errors() ) ) {
+			add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	}
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
@@ -255,8 +265,9 @@ 
 
 foreach ( (array) $options as $option ) :
 	$disabled = false;
-	if ( $option->option_name == '' )
-		continue;
+	if ( $option->option_name == '' ) {
+			continue;
+	}
 	if ( is_serialized( $option->option_value ) ) {
 		if ( is_serialized_string( $option->option_value ) ) {
 			// This is a serialized string, so we should display it.
@@ -282,11 +293,14 @@ 
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
 		echo esc_textarea( $value );
 	?></textarea>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
 	<?php endif ?></td>
 </tr>
-<?php endforeach; ?>
+<?php endforeach;
+}
+?>
   </table>
 
 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />

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

Braces +17 added lines, -11 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users') ) {
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -33,11 +35,13 @@ 
 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( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed 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'] );
 
@@ -94,15 +98,17 @@ 
 <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 } ?>

src/wp-admin/network/sites.php

Braces +14 added lines, -9 removed lines

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

src/wp-admin/network/users.php

Braces +44 added lines, -29 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_network_users' ) )
+if ( ! current_user_can( 'manage_network_users' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 if ( isset( $_GET['action'] ) ) {
 	/** This action is documented in wp-admin/network/edit.php */
@@ -22,8 +24,9 @@ 
 
 	switch ( $_GET['action'] ) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			check_admin_referer( 'deleteuser' );
 
@@ -43,8 +46,9 @@ 
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( !current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
 				check_admin_referer( 'bulk-users-network' );
@@ -56,8 +60,9 @@ 
 					if ( !empty( $user_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
-									wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+								if ( ! current_user_can( 'delete_users' ) ) {
+																	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+								}
 								$title = __( 'Users' );
 								$parent_file = 'users.php';
 								require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -69,14 +74,17 @@ 
 
 							case 'spam':
 								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
-									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								if ( is_super_admin( $user->ID ) ) {
+																	wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								}
 
 								$userfunction = 'all_spam';
 								$blogs = get_blogs_of_user( $user_id, true );
 								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
+									if ( $details->userblog_id != $current_site->blog_id ) {
+										// main blog not a spam !
 										update_blog_status( $details->userblog_id, 'spam', '1' );
+									}
 								}
 								update_user_status( $user_id, 'spam', '1' );
 							break;
@@ -84,8 +92,9 @@ 
 							case 'notspam':
 								$userfunction = 'all_notspam';
 								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
-									update_blog_status( $details->userblog_id, 'spam', '0' );
+								foreach ( (array) $blogs as $details ) {
+																	update_blog_status( $details->userblog_id, 'spam', '0' );
+								}
 
 								update_user_status( $user_id, 'spam', '0' );
 							break;
@@ -97,43 +106,49 @@ 
 			} else {
 				$location = network_admin_url( 'users.php' );
 
-				if ( ! empty( $_REQUEST['paged'] ) )
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				if ( ! empty( $_REQUEST['paged'] ) ) {
+									$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				}
 				wp_redirect( $location );
 			}
 			exit();
 
 		case 'dodelete':
 			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
 				foreach ( $_POST['blog'] as $id => $users ) {
 					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
-							continue;
+						if ( ! current_user_can( 'delete_user', $id ) ) {
+													continue;
+						}
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
-							remove_user_from_blog( $id, $blogid, $user_id );
-						else
-							remove_user_from_blog( $id, $blogid );
+						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] ) {
+													remove_user_from_blog( $id, $blogid, $user_id );
+						} else {
+													remove_user_from_blog( $id, $blogid );
+						}
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
-				foreach ( $_POST['user'] as $id ) {
+			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) ) {
+							foreach ( $_POST['user'] as $id ) {
 					if ( ! current_user_can( 'delete_user', $id ) )
 						continue;
+			}
 					wpmu_delete_user( $id );
 					$i++;
 				}
 
-			if ( $i == 1 )
-				$deletefunction = 'delete';
-			else
-				$deletefunction = 'all_delete';
+			if ( $i == 1 ) {
+							$deletefunction = 'delete';
+			} else {
+							$deletefunction = 'all_delete';
+			}
 
 			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
 			exit();

src/wp-admin/media.php

Braces +24 added lines, -13 removed lines

@@ -19,16 +19,18 @@ 
 	$attachment_id = (int) $_POST['attachment_id'];
 	check_admin_referer('media-form');
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $attachment_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$errors = media_upload_form_handler();
 
 	if ( empty($errors) ) {
 		$location = 'media.php';
 		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
+			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  ) {
+							$location = $referer;
+			}
 		}
 		if ( false !== strpos($location, 'upload.php') ) {
 			$location = remove_query_arg('message', $location);
@@ -44,8 +46,9 @@ 
 case 'edit' :
 	$title = __('Edit Media');
 
-	if ( empty($errors) )
-		$errors = null;
+	if ( empty($errors) ) {
+			$errors = null;
+	}
 
 	if ( empty( $_GET['attachment_id'] ) ) {
 		wp_redirect( admin_url('upload.php') );
@@ -53,14 +56,21 @@ 
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $att_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$att = get_post($att_id);
 
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	if ( empty($att->ID) ) {
+		wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
+	}
+	if ( 'attachment' !== $att->post_type ) {
+		wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
+	}
+	if ( $att->post_status == 'trash' ) {
+		wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	}
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
@@ -97,8 +107,9 @@ 
 				break;
 		}
 	}
-	if ( $message )
-		echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	if ( $message ) {
+			echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	}
 
 ?>
 

src/wp-admin/custom-header.php

Braces +121 added lines, -91 removed lines

@@ -137,15 +137,17 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
+		if ( ! isset( $_GET['step'] ) ) {
+					return 1;
+		}
 
 		$step = (int) $_GET['step'];
 		if ( $step < 1 || 3 < $step ||
 			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
 			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
-		)
-			return 1;
+		) {
+					return 1;
+		}
 
 		return $step;
 	}
@@ -161,8 +163,9 @@ 
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
+							wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
 			wp_enqueue_script('imgareaselect');
 		}
@@ -176,10 +179,11 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
-			wp_enqueue_style('imgareaselect');
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					wp_enqueue_style( 'wp-color-picker' );
+		} elseif ( 2 == $step ) {
+					wp_enqueue_style('imgareaselect');
+		}
 	}
 
 	/**
@@ -188,11 +192,13 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
-			return;
+		if ( ! current_user_can('edit_theme_options') ) {
+					return;
+		}
 
-		if ( empty( $_POST ) )
-			return;
+		if ( empty( $_POST ) ) {
+					return;
+		}
 
 		$this->updated = true;
 
@@ -215,10 +221,11 @@ 
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			if ( strlen($color) == 6 || strlen($color) == 3 ) {
+							set_theme_mod('header_textcolor', $color);
+			} elseif ( ! $color ) {
+							set_theme_mod( 'header_textcolor', 'blank' );
+			}
 		}
 
 		if ( isset( $_POST['default-header'] ) ) {
@@ -238,8 +245,9 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
-			return;
+		if ( !isset($_wp_default_headers) ) {
+					return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
@@ -289,8 +297,9 @@ 
 			echo '<div class="default-header">';
 			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
-				$width = ' width="230"';
+			if ( !empty( $header['attachment_id'] ) ) {
+							$width = ' width="230"';
+			}
 			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>';
 			echo '</div>';
 		}
@@ -304,10 +313,11 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					$this->js_1();
+		} elseif ( 2 == $step ) {
+					$this->js_2();
+		}
 	}
 
 	/**
@@ -492,21 +502,24 @@ 
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+		}
+		if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		}
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
-			$style = ' style="display:none;"';
+		if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+		} else {
+					$style = ' style="display:none;"';
+		}
 		?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
@@ -525,8 +538,8 @@ 
 	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
 	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s wide.' ) . ' ',
 				sprintf(
@@ -535,9 +548,10 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s tall.' ) . ' ',
 				sprintf(
@@ -546,10 +560,11 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf(
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested width is %s.' ) . ' ',
 				sprintf(
@@ -558,8 +573,9 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf(
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested height is %s.' ) . ' ',
 				sprintf(
@@ -568,6 +584,7 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	?></p>
 	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
@@ -620,9 +637,12 @@ 
 <td>
 <?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
-<?php else: ?>
+<?php else {
+	: ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 		$this->show_header_selector( 'default' );
 	?>
@@ -752,11 +772,13 @@ 
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
-			$max_width = 1500;
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
+					$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		}
 		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
 		// If flexible height isn't supported and the image is the exact right size
@@ -764,8 +786,9 @@ 
 			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if ( file_exists( $file ) ) {
+							wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			}
 
 			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
@@ -783,8 +806,9 @@ 
 		} elseif ( $width > $max_width ) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error( $image ) ) {
+							wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
 			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
@@ -822,8 +846,9 @@ 
 	<p class="submit">
 	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	}
 	?>
 	</p>
 </form>
@@ -842,13 +867,15 @@ 
 
 		$uploaded_file = $_FILES['import'];
 		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+					wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if ( isset($file['error']) ) {
+					wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		}
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -912,23 +939,26 @@ 
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
-		else
-			$cropped = get_attached_file( $attachment_id );
+		if ( empty( $_POST['skip-cropping'] ) ) {
+					$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
+		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
+					$cropped = _copy_image_file( $attachment_id );
+		} else {
+					$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error( $cropped ) ) {
+					wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
 		$object = $this->create_attachment_object( $cropped, $attachment_id );
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
+					unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -965,15 +995,17 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('Sorry, you are not allowed to customize headers.'));
+		if ( ! current_user_can('edit_theme_options') ) {
+					wp_die(__('Sorry, you are not allowed to customize headers.'));
+		}
 		$step = $this->step();
-		if ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-		else
-			$this->step_1();
+		if ( 2 == $step ) {
+					$this->step_2();
+		} elseif ( 3 == $step ) {
+					$this->step_3();
+		} else {
+					$this->step_1();
+		}
 	}
 
 	/**
@@ -1015,8 +1047,9 @@ 
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
-				return;
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+							return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -1046,10 +1079,11 @@ 
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
-			else
-				return;
+			if ( isset( $this->default_headers[ $choice ] ) ) {
+							$header_image_data = $this->default_headers[ $choice ];
+			} else {
+							return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1123,21 +1157,17 @@ 
 
 		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
 			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		} elseif ( $has_flex_height && $has_flex_width ) {
 			$dst['dst_height'] = $height;
-		}
-		else {
+		} else {
 			$dst['dst_height'] = $theme_height;
 		}
 
 		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
 			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		} elseif ( $has_flex_width && $has_flex_height ) {
 			$dst['dst_width'] = $width;
-		}
-		else {
+		} else {
 			$dst['dst_width'] = $theme_width;
 		}