iqltechnologies / brighty

brighty/wp-admin/includes/class-automatic-upgrader-skin.php

Spacing +15 added lines, -15 removed lines

@@ -37,8 +37,8 @@ 
 	 * @param bool          $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
-		if ( $context ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
+		if ($context) {
 			$this->options['context'] = $context;
 		}
 		/*
@@ -46,7 +46,7 @@ 
 		 * This will output a credentials form in event of failure. We don't want that, so just hide with a buffer.
 		 */
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
+		$result = parent::request_filesystem_credentials($error, $context, $allow_relaxed_file_ownership);
 		ob_end_clean();
 		return $result;
 	}
@@ -71,26 +71,26 @@ 
 	 * @param string|array|WP_Error $feedback Message data.
 	 * @param mixed                 ...$args  Optional text replacements.
 	 */
-	public function feedback( $feedback, ...$args ) {
-		if ( is_wp_error( $feedback ) ) {
+	public function feedback($feedback, ...$args) {
+		if (is_wp_error($feedback)) {
 			$string = $feedback->get_error_message();
-		} elseif ( is_array( $feedback ) ) {
+		} elseif (is_array($feedback)) {
 			return;
 		} else {
 			$string = $feedback;
 		}
 
-		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
-			$string = $this->upgrader->strings[ $string ];
+		if (!empty($this->upgrader->strings[$string])) {
+			$string = $this->upgrader->strings[$string];
 		}
 
-		if ( strpos( $string, '%' ) !== false ) {
-			if ( ! empty( $args ) ) {
-				$string = vsprintf( $string, $args );
+		if (strpos($string, '%') !== false) {
+			if (!empty($args)) {
+				$string = vsprintf($string, $args);
 			}
 		}
 
-		$string = trim( $string );
+		$string = trim($string);
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
 		$string = wp_kses(
@@ -105,7 +105,7 @@ 
 			)
 		);
 
-		if ( empty( $string ) ) {
+		if (empty($string)) {
 			return;
 		}
 
@@ -128,8 +128,8 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) ) {
-			$this->feedback( $output );
+		if (!empty($output)) {
+			$this->feedback($output);
 		}
 	}
 }

brighty/wp-admin/includes/class-wp-post-comments-list-table.php

Spacing +8 added lines, -8 removed lines

@@ -23,8 +23,8 @@ 
 	protected function get_column_info() {
 		return array(
 			array(
-				'author'  => __( 'Author' ),
-				'comment' => _x( 'Comment', 'column name' ),
+				'author'  => __('Author'),
+				'comment' => _x('Comment', 'column name'),
 			),
 			array(),
 			array(),
@@ -45,21 +45,21 @@ 
 	/**
 	 * @param bool $output_empty
 	 */
-	public function display( $output_empty = false ) {
+	public function display($output_empty = false) {
 		$singular = $this->_args['singular'];
 
-		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field('fetch-list-' . get_class($this), '_ajax_fetch_list_nonce');
 		?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
+<table class="<?php echo implode(' ', $this->get_table_classes()); ?>" style="display:none;">
 	<tbody id="the-comment-list"
 		<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		}
 		?>
 		>
 		<?php
-		if ( ! $output_empty ) {
+		if (!$output_empty) {
 			$this->display_rows_or_placeholder();
 		}
 		?>
@@ -72,7 +72,7 @@ 
 	 * @param bool $comment_status
 	 * @return int
 	 */
-	public function get_per_page( $comment_status = false ) {
+	public function get_per_page($comment_status = false) {
 		return 10;
 	}
 }

brighty/wp-admin/includes/class-walker-category-checklist.php

Spacing +19 added lines, -19 removed lines

@@ -34,8 +34,8 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent  = str_repeat( "\t", $depth );
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
+		$indent  = str_repeat("\t", $depth);
 		$output .= "$indent<ul class='children'>\n";
 	}
 
@@ -50,8 +50,8 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent  = str_repeat( "\t", $depth );
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
+		$indent  = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
 	}
 
@@ -70,33 +70,33 @@ 
 	 * @param array   $args              An array of arguments. @see wp_terms_checklist()
 	 * @param int     $current_object_id Optional. ID of the current term. Default 0.
 	 */
-	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
+	public function start_el(&$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0) {
 		// Restores the more descriptive, specific name for use within this method.
 		$category = $data_object;
 
-		if ( empty( $args['taxonomy'] ) ) {
+		if (empty($args['taxonomy'])) {
 			$taxonomy = 'category';
 		} else {
 			$taxonomy = $args['taxonomy'];
 		}
 
-		if ( 'category' === $taxonomy ) {
+		if ('category' === $taxonomy) {
 			$name = 'post_category';
 		} else {
 			$name = 'tax_input[' . $taxonomy . ']';
 		}
 
-		$args['popular_cats'] = ! empty( $args['popular_cats'] ) ? array_map( 'intval', $args['popular_cats'] ) : array();
+		$args['popular_cats'] = !empty($args['popular_cats']) ? array_map('intval', $args['popular_cats']) : array();
 
-		$class = in_array( $category->term_id, $args['popular_cats'], true ) ? ' class="popular-category"' : '';
+		$class = in_array($category->term_id, $args['popular_cats'], true) ? ' class="popular-category"' : '';
 
-		$args['selected_cats'] = ! empty( $args['selected_cats'] ) ? array_map( 'intval', $args['selected_cats'] ) : array();
+		$args['selected_cats'] = !empty($args['selected_cats']) ? array_map('intval', $args['selected_cats']) : array();
 
-		if ( ! empty( $args['list_only'] ) ) {
+		if (!empty($args['list_only'])) {
 			$aria_checked = 'false';
 			$inner_class  = 'category';
 
-			if ( in_array( $category->term_id, $args['selected_cats'], true ) ) {
+			if (in_array($category->term_id, $args['selected_cats'], true)) {
 				$inner_class .= ' selected';
 				$aria_checked = 'true';
 			}
@@ -105,17 +105,17 @@ 
 				'<div class="' . $inner_class . '" data-term-id=' . $category->term_id .
 				' tabindex="0" role="checkbox" aria-checked="' . $aria_checked . '">' .
 				/** This filter is documented in wp-includes/category-template.php */
-				esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</div>';
+				esc_html(apply_filters('the_category', $category->name, '', '')) . '</div>';
 		} else {
-			$is_selected = in_array( $category->term_id, $args['selected_cats'], true );
-			$is_disabled = ! empty( $args['disabled'] );
+			$is_selected = in_array($category->term_id, $args['selected_cats'], true);
+			$is_disabled = !empty($args['disabled']);
 
 			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
 				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="' . $name . '[]" id="in-' . $taxonomy . '-' . $category->term_id . '"' .
-				checked( $is_selected, true, false ) .
-				disabled( $is_disabled, true, false ) . ' /> ' .
+				checked($is_selected, true, false) .
+				disabled($is_disabled, true, false) . ' /> ' .
 				/** This filter is documented in wp-includes/category-template.php */
-				esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</label>';
+				esc_html(apply_filters('the_category', $category->name, '', '')) . '</label>';
 		}
 	}
 
@@ -132,7 +132,7 @@ 
 	 * @param int     $depth       Depth of the term in reference to parents. Default 0.
 	 * @param array   $args        An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $data_object, $depth = 0, $args = array()) {
 		$output .= "</li>\n";
 	}
 }

brighty/wp-admin/includes/theme-install.php

Spacing +55 added lines, -55 removed lines

@@ -12,8 +12,8 @@ 
 		'title'  => array(),
 		'target' => array(),
 	),
-	'abbr'    => array( 'title' => array() ),
-	'acronym' => array( 'title' => array() ),
+	'abbr'    => array('title' => array()),
+	'acronym' => array('title' => array()),
 	'code'    => array(),
 	'pre'     => array(),
 	'em'      => array(),
@@ -60,23 +60,23 @@ 
  * @return array
  */
 function install_themes_feature_list() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_theme_feature_list()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_theme_feature_list()');
 
-	$cache = get_transient( 'wporg_theme_feature_list' );
-	if ( ! $cache ) {
-		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	$cache = get_transient('wporg_theme_feature_list');
+	if (!$cache) {
+		set_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 	}
 
-	if ( $cache ) {
+	if ($cache) {
 		return $cache;
 	}
 
-	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) ) {
+	$feature_list = themes_api('feature_list', array());
+	if (is_wp_error($feature_list)) {
 		return array();
 	}
 
-	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	return $feature_list;
 }
@@ -88,42 +88,42 @@ 
  *
  * @param bool $type_selector
  */
-function install_theme_search_form( $type_selector = true ) {
-	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector ) {
-		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+function install_theme_search_form($type_selector = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
+	if (!$type_selector) {
+		echo '<p class="install-help">' . __('Search for themes by keyword.') . '</p>';
 	}
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
-	<?php if ( $type_selector ) : ?>
-	<label class="screen-reader-text" for="typeselector"><?php _e( 'Type of search' ); ?></label>
+	<?php if ($type_selector) : ?>
+	<label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
 	<select	name="type" id="typeselector">
-	<option value="term" <?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
-	<option value="author" <?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
-	<option value="tag" <?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Theme Installer' ); ?></option>
+	<option value="term" <?php selected('term', $type); ?>><?php _e('Keyword'); ?></option>
+	<option value="author" <?php selected('author', $type); ?>><?php _e('Author'); ?></option>
+	<option value="tag" <?php selected('tag', $type); ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
 	</select>
 	<label class="screen-reader-text" for="s">
 		<?php
-		switch ( $type ) {
+		switch ($type) {
 			case 'term':
-				_e( 'Search by keyword' );
+				_e('Search by keyword');
 				break;
 			case 'author':
-				_e( 'Search by author' );
+				_e('Search by author');
 				break;
 			case 'tag':
-				_e( 'Search by tag' );
+				_e('Search by tag');
 				break;
 		}
 		?>
 	</label>
 	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
+	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
 	<?php endif; ?>
-	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr( $term ); ?>" autofocus="autofocus" />
-	<?php submit_button( __( 'Search' ), '', 'search', false ); ?>
+	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term); ?>" autofocus="autofocus" />
+	<?php submit_button(__('Search'), '', 'search', false); ?>
 </form>
 	<?php
 }
@@ -134,10 +134,10 @@ 
  * @since 2.8.0
  */
 function install_themes_dashboard() {
-	install_theme_search_form( false );
+	install_theme_search_form(false);
 	?>
-<h4><?php _e( 'Feature Filter' ); ?></h4>
-<p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
+<h4><?php _e('Feature Filter'); ?></h4>
+<p class="install-help"><?php _e('Find a theme based on specific features.'); ?></p>
 
 <form method="get">
 	<input type="hidden" name="tab" value="search" />
@@ -145,14 +145,14 @@ 
 	$feature_list = get_theme_feature_list();
 	echo '<div class="feature-filter">';
 
-	foreach ( (array) $feature_list as $feature_name => $features ) {
-		$feature_name = esc_html( $feature_name );
+	foreach ((array) $feature_list as $feature_name => $features) {
+		$feature_name = esc_html($feature_name);
 		echo '<div class="feature-name">' . $feature_name . '</div>';
 
 		echo '<ol class="feature-group">';
-		foreach ( $features as $feature => $feature_name ) {
-			$feature_name = esc_html( $feature_name );
-			$feature      = esc_attr( $feature );
+		foreach ($features as $feature => $feature_name) {
+			$feature_name = esc_html($feature_name);
+			$feature      = esc_attr($feature);
 			?>
 
 <li>
@@ -169,7 +169,7 @@ 
 
 </div>
 <br class="clear" />
-	<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
+	<?php submit_button(__('Find Themes'), '', 'search'); ?>
 </form>
 	<?php
 }
@@ -179,12 +179,12 @@ 
  */
 function install_themes_upload() {
 	?>
-<p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install or update it by uploading it here.' ); ?></p>
-<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-theme' ); ?>">
-	<?php wp_nonce_field( 'theme-upload' ); ?>
-	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
+<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install or update it by uploading it here.'); ?></p>
+<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
+	<?php wp_nonce_field('theme-upload'); ?>
+	<label class="screen-reader-text" for="themezip"><?php _e('Theme zip file'); ?></label>
 	<input type="file" id="themezip" name="themezip" accept=".zip" />
-	<?php submit_button( __( 'Install Now' ), '', 'install-theme-submit', false ); ?>
+	<?php submit_button(__('Install Now'), '', 'install-theme-submit', false); ?>
 </form>
 	<?php
 }
@@ -198,14 +198,14 @@ 
  *
  * @param object $theme
  */
-function display_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4.0' );
+function display_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4.0');
 	global $wp_list_table;
-	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
+	if (!isset($wp_list_table)) {
+		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
-	$wp_list_table->single_row( $theme );
+	$wp_list_table->single_row($theme);
 }
 
 /**
@@ -218,8 +218,8 @@ 
 function display_themes() {
 	global $wp_list_table;
 
-	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
+	if (!isset($wp_list_table)) {
+		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
 	$wp_list_table->display();
@@ -236,17 +236,17 @@ 
 function install_theme_information() {
 	global $wp_list_table;
 
-	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
+	$theme = themes_api('theme_information', array('slug' => wp_unslash($_REQUEST['theme'])));
 
-	if ( is_wp_error( $theme ) ) {
-		wp_die( $theme );
+	if (is_wp_error($theme)) {
+		wp_die($theme);
 	}
 
-	iframe_header( __( 'Theme Installation' ) );
-	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
+	iframe_header(__('Theme Installation'));
+	if (!isset($wp_list_table)) {
+		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
-	$wp_list_table->theme_installer_single( $theme );
+	$wp_list_table->theme_installer_single($theme);
 	iframe_footer();
 	exit;
 }

brighty/wp-admin/includes/class-ftp-sockets.php

Spacing +94 added lines, -94 removed lines

@@ -27,7 +27,7 @@ 
  */
 class ftp_sockets extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(true, $verb, $le);
 	}
 
@@ -36,13 +36,13 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set receive timeout',socket_strerror(socket_last_error($sock)));
+		if (!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set receive timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		if(!@socket_set_option($sock, SOL_SOCKET , SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set send timeout',socket_strerror(socket_last_error($sock)));
+		if (!@socket_set_option($sock, SOL_SOCKET, SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set send timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
@@ -51,118 +51,118 @@ 
 
 	function _connect($host, $port) {
 		$this->SendMSG("Creating socket");
-		if(!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
-			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
+		if (!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
+			$this->PushError('_connect', 'socket create failed', socket_strerror(socket_last_error($sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
-		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
+		if (!$this->_settimeout($sock)) return FALSE;
+		$this->SendMSG("Connecting to \"" . $host . ":" . $port . "\"");
 		if (!($res = @socket_connect($sock, $host, $port))) {
-			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
+			$this->PushError('_connect', 'socket connect failed', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
-			$this->PushError($fnction,'Connect first');
+	function _readmsg($fnction = "_readmsg") {
+		if (!$this->_connected) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			$tmp = @socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
 			} else {
-				$this->_message.=$tmp;
-				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
+				$this->_message .= $tmp;
+				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^" . CRLF . "]+" . CRLF . "$/Us", $this->_message, $regs);
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < " . rtrim($this->_message, CRLF) . CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if (!$this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @socket_write($this->_ftp_control_sock, $cmd . CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed', socket_strerror(socket_last_error($this->stream)));
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if (!$this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+	function _data_prepare($mode = FTP_ASCII) {
+		if (!$this->_settype($mode)) return FALSE;
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
-			$this->PushError('_data_prepare','socket create failed',socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			$this->PushError('_data_prepare', 'socket create failed', socket_strerror(socket_last_error($this->_ftp_data_sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($this->_ftp_data_sock)) {
+		if (!$this->_settimeout($this->_ftp_data_sock)) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+		if ($this->_passive) {
+			if (!$this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if (!$this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-			$this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
-			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			$this->_datahost = $ip_port[0] . "." . $ip_port[1] . "." . $ip_port[2] . "." . $ip_port[3];
+			$this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
+			$this->SendMSG("Connecting to " . $this->_datahost . ":" . $this->_dataport);
+			if (!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
+			else $this->_ftp_temp_sock = $this->_ftp_data_sock;
 		} else {
-			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
-				$this->PushError("_data_prepare","cannot get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			if (!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
+				$this->PushError("_data_prepare", "cannot get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_bind($this->_ftp_data_sock,$addr)){
-				$this->PushError("_data_prepare","cannot bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if (!@socket_bind($this->_ftp_data_sock, $addr)) {
+				$this->PushError("_data_prepare", "cannot bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_listen($this->_ftp_data_sock)) {
-				$this->PushError("_data_prepare","cannot listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if (!@socket_listen($this->_ftp_data_sock)) {
+				$this->PushError("_data_prepare", "cannot listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","cannot get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if (!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "cannot get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_exec('PORT '.str_replace('.',',',$this->_datahost.'.'.($this->_dataport>>8).'.'.($this->_dataport&0x00FF)), "_port")) {
+			if (!$this->_exec('PORT ' . str_replace('.', ',', $this->_datahost . '.' . ($this->_dataport >> 8) . '.' . ($this->_dataport&0x00FF)), "_port")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if (!$this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
@@ -170,61 +170,61 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
-			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_read","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if (!$this->_passive) {
+			$this->SendMSG("Connecting to " . $this->_datahost . ":" . $this->_dataport);
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_read", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
 		}
 
-		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
-			if($block==="") break;
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+		while (($block = @socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ)) !== false) {
+			if ($block === "") break;
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
-			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_write","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if (!$this->_passive) {
+			$this->SendMSG("Connecting to " . $this->_datahost . ":" . $this->_dataport);
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_write", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return false;
 			}
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while (!feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if (!$this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif (!$this->_data_write_block($mode, $fp)) return false;
 		return true;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
-				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			if (($t = @socket_write($this->_ftp_temp_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while (!empty($block));
 		return true;
 	}
 
@@ -236,9 +236,9 @@ 
 	}
 
 	function _quit() {
-		if($this->_connected) {
+		if ($this->_connected) {
 			@socket_close($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

brighty/wp-admin/includes/admin.php

Spacing +3 added lines, -3 removed lines

@@ -7,13 +7,13 @@ 
  * @since 2.3.0
  */
 
-if ( ! defined( 'WP_ADMIN' ) ) {
+if (!defined('WP_ADMIN')) {
 	/*
 	 * This file is being included from a file other than wp-admin/admin.php, so
 	 * some setup was skipped. Make sure the admin message catalog is loaded since
 	 * load_default_textdomain() will not have done so in this context.
 	 */
-	load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+	load_textdomain('default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo');
 }
 
 /** WordPress Administration Hooks */
@@ -92,7 +92,7 @@ 
 require_once ABSPATH . 'wp-admin/includes/deprecated.php';
 
 /** WordPress Multisite support API */
-if ( is_multisite() ) {
+if (is_multisite()) {
 	require_once ABSPATH . 'wp-admin/includes/ms-admin-filters.php';
 	require_once ABSPATH . 'wp-admin/includes/ms.php';
 	require_once ABSPATH . 'wp-admin/includes/ms-deprecated.php';

brighty/wp-admin/includes/class-wp-filesystem-ftpext.php

Spacing +169 added lines, -169 removed lines

@@ -28,49 +28,49 @@ 
 	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt = '' ) {
+	public function __construct($opt = '') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! extension_loaded( 'ftp' ) ) {
-			$this->errors->add( 'no_ftp_ext', __( 'The ftp PHP extension is not available' ) );
+		if (!extension_loaded('ftp')) {
+			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
 			return;
 		}
 
 		// This class uses the timeout on a per-connection basis, others use it on a per-action basis.
-		if ( ! defined( 'FS_TIMEOUT' ) ) {
-			define( 'FS_TIMEOUT', 240 );
+		if (!defined('FS_TIMEOUT')) {
+			define('FS_TIMEOUT', 240);
 		}
 
-		if ( empty( $opt['port'] ) ) {
+		if (empty($opt['port'])) {
 			$this->options['port'] = 21;
 		} else {
 			$this->options['port'] = $opt['port'];
 		}
 
-		if ( empty( $opt['hostname'] ) ) {
-			$this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+		if (empty($opt['hostname'])) {
+			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		} else {
 			$this->options['hostname'] = $opt['hostname'];
 		}
 
 		// Check if the options provided are OK.
-		if ( empty( $opt['username'] ) ) {
-			$this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+		if (empty($opt['username'])) {
+			$this->errors->add('empty_username', __('FTP username is required'));
 		} else {
 			$this->options['username'] = $opt['username'];
 		}
 
-		if ( empty( $opt['password'] ) ) {
-			$this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+		if (empty($opt['password'])) {
+			$this->errors->add('empty_password', __('FTP password is required'));
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
 
 		$this->options['ssl'] = false;
 
-		if ( isset( $opt['connection_type'] ) && 'ftps' === $opt['connection_type'] ) {
+		if (isset($opt['connection_type']) && 'ftps' === $opt['connection_type']) {
 			$this->options['ssl'] = true;
 		}
 	}
@@ -83,18 +83,18 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function connect() {
-		if ( isset( $this->options['ssl'] ) && $this->options['ssl'] && function_exists( 'ftp_ssl_connect' ) ) {
-			$this->link = @ftp_ssl_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT );
+		if (isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect')) {
+			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		} else {
-			$this->link = @ftp_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT );
+			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		}
 
-		if ( ! $this->link ) {
+		if (!$this->link) {
 			$this->errors->add(
 				'connect',
 				sprintf(
 					/* translators: %s: hostname:port */
-					__( 'Failed to connect to FTP Server %s' ),
+					__('Failed to connect to FTP Server %s'),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -102,12 +102,12 @@ 
 			return false;
 		}
 
-		if ( ! @ftp_login( $this->link, $this->options['username'], $this->options['password'] ) ) {
+		if (!@ftp_login($this->link, $this->options['username'], $this->options['password'])) {
 			$this->errors->add(
 				'auth',
 				sprintf(
 					/* translators: %s: Username. */
-					__( 'Username/Password incorrect for %s' ),
+					__('Username/Password incorrect for %s'),
 					$this->options['username']
 				)
 			);
@@ -116,10 +116,10 @@ 
 		}
 
 		// Set the connection to use Passive FTP.
-		ftp_pasv( $this->link, true );
+		ftp_pasv($this->link, true);
 
-		if ( @ftp_get_option( $this->link, FTP_TIMEOUT_SEC ) < FS_TIMEOUT ) {
-			@ftp_set_option( $this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT );
+		if (@ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT) {
+			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 		}
 
 		return true;
@@ -134,30 +134,30 @@ 
 	 * @return string|false Read data on success, false if no temporary file could be opened,
 	 *                      or if the file couldn't be retrieved.
 	 */
-	public function get_contents( $file ) {
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = fopen( $tempfile, 'w+' );
+	public function get_contents($file) {
+		$tempfile   = wp_tempnam($file);
+		$temphandle = fopen($tempfile, 'w+');
 
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
+		if (!$temphandle) {
+			unlink($tempfile);
 			return false;
 		}
 
-		if ( ! ftp_fget( $this->link, $temphandle, $file, FTP_BINARY ) ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
+		if (!ftp_fget($this->link, $temphandle, $file, FTP_BINARY)) {
+			fclose($temphandle);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+		fseek($temphandle, 0); // Skip back to the start of the file being written to.
 		$contents = '';
 
-		while ( ! feof( $temphandle ) ) {
-			$contents .= fread( $temphandle, 8 * KB_IN_BYTES );
+		while (!feof($temphandle)) {
+			$contents .= fread($temphandle, 8 * KB_IN_BYTES);
 		}
 
-		fclose( $temphandle );
-		unlink( $tempfile );
+		fclose($temphandle);
+		unlink($tempfile);
 
 		return $contents;
 	}
@@ -170,8 +170,8 @@ 
 	 * @param string $file Path to the file.
 	 * @return array|false File contents in an array on success, false on failure.
 	 */
-	public function get_contents_array( $file ) {
-		return explode( "\n", $this->get_contents( $file ) );
+	public function get_contents_array($file) {
+		return explode("\n", $this->get_contents($file));
 	}
 
 	/**
@@ -185,36 +185,36 @@ 
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$tempfile   = wp_tempnam( $file );
-		$temphandle = fopen( $tempfile, 'wb+' );
+	public function put_contents($file, $contents, $mode = false) {
+		$tempfile   = wp_tempnam($file);
+		$temphandle = fopen($tempfile, 'wb+');
 
-		if ( ! $temphandle ) {
-			unlink( $tempfile );
+		if (!$temphandle) {
+			unlink($tempfile);
 			return false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		$data_length   = strlen( $contents );
-		$bytes_written = fwrite( $temphandle, $contents );
+		$data_length   = strlen($contents);
+		$bytes_written = fwrite($temphandle, $contents);
 
 		reset_mbstring_encoding();
 
-		if ( $data_length !== $bytes_written ) {
-			fclose( $temphandle );
-			unlink( $tempfile );
+		if ($data_length !== $bytes_written) {
+			fclose($temphandle);
+			unlink($tempfile);
 			return false;
 		}
 
-		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to.
+		fseek($temphandle, 0); // Skip back to the start of the file being written to.
 
-		$ret = ftp_fput( $this->link, $file, $temphandle, FTP_BINARY );
+		$ret = ftp_fput($this->link, $file, $temphandle, FTP_BINARY);
 
-		fclose( $temphandle );
-		unlink( $tempfile );
+		fclose($temphandle);
+		unlink($tempfile);
 
-		$this->chmod( $file, $mode );
+		$this->chmod($file, $mode);
 
 		return $ret;
 	}
@@ -227,10 +227,10 @@ 
 	 * @return string|false The current working directory on success, false on failure.
 	 */
 	public function cwd() {
-		$cwd = ftp_pwd( $this->link );
+		$cwd = ftp_pwd($this->link);
 
-		if ( $cwd ) {
-			$cwd = trailingslashit( $cwd );
+		if ($cwd) {
+			$cwd = trailingslashit($cwd);
 		}
 
 		return $cwd;
@@ -244,8 +244,8 @@ 
 	 * @param string $dir The new current directory.
 	 * @return bool True on success, false on failure.
 	 */
-	public function chdir( $dir ) {
-		return @ftp_chdir( $this->link, $dir );
+	public function chdir($dir) {
+		return @ftp_chdir($this->link, $dir);
 	}
 
 	/**
@@ -260,11 +260,11 @@ 
 	 *                             Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function chmod( $file, $mode = false, $recursive = false ) {
-		if ( ! $mode ) {
-			if ( $this->is_file( $file ) ) {
+	public function chmod($file, $mode = false, $recursive = false) {
+		if (!$mode) {
+			if ($this->is_file($file)) {
 				$mode = FS_CHMOD_FILE;
-			} elseif ( $this->is_dir( $file ) ) {
+			} elseif ($this->is_dir($file)) {
 				$mode = FS_CHMOD_DIR;
 			} else {
 				return false;
@@ -272,20 +272,20 @@ 
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir( $file ) ) {
-			$filelist = $this->dirlist( $file );
+		if ($recursive && $this->is_dir($file)) {
+			$filelist = $this->dirlist($file);
 
-			foreach ( (array) $filelist as $filename => $filemeta ) {
-				$this->chmod( $file . '/' . $filename, $mode, $recursive );
+			foreach ((array) $filelist as $filename => $filemeta) {
+				$this->chmod($file . '/' . $filename, $mode, $recursive);
 			}
 		}
 
 		// chmod the file or directory.
-		if ( ! function_exists( 'ftp_chmod' ) ) {
-			return (bool) ftp_site( $this->link, sprintf( 'CHMOD %o %s', $mode, $file ) );
+		if (!function_exists('ftp_chmod')) {
+			return (bool) ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
 		}
 
-		return (bool) ftp_chmod( $this->link, $mode, $file );
+		return (bool) ftp_chmod($this->link, $mode, $file);
 	}
 
 	/**
@@ -296,10 +296,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|false Username of the owner on success, false on failure.
 	 */
-	public function owner( $file ) {
-		$dir = $this->dirlist( $file );
+	public function owner($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['owner'];
+		return $dir[$file]['owner'];
 	}
 
 	/**
@@ -310,10 +310,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string Mode of the file (the last 3 digits).
 	 */
-	public function getchmod( $file ) {
-		$dir = $this->dirlist( $file );
+	public function getchmod($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['permsn'];
+		return $dir[$file]['permsn'];
 	}
 
 	/**
@@ -324,10 +324,10 @@ 
 	 * @param string $file Path to the file.
 	 * @return string|false The group on success, false on failure.
 	 */
-	public function group( $file ) {
-		$dir = $this->dirlist( $file );
+	public function group($file) {
+		$dir = $this->dirlist($file);
 
-		return $dir[ $file ]['group'];
+		return $dir[$file]['group'];
 	}
 
 	/**
@@ -343,18 +343,18 @@ 
 	 *                               0755 for dirs. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
-		if ( ! $overwrite && $this->exists( $destination ) ) {
+	public function copy($source, $destination, $overwrite = false, $mode = false) {
+		if (!$overwrite && $this->exists($destination)) {
 			return false;
 		}
 
-		$content = $this->get_contents( $source );
+		$content = $this->get_contents($source);
 
-		if ( false === $content ) {
+		if (false === $content) {
 			return false;
 		}
 
-		return $this->put_contents( $destination, $content, $mode );
+		return $this->put_contents($destination, $content, $mode);
 	}
 
 	/**
@@ -368,8 +368,8 @@ 
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function move( $source, $destination, $overwrite = false ) {
-		return ftp_rename( $this->link, $source, $destination );
+	public function move($source, $destination, $overwrite = false) {
+		return ftp_rename($this->link, $source, $destination);
 	}
 
 	/**
@@ -384,28 +384,28 @@ 
 	 *                                Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function delete( $file, $recursive = false, $type = false ) {
-		if ( empty( $file ) ) {
+	public function delete($file, $recursive = false, $type = false) {
+		if (empty($file)) {
 			return false;
 		}
 
-		if ( 'f' === $type || $this->is_file( $file ) ) {
-			return ftp_delete( $this->link, $file );
+		if ('f' === $type || $this->is_file($file)) {
+			return ftp_delete($this->link, $file);
 		}
 
-		if ( ! $recursive ) {
-			return ftp_rmdir( $this->link, $file );
+		if (!$recursive) {
+			return ftp_rmdir($this->link, $file);
 		}
 
-		$filelist = $this->dirlist( trailingslashit( $file ) );
+		$filelist = $this->dirlist(trailingslashit($file));
 
-		if ( ! empty( $filelist ) ) {
-			foreach ( $filelist as $delete_file ) {
-				$this->delete( trailingslashit( $file ) . $delete_file['name'], $recursive, $delete_file['type'] );
+		if (!empty($filelist)) {
+			foreach ($filelist as $delete_file) {
+				$this->delete(trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type']);
 			}
 		}
 
-		return ftp_rmdir( $this->link, $file );
+		return ftp_rmdir($this->link, $file);
 	}
 
 	/**
@@ -416,14 +416,14 @@ 
 	 * @param string $file Path to file or directory.
 	 * @return bool Whether $file exists or not.
 	 */
-	public function exists( $file ) {
-		$list = ftp_nlist( $this->link, $file );
+	public function exists($file) {
+		$list = ftp_nlist($this->link, $file);
 
-		if ( empty( $list ) && $this->is_dir( $file ) ) {
+		if (empty($list) && $this->is_dir($file)) {
 			return true; // File is an empty directory.
 		}
 
-		return ! empty( $list ); // Empty list = no file, so invert.
+		return !empty($list); // Empty list = no file, so invert.
 	}
 
 	/**
@@ -434,8 +434,8 @@ 
 	 * @param string $file File path.
 	 * @return bool Whether $file is a file.
 	 */
-	public function is_file( $file ) {
-		return $this->exists( $file ) && ! $this->is_dir( $file );
+	public function is_file($file) {
+		return $this->exists($file) && !$this->is_dir($file);
 	}
 
 	/**
@@ -446,12 +446,12 @@ 
 	 * @param string $path Directory path.
 	 * @return bool Whether $path is a directory.
 	 */
-	public function is_dir( $path ) {
+	public function is_dir($path) {
 		$cwd    = $this->cwd();
-		$result = @ftp_chdir( $this->link, trailingslashit( $path ) );
+		$result = @ftp_chdir($this->link, trailingslashit($path));
 
-		if ( $result && $path === $this->cwd() || $this->cwd() !== $cwd ) {
-			@ftp_chdir( $this->link, $cwd );
+		if ($result && $path === $this->cwd() || $this->cwd() !== $cwd) {
+			@ftp_chdir($this->link, $cwd);
 			return true;
 		}
 
@@ -466,7 +466,7 @@ 
 	 * @param string $file Path to file.
 	 * @return bool Whether $file is readable.
 	 */
-	public function is_readable( $file ) {
+	public function is_readable($file) {
 		return true;
 	}
 
@@ -478,7 +478,7 @@ 
 	 * @param string $file Path to file or directory.
 	 * @return bool Whether $file is writable.
 	 */
-	public function is_writable( $file ) {
+	public function is_writable($file) {
 		return true;
 	}
 
@@ -490,7 +490,7 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Unix timestamp representing last access time, false on failure.
 	 */
-	public function atime( $file ) {
+	public function atime($file) {
 		return false;
 	}
 
@@ -502,8 +502,8 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Unix timestamp representing modification time, false on failure.
 	 */
-	public function mtime( $file ) {
-		return ftp_mdtm( $this->link, $file );
+	public function mtime($file) {
+		return ftp_mdtm($this->link, $file);
 	}
 
 	/**
@@ -514,8 +514,8 @@ 
 	 * @param string $file Path to file.
 	 * @return int|false Size of the file in bytes on success, false on failure.
 	 */
-	public function size( $file ) {
-		return ftp_size( $this->link, $file );
+	public function size($file) {
+		return ftp_size($this->link, $file);
 	}
 
 	/**
@@ -532,7 +532,7 @@ 
 	 *                      Default 0.
 	 * @return bool True on success, false on failure.
 	 */
-	public function touch( $file, $time = 0, $atime = 0 ) {
+	public function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 
@@ -550,18 +550,18 @@ 
 	 *                                Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
-		$path = untrailingslashit( $path );
+	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+		$path = untrailingslashit($path);
 
-		if ( empty( $path ) ) {
+		if (empty($path)) {
 			return false;
 		}
 
-		if ( ! ftp_mkdir( $this->link, $path ) ) {
+		if (!ftp_mkdir($this->link, $path)) {
 			return false;
 		}
 
-		$this->chmod( $path, $chmod );
+		$this->chmod($path, $chmod);
 
 		return true;
 	}
@@ -576,33 +576,33 @@ 
 	 *                          Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function rmdir( $path, $recursive = false ) {
-		return $this->delete( $path, $recursive );
+	public function rmdir($path, $recursive = false) {
+		return $this->delete($path, $recursive);
 	}
 
 	/**
 	 * @param string $line
 	 * @return array
 	 */
-	public function parselisting( $line ) {
+	public function parselisting($line) {
 		static $is_windows = null;
 
-		if ( is_null( $is_windows ) ) {
-			$is_windows = stripos( ftp_systype( $this->link ), 'win' ) !== false;
+		if (is_null($is_windows)) {
+			$is_windows = stripos(ftp_systype($this->link), 'win') !== false;
 		}
 
-		if ( $is_windows && preg_match( '/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer ) ) {
+		if ($is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer)) {
 			$b = array();
 
-			if ( $lucifer[3] < 70 ) {
+			if ($lucifer[3] < 70) {
 				$lucifer[3] += 2000;
 			} else {
 				$lucifer[3] += 1900; // 4-digit year fix.
 			}
 
-			$b['isdir'] = ( '<DIR>' === $lucifer[7] );
+			$b['isdir'] = ('<DIR>' === $lucifer[7]);
 
-			if ( $b['isdir'] ) {
+			if ($b['isdir']) {
 				$b['type'] = 'd';
 			} else {
 				$b['type'] = 'f';
@@ -614,17 +614,17 @@ 
 			$b['year']   = $lucifer[3];
 			$b['hour']   = $lucifer[4];
 			$b['minute'] = $lucifer[5];
-			$b['time']   = mktime( $lucifer[4] + ( strcasecmp( $lucifer[6], 'PM' ) === 0 ? 12 : 0 ), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3] );
+			$b['time']   = mktime($lucifer[4] + (strcasecmp($lucifer[6], 'PM') === 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm']  = $lucifer[6];
 			$b['name']   = $lucifer[8];
-		} elseif ( ! $is_windows ) {
-			$lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY );
+		} elseif (!$is_windows) {
+			$lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY);
 
-			if ( $lucifer ) {
+			if ($lucifer) {
 				// echo $line."\n";
-				$lcount = count( $lucifer );
+				$lcount = count($lucifer);
 
-				if ( $lcount < 8 ) {
+				if ($lcount < 8) {
 					return '';
 				}
 
@@ -632,33 +632,33 @@ 
 				$b['isdir']  = 'd' === $lucifer[0][0];
 				$b['islink'] = 'l' === $lucifer[0][0];
 
-				if ( $b['isdir'] ) {
+				if ($b['isdir']) {
 					$b['type'] = 'd';
-				} elseif ( $b['islink'] ) {
+				} elseif ($b['islink']) {
 					$b['type'] = 'l';
 				} else {
 					$b['type'] = 'f';
 				}
 
 				$b['perms']  = $lucifer[0];
-				$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
+				$b['permsn'] = $this->getnumchmodfromh($b['perms']);
 				$b['number'] = $lucifer[1];
 				$b['owner']  = $lucifer[2];
 				$b['group']  = $lucifer[3];
 				$b['size']   = $lucifer[4];
 
-				if ( 8 === $lcount ) {
-					sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
-					sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
+				if (8 === $lcount) {
+					sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
+					sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
 
-					$b['time'] = mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
+					$b['time'] = mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
 					$b['name'] = $lucifer[7];
 				} else {
 					$b['month'] = $lucifer[5];
 					$b['day']   = $lucifer[6];
 
-					if ( preg_match( '/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2 ) ) {
-						$b['year']   = gmdate( 'Y' );
+					if (preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2)) {
+						$b['year']   = gmdate('Y');
 						$b['hour']   = $l2[1];
 						$b['minute'] = $l2[2];
 					} else {
@@ -667,15 +667,15 @@ 
 						$b['minute'] = 0;
 					}
 
-					$b['time'] = strtotime( sprintf( '%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute'] ) );
+					$b['time'] = strtotime(sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']));
 					$b['name'] = $lucifer[8];
 				}
 			}
 		}
 
 		// Replace symlinks formatted as "source -> target" with just the source name.
-		if ( isset( $b['islink'] ) && $b['islink'] ) {
-			$b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+		if (isset($b['islink']) && $b['islink']) {
+			$b['name'] = preg_replace('/(\s*->\s*.*)$/', '', $b['name']);
 		}
 
 		return $b;
@@ -706,64 +706,64 @@ 
 	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
 	 * }
 	 */
-	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
-		if ( $this->is_file( $path ) ) {
-			$limit_file = basename( $path );
-			$path       = dirname( $path ) . '/';
+	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+		if ($this->is_file($path)) {
+			$limit_file = basename($path);
+			$path       = dirname($path) . '/';
 		} else {
 			$limit_file = false;
 		}
 
-		$pwd = ftp_pwd( $this->link );
+		$pwd = ftp_pwd($this->link);
 
-		if ( ! @ftp_chdir( $this->link, $path ) ) { // Can't change to folder = folder doesn't exist.
+		if (!@ftp_chdir($this->link, $path)) { // Can't change to folder = folder doesn't exist.
 			return false;
 		}
 
-		$list = ftp_rawlist( $this->link, '-a', false );
+		$list = ftp_rawlist($this->link, '-a', false);
 
-		@ftp_chdir( $this->link, $pwd );
+		@ftp_chdir($this->link, $pwd);
 
-		if ( empty( $list ) ) { // Empty array = non-existent folder (real folder will show . at least).
+		if (empty($list)) { // Empty array = non-existent folder (real folder will show . at least).
 			return false;
 		}
 
 		$dirlist = array();
 
-		foreach ( $list as $k => $v ) {
-			$entry = $this->parselisting( $v );
+		foreach ($list as $k => $v) {
+			$entry = $this->parselisting($v);
 
-			if ( empty( $entry ) ) {
+			if (empty($entry)) {
 				continue;
 			}
 
-			if ( '.' === $entry['name'] || '..' === $entry['name'] ) {
+			if ('.' === $entry['name'] || '..' === $entry['name']) {
 				continue;
 			}
 
-			if ( ! $include_hidden && '.' === $entry['name'][0] ) {
+			if (!$include_hidden && '.' === $entry['name'][0]) {
 				continue;
 			}
 
-			if ( $limit_file && $entry['name'] !== $limit_file ) {
+			if ($limit_file && $entry['name'] !== $limit_file) {
 				continue;
 			}
 
-			$dirlist[ $entry['name'] ] = $entry;
+			$dirlist[$entry['name']] = $entry;
 		}
 
 		$ret = array();
 
-		foreach ( (array) $dirlist as $struc ) {
-			if ( 'd' === $struc['type'] ) {
-				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+		foreach ((array) $dirlist as $struc) {
+			if ('d' === $struc['type']) {
+				if ($recursive) {
+					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
 				} else {
 					$struc['files'] = array();
 				}
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 
 		return $ret;
@@ -775,8 +775,8 @@ 
 	 * @since 2.5.0
 	 */
 	public function __destruct() {
-		if ( $this->link ) {
-			ftp_close( $this->link );
+		if ($this->link) {
+			ftp_close($this->link);
 		}
 	}
 }

brighty/wp-admin/includes/image-edit.php

Spacing +314 added lines, -314 removed lines

@@ -15,31 +15,31 @@ 
  * @param false|object $msg     Optional. Message to display for image editor updates or errors.
  *                              Default false.
  */
-function wp_image_editor( $post_id, $msg = false ) {
-	$nonce     = wp_create_nonce( "image_editor-$post_id" );
-	$meta      = wp_get_attachment_metadata( $post_id );
-	$thumb     = image_get_intermediate_size( $post_id, 'thumbnail' );
-	$sub_sizes = isset( $meta['sizes'] ) && is_array( $meta['sizes'] );
+function wp_image_editor($post_id, $msg = false) {
+	$nonce     = wp_create_nonce("image_editor-$post_id");
+	$meta      = wp_get_attachment_metadata($post_id);
+	$thumb     = image_get_intermediate_size($post_id, 'thumbnail');
+	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note      = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) ) {
-		$big = max( $meta['width'], $meta['height'] );
+	if (isset($meta['width'], $meta['height'])) {
+		$big = max($meta['width'], $meta['height']);
 	} else {
-		die( __( 'Image data does not exist. Please re-upload the image.' ) );
+		die(__('Image data does not exist. Please re-upload the image.'));
 	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
-	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$can_restore  = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
-		$can_restore = wp_basename( $meta['file'] ) !== $backup_sizes['full-orig']['file'];
+	if (!empty($backup_sizes) && isset($backup_sizes['full-orig'], $meta['file'])) {
+		$can_restore = wp_basename($meta['file']) !== $backup_sizes['full-orig']['file'];
 	}
 
-	if ( $msg ) {
-		if ( isset( $msg->error ) ) {
+	if ($msg) {
+		if (isset($msg->error)) {
 			$note = "<div class='notice notice-error' tabindex='-1' role='alert'><p>$msg->error</p></div>";
-		} elseif ( isset( $msg->msg ) ) {
+		} elseif (isset($msg->msg)) {
 			$note = "<div class='notice notice-success' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
 		}
 	}
@@ -51,7 +51,7 @@ 
 	 *
 	 * @param bool|string[] $edit_custom_sizes True if custom sizes can be edited or array of custom size names.
 	 */
-	$edit_custom_sizes = apply_filters( 'edit_custom_thumbnail_sizes', $edit_custom_sizes );
+	$edit_custom_sizes = apply_filters('edit_custom_thumbnail_sizes', $edit_custom_sizes);
 	?>
 	<div class="imgedit-wrap wp-clearfix">
 	<div id="imgedit-panel-<?php echo $post_id; ?>">
@@ -59,34 +59,34 @@ 
 	<div class="imgedit-panel-content wp-clearfix">
 		<?php echo $note; ?>
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this )" class="imgedit-crop button disabled" disabled><?php esc_html_e( 'Crop' ); ?></button>
+			<button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this )" class="imgedit-crop button disabled" disabled><?php esc_html_e('Crop'); ?></button>
 			<?php
 
 			// On some setups GD library does not provide imagerotate() - Ticket #11536.
-			if ( wp_image_editor_supports(
+			if (wp_image_editor_supports(
 				array(
-					'mime_type' => get_post_mime_type( $post_id ),
-					'methods'   => array( 'rotate' ),
+					'mime_type' => get_post_mime_type($post_id),
+					'methods'   => array('rotate'),
 				)
-			) ) {
+			)) {
 				$note_no_rotate = '';
 				?>
-				<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate left' ); ?></button>
-				<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate right' ); ?></button>
+				<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e('Rotate left'); ?></button>
+				<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e('Rotate right'); ?></button>
 				<?php
 			} else {
-				$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
+				$note_no_rotate = '<p class="note-no-rotate"><em>' . __('Image rotation is not supported by your web host.') . '</em></p>';
 				?>
 				<button type="button" class="imgedit-rleft button disabled" disabled></button>
 				<button type="button" class="imgedit-rright button disabled" disabled></button>
 			<?php } ?>
 
-			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button>
-			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button>
+			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e('Flip vertical'); ?></button>
+			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e('Flip horizontal'); ?></button>
 
 			<br class="imgedit-undo-redo-separator" />
-			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><?php esc_html_e( 'Undo' ); ?></button>
-			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><?php esc_html_e( 'Redo' ); ?></button>
+			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><?php esc_html_e('Undo'); ?></button>
+			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><?php esc_html_e('Redo'); ?></button>
 			<?php echo $note_no_rotate; ?>
 		</div>
 
@@ -94,34 +94,34 @@ 
 		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
 		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
 		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
+		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
 		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')"
-			src="<?php echo esc_url( admin_url( 'admin-ajax.php', 'relative' ) ) . '?action=imgedit-preview&amp;_ajax_nonce=' . $nonce . '&amp;postid=' . $post_id . '&amp;rand=' . rand( 1, 99999 ); ?>" alt="" />
+			src="<?php echo esc_url(admin_url('admin-ajax.php', 'relative')) . '?action=imgedit-preview&amp;_ajax_nonce=' . $nonce . '&amp;postid=' . $post_id . '&amp;rand=' . rand(1, 99999); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e('Cancel'); ?>" />
+			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e('Save'); ?>" />
 		</div>
 	</div>
 
 	<div class="imgedit-settings">
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Scale Image' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
+		<h2><?php _e('Scale Image'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Scale Image Help'); ?></span></button>
 		<div class="imgedit-help">
-		<p><?php _e( 'You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.' ); ?></p>
+		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
+		<?php if (isset($meta['width'], $meta['height'])) : ?>
 		<p>
 			<?php
 			printf(
 				/* translators: %s: Image width and height in pixels. */
-				__( 'Original dimensions %s' ),
+				__('Original dimensions %s'),
 				'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
 			);
 			?>
@@ -130,15 +130,15 @@ 
 		<div class="imgedit-submit">
 
 		<fieldset class="imgedit-scale">
-		<legend><?php _e( 'New dimensions:' ); ?></legend>
+		<legend><?php _e('New dimensions:'); ?></legend>
 		<div class="nowrap">
-		<label for="imgedit-scale-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale width' ); ?></label>
-		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+		<label for="imgedit-scale-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('scale width'); ?></label>
+		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
 		<span class="imgedit-separator" aria-hidden="true">&times;</span>
-		<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
-		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('scale height'); ?></label>
+		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
+		<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e('Scale'); ?>" /></div>
 		</div>
 		</fieldset>
 
@@ -146,23 +146,23 @@ 
 	</div>
 	</div>
 
-	<?php if ( $can_restore ) { ?>
+	<?php if ($can_restore) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link" aria-expanded="false"><?php _e( 'Restore original image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link" aria-expanded="false"><?php _e('Restore original image'); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
 		<div class="imgedit-help imgedit-restore">
 		<p>
 			<?php
-			_e( 'Discard any changes and restore the original image.' );
+			_e('Discard any changes and restore the original image.');
 
-			if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
-				echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+			if (!defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE) {
+				echo ' ' . __('Previously edited copies of the image will not be deleted.');
 			}
 			?>
 		</p>
 		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e('Restore image'); ?>" <?php echo $can_restore; ?> />
 		</div>
 		</div>
 	</div>
@@ -172,38 +172,38 @@ 
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Image Crop' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+		<h2><?php _e('Image Crop'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Image Crop Help'); ?></span></button>
 
 		<div class="imgedit-help">
-		<p><?php _e( 'To crop the image, click on it and drag to make your selection.' ); ?></p>
+		<p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
 
-		<p><strong><?php _e( 'Crop Aspect Ratio' ); ?></strong><br />
-		<?php _e( 'The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.' ); ?></p>
+		<p><strong><?php _e('Crop Aspect Ratio'); ?></strong><br />
+		<?php _e('The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.'); ?></p>
 
-		<p><strong><?php _e( 'Crop Selection' ); ?></strong><br />
-		<?php _e( 'Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.' ); ?></p>
+		<p><strong><?php _e('Crop Selection'); ?></strong><br />
+		<?php _e('Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.'); ?></p>
 		</div>
 	</div>
 
 	<fieldset class="imgedit-crop-ratio">
-		<legend><?php _e( 'Aspect ratio:' ); ?></legend>
+		<legend><?php _e('Aspect ratio:'); ?></legend>
 		<div class="nowrap">
-		<label for="imgedit-crop-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></label>
+		<label for="imgedit-crop-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('crop ratio width'); ?></label>
 		<input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
 		<span class="imgedit-separator" aria-hidden="true">:</span>
-		<label for="imgedit-crop-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></label>
+		<label for="imgedit-crop-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('crop ratio height'); ?></label>
 		<input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
 		</div>
 	</fieldset>
 
 	<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
-		<legend><?php _e( 'Selection:' ); ?></legend>
+		<legend><?php _e('Selection:'); ?></legend>
 		<div class="nowrap">
-		<label for="imgedit-sel-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection width' ); ?></label>
+		<label for="imgedit-sel-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('selection width'); ?></label>
 		<input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		<span class="imgedit-separator" aria-hidden="true">&times;</span>
-		<label for="imgedit-sel-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection height' ); ?></label>
+		<label for="imgedit-sel-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e('selection height'); ?></label>
 		<input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
 		</div>
 	</fieldset>
@@ -211,56 +211,56 @@ 
 	</div>
 
 	<?php
-	if ( $thumb && $sub_sizes ) {
-		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+	if ($thumb && $sub_sizes) {
+		$thumb_img = wp_constrain_dimensions($thumb['width'], $thumb['height'], 160, 120);
 		?>
 
 	<div class="imgedit-group imgedit-applyto">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+		<h2><?php _e('Thumbnail Settings'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Thumbnail Settings Help'); ?></span></button>
 		<div class="imgedit-help">
-		<p><?php _e( 'You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.' ); ?></p>
+		<p><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
 		</div>
 	</div>
 
 	<figure class="imgedit-thumbnail-preview">
 		<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
-		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e('Current thumbnail'); ?></figcaption>
 	</figure>
 
 	<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
 	<fieldset>
-		<legend><?php _e( 'Apply changes to:' ); ?></legend>
+		<legend><?php _e('Apply changes to:'); ?></legend>
 
 		<span class="imgedit-label">
 			<input type="radio" id="imgedit-target-all" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
-			<label for="imgedit-target-all"><?php _e( 'All image sizes' ); ?></label>
+			<label for="imgedit-target-all"><?php _e('All image sizes'); ?></label>
 		</span>
 
 		<span class="imgedit-label">
 			<input type="radio" id="imgedit-target-thumbnail" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
-			<label for="imgedit-target-thumbnail"><?php _e( 'Thumbnail' ); ?></label>
+			<label for="imgedit-target-thumbnail"><?php _e('Thumbnail'); ?></label>
 		</span>
 
 		<span class="imgedit-label">
 			<input type="radio" id="imgedit-target-nothumb" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
-			<label for="imgedit-target-nothumb"><?php _e( 'All sizes except thumbnail' ); ?></label>
+			<label for="imgedit-target-nothumb"><?php _e('All sizes except thumbnail'); ?></label>
 		</span>
 		<?php
-		if ( $edit_custom_sizes ) {
-			if ( ! is_array( $edit_custom_sizes ) ) {
+		if ($edit_custom_sizes) {
+			if (!is_array($edit_custom_sizes)) {
 				$edit_custom_sizes = get_intermediate_image_sizes();
 			}
-			foreach ( array_unique( $edit_custom_sizes ) as $key => $size ) {
-				if ( array_key_exists( $size, $meta['sizes'] ) ) {
-					if ( 'thumbnail' === $size ) {
+			foreach (array_unique($edit_custom_sizes) as $key => $size) {
+				if (array_key_exists($size, $meta['sizes'])) {
+					if ('thumbnail' === $size) {
 						continue;
 					}
 					?>
 					<span class="imgedit-label">
-						<input type="radio" id="imgedit-target-custom<?php echo esc_attr( $key ); ?>" name="imgedit-target-<?php echo $post_id; ?>" value="<?php echo esc_attr( $size ); ?>" />
-						<label for="imgedit-target-custom<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $size ); ?></label>
+						<input type="radio" id="imgedit-target-custom<?php echo esc_attr($key); ?>" name="imgedit-target-<?php echo $post_id; ?>" value="<?php echo esc_attr($size); ?>" />
+						<label for="imgedit-target-custom<?php echo esc_attr($key); ?>"><?php echo esc_html($size); ?></label>
 					</span>
 					<?php
 				}
@@ -277,7 +277,7 @@ 
 
 	</div>
 	<div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
-	<div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e( "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." ); ?></div>
+	<div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
 	</div>
 	<?php
 }
@@ -292,8 +292,8 @@ 
  * @param int             $attachment_id The image's attachment post ID.
  * @return bool True on success, false on failure.
  */
-function wp_stream_image( $image, $mime_type, $attachment_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_stream_image($image, $mime_type, $attachment_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance for the image to be streamed to the browser.
@@ -303,16 +303,16 @@ 
 		 * @param WP_Image_Editor $image         The image editor instance.
 		 * @param int             $attachment_id The attachment post ID.
 		 */
-		$image = apply_filters( 'image_editor_save_pre', $image, $attachment_id );
+		$image = apply_filters('image_editor_save_pre', $image, $attachment_id);
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
+		if (is_wp_error($image->stream($mime_type))) {
 			return false;
 		}
 
 		return true;
 	} else {
 		/* translators: 1: $image, 2: WP_Image_Editor */
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('%1$s needs to be a %2$s object.'), '$image', 'WP_Image_Editor'));
 
 		/**
 		 * Filters the GD image resource to be streamed to the browser.
@@ -323,22 +323,22 @@ 
 		 * @param resource|GdImage $image         Image resource to be streamed.
 		 * @param int              $attachment_id The attachment post ID.
 		 */
-		$image = apply_filters_deprecated( 'image_save_pre', array( $image, $attachment_id ), '3.5.0', 'image_editor_save_pre' );
+		$image = apply_filters_deprecated('image_save_pre', array($image, $attachment_id), '3.5.0', 'image_editor_save_pre');
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $image, null, 90 );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($image, null, 90);
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $image );
+				header('Content-Type: image/png');
+				return imagepng($image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $image );
+				header('Content-Type: image/gif');
+				return imagegif($image);
 			case 'image/webp':
-				if ( function_exists( 'imagewebp' ) ) {
-					header( 'Content-Type: image/webp' );
-					return imagewebp( $image, null, 90 );
+				if (function_exists('imagewebp')) {
+					header('Content-Type: image/webp');
+					return imagewebp($image, null, 90);
 				}
 				return false;
 			default:
@@ -358,11 +358,11 @@ 
  * @param int             $post_id   Attachment post ID.
  * @return bool True on success, false on failure.
  */
-function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -378,19 +378,19 @@ 
 		 * @param string          $mime_type The mime type of the image.
 		 * @param int             $post_id   Attachment post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved ) {
+		if (null !== $saved) {
 			return $saved;
 		}
 
-		return $image->save( $filename, $mime_type );
+		return $image->save($filename, $mime_type);
 	} else {
 		/* translators: 1: $image, 2: WP_Image_Editor */
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('%1$s needs to be a %2$s object.'), '$image', 'WP_Image_Editor'));
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters_deprecated( 'image_save_pre', array( $image, $post_id ), '3.5.0', 'image_editor_save_pre' );
+		$image = apply_filters_deprecated('image_save_pre', array($image, $post_id), '3.5.0', 'image_editor_save_pre');
 
 		/**
 		 * Filters whether to skip saving the image file.
@@ -409,26 +409,26 @@ 
 		 */
 		$saved = apply_filters_deprecated(
 			'wp_save_image_file',
-			array( null, $filename, $image, $mime_type, $post_id ),
+			array(null, $filename, $image, $mime_type, $post_id),
 			'3.5.0',
 			'wp_save_image_editor_file'
 		);
 
-		if ( null !== $saved ) {
+		if (null !== $saved) {
 			return $saved;
 		}
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
-				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+				return imagejpeg($image, $filename, apply_filters('jpeg_quality', 90, 'edit_image'));
 			case 'image/png':
-				return imagepng( $image, $filename );
+				return imagepng($image, $filename);
 			case 'image/gif':
-				return imagegif( $image, $filename );
+				return imagegif($image, $filename);
 			case 'image/webp':
-				if ( function_exists( 'imagewebp' ) ) {
-					return imagewebp( $image, $filename );
+				if (function_exists('imagewebp')) {
+					return imagewebp($image, $filename);
 				}
 				return false;
 			default:
@@ -447,9 +447,9 @@ 
  * @param int $h Image height in pixels.
  * @return float|int Image preview ratio.
  */
-function _image_get_preview_ratio( $w, $h ) {
-	$max = max( $w, $h );
-	return $max > 400 ? ( 400 / $max ) : 1;
+function _image_get_preview_ratio($w, $h) {
+	$max = max($w, $h);
+	return $max > 400 ? (400 / $max) : 1;
 }
 
 /**
@@ -464,14 +464,14 @@ 
  * @param float|int         $angle Image rotation angle, in degrees.
  * @return resource|GdImage|false GD image resource or GdImage instance, false otherwise.
  */
-function _rotate_image_resource( $img, $angle ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()' );
+function _rotate_image_resource($img, $angle) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()');
 
-	if ( function_exists( 'imagerotate' ) ) {
-		$rotated = imagerotate( $img, $angle, 0 );
+	if (function_exists('imagerotate')) {
+		$rotated = imagerotate($img, $angle, 0);
 
-		if ( is_gd_image( $rotated ) ) {
-			imagedestroy( $img );
+		if (is_gd_image($rotated)) {
+			imagedestroy($img);
 			$img = $rotated;
 		}
 	}
@@ -492,21 +492,21 @@ 
  * @param bool             $vert Whether to flip vertically.
  * @return resource|GdImage (maybe) flipped image resource or GdImage instance.
  */
-function _flip_image_resource( $img, $horz, $vert ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()' );
+function _flip_image_resource($img, $horz, $vert) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()');
 
-	$w   = imagesx( $img );
-	$h   = imagesy( $img );
-	$dst = wp_imagecreatetruecolor( $w, $h );
+	$w   = imagesx($img);
+	$h   = imagesy($img);
+	$dst = wp_imagecreatetruecolor($w, $h);
 
-	if ( is_gd_image( $dst ) ) {
-		$sx = $vert ? ( $w - 1 ) : 0;
-		$sy = $horz ? ( $h - 1 ) : 0;
+	if (is_gd_image($dst)) {
+		$sx = $vert ? ($w - 1) : 0;
+		$sy = $horz ? ($h - 1) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled( $dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-			imagedestroy( $img );
+		if (imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
+			imagedestroy($img);
 			$img = $dst;
 		}
 	}
@@ -527,12 +527,12 @@ 
  * @param float            $h   Source height.
  * @return resource|GdImage (maybe) cropped image resource or GdImage instance.
  */
-function _crop_image_resource( $img, $x, $y, $w, $h ) {
-	$dst = wp_imagecreatetruecolor( $w, $h );
+function _crop_image_resource($img, $x, $y, $w, $h) {
+	$dst = wp_imagecreatetruecolor($w, $h);
 
-	if ( is_gd_image( $dst ) ) {
-		if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
-			imagedestroy( $img );
+	if (is_gd_image($dst)) {
+		if (imagecopy($dst, $img, 0, 0, $x, $y, $w, $h)) {
+			imagedestroy($img);
 			$img = $dst;
 		}
 	}
@@ -549,61 +549,61 @@ 
  * @param array           $changes Array of change operations.
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
-function image_edit_apply_changes( $image, $changes ) {
-	if ( is_gd_image( $image ) ) {
+function image_edit_apply_changes($image, $changes) {
+	if (is_gd_image($image)) {
 		/* translators: 1: $image, 2: WP_Image_Editor */
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('%1$s needs to be a %2$s object.'), '$image', 'WP_Image_Editor'));
 	}
 
-	if ( ! is_array( $changes ) ) {
+	if (!is_array($changes)) {
 		return $image;
 	}
 
 	// Expand change operations.
-	foreach ( $changes as $key => $obj ) {
-		if ( isset( $obj->r ) ) {
+	foreach ($changes as $key => $obj) {
+		if (isset($obj->r)) {
 			$obj->type  = 'rotate';
 			$obj->angle = $obj->r;
-			unset( $obj->r );
-		} elseif ( isset( $obj->f ) ) {
+			unset($obj->r);
+		} elseif (isset($obj->f)) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
-			unset( $obj->f );
-		} elseif ( isset( $obj->c ) ) {
+			unset($obj->f);
+		} elseif (isset($obj->c)) {
 			$obj->type = 'crop';
 			$obj->sel  = $obj->c;
-			unset( $obj->c );
+			unset($obj->c);
 		}
-		$changes[ $key ] = $obj;
+		$changes[$key] = $obj;
 	}
 
 	// Combine operations.
-	if ( count( $changes ) > 1 ) {
-		$filtered = array( $changes[0] );
-		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
+	if (count($changes) > 1) {
+		$filtered = array($changes[0]);
+		for ($i = 0, $j = 1, $c = count($changes); $j < $c; $j++) {
 			$combined = false;
-			if ( $filtered[ $i ]->type == $changes[ $j ]->type ) {
-				switch ( $filtered[ $i ]->type ) {
+			if ($filtered[$i]->type == $changes[$j]->type) {
+				switch ($filtered[$i]->type) {
 					case 'rotate':
-						$filtered[ $i ]->angle += $changes[ $j ]->angle;
+						$filtered[$i]->angle += $changes[$j]->angle;
 						$combined               = true;
 						break;
 					case 'flip':
-						$filtered[ $i ]->axis ^= $changes[ $j ]->axis;
+						$filtered[$i]->axis ^= $changes[$j]->axis;
 						$combined              = true;
 						break;
 				}
 			}
-			if ( ! $combined ) {
-				$filtered[ ++$i ] = $changes[ $j ];
+			if (!$combined) {
+				$filtered[ ++$i] = $changes[$j];
 			}
 		}
 		$changes = $filtered;
-		unset( $filtered );
+		unset($filtered);
 	}
 
 	// Image resource before applying the changes.
-	if ( $image instanceof WP_Image_Editor ) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filters the WP_Image_Editor instance before applying changes to the image.
@@ -613,8 +613,8 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
 		 * @param array           $changes Array of change operations.
 		 */
-		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-	} elseif ( is_gd_image( $image ) ) {
+		$image = apply_filters('wp_image_editor_before_change', $image, $changes);
+	} elseif (is_gd_image($image)) {
 
 		/**
 		 * Filters the GD image resource before applying changes to the image.
@@ -625,42 +625,42 @@ 
 		 * @param resource|GdImage $image   GD image resource or GdImage instance.
 		 * @param array            $changes Array of change operations.
 		 */
-		$image = apply_filters_deprecated( 'image_edit_before_change', array( $image, $changes ), '3.5.0', 'wp_image_editor_before_change' );
+		$image = apply_filters_deprecated('image_edit_before_change', array($image, $changes), '3.5.0', 'wp_image_editor_before_change');
 	}
 
-	foreach ( $changes as $operation ) {
-		switch ( $operation->type ) {
+	foreach ($changes as $operation) {
+		switch ($operation->type) {
 			case 'rotate':
-				if ( 0 != $operation->angle ) {
-					if ( $image instanceof WP_Image_Editor ) {
-						$image->rotate( $operation->angle );
+				if (0 != $operation->angle) {
+					if ($image instanceof WP_Image_Editor) {
+						$image->rotate($operation->angle);
 					} else {
-						$image = _rotate_image_resource( $image, $operation->angle );
+						$image = _rotate_image_resource($image, $operation->angle);
 					}
 				}
 				break;
 			case 'flip':
-				if ( 0 != $operation->axis ) {
-					if ( $image instanceof WP_Image_Editor ) {
-						$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+				if (0 != $operation->axis) {
+					if ($image instanceof WP_Image_Editor) {
+						$image->flip(($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					} else {
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource($image, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					}
 				}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
-				if ( $image instanceof WP_Image_Editor ) {
+				if ($image instanceof WP_Image_Editor) {
 					$size = $image->get_size();
 					$w    = $size['width'];
 					$h    = $size['height'];
 
-					$scale = 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
-					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio($w, $h); // Discard preview scaling.
+					$image->crop($sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				} else {
-					$scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.
-					$image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio(imagesx($image), imagesy($image)); // Discard preview scaling.
+					$image = _crop_image_resource($image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				}
 				break;
 		}
@@ -679,20 +679,20 @@ 
  * @param int $post_id Attachment post ID.
  * @return bool True on success, false on failure.
  */
-function stream_preview_image( $post_id ) {
-	$post = get_post( $post_id );
+function stream_preview_image($post_id) {
+	$post = get_post($post_id);
 
-	wp_raise_memory_limit( 'admin' );
+	wp_raise_memory_limit('admin');
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id));
 
-	if ( is_wp_error( $img ) ) {
+	if (is_wp_error($img)) {
 		return false;
 	}
 
-	$changes = ! empty( $_REQUEST['history'] ) ? json_decode( wp_unslash( $_REQUEST['history'] ) ) : null;
-	if ( $changes ) {
-		$img = image_edit_apply_changes( $img, $changes );
+	$changes = !empty($_REQUEST['history']) ? json_decode(wp_unslash($_REQUEST['history'])) : null;
+	if ($changes) {
+		$img = image_edit_apply_changes($img, $changes);
 	}
 
 	// Scale the image.
@@ -700,15 +700,15 @@ 
 	$w    = $size['width'];
 	$h    = $size['height'];
 
-	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2    = max( 1, $w * $ratio );
-	$h2    = max( 1, $h * $ratio );
+	$ratio = _image_get_preview_ratio($w, $h);
+	$w2    = max(1, $w * $ratio);
+	$h2    = max(1, $h * $ratio);
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
+	if (is_wp_error($img->resize($w2, $h2))) {
 		return false;
 	}
 
-	return wp_stream_image( $img, $post->post_mime_type, $post_id );
+	return wp_stream_image($img, $post->post_mime_type, $post_id);
 }
 
 /**
@@ -719,35 +719,35 @@ 
  * @param int $post_id Attachment post ID.
  * @return stdClass Image restoration message object.
  */
-function wp_restore_image( $post_id ) {
-	$meta             = wp_get_attachment_metadata( $post_id );
-	$file             = get_attached_file( $post_id );
-	$backup_sizes     = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+function wp_restore_image($post_id) {
+	$meta             = wp_get_attachment_metadata($post_id);
+	$file             = get_attached_file($post_id);
+	$backup_sizes     = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$old_backup_sizes = $backup_sizes;
 	$restored         = false;
 	$msg              = new stdClass;
 
-	if ( ! is_array( $backup_sizes ) ) {
-		$msg->error = __( 'Cannot load image metadata.' );
+	if (!is_array($backup_sizes)) {
+		$msg->error = __('Cannot load image metadata.');
 		return $msg;
 	}
 
-	$parts         = pathinfo( $file );
-	$suffix        = time() . rand( 100, 999 );
+	$parts         = pathinfo($file);
+	$suffix        = time() . rand(100, 999);
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset( $backup_sizes['full-orig'] ) && is_array( $backup_sizes['full-orig'] ) ) {
+	if (isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig'])) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
+		if ($parts['basename'] != $data['file']) {
+			if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 				// Delete only if it's an edited image.
-				if ( preg_match( '/-e[0-9]{13}\./', $parts['basename'] ) ) {
-					wp_delete_file( $file );
+				if (preg_match('/-e[0-9]{13}\./', $parts['basename'])) {
+					wp_delete_file($file);
 				}
-			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
-				$backup_sizes[ "full-$suffix" ] = array(
+			} elseif (isset($meta['width'], $meta['height'])) {
+				$backup_sizes["full-$suffix"] = array(
 					'width'  => $meta['width'],
 					'height' => $meta['height'],
 					'file'   => $parts['basename'],
@@ -755,47 +755,47 @@ 
 			}
 		}
 
-		$restored_file = path_join( $parts['dirname'], $data['file'] );
-		$restored      = update_attached_file( $post_id, $restored_file );
+		$restored_file = path_join($parts['dirname'], $data['file']);
+		$restored      = update_attached_file($post_id, $restored_file);
 
-		$meta['file']   = _wp_relative_upload_path( $restored_file );
+		$meta['file']   = _wp_relative_upload_path($restored_file);
 		$meta['width']  = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
-	foreach ( $default_sizes as $default_size ) {
-		if ( isset( $backup_sizes[ "$default_size-orig" ] ) ) {
-			$data = $backup_sizes[ "$default_size-orig" ];
-			if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] != $data['file'] ) {
-				if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
+	foreach ($default_sizes as $default_size) {
+		if (isset($backup_sizes["$default_size-orig"])) {
+			$data = $backup_sizes["$default_size-orig"];
+			if (isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file']) {
+				if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 					// Delete only if it's an edited image.
-					if ( preg_match( '/-e[0-9]{13}-/', $meta['sizes'][ $default_size ]['file'] ) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][ $default_size ]['file'] );
-						wp_delete_file( $delete_file );
+					if (preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file'])) {
+						$delete_file = path_join($parts['dirname'], $meta['sizes'][$default_size]['file']);
+						wp_delete_file($delete_file);
 					}
 				} else {
-					$backup_sizes[ "$default_size-{$suffix}" ] = $meta['sizes'][ $default_size ];
+					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
 				}
 			}
 
-			$meta['sizes'][ $default_size ] = $data;
+			$meta['sizes'][$default_size] = $data;
 		} else {
-			unset( $meta['sizes'][ $default_size ] );
+			unset($meta['sizes'][$default_size]);
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+	if (!wp_update_attachment_metadata($post_id, $meta) ||
+		($old_backup_sizes !== $backup_sizes && !update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes))) {
 
-		$msg->error = __( 'Cannot save image metadata.' );
+		$msg->error = __('Cannot save image metadata.');
 		return $msg;
 	}
 
-	if ( ! $restored ) {
-		$msg->error = __( 'Image metadata is inconsistent.' );
+	if (!$restored) {
+		$msg->error = __('Image metadata is inconsistent.');
 	} else {
-		$msg->msg = __( 'Image restored successfully.' );
+		$msg->msg = __('Image restored successfully.');
 	}
 
 	return $msg;
@@ -810,7 +810,7 @@ 
  * @param int $post_id Attachment post ID.
  * @return stdClass
  */
-function wp_save_image( $post_id ) {
+function wp_save_image($post_id) {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
 	$return  = new stdClass;
@@ -818,83 +818,83 @@ 
 	$delete  = false;
 	$scaled  = false;
 	$nocrop  = false;
-	$post    = get_post( $post_id );
+	$post    = get_post($post_id);
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
-	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __( 'Unable to create new image.' ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id, 'full'));
+	if (is_wp_error($img)) {
+		$return->error = esc_js(__('Unable to create new image.'));
 		return $return;
 	}
 
-	$fwidth  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
-	$fheight = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
-	$target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
-	$scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
+	$fwidth  = !empty($_REQUEST['fwidth']) ? (int) $_REQUEST['fwidth'] : 0;
+	$fheight = !empty($_REQUEST['fheight']) ? (int) $_REQUEST['fheight'] : 0;
+	$target  = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
+	$scale   = !empty($_REQUEST['do']) && 'scale' === $_REQUEST['do'];
 
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+	if ($scale && $fwidth > 0 && $fheight > 0) {
 		$size = $img->get_size();
 		$sX   = $size['width'];
 		$sY   = $size['height'];
 
 		// Check if it has roughly the same w / h ratio.
-		$diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
+		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) ) {
+			if ($img->resize($fwidth, $fheight)) {
 				$scaled = true;
 			}
 		}
 
-		if ( ! $scaled ) {
-			$return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
+		if (!$scaled) {
+			$return->error = esc_js(__('Error while saving the scaled image. Please reload the page and try again.'));
 			return $return;
 		}
-	} elseif ( ! empty( $_REQUEST['history'] ) ) {
-		$changes = json_decode( wp_unslash( $_REQUEST['history'] ) );
-		if ( $changes ) {
-			$img = image_edit_apply_changes( $img, $changes );
+	} elseif (!empty($_REQUEST['history'])) {
+		$changes = json_decode(wp_unslash($_REQUEST['history']));
+		if ($changes) {
+			$img = image_edit_apply_changes($img, $changes);
 		}
 	} else {
-		$return->error = esc_js( __( 'Nothing to save, the image has not changed.' ) );
+		$return->error = esc_js(__('Nothing to save, the image has not changed.'));
 		return $return;
 	}
 
-	$meta         = wp_get_attachment_metadata( $post_id );
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
+	$meta         = wp_get_attachment_metadata($post_id);
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
 
-	if ( ! is_array( $meta ) ) {
-		$return->error = esc_js( __( 'Image data does not exist. Please re-upload the image.' ) );
+	if (!is_array($meta)) {
+		$return->error = esc_js(__('Image data does not exist. Please re-upload the image.'));
 		return $return;
 	}
 
-	if ( ! is_array( $backup_sizes ) ) {
+	if (!is_array($backup_sizes)) {
 		$backup_sizes = array();
 	}
 
 	// Generate new filename.
-	$path = get_attached_file( $post_id );
+	$path = get_attached_file($post_id);
 
-	$basename = pathinfo( $path, PATHINFO_BASENAME );
-	$dirname  = pathinfo( $path, PATHINFO_DIRNAME );
-	$ext      = pathinfo( $path, PATHINFO_EXTENSION );
-	$filename = pathinfo( $path, PATHINFO_FILENAME );
-	$suffix   = time() . rand( 100, 999 );
+	$basename = pathinfo($path, PATHINFO_BASENAME);
+	$dirname  = pathinfo($path, PATHINFO_DIRNAME);
+	$ext      = pathinfo($path, PATHINFO_EXTENSION);
+	$filename = pathinfo($path, PATHINFO_FILENAME);
+	$suffix   = time() . rand(100, 999);
 
-	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
-		isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
+		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename) {
 
-		if ( 'thumbnail' === $target ) {
+		if ('thumbnail' === $target) {
 			$new_path = "{$dirname}/{$filename}-temp.{$ext}";
 		} else {
 			$new_path = $path;
 		}
 	} else {
-		while ( true ) {
-			$filename     = preg_replace( '/-e([0-9]+)$/', '', $filename );
+		while (true) {
+			$filename     = preg_replace('/-e([0-9]+)$/', '', $filename);
 			$filename    .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$ext}";
 			$new_path     = "{$dirname}/$new_filename";
-			if ( file_exists( $new_path ) ) {
+			if (file_exists($new_path)) {
 				$suffix++;
 			} else {
 				break;
@@ -903,59 +903,59 @@ 
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( ! wp_save_image_file( $new_path, $img, $post->post_mime_type, $post_id ) ) {
-		$return->error = esc_js( __( 'Unable to save the image.' ) );
+	if (!wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id)) {
+		$return->error = esc_js(__('Unable to save the image.'));
 		return $return;
 	}
 
-	if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
+	if ('nothumb' === $target || 'all' === $target || 'full' === $target || $scaled) {
 		$tag = false;
-		if ( isset( $backup_sizes['full-orig'] ) ) {
-			if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
+		if (isset($backup_sizes['full-orig'])) {
+			if ((!defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE) && $backup_sizes['full-orig']['file'] !== $basename) {
 				$tag = "full-$suffix";
 			}
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag ) {
-			$backup_sizes[ $tag ] = array(
+		if ($tag) {
+			$backup_sizes[$tag] = array(
 				'width'  => $meta['width'],
 				'height' => $meta['height'],
 				'file'   => $basename,
 			);
 		}
-		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
+		$success = ($path === $new_path) || update_attached_file($post_id, $new_path);
 
-		$meta['file'] = _wp_relative_upload_path( $new_path );
+		$meta['file'] = _wp_relative_upload_path($new_path);
 
 		$size           = $img->get_size();
 		$meta['width']  = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success ) {
+		if ($success) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' === $target || 'all' === $target ) {
-				if ( 'nothumb' === $target ) {
-					$sizes = array_diff( $sizes, array( 'thumbnail' ) );
+			if ('nothumb' === $target || 'all' === $target) {
+				if ('nothumb' === $target) {
+					$sizes = array_diff($sizes, array('thumbnail'));
 				}
-			} elseif ( 'thumbnail' !== $target ) {
-				$sizes = array_diff( $sizes, array( $target ) );
+			} elseif ('thumbnail' !== $target) {
+				$sizes = array_diff($sizes, array($target));
 			}
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' === $target ) {
-		$sizes   = array( 'thumbnail' );
+	} elseif ('thumbnail' === $target) {
+		$sizes   = array('thumbnail');
 		$success = true;
 		$delete  = true;
 		$nocrop  = true;
 	} else {
-		$sizes   = array( $target );
+		$sizes   = array($target);
 		$success = true;
 		$delete  = true;
-		$nocrop  = $_wp_additional_image_sizes[ $size ]['crop'];
+		$nocrop  = $_wp_additional_image_sizes[$size]['crop'];
 	}
 
 	/*
@@ -964,70 +964,70 @@ 
 	 * keeping the new resized images from overwriting the existing image files.
 	 * https://core.trac.wordpress.org/ticket/32171
 	 */
-	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size ) {
-			if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
-				$delete_file = path_join( $dirname, $size['file'] );
-				wp_delete_file( $delete_file );
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE && !empty($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size) {
+			if (!empty($size['file']) && preg_match('/-e[0-9]{13}-/', $size['file'])) {
+				$delete_file = path_join($dirname, $size['file']);
+				wp_delete_file($delete_file);
 			}
 		}
 	}
 
-	if ( isset( $sizes ) ) {
+	if (isset($sizes)) {
 		$_sizes = array();
 
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$tag = false;
-			if ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( isset( $backup_sizes[ "$size-orig" ] ) ) {
-					if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes[ "$size-orig" ]['file'] != $meta['sizes'][ $size ]['file'] ) {
+			if (isset($meta['sizes'][$size])) {
+				if (isset($backup_sizes["$size-orig"])) {
+					if ((!defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file']) {
 						$tag = "$size-$suffix";
 					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag ) {
-					$backup_sizes[ $tag ] = $meta['sizes'][ $size ];
+				if ($tag) {
+					$backup_sizes[$tag] = $meta['sizes'][$size];
 				}
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = (int) $_wp_additional_image_sizes[ $size ]['width'];
-				$height = (int) $_wp_additional_image_sizes[ $size ]['height'];
-				$crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+			if (isset($_wp_additional_image_sizes[$size])) {
+				$width  = (int) $_wp_additional_image_sizes[$size]['width'];
+				$height = (int) $_wp_additional_image_sizes[$size]['height'];
+				$crop   = ($nocrop) ? false : $_wp_additional_image_sizes[$size]['crop'];
 			} else {
-				$height = get_option( "{$size}_size_h" );
-				$width  = get_option( "{$size}_size_w" );
-				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+				$height = get_option("{$size}_size_h");
+				$width  = get_option("{$size}_size_w");
+				$crop   = ($nocrop) ? false : get_option("{$size}_crop");
 			}
 
-			$_sizes[ $size ] = array(
+			$_sizes[$size] = array(
 				'width'  => $width,
 				'height' => $height,
 				'crop'   => $crop,
 			);
 		}
 
-		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
+		$meta['sizes'] = array_merge($meta['sizes'], $img->multi_resize($_sizes));
 	}
 
-	unset( $img );
+	unset($img);
 
-	if ( $success ) {
-		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes );
+	if ($success) {
+		wp_update_attachment_metadata($post_id, $meta);
+		update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-		if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
+		if ('thumbnail' === $target || 'all' === $target || 'full' === $target) {
 			// Check if it's an image edit from attachment edit screen.
-			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' === $_REQUEST['context'] ) {
-				$thumb_url         = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+			if (!empty($_REQUEST['context']) && 'edit-attachment' === $_REQUEST['context']) {
+				$thumb_url         = wp_get_attachment_image_src($post_id, array(900, 600), true);
 				$return->thumbnail = $thumb_url[0];
 			} else {
-				$file_url = wp_get_attachment_url( $post_id );
-				if ( ! empty( $meta['sizes']['thumbnail'] ) ) {
+				$file_url = wp_get_attachment_url($post_id);
+				if (!empty($meta['sizes']['thumbnail'])) {
 					$thumb             = $meta['sizes']['thumbnail'];
-					$return->thumbnail = path_join( dirname( $file_url ), $thumb['file'] );
+					$return->thumbnail = path_join(dirname($file_url), $thumb['file']);
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -1037,10 +1037,10 @@ 
 		$delete = true;
 	}
 
-	if ( $delete ) {
-		wp_delete_file( $new_path );
+	if ($delete) {
+		wp_delete_file($new_path);
 	}
 
-	$return->msg = esc_js( __( 'Image saved' ) );
+	$return->msg = esc_js(__('Image saved'));
 	return $return;
 }

brighty/wp-admin/includes/class-bulk-plugin-upgrader-skin.php

Spacing +15 added lines, -15 removed lines

@@ -21,22 +21,22 @@ 
 	public function add_strings() {
 		parent::add_strings();
 		/* translators: 1: Plugin name, 2: Number of the plugin, 3: Total number of plugins being updated. */
-		$this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
+		$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)');
 	}
 
 	/**
 	 * @param string $title
 	 */
-	public function before( $title = '' ) {
-		parent::before( $this->plugin_info['Title'] );
+	public function before($title = '') {
+		parent::before($this->plugin_info['Title']);
 	}
 
 	/**
 	 * @param string $title
 	 */
-	public function after( $title = '' ) {
-		parent::after( $this->plugin_info['Title'] );
-		$this->decrement_update_count( 'plugin' );
+	public function after($title = '') {
+		parent::after($this->plugin_info['Title']);
+		$this->decrement_update_count('plugin');
 	}
 
 	/**
@@ -47,18 +47,18 @@ 
 		$update_actions = array(
 			'plugins_page' => sprintf(
 				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'plugins.php' ),
-				__( 'Go to Plugins page' )
+				self_admin_url('plugins.php'),
+				__('Go to Plugins page')
 			),
 			'updates_page' => sprintf(
 				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'update-core.php' ),
-				__( 'Go to WordPress Updates page' )
+				self_admin_url('update-core.php'),
+				__('Go to WordPress Updates page')
 			),
 		);
 
-		if ( ! current_user_can( 'activate_plugins' ) ) {
-			unset( $update_actions['plugins_page'] );
+		if (!current_user_can('activate_plugins')) {
+			unset($update_actions['plugins_page']);
 		}
 
 		/**
@@ -69,10 +69,10 @@ 
 		 * @param string[] $update_actions Array of plugin action links.
 		 * @param array    $plugin_info    Array of information for the last-updated plugin.
 		 */
-		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+		$update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 
-		if ( ! empty( $update_actions ) ) {
-			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		if (!empty($update_actions)) {
+			$this->feedback(implode(' | ', (array) $update_actions));
 		}
 	}
 }