iqltechnologies / brighty

brighty/wp-admin/update-core.php

Spacing +366 added lines, -366 removed lines

@@ -9,18 +9,18 @@ 
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
 
-wp_enqueue_style( 'plugin-install' );
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_style('plugin-install');
+wp_enqueue_script('plugin-install');
+wp_enqueue_script('updates');
 add_thickbox();
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'update-core.php' ) );
+if (is_multisite() && !is_network_admin()) {
+	wp_redirect(network_admin_url('update-core.php'));
 	exit;
 }
 
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+if (!current_user_can('update_core') && !current_user_can('update_themes') && !current_user_can('update_plugins') && !current_user_can('update_languages')) {
+	wp_die(__('Sorry, you are not allowed to update this site.'));
 }
 
 /**
@@ -33,27 +33,27 @@ 
  *
  * @param object $update
  */
-function list_core_update( $update ) {
+function list_core_update($update) {
 	global $wp_local_package, $wpdb;
 	static $first_pass = true;
 
-	$wp_version     = get_bloginfo( 'version' );
-	$version_string = sprintf( '%s–%s', $update->current, get_locale() );
+	$wp_version     = get_bloginfo('version');
+	$version_string = sprintf('%s–%s', $update->current, get_locale());
 
-	if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
+	if ('en_US' === $update->locale && 'en_US' === get_locale()) {
 		$version_string = $update->current;
-	} elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
+	} elseif ('en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version) {
 		$updates = get_core_updates();
-		if ( $updates && 1 === count( $updates ) ) {
+		if ($updates && 1 === count($updates)) {
 			// If the only available update is a partial builds, it doesn't need a language-specific version string.
 			$version_string = $update->current;
 		}
-	} elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() ) {
-		$version_string = sprintf( '%s–%s', $update->current, $update->locale );
+	} elseif ('en_US' === $update->locale && 'en_US' !== get_locale()) {
+		$version_string = sprintf('%s–%s', $update->current, $update->locale);
 	}
 
 	$current = false;
-	if ( ! isset( $update->response ) || 'latest' === $update->response ) {
+	if (!isset($update->response) || 'latest' === $update->response) {
 		$current = true;
 	}
 
@@ -64,53 +64,53 @@ 
 	$show_buttons  = true;
 
 	// Nightly build versions have two hyphens and a commit number.
-	if ( preg_match( '/-\w+-\d+/', $update->current ) ) {
+	if (preg_match('/-\w+-\d+/', $update->current)) {
 		// Retrieve the major version number.
-		preg_match( '/^\d+.\d+/', $update->current, $update_major );
+		preg_match('/^\d+.\d+/', $update->current, $update_major);
 		/* translators: %s: WordPress version. */
-		$submit = sprintf( __( 'Update to latest %s nightly' ), $update_major[0] );
+		$submit = sprintf(__('Update to latest %s nightly'), $update_major[0]);
 	} else {
 		/* translators: %s: WordPress version. */
-		$submit = sprintf( __( 'Update to version %s' ), $version_string );
+		$submit = sprintf(__('Update to version %s'), $version_string);
 	}
 
-	if ( 'development' === $update->response ) {
-		$message = __( 'You can update to the latest nightly build manually:' );
+	if ('development' === $update->response) {
+		$message = __('You can update to the latest nightly build manually:');
 	} else {
-		if ( $current ) {
+		if ($current) {
 			/* translators: %s: WordPress version. */
-			$submit      = sprintf( __( 'Re-install version %s' ), $version_string );
+			$submit      = sprintf(__('Re-install version %s'), $version_string);
 			$form_action = 'update-core.php?action=do-core-reinstall';
 		} else {
-			$php_compat = version_compare( $php_version, $update->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+			$php_compat = version_compare($php_version, $update->php_version, '>=');
+			if (file_exists(WP_CONTENT_DIR . '/db.php') && empty($wpdb->is_mysql)) {
 				$mysql_compat = true;
 			} else {
-				$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
+				$mysql_compat = version_compare($mysql_version, $update->mysql_version, '>=');
 			}
 
 			$version_url = sprintf(
 				/* translators: %s: WordPress version. */
-				esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-				sanitize_title( $update->current )
+				esc_url(__('https://wordpress.org/support/wordpress-version/version-%s/')),
+				sanitize_title($update->current)
 			);
 
 			$php_update_message = '</p><p>' . sprintf(
 				/* translators: %s: URL to Update PHP page. */
-				__( '<a href="%s">Learn more about updating PHP</a>.' ),
-				esc_url( wp_get_update_php_url() )
+				__('<a href="%s">Learn more about updating PHP</a>.'),
+				esc_url(wp_get_update_php_url())
 			);
 
 			$annotation = wp_get_update_php_annotation();
 
-			if ( $annotation ) {
+			if ($annotation) {
 				$php_update_message .= '</p><p><em>' . $annotation . '</em>';
 			}
 
-			if ( ! $mysql_compat && ! $php_compat ) {
+			if (!$mysql_compat && !$php_compat) {
 				$message = sprintf(
 					/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number. */
-					__( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ),
+					__('You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.'),
 					$version_url,
 					$update->current,
 					$update->php_version,
@@ -118,19 +118,19 @@ 
 					$php_version,
 					$mysql_version
 				) . $php_update_message;
-			} elseif ( ! $php_compat ) {
+			} elseif (!$php_compat) {
 				$message = sprintf(
 					/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number. */
-					__( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ),
+					__('You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.'),
 					$version_url,
 					$update->current,
 					$update->php_version,
 					$php_version
 				) . $php_update_message;
-			} elseif ( ! $mysql_compat ) {
+			} elseif (!$mysql_compat) {
 				$message = sprintf(
 					/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number. */
-					__( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ),
+					__('You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.'),
 					$version_url,
 					$update->current,
 					$update->mysql_version,
@@ -139,14 +139,14 @@ 
 			} else {
 				$message = sprintf(
 					/* translators: 1: Installed WordPress version number, 2: URL to WordPress release notes, 3: New WordPress version number, including locale if necessary. */
-					__( 'You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> manually:' ),
+					__('You can update from WordPress %1$s to <a href="%2$s">WordPress %3$s</a> manually:'),
 					$wp_version,
 					$version_url,
 					$version_string
 				);
 			}
 
-			if ( ! $mysql_compat || ! $php_compat ) {
+			if (!$mysql_compat || !$php_compat) {
 				$show_buttons = false;
 			}
 		}
@@ -156,36 +156,36 @@ 
 	echo $message;
 	echo '</p>';
 
-	echo '<form method="post" action="' . esc_url( $form_action ) . '" name="upgrade" class="upgrade">';
-	wp_nonce_field( 'upgrade-core' );
+	echo '<form method="post" action="' . esc_url($form_action) . '" name="upgrade" class="upgrade">';
+	wp_nonce_field('upgrade-core');
 
 	echo '<p>';
-	echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden" />';
-	echo '<input name="locale" value="' . esc_attr( $update->locale ) . '" type="hidden" />';
-	if ( $show_buttons ) {
-		if ( $first_pass ) {
-			submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false );
+	echo '<input name="version" value="' . esc_attr($update->current) . '" type="hidden" />';
+	echo '<input name="locale" value="' . esc_attr($update->locale) . '" type="hidden" />';
+	if ($show_buttons) {
+		if ($first_pass) {
+			submit_button($submit, $current ? '' : 'primary regular', 'upgrade', false);
 			$first_pass = false;
 		} else {
-			submit_button( $submit, '', 'upgrade', false );
+			submit_button($submit, '', 'upgrade', false);
 		}
 	}
-	if ( 'en_US' !== $update->locale ) {
-		if ( ! isset( $update->dismissed ) || ! $update->dismissed ) {
-			submit_button( __( 'Hide this update' ), '', 'dismiss', false );
+	if ('en_US' !== $update->locale) {
+		if (!isset($update->dismissed) || !$update->dismissed) {
+			submit_button(__('Hide this update'), '', 'dismiss', false);
 		} else {
-			submit_button( __( 'Bring back this update' ), '', 'undismiss', false );
+			submit_button(__('Bring back this update'), '', 'undismiss', false);
 		}
 	}
 	echo '</p>';
 
-	if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
-		echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>';
-	} elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+	if ('en_US' !== $update->locale && (!isset($wp_local_package) || $wp_local_package != $update->locale)) {
+		echo '<p class="hint">' . __('This localized version contains both the translation and various other localization fixes.') . '</p>';
+	} elseif ('en_US' === $update->locale && 'en_US' !== get_locale() && (!$update->packages->partial && $wp_version == $update->partial_version)) {
 		// Partial builds don't need language-specific warnings.
 		echo '<p class="hint">' . sprintf(
 			/* translators: %s: WordPress version. */
-			__( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ),
+			__('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'),
 			'development' !== $update->response ? $update->current : ''
 		) . '</p>';
 	}
@@ -207,9 +207,9 @@ 
 		)
 	);
 
-	if ( $dismissed ) {
-		$show_text = esc_js( __( 'Show hidden updates' ) );
-		$hide_text = esc_js( __( 'Hide hidden updates' ) );
+	if ($dismissed) {
+		$show_text = esc_js(__('Show hidden updates'));
+		$hide_text = esc_js(__('Hide hidden updates'));
 		?>
 		<script type="text/javascript">
 			jQuery( function( $ ) {
@@ -227,11 +227,11 @@ 
 			});
 		</script>
 		<?php
-		echo '<p class="hide-if-no-js"><button type="button" class="button" id="show-dismissed" aria-expanded="false">' . __( 'Show hidden updates' ) . '</button></p>';
+		echo '<p class="hide-if-no-js"><button type="button" class="button" id="show-dismissed" aria-expanded="false">' . __('Show hidden updates') . '</button></p>';
 		echo '<ul id="dismissed-updates" class="core-updates dismissed">';
-		foreach ( (array) $dismissed as $update ) {
+		foreach ((array) $dismissed as $update) {
 			echo '<li>';
-			list_core_update( $update );
+			list_core_update($update);
 			echo '</li>';
 		}
 		echo '</ul>';
@@ -254,44 +254,44 @@ 
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	$is_development_version = preg_match( '/alpha|beta|RC/', $wp_version );
+	$is_development_version = preg_match('/alpha|beta|RC/', $wp_version);
 
-	if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
+	if (isset($updates[0]->version) && version_compare($updates[0]->version, $wp_version, '>')) {
 		echo '<h2 class="response">';
-		_e( 'An updated version of WordPress is available.' );
+		_e('An updated version of WordPress is available.');
 		echo '</h2>';
 
 		echo '<div class="notice notice-warning inline"><p>';
 		printf(
 			/* translators: 1: Documentation on WordPress backups, 2: Documentation on updating WordPress. */
-			__( '<strong>Important:</strong> Before updating, please <a href="%1$s">back up your database and files</a>. For help with updates, visit the <a href="%2$s">Updating WordPress</a> documentation page.' ),
-			__( 'https://wordpress.org/support/article/wordpress-backups/' ),
-			__( 'https://wordpress.org/support/article/updating-wordpress/' )
+			__('<strong>Important:</strong> Before updating, please <a href="%1$s">back up your database and files</a>. For help with updates, visit the <a href="%2$s">Updating WordPress</a> documentation page.'),
+			__('https://wordpress.org/support/article/wordpress-backups/'),
+			__('https://wordpress.org/support/article/updating-wordpress/')
 		);
 		echo '</p></div>';
-	} elseif ( $is_development_version ) {
-		echo '<h2 class="response">' . __( 'You are using a development version of WordPress.' ) . '</h2>';
+	} elseif ($is_development_version) {
+		echo '<h2 class="response">' . __('You are using a development version of WordPress.') . '</h2>';
 	} else {
-		echo '<h2 class="response">' . __( 'You have the latest version of WordPress.' ) . '</h2>';
+		echo '<h2 class="response">' . __('You have the latest version of WordPress.') . '</h2>';
 	}
 
 	echo '<ul class="core-updates">';
-	foreach ( (array) $updates as $update ) {
+	foreach ((array) $updates as $update) {
 		echo '<li>';
-		list_core_update( $update );
+		list_core_update($update);
 		echo '</li>';
 	}
 	echo '</ul>';
 
 	// Don't show the maintenance mode notice when we are only showing a single re-install option.
-	if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) {
-		echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.' ) . '</p>';
-	} elseif ( ! $updates ) {
-		list( $normalized_version ) = explode( '-', $wp_version );
+	if ($updates && (count($updates) > 1 || 'latest' !== $updates[0]->response)) {
+		echo '<p>' . __('While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, this mode will be deactivated.') . '</p>';
+	} elseif (!$updates) {
+		list($normalized_version) = explode('-', $wp_version);
 		echo '<p>' . sprintf(
 			/* translators: 1: URL to About screen, 2: WordPress version. */
-			__( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ),
-			esc_url( self_admin_url( 'about.php' ) ),
+			__('<a href="%1$s">Learn more about WordPress %2$s</a>.'),
+			esc_url(self_admin_url('about.php')),
 			$normalized_version
 		) . '</p>';
 	}
@@ -305,12 +305,12 @@ 
  * @since 5.6.0
  */
 function core_auto_updates_settings() {
-	if ( isset( $_GET['core-major-auto-updates-saved'] ) ) {
-		if ( 'enabled' === $_GET['core-major-auto-updates-saved'] ) {
-			$notice_text = __( 'Automatic updates for all WordPress versions have been enabled. Thank you!' );
+	if (isset($_GET['core-major-auto-updates-saved'])) {
+		if ('enabled' === $_GET['core-major-auto-updates-saved']) {
+			$notice_text = __('Automatic updates for all WordPress versions have been enabled. Thank you!');
 			echo '<div class="notice notice-success is-dismissible"><p>' . $notice_text . '</p></div>';
-		} elseif ( 'disabled' === $_GET['core-major-auto-updates-saved'] ) {
-			$notice_text = __( 'WordPress will only receive automatic security and maintenance releases from now on.' );
+		} elseif ('disabled' === $_GET['core-major-auto-updates-saved']) {
+			$notice_text = __('WordPress will only receive automatic security and maintenance releases from now on.');
 			echo '<div class="notice notice-success is-dismissible"><p>' . $notice_text . '</p></div>';
 		}
 	}
@@ -319,26 +319,26 @@ 
 	$updater = new WP_Automatic_Updater();
 
 	// Defaults:
-	$upgrade_dev   = get_site_option( 'auto_update_core_dev', 'enabled' ) === 'enabled';
-	$upgrade_minor = get_site_option( 'auto_update_core_minor', 'enabled' ) === 'enabled';
-	$upgrade_major = get_site_option( 'auto_update_core_major', 'unset' ) === 'enabled';
+	$upgrade_dev   = get_site_option('auto_update_core_dev', 'enabled') === 'enabled';
+	$upgrade_minor = get_site_option('auto_update_core_minor', 'enabled') === 'enabled';
+	$upgrade_major = get_site_option('auto_update_core_major', 'unset') === 'enabled';
 
 	$can_set_update_option = true;
 	// WP_AUTO_UPDATE_CORE = true (all), 'beta', 'rc', 'development', 'branch-development', 'minor', false.
-	if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
-		if ( false === WP_AUTO_UPDATE_CORE ) {
+	if (defined('WP_AUTO_UPDATE_CORE')) {
+		if (false === WP_AUTO_UPDATE_CORE) {
 			// Defaults to turned off, unless a filter allows it.
 			$upgrade_dev   = false;
 			$upgrade_minor = false;
 			$upgrade_major = false;
-		} elseif ( true === WP_AUTO_UPDATE_CORE
-			|| in_array( WP_AUTO_UPDATE_CORE, array( 'beta', 'rc', 'development', 'branch-development' ), true )
+		} elseif (true === WP_AUTO_UPDATE_CORE
+			|| in_array(WP_AUTO_UPDATE_CORE, array('beta', 'rc', 'development', 'branch-development'), true)
 		) {
 			// ALL updates for core.
 			$upgrade_dev   = true;
 			$upgrade_minor = true;
 			$upgrade_major = true;
-		} elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {
+		} elseif ('minor' === WP_AUTO_UPDATE_CORE) {
 			// Only minor updates for core.
 			$upgrade_dev   = false;
 			$upgrade_minor = true;
@@ -349,7 +349,7 @@ 
 		$can_set_update_option = false;
 	}
 
-	if ( $updater->is_disabled() ) {
+	if ($updater->is_disabled()) {
 		$upgrade_dev   = false;
 		$upgrade_minor = false;
 		$upgrade_major = false;
@@ -364,16 +364,16 @@ 
 	}
 
 	// Is the UI overridden by a plugin using the `allow_major_auto_core_updates` filter?
-	if ( has_filter( 'allow_major_auto_core_updates' ) ) {
+	if (has_filter('allow_major_auto_core_updates')) {
 		$can_set_update_option = false;
 	}
 
 	/** This filter is documented in wp-admin/includes/class-core-upgrader.php */
-	$upgrade_dev = apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev );
+	$upgrade_dev = apply_filters('allow_dev_auto_core_updates', $upgrade_dev);
 	/** This filter is documented in wp-admin/includes/class-core-upgrader.php */
-	$upgrade_minor = apply_filters( 'allow_minor_auto_core_updates', $upgrade_minor );
+	$upgrade_minor = apply_filters('allow_minor_auto_core_updates', $upgrade_minor);
 	/** This filter is documented in wp-admin/includes/class-core-upgrader.php */
-	$upgrade_major = apply_filters( 'allow_major_auto_core_updates', $upgrade_major );
+	$upgrade_major = apply_filters('allow_major_auto_core_updates', $upgrade_major);
 
 	$auto_update_settings = array(
 		'dev'   => $upgrade_dev,
@@ -381,47 +381,47 @@ 
 		'major' => $upgrade_major,
 	);
 
-	if ( $upgrade_major ) {
-		$wp_version = get_bloginfo( 'version' );
+	if ($upgrade_major) {
+		$wp_version = get_bloginfo('version');
 		$updates    = get_core_updates();
 
-		if ( isset( $updates[0]->version ) && version_compare( $updates[0]->version, $wp_version, '>' ) ) {
+		if (isset($updates[0]->version) && version_compare($updates[0]->version, $wp_version, '>')) {
 			echo '<p>' . wp_get_auto_update_message() . '</p>';
 		}
 	}
 
-	$action_url = self_admin_url( 'update-core.php?action=core-major-auto-updates-settings' );
+	$action_url = self_admin_url('update-core.php?action=core-major-auto-updates-settings');
 	?>
 
 	<p class="auto-update-status">
 		<?php
 
-		if ( $updater->is_vcs_checkout( ABSPATH ) ) {
-			_e( 'This site appears to be under version control. Automatic updates are disabled.' );
-		} elseif ( $upgrade_major ) {
-			_e( 'This site is automatically kept up to date with each new version of WordPress.' );
+		if ($updater->is_vcs_checkout(ABSPATH)) {
+			_e('This site appears to be under version control. Automatic updates are disabled.');
+		} elseif ($upgrade_major) {
+			_e('This site is automatically kept up to date with each new version of WordPress.');
 
-			if ( $can_set_update_option ) {
+			if ($can_set_update_option) {
 				echo '<br>';
 				printf(
 					'<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-disable">%s</a>',
-					wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' ),
-					__( 'Switch to automatic updates for maintenance and security releases only.' )
+					wp_nonce_url(add_query_arg('value', 'disable', $action_url), 'core-major-auto-updates-nonce'),
+					__('Switch to automatic updates for maintenance and security releases only.')
 				);
 			}
-		} elseif ( $upgrade_minor ) {
-			_e( 'This site is automatically kept up to date with maintenance and security releases of WordPress only.' );
+		} elseif ($upgrade_minor) {
+			_e('This site is automatically kept up to date with maintenance and security releases of WordPress only.');
 
-			if ( $can_set_update_option ) {
+			if ($can_set_update_option) {
 				echo '<br>';
 				printf(
 					'<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-enable">%s</a>',
-					wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' ),
-					__( 'Enable automatic updates for all new versions of WordPress.' )
+					wp_nonce_url(add_query_arg('value', 'enable', $action_url), 'core-major-auto-updates-nonce'),
+					__('Enable automatic updates for all new versions of WordPress.')
 				);
 			}
 		} else {
-			_e( 'This site will not receive automatic updates for new versions of WordPress.' );
+			_e('This site will not receive automatic updates for new versions of WordPress.');
 		}
 		?>
 	</p>
@@ -440,7 +440,7 @@ 
 	 *     @type bool $major Whether to enable major automatic core updates.
 	 * }
 	 */
-	do_action( 'after_core_auto_updates_settings', $auto_update_settings );
+	do_action('after_core_auto_updates_settings', $auto_update_settings);
 }
 
 /**
@@ -449,45 +449,45 @@ 
  * @since 2.9.0
  */
 function list_plugin_updates() {
-	$wp_version     = get_bloginfo( 'version' );
-	$cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
+	$wp_version     = get_bloginfo('version');
+	$cur_wp_version = preg_replace('/-.*$/', '', $wp_version);
 
 	require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 	$plugins = get_plugin_updates();
-	if ( empty( $plugins ) ) {
-		echo '<h2>' . __( 'Plugins' ) . '</h2>';
-		echo '<p>' . __( 'Your plugins are all up to date.' ) . '</p>';
+	if (empty($plugins)) {
+		echo '<h2>' . __('Plugins') . '</h2>';
+		echo '<p>' . __('Your plugins are all up to date.') . '</p>';
 		return;
 	}
 	$form_action = 'update-core.php?action=do-plugin-upgrade';
 
 	$core_updates = get_core_updates();
-	if ( ! isset( $core_updates[0]->response ) || 'latest' === $core_updates[0]->response || 'development' === $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
+	if (!isset($core_updates[0]->response) || 'latest' === $core_updates[0]->response || 'development' === $core_updates[0]->response || version_compare($core_updates[0]->current, $cur_wp_version, '=')) {
 		$core_update_version = false;
 	} else {
 		$core_update_version = $core_updates[0]->current;
 	}
 
-	$plugins_count = count( $plugins );
+	$plugins_count = count($plugins);
 	?>
 <h2>
 	<?php
 	printf(
 		'%s <span class="count">(%d)</span>',
-		__( 'Plugins' ),
-		number_format_i18n( $plugins_count )
+		__('Plugins'),
+		number_format_i18n($plugins_count)
 	);
 	?>
 </h2>
-<p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.' ); ?></p>
-<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-plugins" class="upgrade">
-	<?php wp_nonce_field( 'upgrade-core' ); ?>
-<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
+<p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.'); ?></p>
+<form method="post" action="<?php echo esc_url($form_action); ?>" name="upgrade-plugins" class="upgrade">
+	<?php wp_nonce_field('upgrade-core'); ?>
+<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
 <table class="widefat updates-table" id="update-plugins-table">
 	<thead>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="plugins-select-all" /></td>
-		<td class="manage-column"><label for="plugins-select-all"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="plugins-select-all"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</thead>
 
@@ -495,87 +495,87 @@ 
 	<?php
 
 	$auto_updates = array();
-	if ( wp_is_auto_update_enabled_for_type( 'plugin' ) ) {
-		$auto_updates       = (array) get_site_option( 'auto_update_plugins', array() );
+	if (wp_is_auto_update_enabled_for_type('plugin')) {
+		$auto_updates       = (array) get_site_option('auto_update_plugins', array());
 		$auto_update_notice = ' | ' . wp_get_auto_update_message();
 	}
 
-	foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-		$plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
+	foreach ((array) $plugins as $plugin_file => $plugin_data) {
+		$plugin_data = (object) _get_plugin_data_markup_translate($plugin_file, (array) $plugin_data, false, true);
 
 		$icon            = '<span class="dashicons dashicons-admin-plugins"></span>';
-		$preferred_icons = array( 'svg', '2x', '1x', 'default' );
-		foreach ( $preferred_icons as $preferred_icon ) {
-			if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
-				$icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
+		$preferred_icons = array('svg', '2x', '1x', 'default');
+		foreach ($preferred_icons as $preferred_icon) {
+			if (!empty($plugin_data->update->icons[$preferred_icon])) {
+				$icon = '<img src="' . esc_url($plugin_data->update->icons[$preferred_icon]) . '" alt="" />';
 				break;
 			}
 		}
 
 		// Get plugin compat for running version of WordPress.
-		if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
+		if (isset($plugin_data->update->tested) && version_compare($plugin_data->update->tested, $cur_wp_version, '>=')) {
 			/* translators: %s: WordPress version. */
-			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $cur_wp_version );
+			$compat = '<br />' . sprintf(__('Compatibility with WordPress %s: 100%% (according to its author)'), $cur_wp_version);
 		} else {
 			/* translators: %s: WordPress version. */
-			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $cur_wp_version );
+			$compat = '<br />' . sprintf(__('Compatibility with WordPress %s: Unknown'), $cur_wp_version);
 		}
 		// Get plugin compat for updated version of WordPress.
-		if ( $core_update_version ) {
-			if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
+		if ($core_update_version) {
+			if (isset($plugin_data->update->tested) && version_compare($plugin_data->update->tested, $core_update_version, '>=')) {
 				/* translators: %s: WordPress version. */
-				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $core_update_version );
+				$compat .= '<br />' . sprintf(__('Compatibility with WordPress %s: 100%% (according to its author)'), $core_update_version);
 			} else {
 				/* translators: %s: WordPress version. */
-				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $core_update_version );
+				$compat .= '<br />' . sprintf(__('Compatibility with WordPress %s: Unknown'), $core_update_version);
 			}
 		}
 
-		$requires_php   = isset( $plugin_data->update->requires_php ) ? $plugin_data->update->requires_php : null;
-		$compatible_php = is_php_version_compatible( $requires_php );
+		$requires_php   = isset($plugin_data->update->requires_php) ? $plugin_data->update->requires_php : null;
+		$compatible_php = is_php_version_compatible($requires_php);
 
-		if ( ! $compatible_php && current_user_can( 'update_php' ) ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
+		if (!$compatible_php && current_user_can('update_php')) {
+			$compat .= '<br>' . __('This update does not work with your version of PHP.') . '&nbsp;';
 			$compat .= sprintf(
 				/* translators: %s: URL to Update PHP page. */
-				__( '<a href="%s">Learn more about updating PHP</a>.' ),
-				esc_url( wp_get_update_php_url() )
+				__('<a href="%s">Learn more about updating PHP</a>.'),
+				esc_url(wp_get_update_php_url())
 			);
 
 			$annotation = wp_get_update_php_annotation();
 
-			if ( $annotation ) {
+			if ($annotation) {
 				$compat .= '</p><p><em>' . $annotation . '</em>';
 			}
 		}
 
 		// Get the upgrade notice for the new plugin version.
-		if ( isset( $plugin_data->update->upgrade_notice ) ) {
-			$upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
+		if (isset($plugin_data->update->upgrade_notice)) {
+			$upgrade_notice = '<br />' . strip_tags($plugin_data->update->upgrade_notice);
 		} else {
 			$upgrade_notice = '';
 		}
 
-		$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662' );
+		$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662');
 		$details     = sprintf(
 			'<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: Plugin name, 2: Version number. */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_data->Name, $plugin_data->update->new_version)),
 			/* translators: %s: Plugin version. */
-			sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
+			sprintf(__('View version %s details.'), $plugin_data->update->new_version)
 		);
 
-		$checkbox_id = 'checkbox_' . md5( $plugin_file );
+		$checkbox_id = 'checkbox_' . md5($plugin_file);
 		?>
 	<tr>
 		<td class="check-column">
-			<?php if ( $compatible_php ) : ?>
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
+			<?php if ($compatible_php) : ?>
+				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr($plugin_file); ?>" />
 				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
 					<?php
 					/* translators: %s: Plugin name. */
-					printf( __( 'Select %s' ), $plugin_data->Name );
+					printf(__('Select %s'), $plugin_data->Name);
 					?>
 				</label>
 			<?php endif; ?>
@@ -586,14 +586,14 @@ 
 			<?php
 			printf(
 				/* translators: 1: Plugin version, 2: New version. */
-				__( 'You have version %1$s installed. Update to %2$s.' ),
+				__('You have version %1$s installed. Update to %2$s.'),
 				$plugin_data->Version,
 				$plugin_data->update->new_version
 			);
 
 			echo ' ' . $details . $compat . $upgrade_notice;
 
-			if ( in_array( $plugin_file, $auto_updates, true ) ) {
+			if (in_array($plugin_file, $auto_updates, true)) {
 				echo $auto_update_notice;
 			}
 			?>
@@ -607,11 +607,11 @@ 
 	<tfoot>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></td>
-		<td class="manage-column"><label for="plugins-select-all-2"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="plugins-select-all-2"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</tfoot>
 </table>
-<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
+<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
 </form>
 	<?php
 }
@@ -623,151 +623,151 @@ 
  */
 function list_theme_updates() {
 	$themes = get_theme_updates();
-	if ( empty( $themes ) ) {
-		echo '<h2>' . __( 'Themes' ) . '</h2>';
-		echo '<p>' . __( 'Your themes are all up to date.' ) . '</p>';
+	if (empty($themes)) {
+		echo '<h2>' . __('Themes') . '</h2>';
+		echo '<p>' . __('Your themes are all up to date.') . '</p>';
 		return;
 	}
 
 	$form_action = 'update-core.php?action=do-theme-upgrade';
 
-	$themes_count = count( $themes );
+	$themes_count = count($themes);
 	?>
 <h2>
 	<?php
 	printf(
 		'%s <span class="count">(%d)</span>',
-		__( 'Themes' ),
-		number_format_i18n( $themes_count )
+		__('Themes'),
+		number_format_i18n($themes_count)
 	);
 	?>
 </h2>
-<p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.' ); ?></p>
+<p><?php _e('The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.'); ?></p>
 <p>
 	<?php
 	printf(
 		/* translators: %s: Link to documentation on child themes. */
-		__( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ),
-		__( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' )
+		__('<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.'),
+		__('https://developer.wordpress.org/themes/advanced-topics/child-themes/')
 	);
 	?>
 </p>
-<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
-	<?php wp_nonce_field( 'upgrade-core' ); ?>
-<p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
+<form method="post" action="<?php echo esc_url($form_action); ?>" name="upgrade-themes" class="upgrade">
+	<?php wp_nonce_field('upgrade-core'); ?>
+<p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
 <table class="widefat updates-table" id="update-themes-table">
 	<thead>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="themes-select-all" /></td>
-		<td class="manage-column"><label for="themes-select-all"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="themes-select-all"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</thead>
 
 	<tbody class="plugins">
 	<?php
 	$auto_updates = array();
-	if ( wp_is_auto_update_enabled_for_type( 'theme' ) ) {
-		$auto_updates       = (array) get_site_option( 'auto_update_themes', array() );
+	if (wp_is_auto_update_enabled_for_type('theme')) {
+		$auto_updates       = (array) get_site_option('auto_update_themes', array());
 		$auto_update_notice = ' | ' . wp_get_auto_update_message();
 	}
 
-	foreach ( $themes as $stylesheet => $theme ) {
-		$requires_wp  = isset( $theme->update['requires'] ) ? $theme->update['requires'] : null;
-		$requires_php = isset( $theme->update['requires_php'] ) ? $theme->update['requires_php'] : null;
+	foreach ($themes as $stylesheet => $theme) {
+		$requires_wp  = isset($theme->update['requires']) ? $theme->update['requires'] : null;
+		$requires_php = isset($theme->update['requires_php']) ? $theme->update['requires_php'] : null;
 
-		$compatible_wp  = is_wp_version_compatible( $requires_wp );
-		$compatible_php = is_php_version_compatible( $requires_php );
+		$compatible_wp  = is_wp_version_compatible($requires_wp);
+		$compatible_php = is_php_version_compatible($requires_php);
 
 		$compat = '';
 
-		if ( ! $compatible_wp && ! $compatible_php ) {
-			$compat .= '<br>' . __( 'This update does not work with your versions of WordPress and PHP.' ) . '&nbsp;';
-			if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+		if (!$compatible_wp && !$compatible_php) {
+			$compat .= '<br>' . __('This update does not work with your versions of WordPress and PHP.') . '&nbsp;';
+			if (current_user_can('update_core') && current_user_can('update_php')) {
 				$compat .= sprintf(
 					/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-					__( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-					self_admin_url( 'update-core.php' ),
-					esc_url( wp_get_update_php_url() )
+					__('<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.'),
+					self_admin_url('update-core.php'),
+					esc_url(wp_get_update_php_url())
 				);
 
 				$annotation = wp_get_update_php_annotation();
 
-				if ( $annotation ) {
+				if ($annotation) {
 					$compat .= '</p><p><em>' . $annotation . '</em>';
 				}
-			} elseif ( current_user_can( 'update_core' ) ) {
+			} elseif (current_user_can('update_core')) {
 				$compat .= sprintf(
 					/* translators: %s: URL to WordPress Updates screen. */
-					__( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
+					__('<a href="%s">Please update WordPress</a>.'),
+					self_admin_url('update-core.php')
 				);
-			} elseif ( current_user_can( 'update_php' ) ) {
+			} elseif (current_user_can('update_php')) {
 				$compat .= sprintf(
 					/* translators: %s: URL to Update PHP page. */
-					__( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
+					__('<a href="%s">Learn more about updating PHP</a>.'),
+					esc_url(wp_get_update_php_url())
 				);
 
 				$annotation = wp_get_update_php_annotation();
 
-				if ( $annotation ) {
+				if ($annotation) {
 					$compat .= '</p><p><em>' . $annotation . '</em>';
 				}
 			}
-		} elseif ( ! $compatible_wp ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of WordPress.' ) . '&nbsp;';
-			if ( current_user_can( 'update_core' ) ) {
+		} elseif (!$compatible_wp) {
+			$compat .= '<br>' . __('This update does not work with your version of WordPress.') . '&nbsp;';
+			if (current_user_can('update_core')) {
 				$compat .= sprintf(
 					/* translators: %s: URL to WordPress Updates screen. */
-					__( '<a href="%s">Please update WordPress</a>.' ),
-					self_admin_url( 'update-core.php' )
+					__('<a href="%s">Please update WordPress</a>.'),
+					self_admin_url('update-core.php')
 				);
 			}
-		} elseif ( ! $compatible_php ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
-			if ( current_user_can( 'update_php' ) ) {
+		} elseif (!$compatible_php) {
+			$compat .= '<br>' . __('This update does not work with your version of PHP.') . '&nbsp;';
+			if (current_user_can('update_php')) {
 				$compat .= sprintf(
 					/* translators: %s: URL to Update PHP page. */
-					__( '<a href="%s">Learn more about updating PHP</a>.' ),
-					esc_url( wp_get_update_php_url() )
+					__('<a href="%s">Learn more about updating PHP</a>.'),
+					esc_url(wp_get_update_php_url())
 				);
 
 				$annotation = wp_get_update_php_annotation();
 
-				if ( $annotation ) {
+				if ($annotation) {
 					$compat .= '</p><p><em>' . $annotation . '</em>';
 				}
 			}
 		}
 
-		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
+		$checkbox_id = 'checkbox_' . md5($theme->get('Name'));
 		?>
 	<tr>
 		<td class="check-column">
-			<?php if ( $compatible_wp && $compatible_php ) : ?>
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
+			<?php if ($compatible_wp && $compatible_php) : ?>
+				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr($stylesheet); ?>" />
 				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
 					<?php
 					/* translators: %s: Theme name. */
-					printf( __( 'Select %s' ), $theme->display( 'Name' ) );
+					printf(__('Select %s'), $theme->display('Name'));
 					?>
 				</label>
 			<?php endif; ?>
 		</td>
 		<td class="plugin-title"><p>
-			<img src="<?php echo esc_url( $theme->get_screenshot() . '?ver=' . $theme->version ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
-			<strong><?php echo $theme->display( 'Name' ); ?></strong>
+			<img src="<?php echo esc_url($theme->get_screenshot() . '?ver=' . $theme->version); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
+			<strong><?php echo $theme->display('Name'); ?></strong>
 			<?php
 			printf(
 				/* translators: 1: Theme version, 2: New version. */
-				__( 'You have version %1$s installed. Update to %2$s.' ),
-				$theme->display( 'Version' ),
+				__('You have version %1$s installed. Update to %2$s.'),
+				$theme->display('Version'),
 				$theme->update['new_version']
 			);
 
 			echo ' ' . $compat;
 
-			if ( in_array( $stylesheet, $auto_updates, true ) ) {
+			if (in_array($stylesheet, $auto_updates, true)) {
 				echo $auto_update_notice;
 			}
 			?>
@@ -781,11 +781,11 @@ 
 	<tfoot>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></td>
-		<td class="manage-column"><label for="themes-select-all-2"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="themes-select-all-2"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</tfoot>
 </table>
-<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
+<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
 </form>
 	<?php
 }
@@ -797,21 +797,21 @@ 
  */
 function list_translation_updates() {
 	$updates = wp_get_translation_updates();
-	if ( ! $updates ) {
-		if ( 'en_US' !== get_locale() ) {
-			echo '<h2>' . __( 'Translations' ) . '</h2>';
-			echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>';
+	if (!$updates) {
+		if ('en_US' !== get_locale()) {
+			echo '<h2>' . __('Translations') . '</h2>';
+			echo '<p>' . __('Your translations are all up to date.') . '</p>';
 		}
 		return;
 	}
 
 	$form_action = 'update-core.php?action=do-translation-upgrade';
 	?>
-	<h2><?php _e( 'Translations' ); ?></h2>
-	<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-translations" class="upgrade">
-		<p><?php _e( 'New translations are available.' ); ?></p>
-		<?php wp_nonce_field( 'upgrade-translations' ); ?>
-		<p><input class="button" type="submit" value="<?php esc_attr_e( 'Update Translations' ); ?>" name="upgrade" /></p>
+	<h2><?php _e('Translations'); ?></h2>
+	<form method="post" action="<?php echo esc_url($form_action); ?>" name="upgrade-translations" class="upgrade">
+		<p><?php _e('New translations are available.'); ?></p>
+		<?php wp_nonce_field('upgrade-translations'); ?>
+		<p><input class="button" type="submit" value="<?php esc_attr_e('Update Translations'); ?>" name="upgrade" /></p>
 	</form>
 	<?php
 }
@@ -825,60 +825,60 @@ 
  *
  * @param bool $reinstall
  */
-function do_core_upgrade( $reinstall = false ) {
+function do_core_upgrade($reinstall = false) {
 	global $wp_filesystem;
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
-	if ( $reinstall ) {
+	if ($reinstall) {
 		$url = 'update-core.php?action=do-core-reinstall';
 	} else {
 		$url = 'update-core.php?action=do-core-upgrade';
 	}
-	$url = wp_nonce_url( $url, 'upgrade-core' );
+	$url = wp_nonce_url($url, 'upgrade-core');
 
-	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
-	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
-	$update  = find_core_update( $version, $locale );
-	if ( ! $update ) {
+	$version = isset($_POST['version']) ? $_POST['version'] : false;
+	$locale  = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update($version, $locale);
+	if (!$update) {
 		return;
 	}
 
 	// Allow relaxed file ownership writes for User-initiated upgrades when the API specifies
 	// that it's safe to do so. This only happens when there are no new files to create.
-	$allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files;
+	$allow_relaxed_file_ownership = !$reinstall && isset($update->new_files) && !$update->new_files;
 
 	?>
 	<div class="wrap">
-	<h1><?php _e( 'Update WordPress' ); ?></h1>
+	<h1><?php _e('Update WordPress'); ?></h1>
 	<?php
 
-	$credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
-	if ( false === $credentials ) {
+	$credentials = request_filesystem_credentials($url, '', false, ABSPATH, array('version', 'locale'), $allow_relaxed_file_ownership);
+	if (false === $credentials) {
 		echo '</div>';
 		return;
 	}
 
-	if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
+	if (!WP_Filesystem($credentials, ABSPATH, $allow_relaxed_file_ownership)) {
 		// Failed to connect. Error and request again.
-		request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
+		request_filesystem_credentials($url, '', true, ABSPATH, array('version', 'locale'), $allow_relaxed_file_ownership);
 		echo '</div>';
 		return;
 	}
 
-	if ( $wp_filesystem->errors->has_errors() ) {
-		foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
-			show_message( $message );
+	if ($wp_filesystem->errors->has_errors()) {
+		foreach ($wp_filesystem->errors->get_error_messages() as $message) {
+			show_message($message);
 		}
 		echo '</div>';
 		return;
 	}
 
-	if ( $reinstall ) {
+	if ($reinstall) {
 		$update->response = 'reinstall';
 	}
 
-	add_filter( 'update_feedback', 'show_message' );
+	add_filter('update_feedback', 'show_message');
 
 	$upgrader = new Core_Upgrader();
 	$result   = $upgrader->upgrade(
@@ -888,36 +888,36 @@ 
 		)
 	);
 
-	if ( is_wp_error( $result ) ) {
-		show_message( $result );
-		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
-			show_message( __( 'Installation failed.' ) );
+	if (is_wp_error($result)) {
+		show_message($result);
+		if ('up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code()) {
+			show_message(__('Installation failed.'));
 		}
 		echo '</div>';
 		return;
 	}
 
-	show_message( __( 'WordPress updated successfully.' ) );
+	show_message(__('WordPress updated successfully.'));
 	show_message(
 		'<span class="hide-if-no-js">' . sprintf(
 			/* translators: 1: WordPress version, 2: URL to About screen. */
-			__( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ),
+			__('Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.'),
 			$result,
-			esc_url( self_admin_url( 'about.php?updated' ) )
+			esc_url(self_admin_url('about.php?updated'))
 		) . '</span>'
 	);
 	show_message(
 		'<span class="hide-if-js">' . sprintf(
 			/* translators: 1: WordPress version, 2: URL to About screen. */
-			__( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ),
+			__('Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.'),
 			$result,
-			esc_url( self_admin_url( 'about.php?updated' ) )
+			esc_url(self_admin_url('about.php?updated'))
 		) . '</span>'
 	);
 	?>
 	</div>
 	<script type="text/javascript">
-	window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>';
+	window.location = '<?php echo self_admin_url('about.php?updated'); ?>';
 	</script>
 	<?php
 }
@@ -928,14 +928,14 @@ 
  * @since 2.7.0
  */
 function do_dismiss_core_update() {
-	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
-	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
-	$update  = find_core_update( $version, $locale );
-	if ( ! $update ) {
+	$version = isset($_POST['version']) ? $_POST['version'] : false;
+	$locale  = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update($version, $locale);
+	if (!$update) {
 		return;
 	}
-	dismiss_core_update( $update );
-	wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
+	dismiss_core_update($update);
+	wp_redirect(wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core'));
 	exit;
 }
 
@@ -945,130 +945,130 @@ 
  * @since 2.7.0
  */
 function do_undismiss_core_update() {
-	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
-	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
-	$update  = find_core_update( $version, $locale );
-	if ( ! $update ) {
+	$version = isset($_POST['version']) ? $_POST['version'] : false;
+	$locale  = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update($version, $locale);
+	if (!$update) {
 		return;
 	}
-	undismiss_core_update( $version, $locale );
-	wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
+	undismiss_core_update($version, $locale);
+	wp_redirect(wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core'));
 	exit;
 }
 
-$action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
+$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
 
 $upgrade_error = false;
-if ( ( 'do-theme-upgrade' === $action || ( 'do-plugin-upgrade' === $action && ! isset( $_GET['plugins'] ) ) )
-	&& ! isset( $_POST['checked'] ) ) {
-	$upgrade_error = ( 'do-theme-upgrade' === $action ) ? 'themes' : 'plugins';
+if (('do-theme-upgrade' === $action || ('do-plugin-upgrade' === $action && !isset($_GET['plugins'])))
+	&& !isset($_POST['checked'])) {
+	$upgrade_error = ('do-theme-upgrade' === $action) ? 'themes' : 'plugins';
 	$action        = 'upgrade-core';
 }
 
-$title       = __( 'WordPress Updates' );
+$title       = __('WordPress Updates');
 $parent_file = 'index.php';
 
-$updates_overview  = '<p>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '</p>';
-$updates_overview .= '<p>' . __( 'If an update is available, you&#8127;ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '</p>';
+$updates_overview  = '<p>' . __('On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.') . '</p>';
+$updates_overview .= '<p>' . __('If an update is available, you&#8127;ll see a notification appear in the Toolbar and navigation menu.') . ' ' . __('Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.') . '</p>';
 
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $updates_overview,
 	)
 );
 
-$updates_howto  = '<p>' . __( '<strong>WordPress</strong> &mdash; Updating your WordPress installation is a simple one-click procedure: just <strong>click on the &#8220;Update now&#8221; button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
-$updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> &mdash; To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate &#8220;Update&#8221; button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>';
+$updates_howto  = '<p>' . __('<strong>WordPress</strong> &mdash; Updating your WordPress installation is a simple one-click procedure: just <strong>click on the &#8220;Update now&#8221; button</strong> when you are notified that a new version is available.') . ' ' . __('In most cases, WordPress will automatically apply maintenance and security updates in the background for you.') . '</p>';
+$updates_howto .= '<p>' . __('<strong>Themes and Plugins</strong> &mdash; To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate &#8220;Update&#8221; button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.') . '</p>';
 
-if ( 'en_US' !== get_locale() ) {
-	$updates_howto .= '<p>' . __( '<strong>Translations</strong> &mdash; The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the &#8220;Update Translations&#8221;</strong> button.' ) . '</p>';
+if ('en_US' !== get_locale()) {
+	$updates_howto .= '<p>' . __('<strong>Translations</strong> &mdash; The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the &#8220;Update Translations&#8221;</strong> button.') . '</p>';
 }
 
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'how-to-update',
-		'title'   => __( 'How to Update' ),
+		'title'   => __('How to Update'),
 		'content' => $updates_howto,
 	)
 );
 
 $help_sidebar_autoupdates = '';
 
-if ( ( current_user_can( 'update_themes' ) && wp_is_auto_update_enabled_for_type( 'theme' ) ) || ( current_user_can( 'update_plugins' ) && wp_is_auto_update_enabled_for_type( 'plugin' ) ) ) {
-	$help_tab_autoupdates  = '<p>' . __( 'Auto-updates can be enabled or disabled for WordPress major versions and for each individual theme or plugin. Themes or plugins with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.' ) . '</p>';
-	$help_tab_autoupdates .= '<p>' . __( 'Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.' ) . '</p>';
+if ((current_user_can('update_themes') && wp_is_auto_update_enabled_for_type('theme')) || (current_user_can('update_plugins') && wp_is_auto_update_enabled_for_type('plugin'))) {
+	$help_tab_autoupdates  = '<p>' . __('Auto-updates can be enabled or disabled for WordPress major versions and for each individual theme or plugin. Themes or plugins with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.') . '</p>';
+	$help_tab_autoupdates .= '<p>' . __('Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.') . '</p>';
 
 	get_current_screen()->add_help_tab(
 		array(
 			'id'      => 'plugins-themes-auto-updates',
-			'title'   => __( 'Auto-updates' ),
+			'title'   => __('Auto-updates'),
 			'content' => $help_tab_autoupdates,
 		)
 	);
 
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __('<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>') . '</p>';
 }
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>' ) . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>') . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __('<a href="https://wordpress.org/support/">Support</a>') . '</p>'
 );
 
-if ( 'upgrade-core' === $action ) {
+if ('upgrade-core' === $action) {
 	// Force a update check when requested.
-	$force_check = ! empty( $_GET['force-check'] );
-	wp_version_check( array(), $force_check );
+	$force_check = !empty($_GET['force-check']);
+	wp_version_check(array(), $force_check);
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
 	?>
 	<div class="wrap">
-	<h1><?php _e( 'WordPress Updates' ); ?></h1>
-	<p><?php _e( 'Here you can find information about updates, set auto-updates and see what plugins or themes need updating.' ); ?></p>
+	<h1><?php _e('WordPress Updates'); ?></h1>
+	<p><?php _e('Here you can find information about updates, set auto-updates and see what plugins or themes need updating.'); ?></p>
 
 	<?php
-	if ( $upgrade_error ) {
+	if ($upgrade_error) {
 		echo '<div class="error"><p>';
-		if ( 'themes' === $upgrade_error ) {
-			_e( 'Please select one or more themes to update.' );
+		if ('themes' === $upgrade_error) {
+			_e('Please select one or more themes to update.');
 		} else {
-			_e( 'Please select one or more plugins to update.' );
+			_e('Please select one or more plugins to update.');
 		}
 		echo '</p></div>';
 	}
 
 	$last_update_check = false;
-	$current           = get_site_transient( 'update_core' );
+	$current           = get_site_transient('update_core');
 
-	if ( $current && isset( $current->last_checked ) ) {
-		$last_update_check = $current->last_checked + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
+	if ($current && isset($current->last_checked)) {
+		$last_update_check = $current->last_checked + get_option('gmt_offset') * HOUR_IN_SECONDS;
 	}
 
 	echo '<h2 class="wp-current-version">';
 	/* translators: Current version of WordPress. */
-	printf( __( 'Current version: %s' ), get_bloginfo( 'version' ) );
+	printf(__('Current version: %s'), get_bloginfo('version'));
 	echo '</h2>';
 
 	echo '<p class="update-last-checked">';
 	/* translators: 1: Date, 2: Time. */
-	printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ), $last_update_check ), date_i18n( __( 'g:i a T' ), $last_update_check ) );
-	echo ' <a href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check again.' ) . '</a>';
+	printf(__('Last checked on %1$s at %2$s.'), date_i18n(__('F j, Y'), $last_update_check), date_i18n(__('g:i a T'), $last_update_check));
+	echo ' <a href="' . esc_url(self_admin_url('update-core.php?force-check=1')) . '">' . __('Check again.') . '</a>';
 	echo '</p>';
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		core_auto_updates_settings();
 		core_upgrade_preamble();
 	}
-	if ( current_user_can( 'update_plugins' ) ) {
+	if (current_user_can('update_plugins')) {
 		list_plugin_updates();
 	}
-	if ( current_user_can( 'update_themes' ) ) {
+	if (current_user_can('update_themes')) {
 		list_theme_updates();
 	}
-	if ( current_user_can( 'update_languages' ) ) {
+	if (current_user_can('update_languages')) {
 		list_translation_updates();
 	}
 
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'core_upgrade_preamble' );
+	do_action('core_upgrade_preamble');
 	echo '</div>';
 
 	wp_localize_script(
@@ -1090,30 +1090,30 @@ 
 
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 
-} elseif ( 'do-core-upgrade' === $action || 'do-core-reinstall' === $action ) {
+} elseif ('do-core-upgrade' === $action || 'do-core-reinstall' === $action) {
 
-	if ( ! current_user_can( 'update_core' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if (!current_user_can('update_core')) {
+		wp_die(__('Sorry, you are not allowed to update this site.'));
 	}
 
-	check_admin_referer( 'upgrade-core' );
+	check_admin_referer('upgrade-core');
 
 	// Do the (un)dismiss actions before headers, so that they can redirect.
-	if ( isset( $_POST['dismiss'] ) ) {
+	if (isset($_POST['dismiss'])) {
 		do_dismiss_core_update();
-	} elseif ( isset( $_POST['undismiss'] ) ) {
+	} elseif (isset($_POST['undismiss'])) {
 		do_undismiss_core_update();
 	}
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
-	if ( 'do-core-reinstall' === $action ) {
+	if ('do-core-reinstall' === $action) {
 		$reinstall = true;
 	} else {
 		$reinstall = false;
 	}
 
-	if ( isset( $_POST['upgrade'] ) ) {
-		do_core_upgrade( $reinstall );
+	if (isset($_POST['upgrade'])) {
+		do_core_upgrade($reinstall);
 	}
 
 	wp_localize_script(
@@ -1126,34 +1126,34 @@ 
 
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 
-} elseif ( 'do-plugin-upgrade' === $action ) {
+} elseif ('do-plugin-upgrade' === $action) {
 
-	if ( ! current_user_can( 'update_plugins' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if (!current_user_can('update_plugins')) {
+		wp_die(__('Sorry, you are not allowed to update this site.'));
 	}
 
-	check_admin_referer( 'upgrade-core' );
+	check_admin_referer('upgrade-core');
 
-	if ( isset( $_GET['plugins'] ) ) {
-		$plugins = explode( ',', $_GET['plugins'] );
-	} elseif ( isset( $_POST['checked'] ) ) {
+	if (isset($_GET['plugins'])) {
+		$plugins = explode(',', $_GET['plugins']);
+	} elseif (isset($_POST['checked'])) {
 		$plugins = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url( 'update-core.php' ) );
+		wp_redirect(admin_url('update-core.php'));
 		exit;
 	}
 
-	$url = 'update.php?action=update-selected&plugins=' . urlencode( implode( ',', $plugins ) );
-	$url = wp_nonce_url( $url, 'bulk-update-plugins' );
+	$url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
+	$url = wp_nonce_url($url, 'bulk-update-plugins');
 
 	// Used in the HTML title tag.
-	$title = __( 'Update Plugins' );
+	$title = __('Update Plugins');
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
 	?>
 	<div class="wrap">
-		<h1><?php _e( 'Update Plugins' ); ?></h1>
-		<iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
+		<h1><?php _e('Update Plugins'); ?></h1>
+		<iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e('Update progress'); ?>"></iframe>
 	</div>
 	<?php
 
@@ -1167,34 +1167,34 @@ 
 
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 
-} elseif ( 'do-theme-upgrade' === $action ) {
+} elseif ('do-theme-upgrade' === $action) {
 
-	if ( ! current_user_can( 'update_themes' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if (!current_user_can('update_themes')) {
+		wp_die(__('Sorry, you are not allowed to update this site.'));
 	}
 
-	check_admin_referer( 'upgrade-core' );
+	check_admin_referer('upgrade-core');
 
-	if ( isset( $_GET['themes'] ) ) {
-		$themes = explode( ',', $_GET['themes'] );
-	} elseif ( isset( $_POST['checked'] ) ) {
+	if (isset($_GET['themes'])) {
+		$themes = explode(',', $_GET['themes']);
+	} elseif (isset($_POST['checked'])) {
 		$themes = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url( 'update-core.php' ) );
+		wp_redirect(admin_url('update-core.php'));
 		exit;
 	}
 
-	$url = 'update.php?action=update-selected-themes&themes=' . urlencode( implode( ',', $themes ) );
-	$url = wp_nonce_url( $url, 'bulk-update-themes' );
+	$url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes));
+	$url = wp_nonce_url($url, 'bulk-update-themes');
 
 	// Used in the HTML title tag.
-	$title = __( 'Update Themes' );
+	$title = __('Update Themes');
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
 	?>
 	<div class="wrap">
-		<h1><?php _e( 'Update Themes' ); ?></h1>
-		<iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
+		<h1><?php _e('Update Themes'); ?></h1>
+		<iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e('Update progress'); ?>"></iframe>
 	</div>
 	<?php
 
@@ -1208,23 +1208,23 @@ 
 
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 
-} elseif ( 'do-translation-upgrade' === $action ) {
+} elseif ('do-translation-upgrade' === $action) {
 
-	if ( ! current_user_can( 'update_languages' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if (!current_user_can('update_languages')) {
+		wp_die(__('Sorry, you are not allowed to update this site.'));
 	}
 
-	check_admin_referer( 'upgrade-translations' );
+	check_admin_referer('upgrade-translations');
 
 	require_once ABSPATH . 'wp-admin/admin-header.php';
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
 	$url     = 'update-core.php?action=do-translation-upgrade';
 	$nonce   = 'upgrade-translations';
-	$title   = __( 'Update Translations' );
+	$title   = __('Update Translations');
 	$context = WP_LANG_DIR;
 
-	$upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) );
+	$upgrader = new Language_Pack_Upgrader(new Language_Pack_Upgrader_Skin(compact('url', 'nonce', 'title', 'context')));
 	$result   = $upgrader->bulk_upgrade();
 
 	wp_localize_script(
@@ -1237,27 +1237,27 @@ 
 
 	require_once ABSPATH . 'wp-admin/admin-footer.php';
 
-} elseif ( 'core-major-auto-updates-settings' === $action ) {
+} elseif ('core-major-auto-updates-settings' === $action) {
 
-	if ( ! current_user_can( 'update_core' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if (!current_user_can('update_core')) {
+		wp_die(__('Sorry, you are not allowed to update this site.'));
 	}
 
-	$redirect_url = self_admin_url( 'update-core.php' );
+	$redirect_url = self_admin_url('update-core.php');
 
-	if ( isset( $_GET['value'] ) ) {
-		check_admin_referer( 'core-major-auto-updates-nonce' );
+	if (isset($_GET['value'])) {
+		check_admin_referer('core-major-auto-updates-nonce');
 
-		if ( 'enable' === $_GET['value'] ) {
-			update_site_option( 'auto_update_core_major', 'enabled' );
-			$redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'enabled', $redirect_url );
-		} elseif ( 'disable' === $_GET['value'] ) {
-			update_site_option( 'auto_update_core_major', 'disabled' );
-			$redirect_url = add_query_arg( 'core-major-auto-updates-saved', 'disabled', $redirect_url );
+		if ('enable' === $_GET['value']) {
+			update_site_option('auto_update_core_major', 'enabled');
+			$redirect_url = add_query_arg('core-major-auto-updates-saved', 'enabled', $redirect_url);
+		} elseif ('disable' === $_GET['value']) {
+			update_site_option('auto_update_core_major', 'disabled');
+			$redirect_url = add_query_arg('core-major-auto-updates-saved', 'disabled', $redirect_url);
 		}
 	}
 
-	wp_redirect( $redirect_url );
+	wp_redirect($redirect_url);
 	exit;
 } else {
 	/**
@@ -1269,5 +1269,5 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	do_action( "update-core-custom_{$action}" );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+	do_action("update-core-custom_{$action}"); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 }

brighty/wp-admin/my-sites.php

Spacing +40 added lines, -40 removed lines

@@ -9,73 +9,73 @@ 
 
 require_once __DIR__ . '/admin.php';
 
-if ( ! is_multisite() ) {
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if (!is_multisite()) {
+	wp_die(__('Multisite support is not enabled.'));
 }
 
-if ( ! current_user_can( 'read' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
+if (!current_user_can('read')) {
+	wp_die(__('Sorry, you are not allowed to access this page.'));
 }
 
-$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
+$action = isset($_POST['action']) ? $_POST['action'] : 'splash';
 
-$blogs = get_blogs_of_user( $current_user->ID );
+$blogs = get_blogs_of_user($current_user->ID);
 
 $updated = false;
-if ( 'updateblogsettings' === $action && isset( $_POST['primary_blog'] ) ) {
-	check_admin_referer( 'update-my-sites' );
+if ('updateblogsettings' === $action && isset($_POST['primary_blog'])) {
+	check_admin_referer('update-my-sites');
 
-	$blog = get_site( (int) $_POST['primary_blog'] );
-	if ( $blog && isset( $blog->domain ) ) {
-		update_user_meta( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'] );
+	$blog = get_site((int) $_POST['primary_blog']);
+	if ($blog && isset($blog->domain)) {
+		update_user_meta($current_user->ID, 'primary_blog', (int) $_POST['primary_blog']);
 		$updated = true;
 	} else {
-		wp_die( __( 'The primary site you chose does not exist.' ) );
+		wp_die(__('The primary site you chose does not exist.'));
 	}
 }
 
 // Used in the HTML title tag.
-$title       = __( 'My Sites' );
+$title       = __('My Sites');
 $parent_file = 'index.php';
 
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __( 'This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.' ) . '</p>',
+			'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>',
 	)
 );
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen">Documentation on My Sites</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen">Documentation on My Sites</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/">Support</a>') . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
-if ( $updated ) { ?>
-	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'Settings saved.' ); ?></strong></p></div>
+if ($updated) { ?>
+	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e('Settings saved.'); ?></strong></p></div>
 <?php } ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline">
 <?php
-echo esc_html( $title );
+echo esc_html($title);
 ?>
 </h1>
 
 <?php
-if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ), true ) ) {
+if (in_array(get_site_option('registration'), array('all', 'blog'), true)) {
 	/** This filter is documented in wp-login.php */
-	$sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
-	printf( ' <a href="%s" class="page-title-action">%s</a>', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) );
+	$sign_up_url = apply_filters('wp_signup_location', network_site_url('wp-signup.php'));
+	printf(' <a href="%s" class="page-title-action">%s</a>', esc_url($sign_up_url), esc_html_x('Add New', 'site'));
 }
 
-if ( empty( $blogs ) ) :
+if (empty($blogs)) :
 	echo '<p>';
-	_e( 'You must be a member of at least one site to use this page.' );
+	_e('You must be a member of at least one site to use this page.');
 	echo '</p>';
 else :
 	?>
@@ -90,7 +90,7 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'myblogs_allblogs_options' );
+	do_action('myblogs_allblogs_options');
 	?>
 	<br clear="all" />
 	<ul class="my-sites striped">
@@ -107,25 +107,25 @@ 
 	 * @param string $settings_html The settings HTML markup. Default empty.
 	 * @param string $context       Context of the setting (global or site-specific). Default 'global'.
 	 */
-	$settings_html = apply_filters( 'myblogs_options', '', 'global' );
+	$settings_html = apply_filters('myblogs_options', '', 'global');
 
-	if ( $settings_html ) {
-		echo '<h3>' . __( 'Global Settings' ) . '</h3>';
+	if ($settings_html) {
+		echo '<h3>' . __('Global Settings') . '</h3>';
 		echo $settings_html;
 	}
 
-	reset( $blogs );
+	reset($blogs);
 
-	foreach ( $blogs as $user_blog ) {
-		switch_to_blog( $user_blog->userblog_id );
+	foreach ($blogs as $user_blog) {
+		switch_to_blog($user_blog->userblog_id);
 
 		echo '<li>';
 		echo "<h3>{$user_blog->blogname}</h3>";
 
-		$actions = "<a href='" . esc_url( home_url() ) . "'>" . __( 'Visit' ) . '</a>';
+		$actions = "<a href='" . esc_url(home_url()) . "'>" . __('Visit') . '</a>';
 
-		if ( current_user_can( 'read' ) ) {
-			$actions .= " | <a href='" . esc_url( admin_url() ) . "'>" . __( 'Dashboard' ) . '</a>';
+		if (current_user_can('read')) {
+			$actions .= " | <a href='" . esc_url(admin_url()) . "'>" . __('Dashboard') . '</a>';
 		}
 
 		/**
@@ -136,12 +136,12 @@ 
 		 * @param string $actions   The HTML site link markup.
 		 * @param object $user_blog An object containing the site data.
 		 */
-		$actions = apply_filters( 'myblogs_blog_actions', $actions, $user_blog );
+		$actions = apply_filters('myblogs_blog_actions', $actions, $user_blog);
 
 		echo "<p class='my-sites-actions'>" . $actions . '</p>';
 
 		/** This filter is documented in wp-admin/my-sites.php */
-		echo apply_filters( 'myblogs_options', '', $user_blog );
+		echo apply_filters('myblogs_options', '', $user_blog);
 
 		echo '</li>';
 
@@ -150,11 +150,11 @@ 
 	?>
 	</ul>
 	<?php
-	if ( count( $blogs ) > 1 || has_action( 'myblogs_allblogs_options' ) || has_filter( 'myblogs_options' ) ) {
+	if (count($blogs) > 1 || has_action('myblogs_allblogs_options') || has_filter('myblogs_options')) {
 		?>
 		<input type="hidden" name="action" value="updateblogsettings" />
 		<?php
-		wp_nonce_field( 'update-my-sites' );
+		wp_nonce_field('update-my-sites');
 		submit_button();
 	}
 	?>

brighty/wp-admin/widgets.php

Spacing +7 added lines, -7 removed lines

@@ -12,23 +12,23 @@
 /** WordPress Administration Widgets API */
 require_once ABSPATH . 'wp-admin/includes/widgets.php';
 
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if (!current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>' . __('You need a higher level of permission.') . '</h1>' .
+		'<p>' . __('Sorry, you are not allowed to edit theme options on this site.') . '</p>',
 		403
 	);
 }
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using is not widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.' ) );
+if (!current_theme_supports('widgets')) {
+	wp_die(__('The theme you are currently using is not widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.'));
 }
 
 // Used in the HTML title tag.
-$title       = __( 'Widgets' );
+$title       = __('Widgets');
 $parent_file = 'themes.php';
 
-if ( wp_use_widgets_block_editor() ) {
+if (wp_use_widgets_block_editor()) {
 	require ABSPATH . 'wp-admin/widgets-form-blocks.php';
 } else {
 	require ABSPATH . 'wp-admin/widgets-form.php';

brighty/wp-admin/users.php

Spacing +210 added lines, -210 removed lines

@@ -10,54 +10,54 @@ 
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
 
-if ( ! current_user_can( 'list_users' ) ) {
+if (!current_user_can('list_users')) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to list users.' ) . '</p>',
+		'<h1>' . __('You need a higher level of permission.') . '</h1>' .
+		'<p>' . __('Sorry, you are not allowed to list users.') . '</p>',
 		403
 	);
 }
 
-$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
+$wp_list_table = _get_list_table('WP_Users_List_Table');
 $pagenum       = $wp_list_table->get_pagenum();
 
 // Used in the HTML title tag.
-$title       = __( 'Users' );
+$title       = __('Users');
 $parent_file = 'users.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
 // Contextual help - choose Help on the top right of admin panel to preview this.
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
-		'content' => '<p>' . __( 'This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.' ) . '</p>' .
-						'<p>' . __( 'To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.' ) . '</p>',
+		'title'   => __('Overview'),
+		'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
+						'<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>',
 	)
 );
 
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'screen-content',
-		'title'   => __( 'Screen Content' ),
-		'content' => '<p>' . __( 'You can customize the display of this screen in a number of ways:' ) . '</p>' .
+		'title'   => __('Screen Content'),
+		'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
 						'<ul>' .
-						'<li>' . __( 'You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.' ) . '</li>' .
-						'<li>' . __( 'You can filter the list of users by User Role using the text links above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.' ) . '</li>' .
-						'<li>' . __( 'You can view all posts made by a user by clicking on the number under the Posts column.' ) . '</li>' .
+						'<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
+						'<li>' . __('You can filter the list of users by User Role using the text links above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
+						'<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
 						'</ul>',
 	)
 );
 
-$help = '<p>' . __( 'Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:' ) . '</p>' .
+$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
 	'<ul>' .
-	'<li>' . __( '<strong>Edit</strong> takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.' ) . '</li>';
+	'<li>' . __('<strong>Edit</strong> takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
 
-if ( is_multisite() ) {
-	$help .= '<li>' . __( '<strong>Remove</strong> allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using bulk actions.' ) . '</li>';
+if (is_multisite()) {
+	$help .= '<li>' . __('<strong>Remove</strong> allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using bulk actions.') . '</li>';
 } else {
-	$help .= '<li>' . __( '<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using bulk actions.' ) . '</li>';
+	$help .= '<li>' . __('<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using bulk actions.') . '</li>';
 }
 
 $help .= '</ul>';
@@ -65,32 +65,32 @@ 
 get_current_screen()->add_help_tab(
 	array(
 		'id'      => 'action-links',
-		'title'   => __( 'Available Actions' ),
+		'title'   => __('Available Actions'),
 		'content' => $help,
 	)
 );
-unset( $help );
+unset($help);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/users-screen/">Documentation on Managing Users</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/roles-and-capabilities/">Descriptions of Roles and Capabilities</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/article/users-screen/">Documentation on Managing Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/article/roles-and-capabilities/">Descriptions of Roles and Capabilities</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/">Support</a>') . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
 	array(
-		'heading_views'      => __( 'Filter users list' ),
-		'heading_pagination' => __( 'Users list navigation' ),
-		'heading_list'       => __( 'Users list' ),
+		'heading_views'      => __('Filter users list'),
+		'heading_pagination' => __('Users list navigation'),
+		'heading_list'       => __('Users list'),
 	)
 );
 
-if ( empty( $_REQUEST ) ) {
-	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
-} elseif ( isset( $_REQUEST['wp_http_referer'] ) ) {
-	$redirect = remove_query_arg( array( 'wp_http_referer', 'updated', 'delete_count' ), wp_unslash( $_REQUEST['wp_http_referer'] ) );
-	$referer  = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( $redirect ) . '" />';
+if (empty($_REQUEST)) {
+	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr(wp_unslash($_SERVER['REQUEST_URI'])) . '" />';
+} elseif (isset($_REQUEST['wp_http_referer'])) {
+	$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash($_REQUEST['wp_http_referer']));
+	$referer  = '<input type="hidden" name="wp_http_referer" value="' . esc_attr($redirect) . '" />';
 } else {
 	$redirect = 'users.php';
 	$referer  = '';
@@ -98,18 +98,18 @@ 
 
 $update = '';
 
-switch ( $wp_list_table->current_action() ) {
+switch ($wp_list_table->current_action()) {
 
 	/* Bulk Dropdown menu Role changes */
 	case 'promote':
-		check_admin_referer( 'bulk-users' );
+		check_admin_referer('bulk-users');
 
-		if ( ! current_user_can( 'promote_users' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
+		if (!current_user_can('promote_users')) {
+			wp_die(__('Sorry, you are not allowed to edit this user.'), 403);
 		}
 
-		if ( empty( $_REQUEST['users'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users'])) {
+			wp_redirect($redirect);
 			exit;
 		}
 
@@ -118,92 +118,92 @@ 
 
 		// Mocking the `none` role so we are able to save it to the database
 		$editable_roles['none'] = array(
-			'name' => __( '&mdash; No role for this site &mdash;' ),
+			'name' => __('&mdash; No role for this site &mdash;'),
 		);
 
-		if ( ! $role || empty( $editable_roles[ $role ] ) ) {
-			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
+		if (!$role || empty($editable_roles[$role])) {
+			wp_die(__('Sorry, you are not allowed to give users that role.'), 403);
 		}
 
-		if ( 'none' === $role ) {
+		if ('none' === $role) {
 			$role = '';
 		}
 
 		$userids = $_REQUEST['users'];
 		$update  = 'promote';
-		foreach ( $userids as $id ) {
+		foreach ($userids as $id) {
 			$id = (int) $id;
 
-			if ( ! current_user_can( 'promote_user', $id ) ) {
-				wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
+			if (!current_user_can('promote_user', $id)) {
+				wp_die(__('Sorry, you are not allowed to edit this user.'), 403);
 			}
 
 			// The new role of the current user must also have the promote_users cap or be a multisite super admin.
-			if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )
-			&& ! ( is_multisite() && current_user_can( 'manage_network_users' ) ) ) {
+			if ($id == $current_user->ID && !$wp_roles->role_objects[$role]->has_cap('promote_users')
+			&& !(is_multisite() && current_user_can('manage_network_users'))) {
 					$update = 'err_admin_role';
 					continue;
 			}
 
 			// If the user doesn't already belong to the blog, bail.
-			if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
+			if (is_multisite() && !is_user_member_of_blog($id)) {
 				wp_die(
-					'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
-					'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
+					'<h1>' . __('Something went wrong.') . '</h1>' .
+					'<p>' . __('One of the selected users is not a member of this site.') . '</p>',
 					403
 				);
 			}
 
-			$user = get_userdata( $id );
-			$user->set_role( $role );
+			$user = get_userdata($id);
+			$user->set_role($role);
 		}
 
-		wp_redirect( add_query_arg( 'update', $update, $redirect ) );
+		wp_redirect(add_query_arg('update', $update, $redirect));
 		exit;
 
 	case 'dodelete':
-		if ( is_multisite() ) {
-			wp_die( __( 'User deletion is not allowed from this screen.' ), 400 );
+		if (is_multisite()) {
+			wp_die(__('User deletion is not allowed from this screen.'), 400);
 		}
 
-		check_admin_referer( 'delete-users' );
+		check_admin_referer('delete-users');
 
-		if ( empty( $_REQUEST['users'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users'])) {
+			wp_redirect($redirect);
 			exit;
 		}
 
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$userids = array_map('intval', (array) $_REQUEST['users']);
 
-		if ( empty( $_REQUEST['delete_option'] ) ) {
-			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-			$url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
-			wp_redirect( $url );
+		if (empty($_REQUEST['delete_option'])) {
+			$url = self_admin_url('users.php?action=delete&users[]=' . implode('&users[]=', $userids) . '&error=true');
+			$url = str_replace('&amp;', '&', wp_nonce_url($url, 'bulk-users'));
+			wp_redirect($url);
 			exit;
 		}
 
-		if ( ! current_user_can( 'delete_users' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to delete users.' ), 403 );
+		if (!current_user_can('delete_users')) {
+			wp_die(__('Sorry, you are not allowed to delete users.'), 403);
 		}
 
 		$update       = 'del';
 		$delete_count = 0;
 
-		foreach ( $userids as $id ) {
-			if ( ! current_user_can( 'delete_user', $id ) ) {
-				wp_die( __( 'Sorry, you are not allowed to delete that user.' ), 403 );
+		foreach ($userids as $id) {
+			if (!current_user_can('delete_user', $id)) {
+				wp_die(__('Sorry, you are not allowed to delete that user.'), 403);
 			}
 
-			if ( $id == $current_user->ID ) {
+			if ($id == $current_user->ID) {
 				$update = 'err_admin_del';
 				continue;
 			}
-			switch ( $_REQUEST['delete_option'] ) {
+			switch ($_REQUEST['delete_option']) {
 				case 'delete':
-					wp_delete_user( $id );
+					wp_delete_user($id);
 					break;
 				case 'reassign':
-					wp_delete_user( $id, $_REQUEST['reassign_user'] );
+					wp_delete_user($id, $_REQUEST['reassign_user']);
 					break;
 			}
 			++$delete_count;
@@ -216,35 +216,35 @@ 
 			),
 			$redirect
 		);
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 
 	case 'resetpassword':
-		check_admin_referer( 'bulk-users' );
-		if ( ! current_user_can( 'edit_users' ) ) {
-			$errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to edit users.' ) );
+		check_admin_referer('bulk-users');
+		if (!current_user_can('edit_users')) {
+			$errors = new WP_Error('edit_users', __('Sorry, you are not allowed to edit users.'));
 		}
-		if ( empty( $_REQUEST['users'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users'])) {
+			wp_redirect($redirect);
 			exit();
 		}
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$userids = array_map('intval', (array) $_REQUEST['users']);
 
 		$reset_count = 0;
 
-		foreach ( $userids as $id ) {
-			if ( ! current_user_can( 'edit_user', $id ) ) {
-				wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+		foreach ($userids as $id) {
+			if (!current_user_can('edit_user', $id)) {
+				wp_die(__('Sorry, you are not allowed to edit this user.'));
 			}
 
-			if ( $id === $current_user->ID ) {
+			if ($id === $current_user->ID) {
 				$update = 'err_admin_reset';
 				continue;
 			}
 
 			// Send the password reset link.
-			$user = get_userdata( $id );
-			if ( retrieve_password( $user->user_login ) ) {
+			$user = get_userdata($id);
+			if (retrieve_password($user->user_login)) {
 				++$reset_count;
 			}
 		}
@@ -256,35 +256,35 @@ 
 			),
 			$redirect
 		);
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 
 	case 'delete':
-		if ( is_multisite() ) {
-			wp_die( __( 'User deletion is not allowed from this screen.' ), 400 );
+		if (is_multisite()) {
+			wp_die(__('User deletion is not allowed from this screen.'), 400);
 		}
 
-		check_admin_referer( 'bulk-users' );
+		check_admin_referer('bulk-users');
 
-		if ( empty( $_REQUEST['users'] ) && empty( $_REQUEST['user'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
+			wp_redirect($redirect);
 			exit;
 		}
 
-		if ( ! current_user_can( 'delete_users' ) ) {
-			$errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to delete users.' ) );
+		if (!current_user_can('delete_users')) {
+			$errors = new WP_Error('edit_users', __('Sorry, you are not allowed to delete users.'));
 		}
 
-		if ( empty( $_REQUEST['users'] ) ) {
-			$userids = array( (int) $_REQUEST['user'] );
+		if (empty($_REQUEST['users'])) {
+			$userids = array((int) $_REQUEST['user']);
 		} else {
-			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+			$userids = array_map('intval', (array) $_REQUEST['users']);
 		}
 
 		$all_userids = $userids;
 
-		if ( in_array( $current_user->ID, $userids, true ) ) {
-			$userids = array_diff( $userids, array( $current_user->ID ) );
+		if (in_array($current_user->ID, $userids, true)) {
+			$userids = array_diff($userids, array($current_user->ID));
 		}
 
 		/**
@@ -296,74 +296,74 @@ 
 		 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
 		 * @param int[] $userids                       Array of IDs for users being deleted.
 		 */
-		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $userids );
+		$users_have_content = (bool) apply_filters('users_have_additional_content', false, $userids);
 
-		if ( $userids && ! $users_have_content ) {
-			if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+		if ($userids && !$users_have_content) {
+			if ($wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode(',', $userids) . ' ) LIMIT 1')) {
 				$users_have_content = true;
-			} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+			} elseif ($wpdb->get_var("SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode(',', $userids) . ' ) LIMIT 1')) {
 				$users_have_content = true;
 			}
 		}
 
-		if ( $users_have_content ) {
-			add_action( 'admin_head', 'delete_users_add_js' );
+		if ($users_have_content) {
+			add_action('admin_head', 'delete_users_add_js');
 		}
 
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 		?>
 	<form method="post" name="updateusers" id="updateusers">
-		<?php wp_nonce_field( 'delete-users' ); ?>
+		<?php wp_nonce_field('delete-users'); ?>
 		<?php echo $referer; ?>
 
 <div class="wrap">
-<h1><?php _e( 'Delete Users' ); ?></h1>
-		<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+<h1><?php _e('Delete Users'); ?></h1>
+		<?php if (isset($_REQUEST['error'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+		<p><strong><?php _e('Error:'); ?></strong> <?php _e('Please select an option.'); ?></p>
 	</div>
 		<?php endif; ?>
 
-		<?php if ( 1 === count( $all_userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+		<?php if (1 === count($all_userids)) : ?>
+	<p><?php _e('You have specified this user for deletion:'); ?></p>
 		<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<p><?php _e('You have specified these users for deletion:'); ?></p>
 		<?php endif; ?>
 
 <ul>
 		<?php
 		$go_delete = 0;
-		foreach ( $all_userids as $id ) {
-			$user = get_userdata( $id );
-			if ( $id == $current_user->ID ) {
+		foreach ($all_userids as $id) {
+			$user = get_userdata($id);
+			if ($id == $current_user->ID) {
 				/* translators: 1: User ID, 2: User login. */
-				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li>' . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
 			} else {
 				/* translators: 1: User ID, 2: User login. */
-				echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li><input type="hidden" name="users[]" value="' . esc_attr($id) . '" />' . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
 				$go_delete++;
 			}
 		}
 		?>
 	</ul>
 		<?php
-		if ( $go_delete ) :
+		if ($go_delete) :
 
-			if ( ! $users_have_content ) :
+			if (!$users_have_content) :
 				?>
 			<input type="hidden" name="delete_option" value="delete" />
 			<?php else : ?>
-				<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+				<?php if (1 == $go_delete) : ?>
+			<fieldset><p><legend><?php _e('What should be done with content owned by this user?'); ?></legend></p>
 		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e('What should be done with content owned by these users?'); ?></legend></p>
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-				<?php _e( 'Delete all content.' ); ?></label></li>
+				<?php _e('Delete all content.'); ?></label></li>
 			<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
 				<?php
-				echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
+				echo '<label for="delete_option1">' . __('Attribute all content to:') . '</label> ';
 				wp_dropdown_users(
 					array(
 						'name'    => 'reassign_user',
@@ -385,12 +385,12 @@ 
 			 * @param WP_User $current_user WP_User object for the current user.
 			 * @param int[]   $userids      Array of IDs for users being deleted.
 			 */
-			do_action( 'delete_user_form', $current_user, $userids );
+			do_action('delete_user_form', $current_user, $userids);
 			?>
 	<input type="hidden" name="action" value="dodelete" />
-			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
+			<?php submit_button(__('Confirm Deletion'), 'primary'); ?>
 	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
+	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 	<?php endif; ?>
 	</div>
 	</form>
@@ -399,55 +399,55 @@ 
 		break;
 
 	case 'doremove':
-		check_admin_referer( 'remove-users' );
+		check_admin_referer('remove-users');
 
-		if ( ! is_multisite() ) {
-			wp_die( __( 'You cannot remove users.' ), 400 );
+		if (!is_multisite()) {
+			wp_die(__('You cannot remove users.'), 400);
 		}
 
-		if ( empty( $_REQUEST['users'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users'])) {
+			wp_redirect($redirect);
 			exit;
 		}
 
-		if ( ! current_user_can( 'remove_users' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to remove users.' ), 403 );
+		if (!current_user_can('remove_users')) {
+			wp_die(__('Sorry, you are not allowed to remove users.'), 403);
 		}
 
 		$userids = $_REQUEST['users'];
 
 		$update = 'remove';
-		foreach ( $userids as $id ) {
+		foreach ($userids as $id) {
 			$id = (int) $id;
-			if ( ! current_user_can( 'remove_user', $id ) ) {
+			if (!current_user_can('remove_user', $id)) {
 				$update = 'err_admin_remove';
 				continue;
 			}
-			remove_user_from_blog( $id, $blog_id );
+			remove_user_from_blog($id, $blog_id);
 		}
 
-		$redirect = add_query_arg( array( 'update' => $update ), $redirect );
-		wp_redirect( $redirect );
+		$redirect = add_query_arg(array('update' => $update), $redirect);
+		wp_redirect($redirect);
 		exit;
 
 	case 'remove':
-		check_admin_referer( 'bulk-users' );
+		check_admin_referer('bulk-users');
 
-		if ( ! is_multisite() ) {
-			wp_die( __( 'You cannot remove users.' ), 400 );
+		if (!is_multisite()) {
+			wp_die(__('You cannot remove users.'), 400);
 		}
 
-		if ( empty( $_REQUEST['users'] ) && empty( $_REQUEST['user'] ) ) {
-			wp_redirect( $redirect );
+		if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
+			wp_redirect($redirect);
 			exit;
 		}
 
-		if ( ! current_user_can( 'remove_users' ) ) {
-			$error = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to remove users.' ) );
+		if (!current_user_can('remove_users')) {
+			$error = new WP_Error('edit_users', __('Sorry, you are not allowed to remove users.'));
 		}
 
-		if ( empty( $_REQUEST['users'] ) ) {
-			$userids = array( (int) $_REQUEST['user'] );
+		if (empty($_REQUEST['users'])) {
+			$userids = array((int) $_REQUEST['user']);
 		} else {
 			$userids = $_REQUEST['users'];
 		}
@@ -455,40 +455,40 @@ 
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 		?>
 	<form method="post" name="updateusers" id="updateusers">
-		<?php wp_nonce_field( 'remove-users' ); ?>
+		<?php wp_nonce_field('remove-users'); ?>
 		<?php echo $referer; ?>
 
 <div class="wrap">
-<h1><?php _e( 'Remove Users from Site' ); ?></h1>
+<h1><?php _e('Remove Users from Site'); ?></h1>
 
-		<?php if ( 1 === count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+		<?php if (1 === count($userids)) : ?>
+	<p><?php _e('You have specified this user for removal:'); ?></p>
 		<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<p><?php _e('You have specified these users for removal:'); ?></p>
 		<?php endif; ?>
 
 <ul>
 		<?php
 		$go_remove = false;
-		foreach ( $userids as $id ) {
+		foreach ($userids as $id) {
 			$id   = (int) $id;
-			$user = get_userdata( $id );
-			if ( ! current_user_can( 'remove_user', $id ) ) {
+			$user = get_userdata($id);
+			if (!current_user_can('remove_user', $id)) {
 				/* translators: 1: User ID, 2: User login. */
-				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li>' . sprintf(__('ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
 			} else {
 				/* translators: 1: User ID, 2: User login. */
-				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
 				$go_remove = true;
 			}
 		}
 		?>
 	</ul>
-		<?php if ( $go_remove ) : ?>
+		<?php if ($go_remove) : ?>
 		<input type="hidden" name="action" value="doremove" />
-			<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
+			<?php submit_button(__('Confirm Removal'), 'primary'); ?>
 	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
+	<p><?php _e('There are no valid users selected for removal.'); ?></p>
 	<?php endif; ?>
 	</div>
 	</form>
@@ -497,103 +497,103 @@ 
 		break;
 
 	default:
-		if ( ! empty( $_GET['_wp_http_referer'] ) ) {
-			wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+		if (!empty($_GET['_wp_http_referer'])) {
+			wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 			exit;
 		}
 
-		if ( $wp_list_table->current_action() && ! empty( $_REQUEST['users'] ) ) {
+		if ($wp_list_table->current_action() && !empty($_REQUEST['users'])) {
 			$screen   = get_current_screen()->id;
 			$sendback = wp_get_referer();
 			$userids  = $_REQUEST['users'];
 
 			/** This action is documented in wp-admin/edit.php */
-			$sendback = apply_filters( "handle_bulk_actions-{$screen}", $sendback, $wp_list_table->current_action(), $userids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+			$sendback = apply_filters("handle_bulk_actions-{$screen}", $sendback, $wp_list_table->current_action(), $userids); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
-			wp_safe_redirect( $sendback );
+			wp_safe_redirect($sendback);
 			exit;
 		}
 
 		$wp_list_table->prepare_items();
-		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-		if ( $pagenum > $total_pages && $total_pages > 0 ) {
-			wp_redirect( add_query_arg( 'paged', $total_pages ) );
+		$total_pages = $wp_list_table->get_pagination_arg('total_pages');
+		if ($pagenum > $total_pages && $total_pages > 0) {
+			wp_redirect(add_query_arg('paged', $total_pages));
 			exit;
 		}
 
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 
 		$messages = array();
-		if ( isset( $_GET['update'] ) ) :
-			switch ( $_GET['update'] ) {
+		if (isset($_GET['update'])) :
+			switch ($_GET['update']) {
 				case 'del':
 				case 'del_many':
-					$delete_count = isset( $_GET['delete_count'] ) ? (int) $_GET['delete_count'] : 0;
-					if ( 1 == $delete_count ) {
-						$message = __( 'User deleted.' );
+					$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
+					if (1 == $delete_count) {
+						$message = __('User deleted.');
 					} else {
 						/* translators: %s: Number of users. */
-						$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+						$message = _n('%s user deleted.', '%s users deleted.', $delete_count);
 					}
-					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf($message, number_format_i18n($delete_count)) . '</p></div>';
 					break;
 				case 'add':
-					$message = __( 'New user created.' );
+					$message = __('New user created.');
 
-					$user_id = isset( $_GET['id'] ) ? $_GET['id'] : false;
-					if ( $user_id && current_user_can( 'edit_user', $user_id ) ) {
+					$user_id = isset($_GET['id']) ? $_GET['id'] : false;
+					if ($user_id && current_user_can('edit_user', $user_id)) {
 						$message .= sprintf(
 							' <a href="%s">%s</a>',
 							esc_url(
 								add_query_arg(
 									'wp_http_referer',
-									urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-									self_admin_url( 'user-edit.php?user_id=' . $user_id )
+									urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+									self_admin_url('user-edit.php?user_id=' . $user_id)
 								)
 							),
-							__( 'Edit user' )
+							__('Edit user')
 						);
 					}
 
 					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . $message . '</p></div>';
 					break;
 				case 'resetpassword':
-					$reset_count = isset( $_GET['reset_count'] ) ? (int) $_GET['reset_count'] : 0;
-					if ( 1 === $reset_count ) {
-						$message = __( 'Password reset link sent.' );
+					$reset_count = isset($_GET['reset_count']) ? (int) $_GET['reset_count'] : 0;
+					if (1 === $reset_count) {
+						$message = __('Password reset link sent.');
 					} else {
 						/* translators: %s: Number of users. */
-						$message = _n( 'Password reset links sent to %s user.', 'Password reset links sent to %s users.', $reset_count );
+						$message = _n('Password reset links sent to %s user.', 'Password reset links sent to %s users.', $reset_count);
 					}
-					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $reset_count ) ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf($message, number_format_i18n($reset_count)) . '</p></div>';
 					break;
 				case 'promote':
-					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
 					break;
 				case 'err_admin_role':
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'The current user&#8217;s role must have user editing capabilities.' ) . '</p></div>';
-					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other user roles have been changed.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
 					break;
 				case 'err_admin_del':
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You cannot delete the current user.' ) . '</p></div>';
-					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other users have been deleted.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You cannot delete the current user.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
 					break;
 				case 'remove':
-					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
 					break;
 				case 'err_admin_remove':
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You cannot remove the current user.' ) . '</p></div>';
-					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'Other users have been removed.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You cannot remove the current user.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
 					break;
 			}
 		endif;
 		?>
 
-		<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
+		<?php if (isset($errors) && is_wp_error($errors)) : ?>
 		<div class="error">
 			<ul>
 			<?php
-			foreach ( $errors->get_error_messages() as $err ) {
+			foreach ($errors->get_error_messages() as $err) {
 				echo "<li>$err</li>\n";
 			}
 			?>
@@ -602,8 +602,8 @@ 
 			<?php
 	endif;
 
-		if ( ! empty( $messages ) ) {
-			foreach ( $messages as $msg ) {
+		if (!empty($messages)) {
+			foreach ($messages as $msg) {
 				echo $msg;
 			}
 		}
@@ -612,25 +612,25 @@ 
 	<div class="wrap">
 	<h1 class="wp-heading-inline">
 		<?php
-		echo esc_html( $title );
+		echo esc_html($title);
 		?>
 </h1>
 
 		<?php
-		if ( current_user_can( 'create_users' ) ) {
+		if (current_user_can('create_users')) {
 			?>
-	<a href="<?php echo esc_url( admin_url( 'user-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-	<a href="<?php echo esc_url( admin_url( 'user-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+	<a href="<?php echo esc_url(admin_url('user-new.php')); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+	<a href="<?php echo esc_url(admin_url('user-new.php')); ?>" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 			<?php
 }
 
-if ( strlen( $usersearch ) ) {
+if (strlen($usersearch)) {
 	echo '<span class="subtitle">';
 	printf(
 		/* translators: %s: Search query. */
-		__( 'Search results for: %s' ),
-		'<strong>' . esc_html( $usersearch ) . '</strong>'
+		__('Search results for: %s'),
+		'<strong>' . esc_html($usersearch) . '</strong>'
 	);
 	echo '</span>';
 }
@@ -642,10 +642,10 @@ 
 
 <form method="get">
 
-		<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+		<?php $wp_list_table->search_box(__('Search Users'), 'user'); ?>
 
-		<?php if ( ! empty( $_REQUEST['role'] ) ) { ?>
-<input type="hidden" name="role" value="<?php echo esc_attr( $_REQUEST['role'] ); ?>" />
+		<?php if (!empty($_REQUEST['role'])) { ?>
+<input type="hidden" name="role" value="<?php echo esc_attr($_REQUEST['role']); ?>" />
 <?php } ?>
 
 		<?php $wp_list_table->display(); ?>

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

Spacing +396 added lines, -397 removed lines

@@ -20,7 +20,7 @@ 
  * @since 2.5.0
  * @var string
  */
-if(!defined('CRLF')) define('CRLF',"\r\n");
+if (!defined('CRLF')) define('CRLF', "\r\n");
 
 /**
  * Sets whatever to autodetect ASCII mode.
@@ -30,7 +30,7 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+if (!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
 
 /**
  *
@@ -38,7 +38,7 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+if (!defined("FTP_BINARY")) define("FTP_BINARY", 1);
 
 /**
  *
@@ -46,7 +46,7 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+if (!defined("FTP_ASCII")) define("FTP_ASCII", 0);
 
 /**
  * Whether to force FTP.
@@ -56,25 +56,25 @@ 
  * @since 2.5.0
  * @var bool
  */
-if(!defined('FTP_FORCE')) define('FTP_FORCE', true);
+if (!defined('FTP_FORCE')) define('FTP_FORCE', true);
 
 /**
  * @since 2.5.0
  * @var string
  */
-define('FTP_OS_Unix','u');
+define('FTP_OS_Unix', 'u');
 
 /**
  * @since 2.5.0
  * @var string
  */
-define('FTP_OS_Windows','w');
+define('FTP_OS_Windows', 'w');
 
 /**
  * @since 2.5.0
  * @var string
  */
-define('FTP_OS_Mac','m');
+define('FTP_OS_Mac', 'm');
 
 /**
  * PemFTP base class
@@ -121,39 +121,39 @@ 
 	var $AutoAsciiExt;
 
 	/* Constructor */
-	function __construct($port_mode=FALSE, $verb=FALSE, $le=FALSE) {
-		$this->LocalEcho=$le;
-		$this->Verbose=$verb;
-		$this->_lastaction=NULL;
-		$this->_error_array=array();
-		$this->_eol_code=array(FTP_OS_Unix=>"\n", FTP_OS_Mac=>"\r", FTP_OS_Windows=>"\r\n");
-		$this->AuthorizedTransferMode=array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
-		$this->OS_FullName=array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
-		$this->AutoAsciiExt=array("ASP","BAT","C","CPP","CSS","CSV","JS","H","HTM","HTML","SHTML","INI","LOG","PHP3","PHTML","PL","PERL","SH","SQL","TXT");
-		$this->_port_available=($port_mode==TRUE);
-		$this->SendMSG("Staring FTP client class".($this->_port_available?"":" without PORT mode support"));
-		$this->_connected=FALSE;
-		$this->_ready=FALSE;
-		$this->_can_restore=FALSE;
-		$this->_code=0;
-		$this->_message="";
-		$this->_ftp_buff_size=4096;
-		$this->_curtype=NULL;
+	function __construct($port_mode = FALSE, $verb = FALSE, $le = FALSE) {
+		$this->LocalEcho = $le;
+		$this->Verbose = $verb;
+		$this->_lastaction = NULL;
+		$this->_error_array = array();
+		$this->_eol_code = array(FTP_OS_Unix=>"\n", FTP_OS_Mac=>"\r", FTP_OS_Windows=>"\r\n");
+		$this->AuthorizedTransferMode = array(FTP_AUTOASCII, FTP_ASCII, FTP_BINARY);
+		$this->OS_FullName = array(FTP_OS_Unix => 'UNIX', FTP_OS_Windows => 'WINDOWS', FTP_OS_Mac => 'MACOS');
+		$this->AutoAsciiExt = array("ASP", "BAT", "C", "CPP", "CSS", "CSV", "JS", "H", "HTM", "HTML", "SHTML", "INI", "LOG", "PHP3", "PHTML", "PL", "PERL", "SH", "SQL", "TXT");
+		$this->_port_available = ($port_mode == TRUE);
+		$this->SendMSG("Staring FTP client class" . ($this->_port_available ? "" : " without PORT mode support"));
+		$this->_connected = FALSE;
+		$this->_ready = FALSE;
+		$this->_can_restore = FALSE;
+		$this->_code = 0;
+		$this->_message = "";
+		$this->_ftp_buff_size = 4096;
+		$this->_curtype = NULL;
 		$this->SetUmask(0022);
 		$this->SetType(FTP_AUTOASCII);
 		$this->SetTimeout(30);
 		$this->Passive(!$this->_port_available);
-		$this->_login="anonymous";
-		$this->_password="anon@ftp.com";
-		$this->_features=array();
-	    $this->OS_local=FTP_OS_Unix;
-		$this->OS_remote=FTP_OS_Unix;
-		$this->features=array();
-		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
-		elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
+		$this->_login = "anonymous";
+		$this->_password = "anon@ftp.com";
+		$this->_features = array();
+	    $this->OS_local = FTP_OS_Unix;
+		$this->OS_remote = FTP_OS_Unix;
+		$this->features = array();
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local = FTP_OS_Windows;
+		elseif (strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local = FTP_OS_Mac;
 	}
 
-	function ftp_base($port_mode=FALSE) {
+	function ftp_base($port_mode = FALSE) {
 		$this->__construct($port_mode);
 	}
 
@@ -163,11 +163,11 @@ 
 
 	function parselisting($line) {
 		$is_windows = ($this->OS_remote == FTP_OS_Windows);
-		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) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
-			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
+			if ($lucifer[3] < 70) { $lucifer[3] += 2000; } else { $lucifer[3] += 1900; } // 4digit year fix
+			$b['isdir'] = ($lucifer[7] == "<DIR>");
+			if ($b['isdir'])
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
@@ -177,19 +177,19 @@ 
 			$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];
-		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+		} else if (!$is_windows && $lucifer = preg_split("/[ ]/", $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
-			$lcount=count($lucifer);
-			if ($lcount<8) return '';
+			$lcount = count($lucifer);
+			if ($lcount < 8) return '';
 			$b = array();
 			$b['isdir'] = $lucifer[0][0] === "d";
 			$b['islink'] = $lucifer[0][0] === "l";
-			if ( $b['isdir'] )
+			if ($b['isdir'])
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			elseif ($b['islink'])
 				$b['type'] = 'l';
 			else
 				$b['type'] = 'f';
@@ -198,15 +198,15 @@ 
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ($lcount==8) {
-				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']);
+			if ($lcount == 8) {
+				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['name'] = $lucifer[7];
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
+				if (preg_match("/([0-9]{2}):([0-9]{2})/", $lucifer[7], $l2)) {
 					$b['year'] = gmdate("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
@@ -215,7 +215,7 @@ 
 					$b['hour'] = 0;
 					$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];
 			}
 		}
@@ -223,227 +223,227 @@ 
 		return $b;
 	}
 
-	function SendMSG($message = "", $crlf=true) {
+	function SendMSG($message = "", $crlf = true) {
 		if ($this->Verbose) {
-			echo $message.($crlf?CRLF:"");
+			echo $message . ($crlf ?CRLF:"");
 			flush();
 		}
 		return TRUE;
 	}
 
-	function SetType($mode=FTP_AUTOASCII) {
-		if(!in_array($mode, $this->AuthorizedTransferMode)) {
+	function SetType($mode = FTP_AUTOASCII) {
+		if (!in_array($mode, $this->AuthorizedTransferMode)) {
 			$this->SendMSG("Wrong type");
 			return FALSE;
 		}
-		$this->_type=$mode;
-		$this->SendMSG("Transfer type: ".($this->_type==FTP_BINARY?"binary":($this->_type==FTP_ASCII?"ASCII":"auto ASCII") ) );
+		$this->_type = $mode;
+		$this->SendMSG("Transfer type: " . ($this->_type == FTP_BINARY ? "binary" : ($this->_type == FTP_ASCII ? "ASCII" : "auto ASCII")));
 		return TRUE;
 	}
 
-	function _settype($mode=FTP_ASCII) {
-		if($this->_ready) {
-			if($mode==FTP_BINARY) {
-				if($this->_curtype!=FTP_BINARY) {
-					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
-					$this->_curtype=FTP_BINARY;
+	function _settype($mode = FTP_ASCII) {
+		if ($this->_ready) {
+			if ($mode == FTP_BINARY) {
+				if ($this->_curtype != FTP_BINARY) {
+					if (!$this->_exec("TYPE I", "SetType")) return FALSE;
+					$this->_curtype = FTP_BINARY;
 				}
-			} elseif($this->_curtype!=FTP_ASCII) {
-				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
-				$this->_curtype=FTP_ASCII;
+			} elseif ($this->_curtype != FTP_ASCII) {
+				if (!$this->_exec("TYPE A", "SetType")) return FALSE;
+				$this->_curtype = FTP_ASCII;
 			}
 		} else return FALSE;
 		return TRUE;
 	}
 
-	function Passive($pasv=NULL) {
-		if(is_null($pasv)) $this->_passive=!$this->_passive;
-		else $this->_passive=$pasv;
-		if(!$this->_port_available and !$this->_passive) {
+	function Passive($pasv = NULL) {
+		if (is_null($pasv)) $this->_passive = !$this->_passive;
+		else $this->_passive = $pasv;
+		if (!$this->_port_available and !$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
-			$this->_passive=TRUE;
+			$this->_passive = TRUE;
 			return FALSE;
 		}
-		$this->SendMSG("Passive mode ".($this->_passive?"on":"off"));
+		$this->SendMSG("Passive mode " . ($this->_passive ? "on" : "off"));
 		return TRUE;
 	}
 
-	function SetServer($host, $port=21, $reconnect=true) {
-		if(!is_long($port)) {
-	        $this->verbose=true;
+	function SetServer($host, $port = 21, $reconnect = true) {
+		if (!is_long($port)) {
+	        $this->verbose = true;
     	    $this->SendMSG("Incorrect port syntax");
 			return FALSE;
 		} else {
-			$ip=@gethostbyname($host);
-	        $dns=@gethostbyaddr($host);
-	        if(!$ip) $ip=$host;
-	        if(!$dns) $dns=$host;
+			$ip = @gethostbyname($host);
+	        $dns = @gethostbyaddr($host);
+	        if (!$ip) $ip = $host;
+	        if (!$dns) $dns = $host;
 	        // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
 	        // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
 	        $ipaslong = ip2long($ip);
-			if ( ($ipaslong == false) || ($ipaslong === -1) ) {
-				$this->SendMSG("Wrong host name/address \"".$host."\"");
+			if (($ipaslong == false) || ($ipaslong === -1)) {
+				$this->SendMSG("Wrong host name/address \"" . $host . "\"");
 				return FALSE;
 			}
-	        $this->_host=$ip;
-	        $this->_fullhost=$dns;
-	        $this->_port=$port;
-	        $this->_dataport=$port-1;
-		}
-		$this->SendMSG("Host \"".$this->_fullhost."(".$this->_host."):".$this->_port."\"");
-		if($reconnect){
-			if($this->_connected) {
+	        $this->_host = $ip;
+	        $this->_fullhost = $dns;
+	        $this->_port = $port;
+	        $this->_dataport = $port - 1;
+		}
+		$this->SendMSG("Host \"" . $this->_fullhost . "(" . $this->_host . "):" . $this->_port . "\"");
+		if ($reconnect) {
+			if ($this->_connected) {
 				$this->SendMSG("Reconnecting");
-				if(!$this->quit(FTP_FORCE)) return FALSE;
-				if(!$this->connect()) return FALSE;
+				if (!$this->quit(FTP_FORCE)) return FALSE;
+				if (!$this->connect()) return FALSE;
 			}
 		}
 		return TRUE;
 	}
 
-	function SetUmask($umask=0022) {
-		$this->_umask=$umask;
+	function SetUmask($umask = 0022) {
+		$this->_umask = $umask;
 		umask($this->_umask);
-		$this->SendMSG("UMASK 0".decoct($this->_umask));
+		$this->SendMSG("UMASK 0" . decoct($this->_umask));
 		return TRUE;
 	}
 
-	function SetTimeout($timeout=30) {
-		$this->_timeout=$timeout;
-		$this->SendMSG("Timeout ".$this->_timeout);
-		if($this->_connected)
-			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+	function SetTimeout($timeout = 30) {
+		$this->_timeout = $timeout;
+		$this->SendMSG("Timeout " . $this->_timeout);
+		if ($this->_connected)
+			if (!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
 		return TRUE;
 	}
 
-	function connect($server=NULL) {
-		if(!empty($server)) {
-			if(!$this->SetServer($server)) return false;
+	function connect($server = NULL) {
+		if (!empty($server)) {
+			if (!$this->SetServer($server)) return false;
 		}
-		if($this->_ready) return true;
-	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
-		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
-			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
+		if ($this->_ready) return true;
+	    $this->SendMsg('Local OS : ' . $this->OS_FullName[$this->OS_local]);
+		if (!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
+			$this->SendMSG("Error : Cannot connect to remote host \"" . $this->_fullhost . " :" . $this->_port . "\"");
 			return FALSE;
 		}
-		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
+		$this->SendMSG("Connected to remote host \"" . $this->_fullhost . ":" . $this->_port . "\". Waiting for greeting.");
 		do {
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			$this->_lastaction=time();
-		} while($this->_code<200);
-		$this->_ready=true;
-		$syst=$this->systype();
-		if(!$syst) $this->SendMSG("Cannot detect remote OS");
+			if (!$this->_readmsg()) return FALSE;
+			if (!$this->_checkCode()) return FALSE;
+			$this->_lastaction = time();
+		} while ($this->_code < 200);
+		$this->_ready = true;
+		$syst = $this->systype();
+		if (!$syst) $this->SendMSG("Cannot detect remote OS");
 		else {
-			if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows;
-			elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac;
-			elseif(preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote=FTP_OS_Unix;
-			else $this->OS_remote=FTP_OS_Mac;
-			$this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]);
-		}
-		if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
-		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+			if (preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote = FTP_OS_Windows;
+			elseif (preg_match("/os/i", $syst[0])) $this->OS_remote = FTP_OS_Mac;
+			elseif (preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote = FTP_OS_Unix;
+			else $this->OS_remote = FTP_OS_Mac;
+			$this->SendMSG("Remote OS: " . $this->OS_FullName[$this->OS_remote]);
+		}
+		if (!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
+		else $this->SendMSG("Supported features: " . implode(", ", array_keys($this->_features)));
 		return TRUE;
 	}
 
-	function quit($force=false) {
-		if($this->_ready) {
-			if(!$this->_exec("QUIT") and !$force) return FALSE;
-			if(!$this->_checkCode() and !$force) return FALSE;
-			$this->_ready=false;
+	function quit($force = false) {
+		if ($this->_ready) {
+			if (!$this->_exec("QUIT") and !$force) return FALSE;
+			if (!$this->_checkCode() and !$force) return FALSE;
+			$this->_ready = false;
 			$this->SendMSG("Session finished");
 		}
 		$this->_quit();
 		return TRUE;
 	}
 
-	function login($user=NULL, $pass=NULL) {
-		if(!is_null($user)) $this->_login=$user;
-		else $this->_login="anonymous";
-		if(!is_null($pass)) $this->_password=$pass;
-		else $this->_password="anon@anon.com";
-		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		if($this->_code!=230) {
-			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+	function login($user = NULL, $pass = NULL) {
+		if (!is_null($user)) $this->_login = $user;
+		else $this->_login = "anonymous";
+		if (!is_null($pass)) $this->_password = $pass;
+		else $this->_password = "anon@anon.com";
+		if (!$this->_exec("USER " . $this->_login, "login")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
+		if ($this->_code != 230) {
+			if (!$this->_exec((($this->_code == 331) ? "PASS " : "ACCT ") . $this->_password, "login")) return FALSE;
+			if (!$this->_checkCode()) return FALSE;
 		}
 		$this->SendMSG("Authentication succeeded");
-		if(empty($this->_features)) {
-			if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
-			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		if (empty($this->_features)) {
+			if (!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
+			else $this->SendMSG("Supported features: " . implode(", ", array_keys($this->_features)));
 		}
 		return TRUE;
 	}
 
 	function pwd() {
-		if(!$this->_exec("PWD", "pwd")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("PWD", "pwd")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
 	}
 
 	function cdup() {
-		if(!$this->_exec("CDUP", "cdup")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("CDUP", "cdup")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return true;
 	}
 
 	function chdir($pathname) {
-		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("CWD " . $pathname, "chdir")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function rmdir($pathname) {
-		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("RMD " . $pathname, "rmdir")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function mkdir($pathname) {
-		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("MKD " . $pathname, "mkdir")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function rename($from, $to) {
-		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		if($this->_code==350) {
-			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("RNFR " . $from, "rename")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
+		if ($this->_code == 350) {
+			if (!$this->_exec("RNTO " . $to, "rename")) return FALSE;
+			if (!$this->_checkCode()) return FALSE;
 		} else return FALSE;
 		return TRUE;
 	}
 
 	function filesize($pathname) {
-		if(!isset($this->_features["SIZE"])) {
+		if (!isset($this->_features["SIZE"])) {
 			$this->PushError("filesize", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("SIZE " . $pathname, "filesize")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 	}
 
 	function abort() {
-		if(!$this->_exec("ABOR", "abort")) return FALSE;
-		if(!$this->_checkCode()) {
-			if($this->_code!=426) return FALSE;
-			if(!$this->_readmsg("abort")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("ABOR", "abort")) return FALSE;
+		if (!$this->_checkCode()) {
+			if ($this->_code != 426) return FALSE;
+			if (!$this->_readmsg("abort")) return FALSE;
+			if (!$this->_checkCode()) return FALSE;
 		}
 		return true;
 	}
 
 	function mdtm($pathname) {
-		if(!isset($this->_features["MDTM"])) {
+		if (!isset($this->_features["MDTM"])) {
 			$this->PushError("mdtm", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("MDTM " . $pathname, "mdtm")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		$mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
 		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -451,61 +451,61 @@ 
 	}
 
 	function systype() {
-		if(!$this->_exec("SYST", "systype")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("SYST", "systype")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		$DATA = explode(" ", $this->_message);
 		return array($DATA[1], $DATA[3]);
 	}
 
 	function delete($pathname) {
-		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("DELE " . $pathname, "delete")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
-	function site($command, $fnction="site") {
-		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+	function site($command, $fnction = "site") {
+		if (!$this->_exec("SITE " . $command, $fnction)) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function chmod($pathname, $mode) {
-		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
+		if (!$this->site(sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
 		return TRUE;
 	}
 
 	function restore($from) {
-		if(!isset($this->_features["REST"])) {
+		if (!isset($this->_features["REST"])) {
 			$this->PushError("restore", "not supported by server");
 			return FALSE;
 		}
-		if($this->_curtype!=FTP_BINARY) {
+		if ($this->_curtype != FTP_BINARY) {
 			$this->PushError("restore", "cannot restore in ASCII mode");
 			return FALSE;
 		}
-		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_exec("REST " . $from, "resore")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return TRUE;
 	}
 
 	function features() {
-		if(!$this->_exec("FEAT", "features")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
-		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
-		$this->_features=array();
-		foreach($f as $k=>$v) {
-			$v=explode(" ", trim($v));
-			$this->_features[array_shift($v)]=$v;
+		if (!$this->_exec("FEAT", "features")) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
+		$f = preg_split("/[" . CRLF . "]+/", preg_replace("/[0-9]{3}[ -].*[" . CRLF . "]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
+		$this->_features = array();
+		foreach ($f as $k=>$v) {
+			$v = explode(" ", trim($v));
+			$this->_features[array_shift($v)] = $v;
 		}
 		return true;
 	}
 
-	function rawlist($pathname="", $arg="") {
-		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
+	function rawlist($pathname = "", $arg = "") {
+		return $this->_list(($arg ? " " . $arg : "") . ($pathname ? " " . $pathname : ""), "LIST", "rawlist");
 	}
 
-	function nlist($pathname="", $arg="") {
-		return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
+	function nlist($pathname = "", $arg = "") {
+		return $this->_list(($arg ? " " . $arg : "") . ($pathname ? " " . $pathname : ""), "NLST", "nlist");
 	}
 
 	function is_exists($pathname) {
@@ -513,331 +513,330 @@ 
 	}
 
 	function file_exists($pathname) {
-		$exists=true;
-		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
+		$exists = true;
+		if (!$this->_exec("RNFR " . $pathname, "rename")) $exists = FALSE;
 		else {
-			if(!$this->_checkCode()) $exists=FALSE;
+			if (!$this->_checkCode()) $exists = FALSE;
 			$this->abort();
 		}
-		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
-		else $this->SendMSG("Remote file ".$pathname." does not exist");
+		if ($exists) $this->SendMSG("Remote file " . $pathname . " exists");
+		else $this->SendMSG("Remote file " . $pathname . " does not exist");
 		return $exists;
 	}
 
-	function fget($fp, $remotefile, $rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+	function fget($fp, $remotefile, $rest = 0) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if (!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("RETR ".$remotefile, "get")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if (!$this->_exec("RETR " . $remotefile, "get")) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if (!$this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$out=$this->_data_read($mode, $fp);
+		$out = $this->_data_read($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_readmsg()) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return $out;
 	}
 
-	function get($remotefile, $localfile=NULL, $rest=0) {
-		if(is_null($localfile)) $localfile=$remotefile;
+	function get($remotefile, $localfile = NULL, $rest = 0) {
+		if (is_null($localfile)) $localfile = $remotefile;
 		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
 		$fp = @fopen($localfile, "w");
 		if (!$fp) {
-			$this->PushError("get","cannot open local file", "Cannot create \"".$localfile."\"");
+			$this->PushError("get", "cannot open local file", "Cannot create \"" . $localfile . "\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if (!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("RETR ".$remotefile, "get")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if (!$this->_exec("RETR " . $remotefile, "get")) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if (!$this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		$out=$this->_data_read($mode, $fp);
+		$out = $this->_data_read($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_readmsg()) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return $out;
 	}
 
-	function fput($remotefile, $fp, $rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+	function fput($remotefile, $fp, $rest = 0) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($remotefile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if (!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("STOR ".$remotefile, "put")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if (!$this->_exec("STOR " . $remotefile, "put")) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if (!$this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$ret=$this->_data_write($mode, $fp);
+		$ret = $this->_data_write($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_readmsg()) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return $ret;
 	}
 
-	function put($localfile, $remotefile=NULL, $rest=0) {
-		if(is_null($remotefile)) $remotefile=$localfile;
+	function put($localfile, $remotefile = NULL, $rest = 0) {
+		if (is_null($remotefile)) $remotefile = $localfile;
 		if (!file_exists($localfile)) {
-			$this->PushError("put","cannot open local file", "No such file or directory \"".$localfile."\"");
+			$this->PushError("put", "cannot open local file", "No such file or directory \"" . $localfile . "\"");
 			return FALSE;
 		}
 		$fp = @fopen($localfile, "r");
 
 		if (!$fp) {
-			$this->PushError("put","cannot open local file", "Cannot read file \"".$localfile."\"");
+			$this->PushError("put", "cannot open local file", "Cannot read file \"" . $localfile . "\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
-		$pi=pathinfo($localfile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
-		if(!$this->_data_prepare($mode)) {
+		if ($this->_can_restore and $rest != 0) fseek($fp, $rest);
+		$pi = pathinfo($localfile);
+		if ($this->_type == FTP_ASCII or ($this->_type == FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode = FTP_ASCII;
+		else $mode = FTP_BINARY;
+		if (!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
-		if(!$this->_exec("STOR ".$remotefile, "put")) {
+		if ($this->_can_restore and $rest != 0) $this->restore($rest);
+		if (!$this->_exec("STOR " . $remotefile, "put")) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if (!$this->_checkCode()) {
 			$this->_data_close();
 			fclose($fp);
 			return FALSE;
 		}
-		$ret=$this->_data_write($mode, $fp);
+		$ret = $this->_data_write($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if (!$this->_readmsg()) return FALSE;
+		if (!$this->_checkCode()) return FALSE;
 		return $ret;
 	}
 
-	function mput($local=".", $remote=NULL, $continious=false) {
-		$local=realpath($local);
-		if(!@file_exists($local)) {
-			$this->PushError("mput","cannot open local folder", "Cannot stat folder \"".$local."\"");
+	function mput($local = ".", $remote = NULL, $continious = false) {
+		$local = realpath($local);
+		if (!@file_exists($local)) {
+			$this->PushError("mput", "cannot open local folder", "Cannot stat folder \"" . $local . "\"");
 			return FALSE;
 		}
-		if(!is_dir($local)) return $this->put($local, $remote);
-		if(empty($remote)) $remote=".";
-		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
-		if($handle = opendir($local)) {
-			$list=array();
+		if (!is_dir($local)) return $this->put($local, $remote);
+		if (empty($remote)) $remote = ".";
+		elseif (!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
+		if ($handle = opendir($local)) {
+			$list = array();
 			while (false !== ($file = readdir($handle))) {
-				if ($file != "." && $file != "..") $list[]=$file;
+				if ($file != "." && $file != "..") $list[] = $file;
 			}
 			closedir($handle);
 		} else {
-			$this->PushError("mput","cannot open local folder", "Cannot read folder \"".$local."\"");
+			$this->PushError("mput", "cannot open local folder", "Cannot read folder \"" . $local . "\"");
 			return FALSE;
 		}
-		if(empty($list)) return TRUE;
-		$ret=true;
-		foreach($list as $el) {
-			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
-			else $t=$this->put($local."/".$el, $remote."/".$el);
-			if(!$t) {
-				$ret=FALSE;
-				if(!$continious) break;
+		if (empty($list)) return TRUE;
+		$ret = true;
+		foreach ($list as $el) {
+			if (is_dir($local . "/" . $el)) $t = $this->mput($local . "/" . $el, $remote . "/" . $el);
+			else $t = $this->put($local . "/" . $el, $remote . "/" . $el);
+			if (!$t) {
+				$ret = FALSE;
+				if (!$continious) break;
 			}
 		}
 		return $ret;
 
 	}
 
-	function mget($remote, $local=".", $continious=false) {
-		$list=$this->rawlist($remote, "-lA");
-		if($list===false) {
-			$this->PushError("mget","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents");
+	function mget($remote, $local = ".", $continious = false) {
+		$list = $this->rawlist($remote, "-lA");
+		if ($list === false) {
+			$this->PushError("mget", "cannot read remote folder list", "Cannot read remote folder \"" . $remote . "\" contents");
 			return FALSE;
 		}
-		if(empty($list)) return true;
-		if(!@file_exists($local)) {
-			if(!@mkdir($local)) {
-				$this->PushError("mget","cannot create local folder", "Cannot create folder \"".$local."\"");
+		if (empty($list)) return true;
+		if (!@file_exists($local)) {
+			if (!@mkdir($local)) {
+				$this->PushError("mget", "cannot create local folder", "Cannot create folder \"" . $local . "\"");
 				return FALSE;
 			}
 		}
-		foreach($list as $k=>$v) {
-			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
-		}
-		$ret=true;
-		foreach($list as $el) {
-			if($el["type"]=="d") {
-				if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
-					$this->PushError("mget", "cannot copy folder", "Cannot copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+		foreach ($list as $k=>$v) {
+			$list[$k] = $this->parselisting($v);
+			if (!$list[$k] or $list[$k]["name"] == "." or $list[$k]["name"] == "..") unset($list[$k]);
+		}
+		$ret = true;
+		foreach ($list as $el) {
+			if ($el["type"] == "d") {
+				if (!$this->mget($remote . "/" . $el["name"], $local . "/" . $el["name"], $continious)) {
+					$this->PushError("mget", "cannot copy folder", "Cannot copy remote folder \"" . $remote . "/" . $el["name"] . "\" to local \"" . $local . "/" . $el["name"] . "\"");
+					$ret = false;
+					if (!$continious) break;
 				}
 			} else {
-				if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) {
-					$this->PushError("mget", "cannot copy file", "Cannot copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+				if (!$this->get($remote . "/" . $el["name"], $local . "/" . $el["name"])) {
+					$this->PushError("mget", "cannot copy file", "Cannot copy remote file \"" . $remote . "/" . $el["name"] . "\" to local \"" . $local . "/" . $el["name"] . "\"");
+					$ret = false;
+					if (!$continious) break;
 				}
 			}
-			@chmod($local."/".$el["name"], $el["perms"]);
-			$t=strtotime($el["date"]);
-			if($t!==-1 and $t!==false) @touch($local."/".$el["name"], $t);
+			@chmod($local . "/" . $el["name"], $el["perms"]);
+			$t = strtotime($el["date"]);
+			if ($t !== -1 and $t !== false) @touch($local . "/" . $el["name"], $t);
 		}
 		return $ret;
 	}
 
-	function mdel($remote, $continious=false) {
-		$list=$this->rawlist($remote, "-la");
-		if($list===false) {
-			$this->PushError("mdel","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents");
+	function mdel($remote, $continious = false) {
+		$list = $this->rawlist($remote, "-la");
+		if ($list === false) {
+			$this->PushError("mdel", "cannot read remote folder list", "Cannot read remote folder \"" . $remote . "\" contents");
 			return false;
 		}
 
-		foreach($list as $k=>$v) {
-			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+		foreach ($list as $k=>$v) {
+			$list[$k] = $this->parselisting($v);
+			if (!$list[$k] or $list[$k]["name"] == "." or $list[$k]["name"] == "..") unset($list[$k]);
 		}
-		$ret=true;
+		$ret = true;
 
-		foreach($list as $el) {
-			if ( empty($el) )
+		foreach ($list as $el) {
+			if (empty($el))
 				continue;
 
-			if($el["type"]=="d") {
-				if(!$this->mdel($remote."/".$el["name"], $continious)) {
-					$ret=false;
-					if(!$continious) break;
+			if ($el["type"] == "d") {
+				if (!$this->mdel($remote . "/" . $el["name"], $continious)) {
+					$ret = false;
+					if (!$continious) break;
 				}
 			} else {
-				if (!$this->delete($remote."/".$el["name"])) {
-					$this->PushError("mdel", "cannot delete file", "Cannot delete remote file \"".$remote."/".$el["name"]."\"");
-					$ret=false;
-					if(!$continious) break;
+				if (!$this->delete($remote . "/" . $el["name"])) {
+					$this->PushError("mdel", "cannot delete file", "Cannot delete remote file \"" . $remote . "/" . $el["name"] . "\"");
+					$ret = false;
+					if (!$continious) break;
 				}
 			}
 		}
 
-		if(!$this->rmdir($remote)) {
-			$this->PushError("mdel", "cannot delete folder", "Cannot delete remote folder \"".$remote."/".$el["name"]."\"");
-			$ret=false;
+		if (!$this->rmdir($remote)) {
+			$this->PushError("mdel", "cannot delete folder", "Cannot delete remote folder \"" . $remote . "/" . $el["name"] . "\"");
+			$ret = false;
 		}
 		return $ret;
 	}
 
 	function mmkdir($dir, $mode = 0777) {
-		if(empty($dir)) return FALSE;
-		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
-		if(!$this->mmkdir(dirname($dir), $mode)) return false;
-		$r=$this->mkdir($dir, $mode);
-		$this->chmod($dir,$mode);
+		if (empty($dir)) return FALSE;
+		if ($this->is_exists($dir) or $dir == "/") return TRUE;
+		if (!$this->mmkdir(dirname($dir), $mode)) return false;
+		$r = $this->mkdir($dir, $mode);
+		$this->chmod($dir, $mode);
 		return $r;
 	}
 
-	function glob($pattern, $handle=NULL) {
-		$path=$output=null;
-		if(PHP_OS=='WIN32') $slash='\\';
-		else $slash='/';
-		$lastpos=strrpos($pattern,$slash);
-		if(!($lastpos===false)) {
-			$path=substr($pattern,0,-$lastpos-1);
-			$pattern=substr($pattern,$lastpos);
-		} else $path=getcwd();
-		if(is_array($handle) and !empty($handle)) {
-			foreach($handle as $dir) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+	function glob($pattern, $handle = NULL) {
+		$path = $output = null;
+		if (PHP_OS == 'WIN32') $slash = '\\';
+		else $slash = '/';
+		$lastpos = strrpos($pattern, $slash);
+		if (!($lastpos === false)) {
+			$path = substr($pattern, 0, -$lastpos - 1);
+			$pattern = substr($pattern, $lastpos);
+		} else $path = getcwd();
+		if (is_array($handle) and !empty($handle)) {
+			foreach ($handle as $dir) {
+				if ($this->glob_pattern_match($pattern, $dir))
+				$output[] = $dir;
 			}
 		} else {
-			$handle=@opendir($path);
-			if($handle===false) return false;
-			while($dir=readdir($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+			$handle = @opendir($path);
+			if ($handle === false) return false;
+			while ($dir = readdir($handle)) {
+				if ($this->glob_pattern_match($pattern, $dir))
+				$output[] = $dir;
 			}
 			closedir($handle);
 		}
-		if(is_array($output)) return $output;
+		if (is_array($output)) return $output;
 		return false;
 	}
 
-	function glob_pattern_match($pattern,$subject) {
-		$out=null;
-		$chunks=explode(';',$pattern);
-		foreach($chunks as $pattern) {
-			$escape=array('$','^','.','{','}','(',')','[',']','|');
-			while(strpos($pattern,'**')!==false)
-				$pattern=str_replace('**','*',$pattern);
-			foreach($escape as $probe)
-				$pattern=str_replace($probe,"\\$probe",$pattern);
-			$pattern=str_replace('?*','*',
-				str_replace('*?','*',
-					str_replace('*',".*",
-						str_replace('?','.{1,1}',$pattern))));
-			$out[]=$pattern;
-		}
-		if(count($out)==1) return($this->glob_regexp("^$out[0]$",$subject));
+	function glob_pattern_match($pattern, $subject) {
+		$out = null;
+		$chunks = explode(';', $pattern);
+		foreach ($chunks as $pattern) {
+			$escape = array('$', '^', '.', '{', '}', '(', ')', '[', ']', '|');
+			while (strpos($pattern, '**') !== false)
+				$pattern = str_replace('**', '*', $pattern);
+			foreach ($escape as $probe)
+				$pattern = str_replace($probe, "\\$probe", $pattern);
+			$pattern = str_replace('?*', '*',
+				str_replace('*?', '*',
+					str_replace('*', ".*",
+						str_replace('?', '.{1,1}', $pattern))));
+			$out[] = $pattern;
+		}
+		if (count($out) == 1) return($this->glob_regexp("^$out[0]$", $subject));
 		else {
-			foreach($out as $tester)
+			foreach ($out as $tester)
 				// TODO: This should probably be glob_regexp(), but needs tests.
-				if($this->my_regexp("^$tester$",$subject)) return true;
+				if ($this->my_regexp("^$tester$", $subject)) return true;
 		}
 		return false;
 	}
 
-	function glob_regexp($pattern,$subject) {
-		$sensitive=(PHP_OS!='WIN32');
-		return ($sensitive?
-			preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $subject ) :
-			preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $subject )
+	function glob_regexp($pattern, $subject) {
+		$sensitive = (PHP_OS != 'WIN32');
+		return ($sensitive ?
+			preg_match('/' . preg_quote($pattern, '/') . '/', $subject) : preg_match('/' . preg_quote($pattern, '/') . '/i', $subject)
 		);
 	}
 
 	function dirlist($remote) {
-		$list=$this->rawlist($remote, "-la");
-		if($list===false) {
-			$this->PushError("dirlist","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents");
+		$list = $this->rawlist($remote, "-la");
+		if ($list === false) {
+			$this->PushError("dirlist", "cannot read remote folder list", "Cannot read remote folder \"" . $remote . "\" contents");
 			return false;
 		}
 
 		$dirlist = array();
-		foreach($list as $k=>$v) {
-			$entry=$this->parselisting($v);
-			if ( empty($entry) )
+		foreach ($list as $k=>$v) {
+			$entry = $this->parselisting($v);
+			if (empty($entry))
 				continue;
 
-			if($entry["name"]=="." or $entry["name"]=="..")
+			if ($entry["name"] == "." or $entry["name"] == "..")
 				continue;
 
 			$dirlist[$entry['name']] = $entry;
@@ -849,27 +848,27 @@ 
 // <!--       Private functions                                                                 -->
 // <!-- --------------------------------------------------------------------------------------- -->
 	function _checkCode() {
-		return ($this->_code<400 and $this->_code>0);
+		return ($this->_code < 400 and $this->_code > 0);
 	}
 
-	function _list($arg="", $cmd="LIST", $fnction="_list") {
-		if(!$this->_data_prepare()) return false;
-		if(!$this->_exec($cmd.$arg, $fnction)) {
+	function _list($arg = "", $cmd = "LIST", $fnction = "_list") {
+		if (!$this->_data_prepare()) return false;
+		if (!$this->_exec($cmd . $arg, $fnction)) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if(!$this->_checkCode()) {
+		if (!$this->_checkCode()) {
 			$this->_data_close();
 			return FALSE;
 		}
-		$out="";
-		if($this->_code<200) {
-			$out=$this->_data_read();
+		$out = "";
+		if ($this->_code < 200) {
+			$out = $this->_data_read();
 			$this->_data_close();
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			if($out === FALSE ) return FALSE;
-			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
+			if (!$this->_readmsg()) return FALSE;
+			if (!$this->_checkCode()) return FALSE;
+			if ($out === FALSE) return FALSE;
+			$out = preg_split("/[" . CRLF . "]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
 //			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
 		}
 		return $out;
@@ -879,34 +878,34 @@ 
 // <!-- Partie : gestion des erreurs                                                            -->
 // <!-- --------------------------------------------------------------------------------------- -->
 // Gnre une erreur pour traitement externe  la classe
-	function PushError($fctname,$msg,$desc=false){
-		$error=array();
-		$error['time']=time();
-		$error['fctname']=$fctname;
-		$error['msg']=$msg;
-		$error['desc']=$desc;
-		if($desc) $tmp=' ('.$desc.')'; else $tmp='';
-		$this->SendMSG($fctname.': '.$msg.$tmp);
-		return(array_push($this->_error_array,$error));
+	function PushError($fctname, $msg, $desc = false) {
+		$error = array();
+		$error['time'] = time();
+		$error['fctname'] = $fctname;
+		$error['msg'] = $msg;
+		$error['desc'] = $desc;
+		if ($desc) $tmp = ' (' . $desc . ')'; else $tmp = '';
+		$this->SendMSG($fctname . ': ' . $msg . $tmp);
+		return(array_push($this->_error_array, $error));
 	}
 
 // Rcupre une erreur externe
-	function PopError(){
-		if(count($this->_error_array)) return(array_pop($this->_error_array));
+	function PopError() {
+		if (count($this->_error_array)) return(array_pop($this->_error_array));
 			else return(false);
 	}
 }
 
-$mod_sockets = extension_loaded( 'sockets' );
-if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) {
-	$prefix = ( PHP_SHLIB_SUFFIX == 'dll' ) ? 'php_' : '';
-	@dl( $prefix . 'sockets.' . PHP_SHLIB_SUFFIX ); // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.dlDeprecated
-	$mod_sockets = extension_loaded( 'sockets' );
+$mod_sockets = extension_loaded('sockets');
+if (!$mod_sockets && function_exists('dl') && is_callable('dl')) {
+	$prefix = (PHP_SHLIB_SUFFIX == 'dll') ? 'php_' : '';
+	@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX); // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.dlDeprecated
+	$mod_sockets = extension_loaded('sockets');
 }
 
-require_once __DIR__ . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
+require_once __DIR__ . "/class-ftp-" . ($mod_sockets ? "sockets" : "pure") . ".php";
 
-if ( $mod_sockets ) {
+if ($mod_sockets) {
 	class ftp extends ftp_sockets {}
 } else {
 	class ftp extends ftp_pure {}

brighty/wp-admin/includes/post.php

Spacing +656 added lines, -656 removed lines

@@ -18,186 +18,186 @@ 
  *                              Defaults to the `$_POST` superglobal.
  * @return array|WP_Error Array of post data on success, WP_Error on failure.
  */
-function _wp_translate_postdata( $update = false, $post_data = null ) {
+function _wp_translate_postdata($update = false, $post_data = null) {
 
-	if ( empty( $post_data ) ) {
+	if (empty($post_data)) {
 		$post_data = &$_POST;
 	}
 
-	if ( $update ) {
+	if ($update) {
 		$post_data['ID'] = (int) $post_data['post_ID'];
 	}
 
-	$ptype = get_post_type_object( $post_data['post_type'] );
+	$ptype = get_post_type_object($post_data['post_type']);
 
-	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' === $post_data['post_type'] ) {
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+	if ($update && !current_user_can('edit_post', $post_data['ID'])) {
+		if ('page' === $post_data['post_type']) {
+			return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to edit pages as this user.'));
 		} else {
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to edit posts as this user.'));
 		}
-	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' === $post_data['post_type'] ) {
-			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+	} elseif (!$update && !current_user_can($ptype->cap->create_posts)) {
+		if ('page' === $post_data['post_type']) {
+			return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to create pages as this user.'));
 		} else {
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to create posts as this user.'));
 		}
 	}
 
-	if ( isset( $post_data['content'] ) ) {
+	if (isset($post_data['content'])) {
 		$post_data['post_content'] = $post_data['content'];
 	}
 
-	if ( isset( $post_data['excerpt'] ) ) {
+	if (isset($post_data['excerpt'])) {
 		$post_data['post_excerpt'] = $post_data['excerpt'];
 	}
 
-	if ( isset( $post_data['parent_id'] ) ) {
+	if (isset($post_data['parent_id'])) {
 		$post_data['post_parent'] = (int) $post_data['parent_id'];
 	}
 
-	if ( isset( $post_data['trackback_url'] ) ) {
+	if (isset($post_data['trackback_url'])) {
 		$post_data['to_ping'] = $post_data['trackback_url'];
 	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
-	if ( ! empty( $post_data['post_author_override'] ) ) {
+	if (!empty($post_data['post_author_override'])) {
 		$post_data['post_author'] = (int) $post_data['post_author_override'];
 	} else {
-		if ( ! empty( $post_data['post_author'] ) ) {
+		if (!empty($post_data['post_author'])) {
 			$post_data['post_author'] = (int) $post_data['post_author'];
 		} else {
 			$post_data['post_author'] = (int) $post_data['user_ID'];
 		}
 	}
 
-	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
-		&& ! current_user_can( $ptype->cap->edit_others_posts ) ) {
+	if (isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID'])
+		&& !current_user_can($ptype->cap->edit_others_posts)) {
 
-		if ( $update ) {
-			if ( 'page' === $post_data['post_type'] ) {
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+		if ($update) {
+			if ('page' === $post_data['post_type']) {
+				return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to edit pages as this user.'));
 			} else {
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to edit posts as this user.'));
 			}
 		} else {
-			if ( 'page' === $post_data['post_type'] ) {
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			if ('page' === $post_data['post_type']) {
+				return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to create pages as this user.'));
 			} else {
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to create posts as this user.'));
 			}
 		}
 	}
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if (!empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
 		// No longer an auto-draft.
-		if ( 'auto-draft' === $post_data['post_status'] ) {
+		if ('auto-draft' === $post_data['post_status']) {
 			$post_data['post_status'] = 'draft';
 		}
 
-		if ( ! get_post_status_object( $post_data['post_status'] ) ) {
-			unset( $post_data['post_status'] );
+		if (!get_post_status_object($post_data['post_status'])) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	// What to do based on which button they pressed.
-	if ( isset( $post_data['saveasdraft'] ) && '' !== $post_data['saveasdraft'] ) {
+	if (isset($post_data['saveasdraft']) && '' !== $post_data['saveasdraft']) {
 		$post_data['post_status'] = 'draft';
 	}
-	if ( isset( $post_data['saveasprivate'] ) && '' !== $post_data['saveasprivate'] ) {
+	if (isset($post_data['saveasprivate']) && '' !== $post_data['saveasprivate']) {
 		$post_data['post_status'] = 'private';
 	}
-	if ( isset( $post_data['publish'] ) && ( '' !== $post_data['publish'] )
-		&& ( ! isset( $post_data['post_status'] ) || 'private' !== $post_data['post_status'] )
+	if (isset($post_data['publish']) && ('' !== $post_data['publish'])
+		&& (!isset($post_data['post_status']) || 'private' !== $post_data['post_status'])
 	) {
 		$post_data['post_status'] = 'publish';
 	}
-	if ( isset( $post_data['advanced'] ) && '' !== $post_data['advanced'] ) {
+	if (isset($post_data['advanced']) && '' !== $post_data['advanced']) {
 		$post_data['post_status'] = 'draft';
 	}
-	if ( isset( $post_data['pending'] ) && '' !== $post_data['pending'] ) {
+	if (isset($post_data['pending']) && '' !== $post_data['pending']) {
 		$post_data['post_status'] = 'pending';
 	}
 
-	if ( isset( $post_data['ID'] ) ) {
+	if (isset($post_data['ID'])) {
 		$post_id = $post_data['ID'];
 	} else {
 		$post_id = false;
 	}
-	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
+	$previous_status = $post_id ? get_post_field('post_status', $post_id) : false;
 
-	if ( isset( $post_data['post_status'] ) && 'private' === $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
+	if (isset($post_data['post_status']) && 'private' === $post_data['post_status'] && !current_user_can($ptype->cap->publish_posts)) {
 		$post_data['post_status'] = $previous_status ? $previous_status : 'pending';
 	}
 
-	$published_statuses = array( 'publish', 'future' );
+	$published_statuses = array('publish', 'future');
 
 	// Posts 'submitted for approval' are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset( $post_data['post_status'] )
-		&& ( in_array( $post_data['post_status'], $published_statuses, true )
-		&& ! current_user_can( $ptype->cap->publish_posts ) )
+	if (isset($post_data['post_status'])
+		&& (in_array($post_data['post_status'], $published_statuses, true)
+		&& !current_user_can($ptype->cap->publish_posts))
 	) {
-		if ( ! in_array( $previous_status, $published_statuses, true ) || ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!in_array($previous_status, $published_statuses, true) || !current_user_can('edit_post', $post_id)) {
 			$post_data['post_status'] = 'pending';
 		}
 	}
 
-	if ( ! isset( $post_data['post_status'] ) ) {
+	if (!isset($post_data['post_status'])) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
 	}
 
-	if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
-		unset( $post_data['post_password'] );
+	if (isset($post_data['post_password']) && !current_user_can($ptype->cap->publish_posts)) {
+		unset($post_data['post_password']);
 	}
 
-	if ( ! isset( $post_data['comment_status'] ) ) {
+	if (!isset($post_data['comment_status'])) {
 		$post_data['comment_status'] = 'closed';
 	}
 
-	if ( ! isset( $post_data['ping_status'] ) ) {
+	if (!isset($post_data['ping_status'])) {
 		$post_data['ping_status'] = 'closed';
 	}
 
-	foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
-		if ( ! empty( $post_data[ 'hidden_' . $timeunit ] ) && $post_data[ 'hidden_' . $timeunit ] != $post_data[ $timeunit ] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if (!empty($post_data['hidden_' . $timeunit]) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit]) {
 			$post_data['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( ! empty( $post_data['edit_date'] ) ) {
+	if (!empty($post_data['edit_date'])) {
 		$aa = $post_data['aa'];
 		$mm = $post_data['mm'];
 		$jj = $post_data['jj'];
 		$hh = $post_data['hh'];
 		$mn = $post_data['mn'];
 		$ss = $post_data['ss'];
-		$aa = ( $aa <= 0 ) ? gmdate( 'Y' ) : $aa;
-		$mm = ( $mm <= 0 ) ? gmdate( 'n' ) : $mm;
-		$jj = ( $jj > 31 ) ? 31 : $jj;
-		$jj = ( $jj <= 0 ) ? gmdate( 'j' ) : $jj;
-		$hh = ( $hh > 23 ) ? $hh - 24 : $hh;
-		$mn = ( $mn > 59 ) ? $mn - 60 : $mn;
-		$ss = ( $ss > 59 ) ? $ss - 60 : $ss;
+		$aa = ($aa <= 0) ? gmdate('Y') : $aa;
+		$mm = ($mm <= 0) ? gmdate('n') : $mm;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$jj = ($jj <= 0) ? gmdate('j') : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 
-		$post_data['post_date'] = sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $aa, $mm, $jj, $hh, $mn, $ss );
+		$post_data['post_date'] = sprintf('%04d-%02d-%02d %02d:%02d:%02d', $aa, $mm, $jj, $hh, $mn, $ss);
 
-		$valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
-		if ( ! $valid_date ) {
-			return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
+		$valid_date = wp_checkdate($mm, $jj, $aa, $post_data['post_date']);
+		if (!$valid_date) {
+			return new WP_Error('invalid_date', __('Invalid date.'));
 		}
 
-		$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+		$post_data['post_date_gmt'] = get_gmt_from_date($post_data['post_date']);
 	}
 
-	if ( isset( $post_data['post_category'] ) ) {
-		$category_object = get_taxonomy( 'category' );
-		if ( ! current_user_can( $category_object->cap->assign_terms ) ) {
-			unset( $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		$category_object = get_taxonomy('category');
+		if (!current_user_can($category_object->cap->assign_terms)) {
+			unset($post_data['post_category']);
 		}
 	}
 
@@ -213,17 +213,17 @@ 
  *                                       Defaults to the `$_POST` superglobal.
  * @return array|WP_Error Array of post data on success, WP_Error on failure.
  */
-function _wp_get_allowed_postdata( $post_data = null ) {
-	if ( empty( $post_data ) ) {
+function _wp_get_allowed_postdata($post_data = null) {
+	if (empty($post_data)) {
 		$post_data = $_POST;
 	}
 
 	// Pass through errors.
-	if ( is_wp_error( $post_data ) ) {
+	if (is_wp_error($post_data)) {
 		return $post_data;
 	}
 
-	return array_diff_key( $post_data, array_flip( array( 'meta_input', 'file', 'guid' ) ) );
+	return array_diff_key($post_data, array_flip(array('meta_input', 'file', 'guid')));
 }
 
 /**
@@ -242,40 +242,40 @@ 
  *                              Defaults to the `$_POST` superglobal.
  * @return int Post ID.
  */
-function edit_post( $post_data = null ) {
+function edit_post($post_data = null) {
 	global $wpdb;
 
-	if ( empty( $post_data ) ) {
+	if (empty($post_data)) {
 		$post_data = &$_POST;
 	}
 
 	// Clear out any data in internal vars.
-	unset( $post_data['filter'] );
+	unset($post_data['filter']);
 
 	$post_ID = (int) $post_data['post_ID'];
-	$post    = get_post( $post_ID );
+	$post    = get_post($post_ID);
 
 	$post_data['post_type']      = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if (!empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' === $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' === $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
-	$ptype = get_post_type_object( $post_data['post_type'] );
-	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' === $post_data['post_type'] ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
+	$ptype = get_post_type_object($post_data['post_type']);
+	if (!current_user_can('edit_post', $post_ID)) {
+		if ('page' === $post_data['post_type']) {
+			wp_die(__('Sorry, you are not allowed to edit this page.'));
 		} else {
-			wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+			wp_die(__('Sorry, you are not allowed to edit this post.'));
 		}
 	}
 
-	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
+	if (post_type_supports($ptype->name, 'revisions')) {
 		$revisions = wp_get_post_revisions(
 			$post_ID,
 			array(
@@ -283,171 +283,171 @@ 
 				'posts_per_page' => 1,
 			)
 		);
-		$revision  = current( $revisions );
+		$revision = current($revisions);
 
 		// Check if the revisions have been upgraded.
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ($revisions && _wp_get_post_revision_version($revision) < 1) {
+			_wp_upgrade_revisions_of_post($post, wp_get_post_revisions($post_ID));
 		}
 	}
 
-	if ( isset( $post_data['visibility'] ) ) {
-		switch ( $post_data['visibility'] ) {
+	if (isset($post_data['visibility'])) {
+		switch ($post_data['visibility']) {
 			case 'public':
 				$post_data['post_password'] = '';
 				break;
 			case 'password':
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 			case 'private':
 				$post_data['post_status']   = 'private';
 				$post_data['post_password'] = '';
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 		}
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) ) {
-		wp_die( $post_data->get_error_message() );
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data)) {
+		wp_die($post_data->get_error_message());
 	}
-	$translated = _wp_get_allowed_postdata( $post_data );
+	$translated = _wp_get_allowed_postdata($post_data);
 
 	// Post formats.
-	if ( isset( $post_data['post_format'] ) ) {
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if (isset($post_data['post_format'])) {
+		set_post_format($post_ID, $post_data['post_format']);
 	}
 
-	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
-	foreach ( $format_meta_urls as $format_meta_url ) {
+	$format_meta_urls = array('url', 'link_url', 'quote_source_url');
+	foreach ($format_meta_urls as $format_meta_url) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) ) {
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		if (isset($post_data[$keyed])) {
+			update_post_meta($post_ID, $keyed, wp_slash(esc_url_raw(wp_unslash($post_data[$keyed]))));
 		}
 	}
 
-	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
+	$format_keys = array('quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed');
 
-	foreach ( $format_keys as $key ) {
+	foreach ($format_keys as $key) {
 		$keyed = '_format_' . $key;
-		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) ) {
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+		if (isset($post_data[$keyed])) {
+			if (current_user_can('unfiltered_html')) {
+				update_post_meta($post_ID, $keyed, $post_data[$keyed]);
 			} else {
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+				update_post_meta($post_ID, $keyed, wp_filter_post_kses($post_data[$keyed]));
 			}
 		}
 	}
 
-	if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
-		$id3data = wp_get_attachment_metadata( $post_ID );
-		if ( ! is_array( $id3data ) ) {
+	if ('attachment' === $post_data['post_type'] && preg_match('#^(audio|video)/#', $post_data['post_mime_type'])) {
+		$id3data = wp_get_attachment_metadata($post_ID);
+		if (!is_array($id3data)) {
 			$id3data = array();
 		}
 
-		foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) {
-			if ( isset( $post_data[ 'id3_' . $key ] ) ) {
-				$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
+		foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) {
+			if (isset($post_data['id3_' . $key])) {
+				$id3data[$key] = sanitize_text_field(wp_unslash($post_data['id3_' . $key]));
 			}
 		}
-		wp_update_attachment_metadata( $post_ID, $id3data );
+		wp_update_attachment_metadata($post_ID, $id3data);
 	}
 
 	// Meta stuff.
-	if ( isset( $post_data['meta'] ) && $post_data['meta'] ) {
-		foreach ( $post_data['meta'] as $key => $value ) {
-			$meta = get_post_meta_by_id( $key );
-			if ( ! $meta ) {
+	if (isset($post_data['meta']) && $post_data['meta']) {
+		foreach ($post_data['meta'] as $key => $value) {
+			$meta = get_post_meta_by_id($key);
+			if (!$meta) {
 				continue;
 			}
-			if ( $meta->post_id != $post_ID ) {
+			if ($meta->post_id != $post_ID) {
 				continue;
 			}
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) ) {
+			if (is_protected_meta($meta->meta_key, 'post') || !current_user_can('edit_post_meta', $post_ID, $meta->meta_key)) {
 				continue;
 			}
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+			if (is_protected_meta($value['key'], 'post') || !current_user_can('edit_post_meta', $post_ID, $value['key'])) {
 				continue;
 			}
-			update_meta( $key, $value['key'], $value['value'] );
+			update_meta($key, $value['key'], $value['value']);
 		}
 	}
 
-	if ( isset( $post_data['deletemeta'] ) && $post_data['deletemeta'] ) {
-		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			$meta = get_post_meta_by_id( $key );
-			if ( ! $meta ) {
+	if (isset($post_data['deletemeta']) && $post_data['deletemeta']) {
+		foreach ($post_data['deletemeta'] as $key => $value) {
+			$meta = get_post_meta_by_id($key);
+			if (!$meta) {
 				continue;
 			}
-			if ( $meta->post_id != $post_ID ) {
+			if ($meta->post_id != $post_ID) {
 				continue;
 			}
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+			if (is_protected_meta($meta->meta_key, 'post') || !current_user_can('delete_post_meta', $post_ID, $meta->meta_key)) {
 				continue;
 			}
-			delete_meta( $key );
+			delete_meta($key);
 		}
 	}
 
 	// Attachment stuff.
-	if ( 'attachment' === $post_data['post_type'] ) {
-		if ( isset( $post_data['_wp_attachment_image_alt'] ) ) {
-			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
+	if ('attachment' === $post_data['post_type']) {
+		if (isset($post_data['_wp_attachment_image_alt'])) {
+			$image_alt = wp_unslash($post_data['_wp_attachment_image_alt']);
 
-			if ( get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) !== $image_alt ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
+			if (get_post_meta($post_ID, '_wp_attachment_image_alt', true) !== $image_alt) {
+				$image_alt = wp_strip_all_tags($image_alt, true);
 
 				// update_post_meta() expects slashed.
-				update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta($post_ID, '_wp_attachment_image_alt', wp_slash($image_alt));
 			}
 		}
 
-		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+		$attachment_data = isset($post_data['attachments'][$post_ID]) ? $post_data['attachments'][$post_ID] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$translated = apply_filters( 'attachment_fields_to_save', $translated, $attachment_data );
+		$translated = apply_filters('attachment_fields_to_save', $translated, $attachment_data);
 	}
 
 	// Convert taxonomy input to term IDs, to avoid ambiguity.
-	if ( isset( $post_data['tax_input'] ) ) {
-		foreach ( (array) $post_data['tax_input'] as $taxonomy => $terms ) {
-			$tax_object = get_taxonomy( $taxonomy );
+	if (isset($post_data['tax_input'])) {
+		foreach ((array) $post_data['tax_input'] as $taxonomy => $terms) {
+			$tax_object = get_taxonomy($taxonomy);
 
-			if ( $tax_object && isset( $tax_object->meta_box_sanitize_cb ) ) {
-				$translated['tax_input'][ $taxonomy ] = call_user_func_array( $tax_object->meta_box_sanitize_cb, array( $taxonomy, $terms ) );
+			if ($tax_object && isset($tax_object->meta_box_sanitize_cb)) {
+				$translated['tax_input'][$taxonomy] = call_user_func_array($tax_object->meta_box_sanitize_cb, array($taxonomy, $terms));
 			}
 		}
 	}
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
+	update_post_meta($post_ID, '_edit_last', get_current_user_id());
 
-	$success = wp_update_post( $translated );
+	$success = wp_update_post($translated);
 
 	// If the save failed, see if we can sanity check the main fields and try again.
-	if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
-		$fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	if (!$success && is_callable(array($wpdb, 'strip_invalid_text_for_column'))) {
+		$fields = array('post_title', 'post_content', 'post_excerpt');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $translated[ $field ] ) ) {
-				$translated[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $translated[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($translated[$field])) {
+				$translated[$field] = $wpdb->strip_invalid_text_for_column($wpdb->posts, $field, $translated[$field]);
 			}
 		}
 
-		wp_update_post( $translated );
+		wp_update_post($translated);
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs.
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
-	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) ) {
-			stick_post( $post_ID );
+	if (current_user_can($ptype->cap->edit_others_posts) && current_user_can($ptype->cap->publish_posts)) {
+		if (!empty($post_data['sticky'])) {
+			stick_post($post_ID);
 		} else {
-			unstick_post( $post_ID );
+			unstick_post($post_ID);
 		}
 	}
 
@@ -468,44 +468,44 @@ 
  *                              Defaults to the `$_POST` superglobal.
  * @return array
  */
-function bulk_edit_posts( $post_data = null ) {
+function bulk_edit_posts($post_data = null) {
 	global $wpdb;
 
-	if ( empty( $post_data ) ) {
+	if (empty($post_data)) {
 		$post_data = &$_POST;
 	}
 
-	if ( isset( $post_data['post_type'] ) ) {
-		$ptype = get_post_type_object( $post_data['post_type'] );
+	if (isset($post_data['post_type'])) {
+		$ptype = get_post_type_object($post_data['post_type']);
 	} else {
-		$ptype = get_post_type_object( 'post' );
+		$ptype = get_post_type_object('post');
 	}
 
-	if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' === $ptype->name ) {
-			wp_die( __( 'Sorry, you are not allowed to edit pages.' ) );
+	if (!current_user_can($ptype->cap->edit_posts)) {
+		if ('page' === $ptype->name) {
+			wp_die(__('Sorry, you are not allowed to edit pages.'));
 		} else {
-			wp_die( __( 'Sorry, you are not allowed to edit posts.' ) );
+			wp_die(__('Sorry, you are not allowed to edit posts.'));
 		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
 		$post_data['post_status'] = null;
-		unset( $post_data['post_status'] );
+		unset($post_data['post_status']);
 	} else {
 		$post_data['post_status'] = $post_data['_status'];
 	}
-	unset( $post_data['_status'] );
+	unset($post_data['_status']);
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if (!empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' === $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' === $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
-	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
+	$post_IDs = array_map('intval', (array) $post_data['post']);
 
 	$reset = array(
 		'post_author',
@@ -522,48 +522,48 @@ 
 		'post_format',
 	);
 
-	foreach ( $reset as $field ) {
-		if ( isset( $post_data[ $field ] ) && ( '' === $post_data[ $field ] || -1 == $post_data[ $field ] ) ) {
-			unset( $post_data[ $field ] );
+	foreach ($reset as $field) {
+		if (isset($post_data[$field]) && ('' === $post_data[$field] || -1 == $post_data[$field])) {
+			unset($post_data[$field]);
 		}
 	}
 
-	if ( isset( $post_data['post_category'] ) ) {
-		if ( is_array( $post_data['post_category'] ) && ! empty( $post_data['post_category'] ) ) {
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		if (is_array($post_data['post_category']) && !empty($post_data['post_category'])) {
+			$new_cats = array_map('absint', $post_data['post_category']);
 		} else {
-			unset( $post_data['post_category'] );
+			unset($post_data['post_category']);
 		}
 	}
 
 	$tax_input = array();
-	if ( isset( $post_data['tax_input'] ) ) {
-		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty( $terms ) ) {
+	if (isset($post_data['tax_input'])) {
+		foreach ($post_data['tax_input'] as $tax_name => $terms) {
+			if (empty($terms)) {
 				continue;
 			}
-			if ( is_taxonomy_hierarchical( $tax_name ) ) {
-				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
+			if (is_taxonomy_hierarchical($tax_name)) {
+				$tax_input[$tax_name] = array_map('absint', $terms);
 			} else {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma ) {
-					$terms = str_replace( $comma, ',', $terms );
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma) {
+					$terms = str_replace($comma, ',', $terms);
 				}
-				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$tax_input[$tax_name] = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 		}
 	}
 
-	if ( isset( $post_data['post_parent'] ) && (int) $post_data['post_parent'] ) {
+	if (isset($post_data['post_parent']) && (int) $post_data['post_parent']) {
 		$parent   = (int) $post_data['post_parent'];
-		$pages    = $wpdb->get_results( "SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'" );
+		$pages    = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'");
 		$children = array();
 
-		for ( $i = 0; $i < 50 && $parent > 0; $i++ ) {
+		for ($i = 0; $i < 50 && $parent > 0; $i++) {
 			$children[] = $parent;
 
-			foreach ( $pages as $page ) {
-				if ( (int) $page->ID === $parent ) {
+			foreach ($pages as $page) {
+				if ((int) $page->ID === $parent) {
 					$parent = (int) $page->post_parent;
 					break;
 				}
@@ -576,83 +576,83 @@ 
 	$locked           = array();
 	$shared_post_data = $post_data;
 
-	foreach ( $post_IDs as $post_ID ) {
+	foreach ($post_IDs as $post_ID) {
 		// Start with fresh post data with each iteration.
 		$post_data = $shared_post_data;
 
-		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
+		$post_type_object = get_post_type_object(get_post_type($post_ID));
 
-		if ( ! isset( $post_type_object )
-			|| ( isset( $children ) && in_array( $post_ID, $children, true ) )
-			|| ! current_user_can( 'edit_post', $post_ID )
+		if (!isset($post_type_object)
+			|| (isset($children) && in_array($post_ID, $children, true))
+			|| !current_user_can('edit_post', $post_ID)
 		) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		if ( wp_check_post_lock( $post_ID ) ) {
+		if (wp_check_post_lock($post_ID)) {
 			$locked[] = $post_ID;
 			continue;
 		}
 
-		$post      = get_post( $post_ID );
-		$tax_names = get_object_taxonomies( $post );
-		foreach ( $tax_names as $tax_name ) {
-			$taxonomy_obj = get_taxonomy( $tax_name );
-			if ( isset( $tax_input[ $tax_name ] ) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
-				$new_terms = $tax_input[ $tax_name ];
+		$post      = get_post($post_ID);
+		$tax_names = get_object_taxonomies($post);
+		foreach ($tax_names as $tax_name) {
+			$taxonomy_obj = get_taxonomy($tax_name);
+			if (isset($tax_input[$tax_name]) && current_user_can($taxonomy_obj->cap->assign_terms)) {
+				$new_terms = $tax_input[$tax_name];
 			} else {
 				$new_terms = array();
 			}
 
-			if ( $taxonomy_obj->hierarchical ) {
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'ids' ) );
+			if ($taxonomy_obj->hierarchical) {
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'ids'));
 			} else {
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'names' ) );
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'names'));
 			}
 
-			$post_data['tax_input'][ $tax_name ] = array_merge( $current_terms, $new_terms );
+			$post_data['tax_input'][$tax_name] = array_merge($current_terms, $new_terms);
 		}
 
-		if ( isset( $new_cats ) && in_array( 'category', $tax_names, true ) ) {
-			$cats                       = (array) wp_get_post_categories( $post_ID );
-			$post_data['post_category'] = array_unique( array_merge( $cats, $new_cats ) );
-			unset( $post_data['tax_input']['category'] );
+		if (isset($new_cats) && in_array('category', $tax_names, true)) {
+			$cats                       = (array) wp_get_post_categories($post_ID);
+			$post_data['post_category'] = array_unique(array_merge($cats, $new_cats));
+			unset($post_data['tax_input']['category']);
 		}
 
 		$post_data['post_ID']        = $post_ID;
 		$post_data['post_type']      = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
 
-		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
-			if ( ! isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $post->$field;
+		foreach (array('comment_status', 'ping_status', 'post_author') as $field) {
+			if (!isset($post_data[$field])) {
+				$post_data[$field] = $post->$field;
 			}
 		}
 
-		$post_data = _wp_translate_postdata( true, $post_data );
-		if ( is_wp_error( $post_data ) ) {
+		$post_data = _wp_translate_postdata(true, $post_data);
+		if (is_wp_error($post_data)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
-		$post_data = _wp_get_allowed_postdata( $post_data );
+		$post_data = _wp_get_allowed_postdata($post_data);
 
-		if ( isset( $shared_post_data['post_format'] ) ) {
-			set_post_format( $post_ID, $shared_post_data['post_format'] );
+		if (isset($shared_post_data['post_format'])) {
+			set_post_format($post_ID, $shared_post_data['post_format']);
 		}
 
 		// Prevent wp_insert_post() from overwriting post format with the old data.
-		unset( $post_data['tax_input']['post_format'] );
+		unset($post_data['tax_input']['post_format']);
 
-		$post_id = wp_update_post( $post_data );
-		update_post_meta( $post_id, '_edit_last', get_current_user_id() );
+		$post_id = wp_update_post($post_data);
+		update_post_meta($post_id, '_edit_last', get_current_user_id());
 		$updated[] = $post_id;
 
-		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' === $post_data['sticky'] ) {
-				stick_post( $post_ID );
+		if (isset($post_data['sticky']) && current_user_can($ptype->cap->edit_others_posts)) {
+			if ('sticky' === $post_data['sticky']) {
+				stick_post($post_ID);
 			} else {
-				unstick_post( $post_ID );
+				unstick_post($post_ID);
 			}
 		}
 	}
@@ -673,41 +673,41 @@ 
  * @param bool   $create_in_db Optional. Whether to insert the post into database. Default false.
  * @return WP_Post Post object containing all the default post data as attributes
  */
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
+function get_default_post_to_edit($post_type = 'post', $create_in_db = false) {
 	$post_title = '';
-	if ( ! empty( $_REQUEST['post_title'] ) ) {
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ) );
+	if (!empty($_REQUEST['post_title'])) {
+		$post_title = esc_html(wp_unslash($_REQUEST['post_title']));
 	}
 
 	$post_content = '';
-	if ( ! empty( $_REQUEST['content'] ) ) {
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ) );
+	if (!empty($_REQUEST['content'])) {
+		$post_content = esc_html(wp_unslash($_REQUEST['content']));
 	}
 
 	$post_excerpt = '';
-	if ( ! empty( $_REQUEST['excerpt'] ) ) {
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ) );
+	if (!empty($_REQUEST['excerpt'])) {
+		$post_excerpt = esc_html(wp_unslash($_REQUEST['excerpt']));
 	}
 
-	if ( $create_in_db ) {
+	if ($create_in_db) {
 		$post_id = wp_insert_post(
 			array(
-				'post_title'  => __( 'Auto Draft' ),
+				'post_title'  => __('Auto Draft'),
 				'post_type'   => $post_type,
 				'post_status' => 'auto-draft',
 			),
 			false,
 			false
 		);
-		$post    = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
-			set_post_format( $post, get_option( 'default_post_format' ) );
+		$post = get_post($post_id);
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats') && get_option('default_post_format')) {
+			set_post_format($post, get_option('default_post_format'));
 		}
-		wp_after_insert_post( $post, false, null );
+		wp_after_insert_post($post, false, null);
 
 		// Schedule auto-draft cleanup.
-		if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
-			wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+		if (!wp_next_scheduled('wp_scheduled_auto_draft_delete')) {
+			wp_schedule_event(time(), 'daily', 'wp_scheduled_auto_draft_delete');
 		}
 	} else {
 		$post                 = new stdClass;
@@ -721,14 +721,14 @@ 
 		$post->post_status    = 'draft';
 		$post->to_ping        = '';
 		$post->pinged         = '';
-		$post->comment_status = get_default_comment_status( $post_type );
-		$post->ping_status    = get_default_comment_status( $post_type, 'pingback' );
-		$post->post_pingback  = get_option( 'default_pingback_flag' );
-		$post->post_category  = get_option( 'default_category' );
+		$post->comment_status = get_default_comment_status($post_type);
+		$post->ping_status    = get_default_comment_status($post_type, 'pingback');
+		$post->post_pingback  = get_option('default_pingback_flag');
+		$post->post_category  = get_option('default_category');
 		$post->page_template  = 'default';
 		$post->post_parent    = 0;
 		$post->menu_order     = 0;
-		$post                 = new WP_Post( $post );
+		$post                 = new WP_Post($post);
 	}
 
 	/**
@@ -739,7 +739,7 @@ 
 	 * @param string  $post_content Default post content.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_content = (string) apply_filters( 'default_content', $post_content, $post );
+	$post->post_content = (string) apply_filters('default_content', $post_content, $post);
 
 	/**
 	 * Filters the default post title initially used in the "Write Post" form.
@@ -749,7 +749,7 @@ 
 	 * @param string  $post_title Default post title.
 	 * @param WP_Post $post       Post object.
 	 */
-	$post->post_title = (string) apply_filters( 'default_title', $post_title, $post );
+	$post->post_title = (string) apply_filters('default_title', $post_title, $post);
 
 	/**
 	 * Filters the default post excerpt initially used in the "Write Post" form.
@@ -759,7 +759,7 @@ 
 	 * @param string  $post_excerpt Default post excerpt.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_excerpt = (string) apply_filters( 'default_excerpt', $post_excerpt, $post );
+	$post->post_excerpt = (string) apply_filters('default_excerpt', $post_excerpt, $post);
 
 	return $post;
 }
@@ -780,45 +780,45 @@ 
  * @param string $status  Optional. Post status.
  * @return int Post ID if post exists, 0 otherwise.
  */
-function post_exists( $title, $content = '', $date = '', $type = '', $status = '' ) {
+function post_exists($title, $content = '', $date = '', $type = '', $status = '') {
 	global $wpdb;
 
-	$post_title   = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
-	$post_content = wp_unslash( sanitize_post_field( 'post_content', $content, 0, 'db' ) );
-	$post_date    = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
-	$post_type    = wp_unslash( sanitize_post_field( 'post_type', $type, 0, 'db' ) );
-	$post_status  = wp_unslash( sanitize_post_field( 'post_status', $status, 0, 'db' ) );
+	$post_title   = wp_unslash(sanitize_post_field('post_title', $title, 0, 'db'));
+	$post_content = wp_unslash(sanitize_post_field('post_content', $content, 0, 'db'));
+	$post_date    = wp_unslash(sanitize_post_field('post_date', $date, 0, 'db'));
+	$post_type    = wp_unslash(sanitize_post_field('post_type', $type, 0, 'db'));
+	$post_status  = wp_unslash(sanitize_post_field('post_status', $status, 0, 'db'));
 
 	$query = "SELECT ID FROM $wpdb->posts WHERE 1=1";
 	$args  = array();
 
-	if ( ! empty( $date ) ) {
+	if (!empty($date)) {
 		$query .= ' AND post_date = %s';
 		$args[] = $post_date;
 	}
 
-	if ( ! empty( $title ) ) {
+	if (!empty($title)) {
 		$query .= ' AND post_title = %s';
 		$args[] = $post_title;
 	}
 
-	if ( ! empty( $content ) ) {
+	if (!empty($content)) {
 		$query .= ' AND post_content = %s';
 		$args[] = $post_content;
 	}
 
-	if ( ! empty( $type ) ) {
+	if (!empty($type)) {
 		$query .= ' AND post_type = %s';
 		$args[] = $post_type;
 	}
 
-	if ( ! empty( $status ) ) {
+	if (!empty($status)) {
 		$query .= ' AND post_status = %s';
 		$args[] = $post_status;
 	}
 
-	if ( ! empty( $args ) ) {
-		return (int) $wpdb->get_var( $wpdb->prepare( $query, $args ) );
+	if (!empty($args)) {
+		return (int) $wpdb->get_var($wpdb->prepare($query, $args));
 	}
 
 	return 0;
@@ -834,70 +834,70 @@ 
  * @return int|WP_Error Post ID on success, WP_Error on failure.
  */
 function wp_write_post() {
-	if ( isset( $_POST['post_type'] ) ) {
-		$ptype = get_post_type_object( $_POST['post_type'] );
+	if (isset($_POST['post_type'])) {
+		$ptype = get_post_type_object($_POST['post_type']);
 	} else {
-		$ptype = get_post_type_object( 'post' );
+		$ptype = get_post_type_object('post');
 	}
 
-	if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' === $ptype->name ) {
-			return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
+	if (!current_user_can($ptype->cap->edit_posts)) {
+		if ('page' === $ptype->name) {
+			return new WP_Error('edit_pages', __('Sorry, you are not allowed to create pages on this site.'));
 		} else {
-			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+			return new WP_Error('edit_posts', __('Sorry, you are not allowed to create posts or drafts on this site.'));
 		}
 	}
 
 	$_POST['post_mime_type'] = '';
 
 	// Clear out any data in internal vars.
-	unset( $_POST['filter'] );
+	unset($_POST['filter']);
 
 	// Edit, don't write, if we have a post ID.
-	if ( isset( $_POST['post_ID'] ) ) {
+	if (isset($_POST['post_ID'])) {
 		return edit_post();
 	}
 
-	if ( isset( $_POST['visibility'] ) ) {
-		switch ( $_POST['visibility'] ) {
+	if (isset($_POST['visibility'])) {
+		switch ($_POST['visibility']) {
 			case 'public':
 				$_POST['post_password'] = '';
 				break;
 			case 'password':
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 			case 'private':
 				$_POST['post_status']   = 'private';
 				$_POST['post_password'] = '';
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 		}
 	}
 
-	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error( $translated ) ) {
+	$translated = _wp_translate_postdata(false);
+	if (is_wp_error($translated)) {
 		return $translated;
 	}
-	$translated = _wp_get_allowed_postdata( $translated );
+	$translated = _wp_get_allowed_postdata($translated);
 
 	// Create the post.
-	$post_ID = wp_insert_post( $translated );
-	if ( is_wp_error( $post_ID ) ) {
+	$post_ID = wp_insert_post($translated);
+	if (is_wp_error($post_ID)) {
 		return $post_ID;
 	}
 
-	if ( empty( $post_ID ) ) {
+	if (empty($post_ID)) {
 		return 0;
 	}
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
+	add_post_meta($post_ID, '_edit_last', $GLOBALS['current_user']->ID);
 
 	// Now that we have an ID we can fix any attachment anchor hrefs.
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
 	return $post_ID;
 }
@@ -911,8 +911,8 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) ) {
-		wp_die( $result->get_error_message() );
+	if (is_wp_error($result)) {
+		wp_die($result->get_error_message());
 	} else {
 		return $result;
 	}
@@ -930,36 +930,36 @@ 
  * @param int $post_ID
  * @return int|bool
  */
-function add_meta( $post_ID ) {
+function add_meta($post_ID) {
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = isset( $_POST['metakeyselect'] ) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
-	$metakeyinput  = isset( $_POST['metakeyinput'] ) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
-	$metavalue     = isset( $_POST['metavalue'] ) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) ) {
-		$metavalue = trim( $metavalue );
+	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash(trim($_POST['metakeyselect'])) : '';
+	$metakeyinput  = isset($_POST['metakeyinput']) ? wp_unslash(trim($_POST['metakeyinput'])) : '';
+	$metavalue     = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
+	if (is_string($metavalue)) {
+		$metavalue = trim($metavalue);
 	}
 
-	if ( ( ( '#NONE#' !== $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) {
+	if ((('#NONE#' !== $metakeyselect) && !empty($metakeyselect)) || !empty($metakeyinput)) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
-		if ( '#NONE#' !== $metakeyselect ) {
+		if ('#NONE#' !== $metakeyselect) {
 			$metakey = $metakeyselect;
 		}
 
-		if ( $metakeyinput ) {
+		if ($metakeyinput) {
 			$metakey = $metakeyinput; // Default.
 		}
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+		if (is_protected_meta($metakey, 'post') || !current_user_can('add_post_meta', $post_ID, $metakey)) {
 			return false;
 		}
 
-		$metakey = wp_slash( $metakey );
+		$metakey = wp_slash($metakey);
 
-		return add_post_meta( $post_ID, $metakey, $metavalue );
+		return add_post_meta($post_ID, $metakey, $metavalue);
 	}
 
 	return false;
@@ -973,8 +973,8 @@ 
  * @param int $mid
  * @return bool
  */
-function delete_meta( $mid ) {
-	return delete_metadata_by_mid( 'post', $mid );
+function delete_meta($mid) {
+	return delete_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -1008,8 +1008,8 @@ 
  * @param int $mid
  * @return object|bool
  */
-function get_post_meta_by_id( $mid ) {
-	return get_metadata_by_mid( 'post', $mid );
+function get_post_meta_by_id($mid) {
+	return get_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -1033,7 +1033,7 @@ 
  *     }
  * }
  */
-function has_meta( $postid ) {
+function has_meta($postid) {
 	global $wpdb;
 
 	return $wpdb->get_results(
@@ -1057,11 +1057,11 @@ 
  * @param string $meta_value Meta value. Expect slashed.
  * @return bool
  */
-function update_meta( $meta_id, $meta_key, $meta_value ) {
-	$meta_key   = wp_unslash( $meta_key );
-	$meta_value = wp_unslash( $meta_value );
+function update_meta($meta_id, $meta_key, $meta_value) {
+	$meta_key   = wp_unslash($meta_key);
+	$meta_value = wp_unslash($meta_value);
 
-	return update_metadata_by_mid( 'post', $meta_id, $meta_value, $meta_key );
+	return update_metadata_by_mid('post', $meta_id, $meta_value, $meta_key);
 }
 
 //
@@ -1077,28 +1077,28 @@ 
  * @param int|object $post Post ID or post object.
  * @return void|int|WP_Error Void if nothing fixed. 0 or WP_Error on update failure. The post ID on update success.
  */
-function _fix_attachment_links( $post ) {
-	$post    = get_post( $post, ARRAY_A );
+function _fix_attachment_links($post) {
+	$post    = get_post($post, ARRAY_A);
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ), true ) ) {
+	if (!get_option('permalink_structure') || !in_array($post['post_status'], array('publish', 'future', 'private'), true)) {
 		return;
 	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero).
-	if ( ! strpos( $content, '?attachment_id=' ) || ! preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
+	if (!strpos($content, '?attachment_id=') || !preg_match_all('/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches)) {
 		return;
 	}
 
-	$site_url = get_bloginfo( 'url' );
-	$site_url = substr( $site_url, (int) strpos( $site_url, '://' ) ); // Remove the http(s).
+	$site_url = get_bloginfo('url');
+	$site_url = substr($site_url, (int) strpos($site_url, '://')); // Remove the http(s).
 	$replace  = '';
 
-	foreach ( $link_matches[1] as $key => $value ) {
-		if ( ! strpos( $value, '?attachment_id=' ) || ! strpos( $value, 'wp-att-' )
-			|| ! preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| ! preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
+	foreach ($link_matches[1] as $key => $value) {
+		if (!strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
+			|| !preg_match('/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match)
+			|| !preg_match('/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match)) {
 				continue;
 		}
 
@@ -1106,22 +1106,22 @@ 
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos( $url_match[0], $site_url ) === false ) {
+		if (!$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false) {
 			continue;
 		}
 
-		$link    = $link_matches[0][ $key ];
-		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
+		$link    = $link_matches[0][$key];
+		$replace = str_replace($url_match[0], 'href=' . $quote . get_attachment_link($url_id) . $quote, $link);
 
-		$content = str_replace( $link, $replace, $content );
+		$content = str_replace($link, $replace, $content);
 	}
 
-	if ( $replace ) {
+	if ($replace) {
 		$post['post_content'] = $content;
 		// Escape data pulled from DB.
-		$post = add_magic_quotes( $post );
+		$post = add_magic_quotes($post);
 
-		return wp_update_post( $post );
+		return wp_update_post($post);
 	}
 }
 
@@ -1133,10 +1133,10 @@ 
  * @param string $type The post_type you want the statuses for. Default 'post'.
  * @return string[] An array of all the statuses for the supplied post type.
  */
-function get_available_post_statuses( $type = 'post' ) {
-	$stati = wp_count_posts( $type );
+function get_available_post_statuses($type = 'post') {
+	$stati = wp_count_posts($type);
 
-	return array_keys( get_object_vars( $stati ) );
+	return array_keys(get_object_vars($stati));
 }
 
 /**
@@ -1148,48 +1148,48 @@ 
  *                       Defaults to the `$_GET` superglobal.
  * @return array
  */
-function wp_edit_posts_query( $q = false ) {
-	if ( false === $q ) {
+function wp_edit_posts_query($q = false) {
+	if (false === $q) {
 		$q = $_GET;
 	}
-	$q['m']     = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat']   = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']     = isset($q['m']) ? (int) $q['m'] : 0;
+	$q['cat']   = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$post_stati = get_post_stati();
 
-	if ( isset( $q['post_type'] ) && in_array( $q['post_type'], get_post_types(), true ) ) {
+	if (isset($q['post_type']) && in_array($q['post_type'], get_post_types(), true)) {
 		$post_type = $q['post_type'];
 	} else {
 		$post_type = 'post';
 	}
 
-	$avail_post_stati = get_available_post_statuses( $post_type );
+	$avail_post_stati = get_available_post_statuses($post_type);
 	$post_status      = '';
 	$perm             = '';
 
-	if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stati, true ) ) {
+	if (isset($q['post_status']) && in_array($q['post_status'], $post_stati, true)) {
 		$post_status = $q['post_status'];
 		$perm        = 'readable';
 	}
 
 	$orderby = '';
 
-	if ( isset( $q['orderby'] ) ) {
+	if (isset($q['orderby'])) {
 		$orderby = $q['orderby'];
-	} elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ), true ) ) {
+	} elseif (isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft'), true)) {
 		$orderby = 'modified';
 	}
 
 	$order = '';
 
-	if ( isset( $q['order'] ) ) {
+	if (isset($q['order'])) {
 		$order = $q['order'];
-	} elseif ( isset( $q['post_status'] ) && 'pending' === $q['post_status'] ) {
+	} elseif (isset($q['post_status']) && 'pending' === $q['post_status']) {
 		$order = 'ASC';
 	}
 
 	$per_page       = "edit_{$post_type}_per_page";
-	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
+	$posts_per_page = (int) get_user_option($per_page);
+	if (empty($posts_per_page) || $posts_per_page < 1) {
 		$posts_per_page = 20;
 	}
 
@@ -1209,7 +1209,7 @@ 
 	 * @param int $posts_per_page Number of posts to display per page for the given post
 	 *                            type. Default 20.
 	 */
-	$posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
+	$posts_per_page = apply_filters("edit_{$post_type}_per_page", $posts_per_page);
 
 	/**
 	 * Filters the number of posts displayed per page when specifically listing "posts".
@@ -1219,12 +1219,12 @@ 
 	 * @param int    $posts_per_page Number of posts to be displayed. Default 20.
 	 * @param string $post_type      The post type.
 	 */
-	$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
+	$posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page, $post_type);
 
-	$query = compact( 'post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page' );
+	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) && empty( $orderby ) ) {
+	if (is_post_type_hierarchical($post_type) && empty($orderby)) {
 		$query['orderby']                = 'menu_order title';
 		$query['order']                  = 'asc';
 		$query['posts_per_page']         = -1;
@@ -1232,11 +1232,11 @@ 
 		$query['fields']                 = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) ) {
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if (!empty($q['show_sticky'])) {
+		$query['post__in'] = (array) get_option('sticky_posts');
 	}
 
-	wp( $query );
+	wp($query);
 
 	return $avail_post_stati;
 }
@@ -1250,24 +1250,24 @@ 
  *                       Defaults to the `$_GET` superglobal.
  * @return array The parsed query vars.
  */
-function wp_edit_attachments_query_vars( $q = false ) {
-	if ( false === $q ) {
+function wp_edit_attachments_query_vars($q = false) {
+	if (false === $q) {
 		$q = $_GET;
 	}
-	$q['m']         = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat']       = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']         = isset($q['m']) ? (int) $q['m'] : 0;
+	$q['cat']       = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$q['post_type'] = 'attachment';
-	$post_type      = get_post_type_object( 'attachment' );
+	$post_type      = get_post_type_object('attachment');
 	$states         = 'inherit';
-	if ( current_user_can( $post_type->cap->read_private_posts ) ) {
+	if (current_user_can($post_type->cap->read_private_posts)) {
 		$states .= ',private';
 	}
 
-	$q['post_status'] = isset( $q['status'] ) && 'trash' === $q['status'] ? 'trash' : $states;
-	$q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' === $q['attachment-filter'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['status']) && 'trash' === $q['status'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['attachment-filter']) && 'trash' === $q['attachment-filter'] ? 'trash' : $states;
 
-	$media_per_page = (int) get_user_option( 'upload_per_page' );
-	if ( empty( $media_per_page ) || $media_per_page < 1 ) {
+	$media_per_page = (int) get_user_option('upload_per_page');
+	if (empty($media_per_page) || $media_per_page < 1) {
 		$media_per_page = 20;
 	}
 
@@ -1278,31 +1278,31 @@ 
 	 *
 	 * @param int $media_per_page Number of media to list. Default 20.
 	 */
-	$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
+	$q['posts_per_page'] = apply_filters('upload_per_page', $media_per_page);
 
 	$post_mime_types = get_post_mime_types();
-	if ( isset( $q['post_mime_type'] ) && ! array_intersect( (array) $q['post_mime_type'], array_keys( $post_mime_types ) ) ) {
-		unset( $q['post_mime_type'] );
+	if (isset($q['post_mime_type']) && !array_intersect((array) $q['post_mime_type'], array_keys($post_mime_types))) {
+		unset($q['post_mime_type']);
 	}
 
-	foreach ( array_keys( $post_mime_types ) as $type ) {
-		if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" === $q['attachment-filter'] ) {
+	foreach (array_keys($post_mime_types) as $type) {
+		if (isset($q['attachment-filter']) && "post_mime_type:$type" === $q['attachment-filter']) {
 			$q['post_mime_type'] = $type;
 			break;
 		}
 	}
 
-	if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' === $q['attachment-filter'] ) ) {
+	if (isset($q['detached']) || (isset($q['attachment-filter']) && 'detached' === $q['attachment-filter'])) {
 		$q['post_parent'] = 0;
 	}
 
-	if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' === $q['attachment-filter'] ) ) {
+	if (isset($q['mine']) || (isset($q['attachment-filter']) && 'mine' === $q['attachment-filter'])) {
 		$q['author'] = get_current_user_id();
 	}
 
 	// Filter query clauses to include filenames.
-	if ( isset( $q['s'] ) ) {
-		add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+	if (isset($q['s'])) {
+		add_filter('posts_clauses', '_filter_query_attachment_filenames');
 	}
 
 	return $q;
@@ -1318,13 +1318,13 @@ 
  *                       Defaults to the `$_GET` superglobal.
  * @return array
  */
-function wp_edit_attachments_query( $q = false ) {
-	wp( wp_edit_attachments_query_vars( $q ) );
+function wp_edit_attachments_query($q = false) {
+	wp(wp_edit_attachments_query_vars($q));
 
 	$post_mime_types       = get_post_mime_types();
-	$avail_post_mime_types = get_available_post_mime_types( 'attachment' );
+	$avail_post_mime_types = get_available_post_mime_types('attachment');
 
-	return array( $post_mime_types, $avail_post_mime_types );
+	return array($post_mime_types, $avail_post_mime_types);
 }
 
 /**
@@ -1336,18 +1336,18 @@ 
  * @param string $screen_id The screen on which the meta box is shown.
  * @return string Space-separated string of class names.
  */
-function postbox_classes( $box_id, $screen_id ) {
-	if ( isset( $_GET['edit'] ) && $_GET['edit'] == $box_id ) {
-		$classes = array( '' );
-	} elseif ( get_user_option( 'closedpostboxes_' . $screen_id ) ) {
-		$closed = get_user_option( 'closedpostboxes_' . $screen_id );
-		if ( ! is_array( $closed ) ) {
-			$classes = array( '' );
+function postbox_classes($box_id, $screen_id) {
+	if (isset($_GET['edit']) && $_GET['edit'] == $box_id) {
+		$classes = array('');
+	} elseif (get_user_option('closedpostboxes_' . $screen_id)) {
+		$closed = get_user_option('closedpostboxes_' . $screen_id);
+		if (!is_array($closed)) {
+			$classes = array('');
 		} else {
-			$classes = in_array( $box_id, $closed, true ) ? array( 'closed' ) : array( '' );
+			$classes = in_array($box_id, $closed, true) ? array('closed') : array('');
 		}
 	} else {
-		$classes = array( '' );
+		$classes = array('');
 	}
 
 	/**
@@ -1360,9 +1360,9 @@ 
 	 *
 	 * @param string[] $classes An array of postbox classes.
 	 */
-	$classes = apply_filters( "postbox_classes_{$screen_id}_{$box_id}", $classes );
+	$classes = apply_filters("postbox_classes_{$screen_id}_{$box_id}", $classes);
 
-	return implode( ' ', $classes );
+	return implode(' ', $classes);
 }
 
 /**
@@ -1381,62 +1381,62 @@ 
  *     @type string $1 The post name.
  * }
  */
-function get_sample_permalink( $id, $title = null, $name = null ) {
-	$post = get_post( $id );
-	if ( ! $post ) {
-		return array( '', '' );
+function get_sample_permalink($id, $title = null, $name = null) {
+	$post = get_post($id);
+	if (!$post) {
+		return array('', '');
 	}
 
-	$ptype = get_post_type_object( $post->post_type );
+	$ptype = get_post_type_object($post->post_type);
 
 	$original_status = $post->post_status;
 	$original_date   = $post->post_date;
 	$original_name   = $post->post_name;
 
 	// Hack: get_permalink() would return plain permalink for drafts, so we will fake that our post is published.
-	if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ), true ) ) {
+	if (in_array($post->post_status, array('draft', 'pending', 'future'), true)) {
 		$post->post_status = 'publish';
-		$post->post_name   = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
+		$post->post_name   = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
 	}
 
 	// If the user wants to set a new name -- override the current one.
 	// Note: if empty name is supplied -- use the title instead, see #6072.
-	if ( ! is_null( $name ) ) {
-		$post->post_name = sanitize_title( $name ? $name : $title, $post->ID );
+	if (!is_null($name)) {
+		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 	}
 
-	$post->post_name = wp_unique_post_slug( $post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent );
+	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
 
 	$post->filter = 'sample';
 
-	$permalink = get_permalink( $post, true );
+	$permalink = get_permalink($post, true);
 
 	// Replace custom post_type token with generic pagename token for ease of use.
-	$permalink = str_replace( "%$post->post_type%", '%pagename%', $permalink );
+	$permalink = str_replace("%$post->post_type%", '%pagename%', $permalink);
 
 	// Handle page hierarchy.
-	if ( $ptype->hierarchical ) {
-		$uri = get_page_uri( $post );
-		if ( $uri ) {
-			$uri = untrailingslashit( $uri );
-			$uri = strrev( stristr( strrev( $uri ), '/' ) );
-			$uri = untrailingslashit( $uri );
+	if ($ptype->hierarchical) {
+		$uri = get_page_uri($post);
+		if ($uri) {
+			$uri = untrailingslashit($uri);
+			$uri = strrev(stristr(strrev($uri), '/'));
+			$uri = untrailingslashit($uri);
 		}
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( ! empty( $uri ) ) {
+		$uri = apply_filters('editable_slug', $uri, $post);
+		if (!empty($uri)) {
 			$uri .= '/';
 		}
-		$permalink = str_replace( '%pagename%', "{$uri}%pagename%", $permalink );
+		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	$permalink         = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
+	$permalink         = array($permalink, apply_filters('editable_slug', $post->post_name, $post));
 	$post->post_status = $original_status;
 	$post->post_date   = $original_date;
 	$post->post_name   = $original_name;
-	unset( $post->filter );
+	unset($post->filter);
 
 	/**
 	 * Filters the sample permalink.
@@ -1454,7 +1454,7 @@ 
 	 * @param string  $name    Post name (slug).
 	 * @param WP_Post $post    Post object.
 	 */
-	return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post );
+	return apply_filters('get_sample_permalink', $permalink, $post->ID, $title, $name, $post);
 }
 
 /**
@@ -1467,63 +1467,63 @@ 
  * @param string|null $new_slug  Optional. New slug. Default null.
  * @return string The HTML of the sample permalink slug editor.
  */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
-	$post = get_post( $id );
-	if ( ! $post ) {
+function get_sample_permalink_html($id, $new_title = null, $new_slug = null) {
+	$post = get_post($id);
+	if (!$post) {
 		return '';
 	}
 
-	list($permalink, $post_name) = get_sample_permalink( $post->ID, $new_title, $new_slug );
+	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
 	$view_link      = false;
 	$preview_target = '';
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		if ( 'draft' === $post->post_status || empty( $post->post_name ) ) {
-			$view_link      = get_preview_post_link( $post );
+	if (current_user_can('read_post', $post->ID)) {
+		if ('draft' === $post->post_status || empty($post->post_name)) {
+			$view_link      = get_preview_post_link($post);
 			$preview_target = " target='wp-preview-{$post->ID}'";
 		} else {
-			if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
-				$view_link = get_permalink( $post );
+			if ('publish' === $post->post_status || 'attachment' === $post->post_type) {
+				$view_link = get_permalink($post);
 			} else {
 				// Allow non-published (private, future) to be viewed at a pretty permalink, in case $post->post_name is set.
-				$view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
+				$view_link = str_replace(array('%pagename%', '%postname%'), $post->post_name, $permalink);
 			}
 		}
 	}
 
 	// Permalinks without a post/page name placeholder don't have anything to edit.
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
+		$return = '<strong>' . __('Permalink:') . "</strong>\n";
 
-		if ( false !== $view_link ) {
-			$display_link = urldecode( $view_link );
-			$return      .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";
+		if (false !== $view_link) {
+			$display_link = urldecode($view_link);
+			$return      .= '<a id="sample-permalink" href="' . esc_url($view_link) . '"' . $preview_target . '>' . esc_html($display_link) . "</a>\n";
 		} else {
 			$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
 		}
 
 		// Encourage a pretty permalink setting.
-		if ( ! get_option( 'permalink_structure' ) && current_user_can( 'manage_options' )
-			&& ! ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $id )
+		if (!get_option('permalink_structure') && current_user_can('manage_options')
+			&& !('page' === get_option('show_on_front') && get_option('page_on_front') == $id)
 		) {
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small">' . __( 'Change Permalink Structure' ) . "</a></span>\n";
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small">' . __('Change Permalink Structure') . "</a></span>\n";
 		}
 	} else {
-		if ( mb_strlen( $post_name ) > 34 ) {
-			$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
+		if (mb_strlen($post_name) > 34) {
+			$post_name_abridged = mb_substr($post_name, 0, 16) . '&hellip;' . mb_substr($post_name, -16);
 		} else {
 			$post_name_abridged = $post_name;
 		}
 
-		$post_name_html = '<span id="editable-post-name">' . esc_html( $post_name_abridged ) . '</span>';
-		$display_link   = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );
+		$post_name_html = '<span id="editable-post-name">' . esc_html($post_name_abridged) . '</span>';
+		$display_link   = str_replace(array('%pagename%', '%postname%'), $post_name_html, esc_html(urldecode($permalink)));
 
-		$return  = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
-		$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
+		$return  = '<strong>' . __('Permalink:') . "</strong>\n";
+		$return .= '<span id="sample-permalink"><a href="' . esc_url($view_link) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
-		$return .= '<span id="editable-post-name-full">' . esc_html( $post_name ) . "</span>\n";
+		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __('Edit permalink') . '">' . __('Edit') . "</button></span>\n";
+		$return .= '<span id="editable-post-name-full">' . esc_html($post_name) . "</span>\n";
 	}
 
 	/**
@@ -1538,7 +1538,7 @@ 
 	 * @param string  $new_slug  New sample permalink slug.
 	 * @param WP_Post $post      Post object.
 	 */
-	$return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
+	$return = apply_filters('get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post);
 
 	return $return;
 }
@@ -1553,23 +1553,23 @@ 
  *                                       with the thumbnail. Defaults to global $post.
  * @return string The post thumbnail HTML.
  */
-function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+function _wp_post_thumbnail_html($thumbnail_id = null, $post = null) {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-	$post               = get_post( $post );
-	$post_type_object   = get_post_type_object( $post->post_type );
+	$post               = get_post($post);
+	$post_type_object   = get_post_type_object($post->post_type);
 	$set_thumbnail_link = '<p class="hide-if-no-js"><a href="%s" id="set-post-thumbnail"%s class="thickbox">%s</a></p>';
-	$upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
+	$upload_iframe_src  = get_upload_iframe_src('image', $post->ID);
 
 	$content = sprintf(
 		$set_thumbnail_link,
-		esc_url( $upload_iframe_src ),
+		esc_url($upload_iframe_src),
 		'', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.
-		esc_html( $post_type_object->labels->set_featured_image )
+		esc_html($post_type_object->labels->set_featured_image)
 	);
 
-	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
-		$size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
+	if ($thumbnail_id && get_post($thumbnail_id)) {
+		$size = isset($_wp_additional_image_sizes['post-thumbnail']) ? 'post-thumbnail' : array(266, 266);
 
 		/**
 		 * Filters the size used to display the post thumbnail image in the 'Featured image' meta box.
@@ -1585,23 +1585,23 @@ 
 		 * @param int          $thumbnail_id Post thumbnail attachment ID.
 		 * @param WP_Post      $post         The post object associated with the thumbnail.
 		 */
-		$size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post );
+		$size = apply_filters('admin_post_thumbnail_size', $size, $thumbnail_id, $post);
 
-		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
+		$thumbnail_html = wp_get_attachment_image($thumbnail_id, $size);
 
-		if ( ! empty( $thumbnail_html ) ) {
-			$content  = sprintf(
+		if (!empty($thumbnail_html)) {
+			$content = sprintf(
 				$set_thumbnail_link,
-				esc_url( $upload_iframe_src ),
+				esc_url($upload_iframe_src),
 				' aria-describedby="set-post-thumbnail-desc"',
 				$thumbnail_html
 			);
-			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</p>';
-			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __('Click the image to edit or update') . '</p>';
+			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">' . esc_html($post_type_object->labels->remove_featured_image) . '</a></p>';
 		}
 	}
 
-	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr( $thumbnail_id ? $thumbnail_id : '-1' ) . '" />';
+	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr($thumbnail_id ? $thumbnail_id : '-1') . '" />';
 
 	/**
 	 * Filters the admin post thumbnail HTML markup to return.
@@ -1614,7 +1614,7 @@ 
 	 * @param int      $post_id      Post ID.
 	 * @param int|null $thumbnail_id Thumbnail attachment ID, or null if there isn't one.
 	 */
-	return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id );
+	return apply_filters('admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id);
 }
 
 /**
@@ -1626,29 +1626,29 @@ 
  * @return int|false ID of the user with lock. False if the post does not exist, post is not locked,
  *                   the user with lock does not exist, or the post is locked by current user.
  */
-function wp_check_post_lock( $post_id ) {
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+function wp_check_post_lock($post_id) {
+	$post = get_post($post_id);
+	if (!$post) {
 		return false;
 	}
 
-	$lock = get_post_meta( $post->ID, '_edit_lock', true );
-	if ( ! $lock ) {
+	$lock = get_post_meta($post->ID, '_edit_lock', true);
+	if (!$lock) {
 		return false;
 	}
 
-	$lock = explode( ':', $lock );
+	$lock = explode(':', $lock);
 	$time = $lock[0];
-	$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+	$user = isset($lock[1]) ? $lock[1] : get_post_meta($post->ID, '_edit_last', true);
 
-	if ( ! get_userdata( $user ) ) {
+	if (!get_userdata($user)) {
 		return false;
 	}
 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
+	$time_window = apply_filters('wp_check_post_lock_window', 150);
 
-	if ( $time && $time > time() - $time_window && get_current_user_id() != $user ) {
+	if ($time && $time > time() - $time_window && get_current_user_id() != $user) {
 		return $user;
 	}
 
@@ -1669,23 +1669,23 @@ 
  *     @type int $1 The ID of the current user.
  * }
  */
-function wp_set_post_lock( $post_id ) {
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+function wp_set_post_lock($post_id) {
+	$post = get_post($post_id);
+	if (!$post) {
 		return false;
 	}
 
 	$user_id = get_current_user_id();
-	if ( 0 == $user_id ) {
+	if (0 == $user_id) {
 		return false;
 	}
 
 	$now  = time();
 	$lock = "$now:$user_id";
 
-	update_post_meta( $post->ID, '_edit_lock', $lock );
+	update_post_meta($post->ID, '_edit_lock', $lock);
 
-	return array( $now, $user_id );
+	return array($now, $user_id);
 }
 
 /**
@@ -1695,17 +1695,17 @@ 
  */
 function _admin_notice_post_locked() {
 	$post = get_post();
-	if ( ! $post ) {
+	if (!$post) {
 		return;
 	}
 
 	$user    = null;
-	$user_id = wp_check_post_lock( $post->ID );
-	if ( $user_id ) {
-		$user = get_userdata( $user_id );
+	$user_id = wp_check_post_lock($post->ID);
+	if ($user_id) {
+		$user = get_userdata($user_id);
 	}
 
-	if ( $user ) {
+	if ($user) {
 		/**
 		 * Filters whether to show the post locked dialog.
 		 *
@@ -1717,7 +1717,7 @@ 
 		 * @param WP_Post $post    Post object.
 		 * @param WP_User $user    The user with the lock for the post.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
+		if (!apply_filters('show_post_locked_dialog', true, $post, $user)) {
 			return;
 		}
 
@@ -1727,17 +1727,17 @@ 
 	}
 
 	$sendback = wp_get_referer();
-	if ( $locked && $sendback && false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+	if ($locked && $sendback && false === strpos($sendback, 'post.php') && false === strpos($sendback, 'post-new.php')) {
 
-		$sendback_text = __( 'Go back' );
+		$sendback_text = __('Go back');
 	} else {
-		$sendback = admin_url( 'edit.php' );
+		$sendback = admin_url('edit.php');
 
-		if ( 'post' !== $post->post_type ) {
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ('post' !== $post->post_type) {
+			$sendback = add_query_arg('post_type', $post->post_type, $sendback);
 		}
 
-		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
+		$sendback_text = get_post_type_object($post->post_type)->labels->all_items;
 	}
 
 	$hidden = $locked ? '' : ' hidden';
@@ -1748,18 +1748,18 @@ 
 	<div class="notification-dialog">
 	<?php
 
-	if ( $locked ) {
+	if ($locked) {
 		$query_args = array();
-		if ( get_post_type_object( $post->post_type )->public ) {
-			if ( 'publish' === $post->post_status || $user->ID != $post->post_author ) {
+		if (get_post_type_object($post->post_type)->public) {
+			if ('publish' === $post->post_status || $user->ID != $post->post_author) {
 				// Latest content is in autosave.
-				$nonce                       = wp_create_nonce( 'post_preview_' . $post->ID );
+				$nonce                       = wp_create_nonce('post_preview_' . $post->ID);
 				$query_args['preview_id']    = $post->ID;
 				$query_args['preview_nonce'] = $nonce;
 			}
 		}
 
-		$preview_link = get_preview_post_link( $post->ID, $query_args );
+		$preview_link = get_preview_post_link($post->ID, $query_args);
 
 		/**
 		 * Filters whether to allow the post lock to be overridden.
@@ -1773,20 +1773,20 @@ 
 		 * @param WP_Post $post     Post object.
 		 * @param WP_User $user     The user with the lock for the post.
 		 */
-		$override = apply_filters( 'override_post_lock', true, $post, $user );
+		$override = apply_filters('override_post_lock', true, $post, $user);
 		$tab_last = $override ? '' : ' wp-tab-last';
 
 		?>
 		<div class="post-locked-message">
-		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
+		<div class="post-locked-avatar"><?php echo get_avatar($user->ID, 64); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-		if ( $override ) {
+		if ($override) {
 			/* translators: %s: User's display name. */
-			printf( __( '%s is currently editing this post. Do you want to take over?' ), esc_html( $user->display_name ) );
+			printf(__('%s is currently editing this post. Do you want to take over?'), esc_html($user->display_name));
 		} else {
 			/* translators: %s: User's display name. */
-			printf( __( '%s is currently editing this post.' ), esc_html( $user->display_name ) );
+			printf(__('%s is currently editing this post.'), esc_html($user->display_name));
 		}
 		?>
 		</p>
@@ -1800,19 +1800,19 @@ 
 		 * @param WP_Post $post Post object.
 		 * @param WP_User $user The user with the lock for the post.
 		 */
-		do_action( 'post_locked_dialog', $post, $user );
+		do_action('post_locked_dialog', $post, $user);
 		?>
 		<p>
-		<a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
-		<?php if ( $preview_link ) { ?>
-		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
+		<a class="button" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a>
+		<?php if ($preview_link) { ?>
+		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url($preview_link); ?>"><?php _e('Preview'); ?></a>
 			<?php
 		}
 
 		// Allow plugins to prevent some users overriding the post lock.
-		if ( $override ) {
+		if ($override) {
 			?>
-	<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
+	<a class="button button-primary wp-tab-last" href="<?php echo esc_url(add_query_arg('get-post-lock', '1', wp_nonce_url(get_edit_post_link($post->ID, 'url'), 'lock-post_' . $post->ID))); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}
 
@@ -1826,8 +1826,8 @@ 
 			<div class="post-locked-avatar"></div>
 			<p class="wp-tab-first" tabindex="0">
 			<span class="currently-editing"></span><br />
-			<span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" alt="" /> <?php _e( 'Saving revision&hellip;' ); ?></span>
-			<span class="locked-saved hidden"><?php _e( 'Your latest changes were saved as a revision.' ); ?></span>
+			<span class="locked-saving hidden"><img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" width="16" height="16" alt="" /> <?php _e('Saving revision&hellip;'); ?></span>
+			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
 			</p>
 			<?php
 			/**
@@ -1837,9 +1837,9 @@ 
 			 *
 			 * @param WP_Post $post Post object.
 			 */
-			do_action( 'post_lock_lost_dialog', $post );
+			do_action('post_lock_lost_dialog', $post);
 			?>
-			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
+			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a></p>
 		</div>
 		<?php
 	}
@@ -1859,42 +1859,42 @@ 
  *                             If a numeric post ID is provided, will use the `$_POST` superglobal.
  * @return int|WP_Error The autosave revision ID. WP_Error or 0 on error.
  */
-function wp_create_post_autosave( $post_data ) {
-	if ( is_numeric( $post_data ) ) {
+function wp_create_post_autosave($post_data) {
+	if (is_numeric($post_data)) {
 		$post_id   = $post_data;
 		$post_data = $_POST;
 	} else {
 		$post_id = (int) $post_data['post_ID'];
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) ) {
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data)) {
 		return $post_data;
 	}
-	$post_data = _wp_get_allowed_postdata( $post_data );
+	$post_data = _wp_get_allowed_postdata($post_data);
 
 	$post_author = get_current_user_id();
 
 	// Store one autosave per author. If there is already an autosave, overwrite it.
-	$old_autosave = wp_get_post_autosave( $post_id, $post_author );
-	if ( $old_autosave ) {
-		$new_autosave                = _wp_post_revision_data( $post_data, true );
+	$old_autosave = wp_get_post_autosave($post_id, $post_author);
+	if ($old_autosave) {
+		$new_autosave                = _wp_post_revision_data($post_data, true);
 		$new_autosave['ID']          = $old_autosave->ID;
 		$new_autosave['post_author'] = $post_author;
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
 		// If the new autosave has the same content as the post, delete the autosave.
 		$autosave_is_different = false;
-		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
-			if ( normalize_whitespace( $new_autosave[ $field ] ) !== normalize_whitespace( $post->$field ) ) {
+		foreach (array_intersect(array_keys($new_autosave), array_keys(_wp_post_revision_fields($post))) as $field) {
+			if (normalize_whitespace($new_autosave[$field]) !== normalize_whitespace($post->$field)) {
 				$autosave_is_different = true;
 				break;
 			}
 		}
 
-		if ( ! $autosave_is_different ) {
-			wp_delete_post_revision( $old_autosave->ID );
+		if (!$autosave_is_different) {
+			wp_delete_post_revision($old_autosave->ID);
 			return 0;
 		}
 
@@ -1905,16 +1905,16 @@ 
 		 *
 		 * @param array $new_autosave Post array - the autosave that is about to be saved.
 		 */
-		do_action( 'wp_creating_autosave', $new_autosave );
+		do_action('wp_creating_autosave', $new_autosave);
 
-		return wp_update_post( $new_autosave );
+		return wp_update_post($new_autosave);
 	}
 
 	// _wp_put_post_revision() expects unescaped.
-	$post_data = wp_unslash( $post_data );
+	$post_data = wp_unslash($post_data);
 
 	// Otherwise create the new autosave as a special post revision.
-	return _wp_put_post_revision( $post_data, true );
+	return _wp_put_post_revision($post_data, true);
 }
 
 /**
@@ -1929,51 +1929,51 @@ 
 	$post_ID     = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
-	$post = get_post( $post_ID );
-	if ( ! $post ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	$post = get_post($post_ID);
+	if (!$post) {
+		wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	if (!current_user_can('edit_post', $post->ID)) {
+		wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
 	$is_autosave = false;
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
-		&& ( 'draft' === $post->post_status || 'auto-draft' === $post->post_status )
+	if (!wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author
+		&& ('draft' === $post->post_status || 'auto-draft' === $post->post_status)
 	) {
 		$saved_post_id = edit_post();
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' === $_POST['post_status'] ) {
+		if (isset($_POST['post_status']) && 'auto-draft' === $_POST['post_status']) {
 			$_POST['post_status'] = 'draft';
 		}
 
-		$saved_post_id = wp_create_post_autosave( $post->ID );
+		$saved_post_id = wp_create_post_autosave($post->ID);
 	}
 
-	if ( is_wp_error( $saved_post_id ) ) {
-		wp_die( $saved_post_id->get_error_message() );
+	if (is_wp_error($saved_post_id)) {
+		wp_die($saved_post_id->get_error_message());
 	}
 
 	$query_args = array();
 
-	if ( $is_autosave && $saved_post_id ) {
+	if ($is_autosave && $saved_post_id) {
 		$query_args['preview_id']    = $post->ID;
-		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
+		$query_args['preview_nonce'] = wp_create_nonce('post_preview_' . $post->ID);
 
-		if ( isset( $_POST['post_format'] ) ) {
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if (isset($_POST['post_format'])) {
+			$query_args['post_format'] = empty($_POST['post_format']) ? 'standard' : sanitize_key($_POST['post_format']);
 		}
 
-		if ( isset( $_POST['_thumbnail_id'] ) ) {
-			$query_args['_thumbnail_id'] = ( (int) $_POST['_thumbnail_id'] <= 0 ) ? '-1' : (int) $_POST['_thumbnail_id'];
+		if (isset($_POST['_thumbnail_id'])) {
+			$query_args['_thumbnail_id'] = ((int) $_POST['_thumbnail_id'] <= 0) ? '-1' : (int) $_POST['_thumbnail_id'];
 		}
 	}
 
-	return get_preview_post_link( $post, $query_args );
+	return get_preview_post_link($post, $query_args);
 }
 
 /**
@@ -1987,43 +1987,43 @@ 
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *               The ID can be the draft post_id or the autosave revision post_id.
  */
-function wp_autosave( $post_data ) {
+function wp_autosave($post_data) {
 	// Back-compat.
-	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
-		define( 'DOING_AUTOSAVE', true );
+	if (!defined('DOING_AUTOSAVE')) {
+		define('DOING_AUTOSAVE', true);
 	}
 
 	$post_id              = (int) $post_data['post_id'];
 	$post_data['ID']      = $post_id;
 	$post_data['post_ID'] = $post_id;
 
-	if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
-		return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
+	if (false === wp_verify_nonce($post_data['_wpnonce'], 'update-post_' . $post_id)) {
+		return new WP_Error('invalid_nonce', __('Error while saving.'));
 	}
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
+	if (!current_user_can('edit_post', $post->ID)) {
+		return new WP_Error('edit_posts', __('Sorry, you are not allowed to edit this item.'));
 	}
 
-	if ( 'auto-draft' === $post->post_status ) {
+	if ('auto-draft' === $post->post_status) {
 		$post_data['post_status'] = 'draft';
 	}
 
-	if ( 'page' !== $post_data['post_type'] && ! empty( $post_data['catslist'] ) ) {
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ('page' !== $post_data['post_type'] && !empty($post_data['catslist'])) {
+		$post_data['post_category'] = explode(',', $post_data['catslist']);
 	}
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
-		&& ( 'auto-draft' === $post->post_status || 'draft' === $post->post_status )
+	if (!wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author
+		&& ('auto-draft' === $post->post_status || 'draft' === $post->post_status)
 	) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked.
-		return edit_post( wp_slash( $post_data ) );
+		return edit_post(wp_slash($post_data));
 	} else {
 		// Non-drafts or other users' drafts are not overwritten.
 		// The autosave is stored in a special post revision for each user.
-		return wp_create_post_autosave( wp_slash( $post_data ) );
+		return wp_create_post_autosave(wp_slash($post_data));
 	}
 }
 
@@ -2034,12 +2034,12 @@ 
  *
  * @param int $post_id Optional. Post ID.
  */
-function redirect_post( $post_id = '' ) {
-	if ( isset( $_POST['save'] ) || isset( $_POST['publish'] ) ) {
-		$status = get_post_status( $post_id );
+function redirect_post($post_id = '') {
+	if (isset($_POST['save']) || isset($_POST['publish'])) {
+		$status = get_post_status($post_id);
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
+		if (isset($_POST['publish'])) {
+			switch ($status) {
 				case 'pending':
 					$message = 8;
 					break;
@@ -2053,17 +2053,17 @@ 
 			$message = 'draft' === $status ? 10 : 1;
 		}
 
-		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset( $_POST['addmeta'] ) && $_POST['addmeta'] ) {
-		$location = add_query_arg( 'message', 2, wp_get_referer() );
-		$location = explode( '#', $location );
+		$location = add_query_arg('message', $message, get_edit_post_link($post_id, 'url'));
+	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+		$location = add_query_arg('message', 2, wp_get_referer());
+		$location = explode('#', $location);
 		$location = $location[0] . '#postcustom';
-	} elseif ( isset( $_POST['deletemeta'] ) && $_POST['deletemeta'] ) {
-		$location = add_query_arg( 'message', 3, wp_get_referer() );
-		$location = explode( '#', $location );
+	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+		$location = add_query_arg('message', 3, wp_get_referer());
+		$location = explode('#', $location);
 		$location = $location[0] . '#postcustom';
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+		$location = add_query_arg('message', 4, get_edit_post_link($post_id, 'url'));
 	}
 
 	/**
@@ -2074,7 +2074,7 @@ 
 	 * @param string $location The destination URL.
 	 * @param int    $post_id  The post ID.
 	 */
-	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	wp_redirect(apply_filters('redirect_post_location', $location, $post_id));
 	exit;
 }
 
@@ -2087,8 +2087,8 @@ 
  * @param array  $terms    Raw term data from the 'tax_input' field.
  * @return int[] Array of sanitized term IDs.
  */
-function taxonomy_meta_box_sanitize_cb_checkboxes( $taxonomy, $terms ) {
-	return array_map( 'intval', $terms );
+function taxonomy_meta_box_sanitize_cb_checkboxes($taxonomy, $terms) {
+	return array_map('intval', $terms);
 }
 
 /**
@@ -2100,24 +2100,24 @@ 
  * @param array|string $terms    Raw term data from the 'tax_input' field.
  * @return array
  */
-function taxonomy_meta_box_sanitize_cb_input( $taxonomy, $terms ) {
+function taxonomy_meta_box_sanitize_cb_input($taxonomy, $terms) {
 	/*
 	 * Assume that a 'tax_input' string is a comma-separated list of term names.
 	 * Some languages may use a character other than a comma as a delimiter, so we standardize on
 	 * commas before parsing the list.
 	 */
-	if ( ! is_array( $terms ) ) {
-		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma ) {
-			$terms = str_replace( $comma, ',', $terms );
+	if (!is_array($terms)) {
+		$comma = _x(',', 'tag delimiter');
+		if (',' !== $comma) {
+			$terms = str_replace($comma, ',', $terms);
 		}
-		$terms = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+		$terms = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 	}
 
 	$clean_terms = array();
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 		// Empty terms are invalid input.
-		if ( empty( $term ) ) {
+		if (empty($term)) {
 			continue;
 		}
 
@@ -2130,7 +2130,7 @@ 
 			)
 		);
 
-		if ( ! empty( $_term ) ) {
+		if (!empty($_term)) {
 			$clean_terms[] = (int) $_term[0];
 		} else {
 			// No existing term was found, so pass the string. A new term will be created.
@@ -2149,20 +2149,20 @@ 
  * @param int|WP_Post $post Post ID or WP_Post object.
  * @return bool Whether the post can be edited in the block editor.
  */
-function use_block_editor_for_post( $post ) {
-	$post = get_post( $post );
+function use_block_editor_for_post($post) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if (!$post) {
 		return false;
 	}
 
 	// We're in the meta box loader, so don't use the block editor.
-	if ( isset( $_GET['meta-box-loader'] ) ) {
-		check_admin_referer( 'meta-box-loader', 'meta-box-loader-nonce' );
+	if (isset($_GET['meta-box-loader'])) {
+		check_admin_referer('meta-box-loader', 'meta-box-loader-nonce');
 		return false;
 	}
 
-	$use_block_editor = use_block_editor_for_post_type( $post->post_type );
+	$use_block_editor = use_block_editor_for_post_type($post->post_type);
 
 	/**
 	 * Filters whether a post is able to be edited in the block editor.
@@ -2172,7 +2172,7 @@ 
 	 * @param bool    $use_block_editor Whether the post can be edited or not.
 	 * @param WP_Post $post             The post being checked.
 	 */
-	return apply_filters( 'use_block_editor_for_post', $use_block_editor, $post );
+	return apply_filters('use_block_editor_for_post', $use_block_editor, $post);
 }
 
 /**
@@ -2186,17 +2186,17 @@ 
  * @param string $post_type The post type.
  * @return bool Whether the post type can be edited with the block editor.
  */
-function use_block_editor_for_post_type( $post_type ) {
-	if ( ! post_type_exists( $post_type ) ) {
+function use_block_editor_for_post_type($post_type) {
+	if (!post_type_exists($post_type)) {
 		return false;
 	}
 
-	if ( ! post_type_supports( $post_type, 'editor' ) ) {
+	if (!post_type_supports($post_type, 'editor')) {
 		return false;
 	}
 
-	$post_type_object = get_post_type_object( $post_type );
-	if ( $post_type_object && ! $post_type_object->show_in_rest ) {
+	$post_type_object = get_post_type_object($post_type);
+	if ($post_type_object && !$post_type_object->show_in_rest) {
 		return false;
 	}
 
@@ -2208,7 +2208,7 @@ 
 	 * @param bool   $use_block_editor  Whether the post type can be edited or not. Default true.
 	 * @param string $post_type         The post type being checked.
 	 */
-	return apply_filters( 'use_block_editor_for_post_type', true, $post_type );
+	return apply_filters('use_block_editor_for_post_type', true, $post_type);
 }
 
 /**
@@ -2243,17 +2243,17 @@ 
 		'variations'       => 'variations',
 	);
 
-	foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {
-		foreach ( $fields_to_pick as $field => $key ) {
-			if ( ! isset( $block_type->{ $field } ) ) {
+	foreach ($block_registry->get_all_registered() as $block_name => $block_type) {
+		foreach ($fields_to_pick as $field => $key) {
+			if (!isset($block_type->{ $field } )) {
 				continue;
 			}
 
-			if ( ! isset( $blocks[ $block_name ] ) ) {
-				$blocks[ $block_name ] = array();
+			if (!isset($blocks[$block_name])) {
+				$blocks[$block_name] = array();
 			}
 
-			$blocks[ $block_name ][ $key ] = $block_type->{ $field };
+			$blocks[$block_name][$key] = $block_type->{ $field };
 		}
 	}
 
@@ -2281,21 +2281,21 @@ 
 	 *
 	 * @param array $wp_meta_boxes Global meta box state.
 	 */
-	$wp_meta_boxes = apply_filters( 'filter_block_editor_meta_boxes', $wp_meta_boxes );
-	$locations     = array( 'side', 'normal', 'advanced' );
-	$priorities    = array( 'high', 'sorted', 'core', 'default', 'low' );
+	$wp_meta_boxes = apply_filters('filter_block_editor_meta_boxes', $wp_meta_boxes);
+	$locations     = array('side', 'normal', 'advanced');
+	$priorities    = array('high', 'sorted', 'core', 'default', 'low');
 
 	// Render meta boxes.
 	?>
 	<form class="metabox-base-form">
-	<?php the_block_editor_meta_box_post_form_hidden_fields( $post ); ?>
+	<?php the_block_editor_meta_box_post_form_hidden_fields($post); ?>
 	</form>
-	<form id="toggle-custom-fields-form" method="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>">
-		<?php wp_nonce_field( 'toggle-custom-fields', 'toggle-custom-fields-nonce' ); ?>
+	<form id="toggle-custom-fields-form" method="post" action="<?php echo esc_url(admin_url('post.php')); ?>">
+		<?php wp_nonce_field('toggle-custom-fields', 'toggle-custom-fields-nonce'); ?>
 		<input type="hidden" name="action" value="toggle-custom-fields" />
 	</form>
-	<?php foreach ( $locations as $location ) : ?>
-		<form class="metabox-location-<?php echo esc_attr( $location ); ?>" onsubmit="return false;">
+	<?php foreach ($locations as $location) : ?>
+		<form class="metabox-location-<?php echo esc_attr($location); ?>" onsubmit="return false;">
 			<div id="poststuff" class="sidebar-open">
 				<div id="postbox-container-2" class="postbox-container">
 					<?php
@@ -2312,30 +2312,30 @@ 
 	<?php
 
 	$meta_boxes_per_location = array();
-	foreach ( $locations as $location ) {
-		$meta_boxes_per_location[ $location ] = array();
+	foreach ($locations as $location) {
+		$meta_boxes_per_location[$location] = array();
 
-		if ( ! isset( $wp_meta_boxes[ $current_screen->id ][ $location ] ) ) {
+		if (!isset($wp_meta_boxes[$current_screen->id][$location])) {
 			continue;
 		}
 
-		foreach ( $priorities as $priority ) {
-			if ( ! isset( $wp_meta_boxes[ $current_screen->id ][ $location ][ $priority ] ) ) {
+		foreach ($priorities as $priority) {
+			if (!isset($wp_meta_boxes[$current_screen->id][$location][$priority])) {
 				continue;
 			}
 
-			$meta_boxes = (array) $wp_meta_boxes[ $current_screen->id ][ $location ][ $priority ];
-			foreach ( $meta_boxes as $meta_box ) {
-				if ( false == $meta_box || ! $meta_box['title'] ) {
+			$meta_boxes = (array) $wp_meta_boxes[$current_screen->id][$location][$priority];
+			foreach ($meta_boxes as $meta_box) {
+				if (false == $meta_box || !$meta_box['title']) {
 					continue;
 				}
 
 				// If a meta box is just here for back compat, don't show it in the block editor.
-				if ( isset( $meta_box['args']['__back_compat_meta_box'] ) && $meta_box['args']['__back_compat_meta_box'] ) {
+				if (isset($meta_box['args']['__back_compat_meta_box']) && $meta_box['args']['__back_compat_meta_box']) {
 					continue;
 				}
 
-				$meta_boxes_per_location[ $location ][] = array(
+				$meta_boxes_per_location[$location][] = array(
 					'id'    => $meta_box['id'],
 					'title' => $meta_box['title'],
 				);
@@ -2351,27 +2351,27 @@ 
 	 * our editor instance.
 	 */
 	$script = 'window._wpLoadBlockEditor.then( function() {
-		wp.data.dispatch( \'core/edit-post\' ).setAvailableMetaBoxesPerLocation( ' . wp_json_encode( $meta_boxes_per_location ) . ' );
+		wp.data.dispatch( \'core/edit-post\' ).setAvailableMetaBoxesPerLocation( ' . wp_json_encode($meta_boxes_per_location) . ' );
 	} );';
 
-	wp_add_inline_script( 'wp-edit-post', $script );
+	wp_add_inline_script('wp-edit-post', $script);
 
 	/*
 	 * When `wp-edit-post` is output in the `<head>`, the inline script needs to be manually printed.
 	 * Otherwise, meta boxes will not display because inline scripts for `wp-edit-post`
 	 * will not be printed again after this point.
 	 */
-	if ( wp_script_is( 'wp-edit-post', 'done' ) ) {
-		printf( "<script type='text/javascript'>\n%s\n</script>\n", trim( $script ) );
+	if (wp_script_is('wp-edit-post', 'done')) {
+		printf("<script type='text/javascript'>\n%s\n</script>\n", trim($script));
 	}
 
 	/*
 	 * If the 'postcustom' meta box is enabled, then we need to perform
 	 * some extra initialization on it.
 	 */
-	$enable_custom_fields = (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true );
+	$enable_custom_fields = (bool) get_user_meta(get_current_user_id(), 'enable_custom_fields', true);
 
-	if ( $enable_custom_fields ) {
+	if ($enable_custom_fields) {
 		$script = "( function( $ ) {
 			if ( $('#postcustom').length ) {
 				$( '#the-list' ).wpList( {
@@ -2385,8 +2385,8 @@ 
 				});
 			}
 		} )( jQuery );";
-		wp_enqueue_script( 'wp-lists' );
-		wp_add_inline_script( 'wp-lists', $script );
+		wp_enqueue_script('wp-lists');
+		wp_add_inline_script('wp-lists', $script);
 	}
 
 	// Reset meta box data.
@@ -2400,18 +2400,18 @@ 
  *
  * @param WP_Post $post Current post object.
  */
-function the_block_editor_meta_box_post_form_hidden_fields( $post ) {
+function the_block_editor_meta_box_post_form_hidden_fields($post) {
 	$form_extra = '';
-	if ( 'auto-draft' === $post->post_status ) {
+	if ('auto-draft' === $post->post_status) {
 		$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 	}
 	$form_action  = 'editpost';
 	$nonce_action = 'update-post_' . $post->ID;
-	$form_extra  .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr( $post->ID ) . "' />";
+	$form_extra  .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post->ID) . "' />";
 	$referer      = wp_get_referer();
 	$current_user = wp_get_current_user();
 	$user_id      = $current_user->ID;
-	wp_nonce_field( $nonce_action );
+	wp_nonce_field($nonce_action);
 
 	/*
 	 * Some meta boxes hook into these actions to add hidden input fields in the classic post form.
@@ -2420,39 +2420,39 @@ 
 	 */
 	ob_start();
 	/** This filter is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'edit_form_after_title', $post );
+	do_action('edit_form_after_title', $post);
 	/** This filter is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'edit_form_advanced', $post );
+	do_action('edit_form_advanced', $post);
 	$classic_output = ob_get_clean();
 
-	$classic_elements = wp_html_split( $classic_output );
+	$classic_elements = wp_html_split($classic_output);
 	$hidden_inputs    = '';
-	foreach ( $classic_elements as $element ) {
-		if ( 0 !== strpos( $element, '<input ' ) ) {
+	foreach ($classic_elements as $element) {
+		if (0 !== strpos($element, '<input ')) {
 			continue;
 		}
 
-		if ( preg_match( '/\stype=[\'"]hidden[\'"]\s/', $element ) ) {
+		if (preg_match('/\stype=[\'"]hidden[\'"]\s/', $element)) {
 			echo $element;
 		}
 	}
 	?>
 	<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_id; ?>" />
-	<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ); ?>" />
-	<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr( $form_action ); ?>" />
-	<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post->post_type ); ?>" />
-	<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status ); ?>" />
-	<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
+	<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action); ?>" />
+	<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action); ?>" />
+	<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
+	<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status); ?>" />
+	<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url($referer) : ''; ?>" />
 
 	<?php
-	if ( 'draft' !== get_post_status( $post ) ) {
-		wp_original_referer_field( true, 'previous' );
+	if ('draft' !== get_post_status($post)) {
+		wp_original_referer_field(true, 'previous');
 	}
 	echo $form_extra;
-	wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+	wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 	// Permalink title nonce.
-	wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+	wp_nonce_field('samplepermalink', 'samplepermalinknonce', false);
 
 	/**
 	 * Adds hidden input fields to the meta box save form.
@@ -2464,7 +2464,7 @@ 
 	 *
 	 * @param WP_Post $post The post that is being edited.
 	 */
-	do_action( 'block_editor_meta_box_hidden_fields', $post );
+	do_action('block_editor_meta_box_hidden_fields', $post);
 }
 
 /**
@@ -2477,8 +2477,8 @@ 
  * @param string $post_type Post type.
  * @return bool Whether the block editor should be disabled or not.
  */
-function _disable_block_editor_for_navigation_post_type( $value, $post_type ) {
-	if ( 'wp_navigation' === $post_type ) {
+function _disable_block_editor_for_navigation_post_type($value, $post_type) {
+	if ('wp_navigation' === $post_type) {
 		return false;
 	}
 
@@ -2496,13 +2496,13 @@ 
  *
  * @param WP_Post $post An instance of WP_Post class.
  */
-function _disable_content_editor_for_navigation_post_type( $post ) {
-	$post_type = get_post_type( $post );
-	if ( 'wp_navigation' !== $post_type ) {
+function _disable_content_editor_for_navigation_post_type($post) {
+	$post_type = get_post_type($post);
+	if ('wp_navigation' !== $post_type) {
 		return;
 	}
 
-	remove_post_type_support( $post_type, 'editor' );
+	remove_post_type_support($post_type, 'editor');
 }
 
 /**
@@ -2517,11 +2517,11 @@ 
  *
  * @param WP_Post $post An instance of WP_Post class.
  */
-function _enable_content_editor_for_navigation_post_type( $post ) {
-	$post_type = get_post_type( $post );
-	if ( 'wp_navigation' !== $post_type ) {
+function _enable_content_editor_for_navigation_post_type($post) {
+	$post_type = get_post_type($post);
+	if ('wp_navigation' !== $post_type) {
 		return;
 	}
 
-	add_post_type_support( $post_type, 'editor' );
+	add_post_type_support($post_type, 'editor');
 }

brighty/wp-admin/includes/class-wp-media-list-table.php

Spacing +209 added lines, -209 removed lines

@@ -37,18 +37,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		$this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+	public function __construct($args = array()) {
+		$this->detached = (isset($_REQUEST['attachment-filter']) && 'detached' === $_REQUEST['attachment-filter']);
 
 		$this->modes = array(
-			'list' => __( 'List view' ),
-			'grid' => __( 'Grid view' ),
+			'list' => __('List view'),
+			'grid' => __('Grid view'),
 		);
 
 		parent::__construct(
 			array(
 				'plural' => 'media',
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen' => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
 	}
@@ -57,7 +57,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'upload_files' );
+		return current_user_can('upload_files');
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	public function prepare_items() {
 		global $mode, $wp_query, $post_mime_types, $avail_post_mime_types;
 
-		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		$mode = empty($_REQUEST['mode']) ? 'list' : $_REQUEST['mode'];
 
 		/*
 		 * Exclude attachments scheduled for deletion in the next two hours
@@ -80,29 +80,29 @@ 
 
 		$crons = _get_cron_array();
 
-		if ( is_array( $crons ) ) {
-			foreach ( $crons as $cron ) {
-				if ( isset( $cron['upgrader_scheduled_cleanup'] ) ) {
-					$details = reset( $cron['upgrader_scheduled_cleanup'] );
+		if (is_array($crons)) {
+			foreach ($crons as $cron) {
+				if (isset($cron['upgrader_scheduled_cleanup'])) {
+					$details = reset($cron['upgrader_scheduled_cleanup']);
 
-					if ( ! empty( $details['args'][0] ) ) {
+					if (!empty($details['args'][0])) {
 						$not_in[] = (int) $details['args'][0];
 					}
 				}
 			}
 		}
 
-		if ( ! empty( $_REQUEST['post__not_in'] ) && is_array( $_REQUEST['post__not_in'] ) ) {
-			$not_in = array_merge( array_values( $_REQUEST['post__not_in'] ), $not_in );
+		if (!empty($_REQUEST['post__not_in']) && is_array($_REQUEST['post__not_in'])) {
+			$not_in = array_merge(array_values($_REQUEST['post__not_in']), $not_in);
 		}
 
-		if ( ! empty( $not_in ) ) {
+		if (!empty($not_in)) {
 			$_REQUEST['post__not_in'] = $not_in;
 		}
 
-		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
+		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query($_REQUEST);
 
-		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
+		$this->is_trash = isset($_REQUEST['attachment-filter']) && 'trash' === $_REQUEST['attachment-filter'];
 
 		$this->set_pagination_args(
 			array(
@@ -123,47 +123,47 @@ 
 
 		$type_links = array();
 
-		$filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter'];
+		$filter = empty($_GET['attachment-filter']) ? '' : $_GET['attachment-filter'];
 
 		$type_links['all'] = sprintf(
 			'<option value=""%s>%s</option>',
-			selected( $filter, true, false ),
-			__( 'All media items' )
+			selected($filter, true, false),
+			__('All media items')
 		);
 
-		foreach ( $post_mime_types as $mime_type => $label ) {
-			if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+		foreach ($post_mime_types as $mime_type => $label) {
+			if (!wp_match_mime_types($mime_type, $avail_post_mime_types)) {
 				continue;
 			}
 
 			$selected = selected(
-				$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
-					wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
+				$filter && 0 === strpos($filter, 'post_mime_type:') &&
+					wp_match_mime_types($mime_type, str_replace('post_mime_type:', '', $filter)),
 				true,
 				false
 			);
 
-			$type_links[ $mime_type ] = sprintf(
+			$type_links[$mime_type] = sprintf(
 				'<option value="post_mime_type:%s"%s>%s</option>',
-				esc_attr( $mime_type ),
+				esc_attr($mime_type),
 				$selected,
 				$label[0]
 			);
 		}
 
-		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . _x( 'Unattached', 'media items' ) . '</option>';
+		$type_links['detached'] = '<option value="detached"' . ($this->detached ? ' selected="selected"' : '') . '>' . _x('Unattached', 'media items') . '</option>';
 
 		$type_links['mine'] = sprintf(
 			'<option value="mine"%s>%s</option>',
-			selected( 'mine' === $filter, true, false ),
-			_x( 'Mine', 'media items' )
+			selected('mine' === $filter, true, false),
+			_x('Mine', 'media items')
 		);
 
-		if ( $this->is_trash || ( defined( 'MEDIA_TRASH' ) && MEDIA_TRASH ) ) {
+		if ($this->is_trash || (defined('MEDIA_TRASH') && MEDIA_TRASH)) {
 			$type_links['trash'] = sprintf(
 				'<option value="trash"%s>%s</option>',
-				selected( 'trash' === $filter, true, false ),
-				_x( 'Trash', 'attachment filter' )
+				selected('trash' === $filter, true, false),
+				_x('Trash', 'attachment filter')
 			);
 		}
 
@@ -176,19 +176,19 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( MEDIA_TRASH ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
-				$actions['delete']  = __( 'Delete permanently' );
+		if (MEDIA_TRASH) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
+				$actions['delete']  = __('Delete permanently');
 			} else {
-				$actions['trash'] = __( 'Move to Trash' );
+				$actions['trash'] = __('Move to Trash');
 			}
 		} else {
-			$actions['delete'] = __( 'Delete permanently' );
+			$actions['delete'] = __('Delete permanently');
 		}
 
-		if ( $this->detached ) {
-			$actions['attach'] = __( 'Attach' );
+		if ($this->detached) {
+			$actions['attach'] = __('Attach');
 		}
 
 		return $actions;
@@ -197,26 +197,26 @@ 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'bar' !== $which ) {
+	protected function extra_tablenav($which) {
+		if ('bar' !== $which) {
 			return;
 		}
 		?>
 		<div class="actions">
 			<?php
-			if ( ! $this->is_trash ) {
-				$this->months_dropdown( 'attachment' );
+			if (!$this->is_trash) {
+				$this->months_dropdown('attachment');
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			do_action('restrict_manage_posts', $this->screen->post_type, $which);
 
-			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 
-			if ( $this->is_trash && $this->has_items()
-				&& current_user_can( 'edit_others_posts' )
+			if ($this->is_trash && $this->has_items()
+				&& current_user_can('edit_others_posts')
 			) {
-				submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+				submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 			}
 			?>
 		</div>
@@ -227,15 +227,15 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+		if (isset($_REQUEST['found_post_id']) && isset($_REQUEST['media'])) {
 			return 'attach';
 		}
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+		if (isset($_REQUEST['parent_post_id']) && isset($_REQUEST['media'])) {
 			return 'detach';
 		}
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2'])) {
 			return 'delete_all';
 		}
 
@@ -252,10 +252,10 @@ 
 	/**
 	 */
 	public function no_items() {
-		if ( $this->is_trash ) {
-			_e( 'No media files found in Trash.' );
+		if ($this->is_trash) {
+			_e('No media files found in Trash.');
 		} else {
-			_e( 'No media files found.' );
+			_e('No media files found.');
 		}
 	}
 
@@ -269,17 +269,17 @@ 
 
 		$views = $this->get_views();
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 		?>
 		<div class="wp-filter">
 			<div class="filter-items">
-				<?php $this->view_switcher( $mode ); ?>
+				<?php $this->view_switcher($mode); ?>
 
-				<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+				<label for="attachment-filter" class="screen-reader-text"><?php _e('Filter by type'); ?></label>
 				<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
 					<?php
-					if ( ! empty( $views ) ) {
-						foreach ( $views as $class => $view ) {
+					if (!empty($views)) {
+						foreach ($views as $class => $view) {
 							echo "\t$view\n";
 						}
 					}
@@ -287,15 +287,15 @@ 
 				</select>
 
 				<?php
-				$this->extra_tablenav( 'bar' );
+				$this->extra_tablenav('bar');
 
 				/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-				$views = apply_filters( "views_{$this->screen->id}", array() );
+				$views = apply_filters("views_{$this->screen->id}", array());
 
 				// Back compat for pre-4.0 view links.
-				if ( ! empty( $views ) ) {
+				if (!empty($views)) {
 					echo '<ul class="filter-links">';
-					foreach ( $views as $class => $view ) {
+					foreach ($views as $class => $view) {
 						echo "<li class='$class'>$view</li>";
 					}
 					echo '</ul>';
@@ -304,7 +304,7 @@ 
 			</div>
 
 			<div class="search-form">
-				<label for="media-search-input" class="media-search-input-label"><?php esc_html_e( 'Search' ); ?></label>
+				<label for="media-search-input" class="media-search-input-label"><?php esc_html_e('Search'); ?></label>
 				<input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
 			</div>
 		</div>
@@ -318,11 +318,11 @@ 
 		$posts_columns       = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
 		/* translators: Column name. */
-		$posts_columns['title']  = _x( 'File', 'column name' );
-		$posts_columns['author'] = __( 'Author' );
+		$posts_columns['title']  = _x('File', 'column name');
+		$posts_columns['author'] = __('Author');
 
-		$taxonomies = get_taxonomies_for_attachments( 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_taxonomies_for_attachments('objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filters the taxonomy columns for attachments in the Media list table.
@@ -332,31 +332,31 @@ 
 		 * @param string[] $taxonomies An array of registered taxonomy names to show for attachments.
 		 * @param string   $post_type  The post type. Default 'attachment'.
 		 */
-		$taxonomies = apply_filters( 'manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment' );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters('manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment');
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy ) {
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy) {
 				$column_key = 'categories';
-			} elseif ( 'post_tag' === $taxonomy ) {
+			} elseif ('post_tag' === $taxonomy) {
 				$column_key = 'tags';
 			} else {
 				$column_key = 'taxonomy-' . $taxonomy;
 			}
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
 		/* translators: Column name. */
-		if ( ! $this->detached ) {
-			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) ) {
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if (!$this->detached) {
+			$posts_columns['parent'] = _x('Uploaded to', 'column name');
+			if (post_type_supports('attachment', 'comments')) {
+				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__('Comments') . '"><span class="screen-reader-text">' . __('Comments') . '</span></span>';
 			}
 		}
 
 		/* translators: Column name. */
-		$posts_columns['date'] = _x( 'Date', 'column name' );
+		$posts_columns['date'] = _x('Date', 'column name');
 
 		/**
 		 * Filters the Media list table columns.
@@ -367,7 +367,7 @@ 
 		 * @param bool     $detached      Whether the list table contains media not attached
 		 *                                to any posts. Default true.
 		 */
-		return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
+		return apply_filters('manage_media_columns', $posts_columns, $this->detached);
 	}
 
 	/**
@@ -379,7 +379,7 @@ 
 			'author'   => 'author',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
+			'date'     => array('date', true),
 		);
 	}
 
@@ -391,16 +391,16 @@ 
 	 *
 	 * @param WP_Post $item The current WP_Post object.
 	 */
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		// Restores the more descriptive, specific name for use within this method.
 		$post = $item;
 
-		if ( current_user_can( 'edit_post', $post->ID ) ) {
+		if (current_user_can('edit_post', $post->ID)) {
 			?>
 			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
 				<?php
 				/* translators: %s: Attachment title. */
-				printf( __( 'Select %s' ), _draft_or_post_title() );
+				printf(__('Select %s'), _draft_or_post_title());
 				?>
 			</label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
@@ -415,20 +415,20 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
-		list( $mime ) = explode( '/', $post->post_mime_type );
+	public function column_title($post) {
+		list($mime) = explode('/', $post->post_mime_type);
 
 		$title      = _draft_or_post_title();
-		$thumb      = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$thumb      = wp_get_attachment_image($post->ID, array(60, 60), true, array('alt' => ''));
 		$link_start = '';
 		$link_end   = '';
 
-		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+		if (current_user_can('edit_post', $post->ID) && !$this->is_trash) {
 			$link_start = sprintf(
 				'<a href="%s" aria-label="%s">',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: Attachment title. */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) )
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title))
 			);
 			$link_end = '</a>';
 		}
@@ -439,22 +439,22 @@ 
 			<?php
 			echo $link_start;
 
-			if ( $thumb ) :
+			if ($thumb) :
 				?>
-				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+				<span class="media-icon <?php echo sanitize_html_class($mime . '-icon'); ?>"><?php echo $thumb; ?></span>
 				<?php
 			endif;
 
 			echo $title . $link_end;
 
-			_media_states( $post );
+			_media_states($post);
 			?>
 		</strong>
 		<p class="filename">
-			<span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+			<span class="screen-reader-text"><?php _e('File name:'); ?> </span>
 			<?php
-			$file = get_attached_file( $post->ID );
-			echo esc_html( wp_basename( $file ) );
+			$file = get_attached_file($post->ID);
+			echo esc_html(wp_basename($file));
 			?>
 		</p>
 		<?php
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
+	public function column_author($post) {
 		printf(
 			'<a href="%s">%s</a>',
-			esc_url( add_query_arg( array( 'author' => get_the_author_meta( 'ID' ) ), 'upload.php' ) ),
+			esc_url(add_query_arg(array('author' => get_the_author_meta('ID')), 'upload.php')),
 			get_the_author()
 		);
 	}
@@ -482,7 +482,7 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_desc( $post ) {
+	public function column_desc($post) {
 		echo has_excerpt() ? $post->post_excerpt : '';
 	}
 
@@ -493,18 +493,18 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$h_time = __( 'Unpublished' );
+	public function column_date($post) {
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$h_time = __('Unpublished');
 		} else {
-			$time      = get_post_timestamp( $post );
+			$time      = get_post_timestamp($post);
 			$time_diff = time() - $time;
 
-			if ( $time && $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
+			if ($time && $time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
 				/* translators: %s: Human-readable time difference. */
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = get_the_time( __( 'Y/m/d' ), $post );
+				$h_time = get_the_time(__('Y/m/d'), $post);
 			}
 		}
 
@@ -517,7 +517,7 @@ 
 		 * @param WP_Post $post        Attachment object.
 		 * @param string  $column_name The column name.
 		 */
-		echo apply_filters( 'media_date_column_time', $h_time, $post, 'date' );
+		echo apply_filters('media_date_column_time', $h_time, $post, 'date');
 	}
 
 	/**
@@ -527,33 +527,33 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_parent( $post ) {
-		$user_can_edit = current_user_can( 'edit_post', $post->ID );
+	public function column_parent($post) {
+		$user_can_edit = current_user_can('edit_post', $post->ID);
 
-		if ( $post->post_parent > 0 ) {
-			$parent = get_post( $post->post_parent );
+		if ($post->post_parent > 0) {
+			$parent = get_post($post->post_parent);
 		} else {
 			$parent = false;
 		}
 
-		if ( $parent ) {
-			$title       = _draft_or_post_title( $post->post_parent );
-			$parent_type = get_post_type_object( $parent->post_type );
+		if ($parent) {
+			$title       = _draft_or_post_title($post->post_parent);
+			$parent_type = get_post_type_object($parent->post_type);
 
-			if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
-				printf( '<strong><a href="%s">%s</a></strong>', get_edit_post_link( $post->post_parent ), $title );
-			} elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
-				printf( '<strong>%s</strong>', $title );
+			if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $post->post_parent)) {
+				printf('<strong><a href="%s">%s</a></strong>', get_edit_post_link($post->post_parent), $title);
+			} elseif ($parent_type && current_user_can('read_post', $post->post_parent)) {
+				printf('<strong>%s</strong>', $title);
 			} else {
-				_e( '(Private post)' );
+				_e('(Private post)');
 			}
 
-			if ( $user_can_edit ) :
+			if ($user_can_edit) :
 				$detach_url = add_query_arg(
 					array(
 						'parent_post_id' => $post->post_parent,
 						'media[]'        => $post->ID,
-						'_wpnonce'       => wp_create_nonce( 'bulk-' . $this->_args['plural'] ),
+						'_wpnonce'       => wp_create_nonce('bulk-' . $this->_args['plural']),
 					),
 					'upload.php'
 				);
@@ -561,22 +561,22 @@ 
 					'<br /><a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
 					$detach_url,
 					/* translators: %s: Title of the post the attachment is attached to. */
-					esc_attr( sprintf( __( 'Detach from &#8220;%s&#8221;' ), $title ) ),
-					__( 'Detach' )
+					esc_attr(sprintf(__('Detach from &#8220;%s&#8221;'), $title)),
+					__('Detach')
 				);
 			endif;
 		} else {
-			_e( '(Unattached)' );
+			_e('(Unattached)');
 			?>
 			<?php
-			if ( $user_can_edit ) {
-				$title = _draft_or_post_title( $post->post_parent );
+			if ($user_can_edit) {
+				$title = _draft_or_post_title($post->post_parent);
 				printf(
 					'<br /><a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $title)),
+					__('Attach')
 				);
 			}
 		}
@@ -589,16 +589,16 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		echo '<div class="post-com-count-wrapper">';
 
-		if ( isset( $this->comment_pending_count[ $post->ID ] ) ) {
-			$pending_comments = $this->comment_pending_count[ $post->ID ];
+		if (isset($this->comment_pending_count[$post->ID])) {
+			$pending_comments = $this->comment_pending_count[$post->ID];
 		} else {
-			$pending_comments = get_pending_comments_num( $post->ID );
+			$pending_comments = get_pending_comments_num($post->ID);
 		}
 
-		$this->comments_bubble( $post->ID, $pending_comments );
+		$this->comments_bubble($post->ID, $pending_comments);
 
 		echo '</div>';
 	}
@@ -612,39 +612,39 @@ 
 	 * @param WP_Post $item        The current WP_Post object.
 	 * @param string  $column_name Current column name.
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		// Restores the more descriptive, specific name for use within this method.
 		$post = $item;
 
-		if ( 'categories' === $column_name ) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
 
-		if ( $taxonomy ) {
-			$terms = get_the_terms( $post->ID, $taxonomy );
+		if ($taxonomy) {
+			$terms = get_the_terms($post->ID, $taxonomy);
 
-			if ( is_array( $terms ) ) {
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv             = array();
 					$posts_in_term_qv['taxonomy'] = $taxonomy;
 					$posts_in_term_qv['term']     = $t->slug;
 
 					$out[] = sprintf(
 						'<a href="%s">%s</a>',
-						esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
-						esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
+						esc_url(add_query_arg($posts_in_term_qv, 'upload.php')),
+						esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'))
 					);
 				}
-				echo implode( wp_get_list_item_separator(), $out );
+				echo implode(wp_get_list_item_separator(), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . get_taxonomy($taxonomy)->labels->no_terms . '</span>';
 			}
 
 			return;
@@ -660,7 +660,7 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $post_id     Attachment ID.
 		 */
-		do_action( 'manage_media_custom_column', $column_name, $post->ID );
+		do_action('manage_media_custom_column', $column_name, $post->ID);
 	}
 
 	/**
@@ -669,26 +669,26 @@ 
 	public function display_rows() {
 		global $post, $wp_query;
 
-		$post_ids = wp_list_pluck( $wp_query->posts, 'ID' );
-		reset( $wp_query->posts );
+		$post_ids = wp_list_pluck($wp_query->posts, 'ID');
+		reset($wp_query->posts);
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		add_filter( 'the_title', 'esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		while ( have_posts() ) :
+		while (have_posts()) :
 			the_post();
 
-			if ( $this->is_trash && 'trash' !== $post->post_status
-				|| ! $this->is_trash && 'trash' === $post->post_status
+			if ($this->is_trash && 'trash' !== $post->post_status
+				|| !$this->is_trash && 'trash' === $post->post_status
 			) {
 				continue;
 			}
 
-			$post_owner = ( get_current_user_id() === (int) $post->post_author ) ? 'self' : 'other';
+			$post_owner = (get_current_user_id() === (int) $post->post_author) ? 'self' : 'other';
 			?>
-			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
-				<?php $this->single_row_columns( $post ); ?>
+			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim(' author-' . $post_owner . ' status-' . $post->post_status); ?>">
+				<?php $this->single_row_columns($post); ?>
 			</tr>
 			<?php
 		endwhile;
@@ -710,118 +710,118 @@ 
 	 * @param string  $att_title
 	 * @return array
 	 */
-	private function _get_row_actions( $post, $att_title ) {
+	private function _get_row_actions($post, $att_title) {
 		$actions = array();
 
-		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+		if ($this->detached) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
+					get_edit_post_link($post->ID),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
 
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID),
 						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				} else {
-					$delete_ays        = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+					$delete_ays        = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID),
 						$delete_ays,
 						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
 
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-				get_permalink( $post->ID ),
+				get_permalink($post->ID),
 				/* translators: %s: Attachment title. */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+				__('View')
 			);
 
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$actions['attach'] = sprintf(
 					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $att_title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $att_title)),
+					__('Attach')
 				);
 			}
 		} else {
-			if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+			if (current_user_can('edit_post', $post->ID) && !$this->is_trash) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
+					get_edit_post_link($post->ID),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
 
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if ($this->is_trash) {
 					$actions['untrash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID),
 						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $att_title ) ),
-						__( 'Restore' )
+						esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $att_title)),
+						__('Restore')
 					);
-				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+				} elseif (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID),
 						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				}
 
-				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
-					$delete_ays        = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+				if ($this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH) {
+					$delete_ays        = (!$this->is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID),
 						$delete_ays,
 						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
 
-			if ( ! $this->is_trash ) {
+			if (!$this->is_trash) {
 				$actions['view'] = sprintf(
 					'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+					__('View')
 				);
 
 				$actions['copy'] = sprintf(
 					'<span class="copy-to-clipboard-container"><button type="button" class="button-link copy-attachment-url media-library" data-clipboard-text="%s" aria-label="%s">%s</button><span class="success hidden" aria-hidden="true">%s</span></span>',
-					esc_url( wp_get_attachment_url( $post->ID ) ),
+					esc_url(wp_get_attachment_url($post->ID)),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Copy &#8220;%s&#8221; URL to clipboard' ), $att_title ) ),
-					__( 'Copy URL to clipboard' ),
-					__( 'Copied!' )
+					esc_attr(sprintf(__('Copy &#8220;%s&#8221; URL to clipboard'), $att_title)),
+					__('Copy URL to clipboard'),
+					__('Copied!')
 				);
 			}
 		}
@@ -837,7 +837,7 @@ 
 		 * @param bool     $detached Whether the list table contains media not attached
 		 *                           to any posts. Default true.
 		 */
-		return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+		return apply_filters('media_row_actions', $actions, $post, $this->detached);
 	}
 
 	/**
@@ -852,8 +852,8 @@ 
 	 * @return string Row actions output for media attachments, or an empty string
 	 *                if the current column is not the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($item, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
@@ -863,6 +863,6 @@ 
 			$att_title
 		);
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 }

brighty/wp-admin/includes/class-wp-importer.php

Spacing +72 added lines, -72 removed lines

@@ -17,7 +17,7 @@ 
 	 * @param string $blog_id
 	 * @return array
 	 */
-	public function get_imported_posts( $importer_name, $blog_id ) {
+	public function get_imported_posts($importer_name, $blog_id) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -28,19 +28,19 @@ 
 		// Grab all posts in chunks.
 		do {
 			$meta_key = $importer_name . '_' . $blog_id . '_permalink';
-			$sql      = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit );
-			$results  = $wpdb->get_results( $sql );
+			$sql      = $wpdb->prepare("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit);
+			$results  = $wpdb->get_results($sql);
 
 			// Increment offset.
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( ! empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if (!empty($results)) {
+				foreach ($results as $r) {
 					// Set permalinks into array.
-					$hashtable[ $r->meta_value ] = (int) $r->post_id;
+					$hashtable[$r->meta_value] = (int) $r->post_id;
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		return $hashtable;
 	}
@@ -54,18 +54,18 @@ 
 	 * @param string $blog_id
 	 * @return int
 	 */
-	public function count_imported_posts( $importer_name, $blog_id ) {
+	public function count_imported_posts($importer_name, $blog_id) {
 		global $wpdb;
 
 		$count = 0;
 
 		// Get count of permalinks.
 		$meta_key = $importer_name . '_' . $blog_id . '_permalink';
-		$sql      = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key );
+		$sql      = $wpdb->prepare("SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = %s", $meta_key);
 
-		$result = $wpdb->get_results( $sql );
+		$result = $wpdb->get_results($sql);
 
-		if ( ! empty( $result ) ) {
+		if (!empty($result)) {
 			$count = (int) $result[0]->cnt;
 		}
 
@@ -80,7 +80,7 @@ 
 	 * @param string $blog_id
 	 * @return array
 	 */
-	public function get_imported_comments( $blog_id ) {
+	public function get_imported_comments($blog_id) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -90,26 +90,26 @@ 
 
 		// Grab all comments in chunks.
 		do {
-			$sql     = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$sql     = $wpdb->prepare("SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit);
+			$results = $wpdb->get_results($sql);
 
 			// Increment offset.
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( ! empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if (!empty($results)) {
+				foreach ($results as $r) {
 					// Explode comment_agent key.
-					list ( $comment_agent_blog_id, $source_comment_id ) = explode( '-', $r->comment_agent );
+					list ($comment_agent_blog_id, $source_comment_id) = explode('-', $r->comment_agent);
 
 					$source_comment_id = (int) $source_comment_id;
 
 					// Check if this comment came from this blog.
-					if ( $blog_id == $comment_agent_blog_id ) {
-						$hashtable[ $source_comment_id ] = (int) $r->comment_ID;
+					if ($blog_id == $comment_agent_blog_id) {
+						$hashtable[$source_comment_id] = (int) $r->comment_ID;
 					}
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		return $hashtable;
 	}
@@ -118,17 +118,17 @@ 
 	 * @param int $blog_id
 	 * @return int|void
 	 */
-	public function set_blog( $blog_id ) {
-		if ( is_numeric( $blog_id ) ) {
+	public function set_blog($blog_id) {
+		if (is_numeric($blog_id)) {
 			$blog_id = (int) $blog_id;
 		} else {
-			$blog   = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
-			$parsed = parse_url( $blog );
-			if ( ! $parsed || empty( $parsed['host'] ) ) {
-				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
+			$blog   = 'http://' . preg_replace('#^https?://#', '', $blog_id);
+			$parsed = parse_url($blog);
+			if (!$parsed || empty($parsed['host'])) {
+				fwrite(STDERR, "Error: can not determine blog_id from $blog_id\n");
 				exit;
 			}
-			if ( empty( $parsed['path'] ) ) {
+			if (empty($parsed['path'])) {
 				$parsed['path'] = '/';
 			}
 			$blogs = get_sites(
@@ -138,17 +138,17 @@ 
 					'path'   => $parsed['path'],
 				)
 			);
-			if ( ! $blogs ) {
-				fwrite( STDERR, "Error: Could not find blog\n" );
+			if (!$blogs) {
+				fwrite(STDERR, "Error: Could not find blog\n");
 				exit;
 			}
-			$blog    = array_shift( $blogs );
+			$blog    = array_shift($blogs);
 			$blog_id = (int) $blog->blog_id;
 		}
 
-		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() ) {
-				switch_to_blog( $blog_id );
+		if (function_exists('is_multisite')) {
+			if (is_multisite()) {
+				switch_to_blog($blog_id);
 			}
 		}
 
@@ -159,15 +159,15 @@ 
 	 * @param int $user_id
 	 * @return int|void
 	 */
-	public function set_user( $user_id ) {
-		if ( is_numeric( $user_id ) ) {
+	public function set_user($user_id) {
+		if (is_numeric($user_id)) {
 			$user_id = (int) $user_id;
 		} else {
-			$user_id = (int) username_exists( $user_id );
+			$user_id = (int) username_exists($user_id);
 		}
 
-		if ( ! $user_id || ! wp_set_current_user( $user_id ) ) {
-			fwrite( STDERR, "Error: can not find user\n" );
+		if (!$user_id || !wp_set_current_user($user_id)) {
+			fwrite(STDERR, "Error: can not find user\n");
 			exit;
 		}
 
@@ -181,8 +181,8 @@ 
 	 * @param string $b
 	 * @return int
 	 */
-	public function cmpr_strlen( $a, $b ) {
-		return strlen( $b ) - strlen( $a );
+	public function cmpr_strlen($a, $b) {
+		return strlen($b) - strlen($a);
 	}
 
 	/**
@@ -194,22 +194,22 @@ 
 	 * @param bool   $head
 	 * @return array
 	 */
-	public function get_page( $url, $username = '', $password = '', $head = false ) {
+	public function get_page($url, $username = '', $password = '', $head = false) {
 		// Increase the timeout.
-		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
+		add_filter('http_request_timeout', array($this, 'bump_request_timeout'));
 
 		$headers = array();
 		$args    = array();
-		if ( true === $head ) {
+		if (true === $head) {
 			$args['method'] = 'HEAD';
 		}
-		if ( ! empty( $username ) && ! empty( $password ) ) {
-			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		if (!empty($username) && !empty($password)) {
+			$headers['Authorization'] = 'Basic ' . base64_encode("$username:$password");
 		}
 
 		$args['headers'] = $headers;
 
-		return wp_safe_remote_request( $url, $args );
+		return wp_safe_remote_request($url, $args);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 * @param int $val
 	 * @return int
 	 */
-	public function bump_request_timeout( $val ) {
+	public function bump_request_timeout($val) {
 		return 60;
 	}
 
@@ -228,8 +228,8 @@ 
 	 * @return bool
 	 */
 	public function is_user_over_quota() {
-		if ( function_exists( 'upload_is_user_over_quota' ) ) {
-			if ( upload_is_user_over_quota() ) {
+		if (function_exists('upload_is_user_over_quota')) {
+			if (upload_is_user_over_quota()) {
 				return true;
 			}
 		}
@@ -243,8 +243,8 @@ 
 	 * @param string $text
 	 * @return string
 	 */
-	public function min_whitespace( $text ) {
-		return preg_replace( '|[\r\n\t ]+|', ' ', $text );
+	public function min_whitespace($text) {
+		return preg_replace('|[\r\n\t ]+|', ' ', $text);
 	}
 
 	/**
@@ -272,9 +272,9 @@ 
  * @param bool   $required
  * @return mixed
  */
-function get_cli_args( $param, $required = false ) {
+function get_cli_args($param, $required = false) {
 	$args = $_SERVER['argv'];
-	if ( ! is_array( $args ) ) {
+	if (!is_array($args)) {
 		$args = array();
 	}
 
@@ -283,40 +283,40 @@ 
 	$last_arg = null;
 	$return   = null;
 
-	$il = count( $args );
+	$il = count($args);
 
-	for ( $i = 1, $il; $i < $il; $i++ ) {
-		if ( (bool) preg_match( '/^--(.+)/', $args[ $i ], $match ) ) {
-			$parts = explode( '=', $match[1] );
-			$key   = preg_replace( '/[^a-z0-9]+/', '', $parts[0] );
+	for ($i = 1, $il; $i < $il; $i++) {
+		if ((bool) preg_match('/^--(.+)/', $args[$i], $match)) {
+			$parts = explode('=', $match[1]);
+			$key   = preg_replace('/[^a-z0-9]+/', '', $parts[0]);
 
-			if ( isset( $parts[1] ) ) {
-				$out[ $key ] = $parts[1];
+			if (isset($parts[1])) {
+				$out[$key] = $parts[1];
 			} else {
-				$out[ $key ] = true;
+				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( (bool) preg_match( '/^-([a-zA-Z0-9]+)/', $args[ $i ], $match ) ) {
-			for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
-				$key         = $match[1][ $j ];
-				$out[ $key ] = true;
+		} elseif ((bool) preg_match('/^-([a-zA-Z0-9]+)/', $args[$i], $match)) {
+			for ($j = 0, $jl = strlen($match[1]); $j < $jl; $j++) {
+				$key         = $match[1][$j];
+				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( null !== $last_arg ) {
-			$out[ $last_arg ] = $args[ $i ];
+		} elseif (null !== $last_arg) {
+			$out[$last_arg] = $args[$i];
 		}
 	}
 
 	// Check array for specified param.
-	if ( isset( $out[ $param ] ) ) {
+	if (isset($out[$param])) {
 		// Set return value.
-		$return = $out[ $param ];
+		$return = $out[$param];
 	}
 
 	// Check for missing required param.
-	if ( ! isset( $out[ $param ] ) && $required ) {
+	if (!isset($out[$param]) && $required) {
 		// Display message and exit.
 		echo "\"$param\" parameter is required but was not specified\n";
 		exit;

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

Spacing +152 added lines, -152 removed lines

@@ -54,16 +54,16 @@ 
 	 * @since 2.8.0
 	 */
 	public function upgrade_strings() {
-		$this->strings['up_to_date'] = __( 'The plugin is at the latest version.' );
-		$this->strings['no_package'] = __( 'Update package not available.' );
+		$this->strings['up_to_date'] = __('The plugin is at the latest version.');
+		$this->strings['no_package'] = __('Update package not available.');
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package']       = __( 'Unpacking the update&#8230;' );
-		$this->strings['remove_old']           = __( 'Removing the old version of the plugin&#8230;' );
-		$this->strings['remove_old_failed']    = __( 'Could not remove the old plugin.' );
-		$this->strings['process_failed']       = __( 'Plugin update failed.' );
-		$this->strings['process_success']      = __( 'Plugin updated successfully.' );
-		$this->strings['process_bulk_success'] = __( 'Plugins updated successfully.' );
+		$this->strings['downloading_package']  = sprintf(__('Downloading update from %s&#8230;'), '<span class="code">%s</span>');
+		$this->strings['unpack_package']       = __('Unpacking the update&#8230;');
+		$this->strings['remove_old']           = __('Removing the old version of the plugin&#8230;');
+		$this->strings['remove_old_failed']    = __('Could not remove the old plugin.');
+		$this->strings['process_failed']       = __('Plugin update failed.');
+		$this->strings['process_success']      = __('Plugin updated successfully.');
+		$this->strings['process_bulk_success'] = __('Plugins updated successfully.');
 	}
 
 	/**
@@ -72,30 +72,30 @@ 
 	 * @since 2.8.0
 	 */
 	public function install_strings() {
-		$this->strings['no_package'] = __( 'Installation package not available.' );
+		$this->strings['no_package'] = __('Installation package not available.');
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
-		$this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
-		$this->strings['remove_old']          = __( 'Removing the current plugin&#8230;' );
-		$this->strings['remove_old_failed']   = __( 'Could not remove the current plugin.' );
-		$this->strings['no_files']            = __( 'The plugin contains no files.' );
-		$this->strings['process_failed']      = __( 'Plugin installation failed.' );
-		$this->strings['process_success']     = __( 'Plugin installed successfully.' );
+		$this->strings['downloading_package'] = sprintf(__('Downloading installation package from %s&#8230;'), '<span class="code">%s</span>');
+		$this->strings['unpack_package']      = __('Unpacking the package&#8230;');
+		$this->strings['installing_package']  = __('Installing the plugin&#8230;');
+		$this->strings['remove_old']          = __('Removing the current plugin&#8230;');
+		$this->strings['remove_old_failed']   = __('Could not remove the current plugin.');
+		$this->strings['no_files']            = __('The plugin contains no files.');
+		$this->strings['process_failed']      = __('Plugin installation failed.');
+		$this->strings['process_success']     = __('Plugin installed successfully.');
 		/* translators: 1: Plugin name, 2: Plugin version. */
-		$this->strings['process_success_specific'] = __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' );
+		$this->strings['process_success_specific'] = __('Successfully installed the plugin <strong>%1$s %2$s</strong>.');
 
-		if ( ! empty( $this->skin->overwrite ) ) {
-			if ( 'update-plugin' === $this->skin->overwrite ) {
-				$this->strings['installing_package'] = __( 'Updating the plugin&#8230;' );
-				$this->strings['process_failed']     = __( 'Plugin update failed.' );
-				$this->strings['process_success']    = __( 'Plugin updated successfully.' );
+		if (!empty($this->skin->overwrite)) {
+			if ('update-plugin' === $this->skin->overwrite) {
+				$this->strings['installing_package'] = __('Updating the plugin&#8230;');
+				$this->strings['process_failed']     = __('Plugin update failed.');
+				$this->strings['process_success']    = __('Plugin updated successfully.');
 			}
 
-			if ( 'downgrade-plugin' === $this->skin->overwrite ) {
-				$this->strings['installing_package'] = __( 'Downgrading the plugin&#8230;' );
-				$this->strings['process_failed']     = __( 'Plugin downgrade failed.' );
-				$this->strings['process_success']    = __( 'Plugin downgraded successfully.' );
+			if ('downgrade-plugin' === $this->skin->overwrite) {
+				$this->strings['installing_package'] = __('Downgrading the plugin&#8230;');
+				$this->strings['process_failed']     = __('Plugin downgrade failed.');
+				$this->strings['process_success']    = __('Plugin downgraded successfully.');
 			}
 		}
 	}
@@ -115,21 +115,21 @@ 
 	 * }
 	 * @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise.
 	 */
-	public function install( $package, $args = array() ) {
-		$defaults    = array(
+	public function install($package, $args = array()) {
+		$defaults = array(
 			'clear_update_cache' => true,
 			'overwrite_package'  => false, // Do not overwrite files.
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->install_strings();
 
-		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		add_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
 		$this->run(
@@ -145,17 +145,17 @@ 
 			)
 		);
 
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
+		remove_filter('upgrader_source_selection', array($this, 'check_package'));
 
-		if ( ! $this->result || is_wp_error( $this->result ) ) {
+		if (!$this->result || is_wp_error($this->result)) {
 			return $this->result;
 		}
 
 		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
-		if ( $parsed_args['overwrite_package'] ) {
+		if ($parsed_args['overwrite_package']) {
 			/**
 			 * Fires when the upgrader has successfully overwritten a currently installed
 			 * plugin or theme with an uploaded zip package.
@@ -166,7 +166,7 @@ 
 			 * @param array   $data         The new plugin or theme data.
 			 * @param string  $package_type The package type ('plugin' or 'theme').
 			 */
-			do_action( 'upgrader_overwrote_package', $package, $this->new_plugin_data, 'plugin' );
+			do_action('upgrader_overwrote_package', $package, $this->new_plugin_data, 'plugin');
 		}
 
 		return true;
@@ -187,36 +187,36 @@ 
 	 * }
 	 * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
 	 */
-	public function upgrade( $plugin, $args = array() ) {
+	public function upgrade($plugin, $args = array()) {
 		$defaults    = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
-		if ( ! isset( $current->response[ $plugin ] ) ) {
+		$current = get_site_transient('update_plugins');
+		if (!isset($current->response[$plugin])) {
 			$this->skin->before();
-			$this->skin->set_result( false );
-			$this->skin->error( 'up_to_date' );
+			$this->skin->set_result(false);
+			$this->skin->error('up_to_date');
 			$this->skin->after();
 			return false;
 		}
 
 		// Get the URL to the zip file.
-		$r = $current->response[ $plugin ];
+		$r = $current->response[$plugin];
 
-		add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 );
-		add_filter( 'upgrader_pre_install', array( $this, 'active_before' ), 10, 2 );
-		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
-		add_filter( 'upgrader_post_install', array( $this, 'active_after' ), 10, 2 );
+		add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
+		add_filter('upgrader_pre_install', array($this, 'active_before'), 10, 2);
+		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
+		add_filter('upgrader_post_install', array($this, 'active_after'), 10, 2);
 		// There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.
 		// 'source_selection' => array( $this, 'source_selection' ),
-		if ( $parsed_args['clear_update_cache'] ) {
+		if ($parsed_args['clear_update_cache']) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
-			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+			add_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0);
 		}
 
 		$this->run(
@@ -234,26 +234,26 @@ 
 		);
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ) );
-		remove_filter( 'upgrader_pre_install', array( $this, 'active_before' ) );
-		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
-		remove_filter( 'upgrader_post_install', array( $this, 'active_after' ) );
+		remove_action('upgrader_process_complete', 'wp_clean_plugins_cache', 9);
+		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
+		remove_filter('upgrader_pre_install', array($this, 'active_before'));
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
+		remove_filter('upgrader_post_install', array($this, 'active_after'));
 
-		if ( ! $this->result || is_wp_error( $this->result ) ) {
+		if (!$this->result || is_wp_error($this->result)) {
 			return $this->result;
 		}
 
 		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		// Ensure any future auto-update failures trigger a failure email by removing
 		// the last failure notification from the list when plugins update successfully.
-		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
+		$past_failure_emails = get_option('auto_plugin_theme_update_emails', array());
 
-		if ( isset( $past_failure_emails[ $plugin ] ) ) {
-			unset( $past_failure_emails[ $plugin ] );
-			update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+		if (isset($past_failure_emails[$plugin])) {
+			unset($past_failure_emails[$plugin]);
+			update_option('auto_plugin_theme_update_emails', $past_failure_emails);
 		}
 
 		return true;
@@ -273,25 +273,25 @@ 
 	 * }
 	 * @return array|false An array of results indexed by plugin file, or false if unable to connect to the filesystem.
 	 */
-	public function bulk_upgrade( $plugins, $args = array() ) {
+	public function bulk_upgrade($plugins, $args = array()) {
 		$defaults    = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $args, $defaults );
+		$parsed_args = wp_parse_args($args, $defaults);
 
 		$this->init();
 		$this->bulk = true;
 		$this->upgrade_strings();
 
-		$current = get_site_transient( 'update_plugins' );
+		$current = get_site_transient('update_plugins');
 
-		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
+		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 
 		$this->skin->header();
 
 		// Connect to the filesystem first.
-		$res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
-		if ( ! $res ) {
+		$res = $this->fs_connect(array(WP_CONTENT_DIR, WP_PLUGIN_DIR));
+		if (!$res) {
 			$this->skin->footer();
 			return false;
 		}
@@ -304,35 +304,35 @@ 
 		 * - a plugin with an update available is currently active.
 		 * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
-		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin ) {
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin ] ) );
+		$maintenance = (is_multisite() && !empty($plugins));
+		foreach ($plugins as $plugin) {
+			$maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[$plugin]));
 		}
-		if ( $maintenance ) {
-			$this->maintenance_mode( true );
+		if ($maintenance) {
+			$this->maintenance_mode(true);
 		}
 
 		$results = array();
 
-		$this->update_count   = count( $plugins );
+		$this->update_count   = count($plugins);
 		$this->update_current = 0;
-		foreach ( $plugins as $plugin ) {
+		foreach ($plugins as $plugin) {
 			$this->update_current++;
-			$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true );
+			$this->skin->plugin_info = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin, false, true);
 
-			if ( ! isset( $current->response[ $plugin ] ) ) {
-				$this->skin->set_result( 'up_to_date' );
+			if (!isset($current->response[$plugin])) {
+				$this->skin->set_result('up_to_date');
 				$this->skin->before();
-				$this->skin->feedback( 'up_to_date' );
+				$this->skin->feedback('up_to_date');
 				$this->skin->after();
-				$results[ $plugin ] = true;
+				$results[$plugin] = true;
 				continue;
 			}
 
 			// Get the URL to the zip file.
-			$r = $current->response[ $plugin ];
+			$r = $current->response[$plugin];
 
-			$this->skin->plugin_active = is_plugin_active( $plugin );
+			$this->skin->plugin_active = is_plugin_active($plugin);
 
 			$result = $this->run(
 				array(
@@ -347,18 +347,18 @@ 
 				)
 			);
 
-			$results[ $plugin ] = $result;
+			$results[$plugin] = $result;
 
 			// Prevent credentials auth screen from displaying multiple times.
-			if ( false === $result ) {
+			if (false === $result) {
 				break;
 			}
 		} // End foreach $plugins.
 
-		$this->maintenance_mode( false );
+		$this->maintenance_mode(false);
 
 		// Force refresh of plugin update information.
-		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+		wp_clean_plugins_cache($parsed_args['clear_update_cache']);
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
 		do_action(
@@ -377,22 +377,22 @@ 
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
 		// Ensure any future auto-update failures trigger a failure email by removing
 		// the last failure notification from the list when plugins update successfully.
-		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
+		$past_failure_emails = get_option('auto_plugin_theme_update_emails', array());
 
-		foreach ( $results as $plugin => $result ) {
+		foreach ($results as $plugin => $result) {
 			// Maintain last failure notification when plugins failed to update manually.
-			if ( ! $result || is_wp_error( $result ) || ! isset( $past_failure_emails[ $plugin ] ) ) {
+			if (!$result || is_wp_error($result) || !isset($past_failure_emails[$plugin])) {
 				continue;
 			}
 
-			unset( $past_failure_emails[ $plugin ] );
+			unset($past_failure_emails[$plugin]);
 		}
 
-		update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+		update_option('auto_plugin_theme_update_emails', $past_failure_emails);
 
 		return $results;
 	}
@@ -410,59 +410,59 @@ 
 	 * @param string $source The path to the downloaded package source.
 	 * @return string|WP_Error The source as passed, or a WP_Error object on failure.
 	 */
-	public function check_package( $source ) {
+	public function check_package($source) {
 		global $wp_filesystem, $wp_version;
 
 		$this->new_plugin_data = array();
 
-		if ( is_wp_error( $source ) ) {
+		if (is_wp_error($source)) {
 			return $source;
 		}
 
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );
-		if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace($wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+		if (!is_dir($working_directory)) { // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
 		}
 
 		// Check that the folder contains at least 1 valid plugin.
-		$files = glob( $working_directory . '*.php' );
-		if ( $files ) {
-			foreach ( $files as $file ) {
-				$info = get_plugin_data( $file, false, false );
-				if ( ! empty( $info['Name'] ) ) {
+		$files = glob($working_directory . '*.php');
+		if ($files) {
+			foreach ($files as $file) {
+				$info = get_plugin_data($file, false, false);
+				if (!empty($info['Name'])) {
 					$this->new_plugin_data = $info;
 					break;
 				}
 			}
 		}
 
-		if ( empty( $this->new_plugin_data ) ) {
-			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		if (empty($this->new_plugin_data)) {
+			return new WP_Error('incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __('No valid plugins were found.'));
 		}
 
-		$requires_php = isset( $info['RequiresPHP'] ) ? $info['RequiresPHP'] : null;
-		$requires_wp  = isset( $info['RequiresWP'] ) ? $info['RequiresWP'] : null;
+		$requires_php = isset($info['RequiresPHP']) ? $info['RequiresPHP'] : null;
+		$requires_wp  = isset($info['RequiresWP']) ? $info['RequiresWP'] : null;
 
-		if ( ! is_php_version_compatible( $requires_php ) ) {
+		if (!is_php_version_compatible($requires_php)) {
 			$error = sprintf(
 				/* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */
-				__( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ),
+				__('The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.'),
 				phpversion(),
 				$requires_php
 			);
 
-			return new WP_Error( 'incompatible_php_required_version', $this->strings['incompatible_archive'], $error );
+			return new WP_Error('incompatible_php_required_version', $this->strings['incompatible_archive'], $error);
 		}
 
-		if ( ! is_wp_version_compatible( $requires_wp ) ) {
+		if (!is_wp_version_compatible($requires_wp)) {
 			$error = sprintf(
 				/* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */
-				__( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
+				__('Your WordPress version is %1$s, however the uploaded plugin requires %2$s.'),
 				$wp_version,
 				$requires_wp
 			);
 
-			return new WP_Error( 'incompatible_wp_required_version', $this->strings['incompatible_archive'], $error );
+			return new WP_Error('incompatible_wp_required_version', $this->strings['incompatible_archive'], $error);
 		}
 
 		return $source;
@@ -478,21 +478,21 @@ 
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array( $this->result ) ) {
+		if (!is_array($this->result)) {
 			return false;
 		}
-		if ( empty( $this->result['destination_name'] ) ) {
+		if (empty($this->result['destination_name'])) {
 			return false;
 		}
 
 		// Ensure to pass with leading slash.
-		$plugin = get_plugins( '/' . $this->result['destination_name'] );
-		if ( empty( $plugin ) ) {
+		$plugin = get_plugins('/' . $this->result['destination_name']);
+		if (empty($plugin)) {
 			return false;
 		}
 
 		// Assume the requested plugin is the first in the list.
-		$pluginfiles = array_keys( $plugin );
+		$pluginfiles = array_keys($plugin);
 
 		return $this->result['destination_name'] . '/' . $pluginfiles[0];
 	}
@@ -509,25 +509,25 @@ 
 	 * @param array         $plugin   Plugin package arguments.
 	 * @return bool|WP_Error The original `$response` parameter or WP_Error.
 	 */
-	public function deactivate_plugin_before_upgrade( $response, $plugin ) {
+	public function deactivate_plugin_before_upgrade($response, $plugin) {
 
-		if ( is_wp_error( $response ) ) { // Bypass.
+		if (is_wp_error($response)) { // Bypass.
 			return $response;
 		}
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it.
-		if ( wp_doing_cron() ) {
+		if (wp_doing_cron()) {
 			return $response;
 		}
 
-		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
-		if ( empty( $plugin ) ) {
-			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
+		if (empty($plugin)) {
+			return new WP_Error('bad_request', $this->strings['bad_request']);
 		}
 
-		if ( is_plugin_active( $plugin ) ) {
+		if (is_plugin_active($plugin)) {
 			// Deactivate the plugin silently, Prevent deactivation hooks from running.
-			deactivate_plugins( $plugin, true );
+			deactivate_plugins($plugin, true);
 		}
 
 		return $response;
@@ -544,26 +544,26 @@ 
 	 * @param array         $plugin   Plugin package arguments.
 	 * @return bool|WP_Error The original `$response` parameter or WP_Error.
 	 */
-	public function active_before( $response, $plugin ) {
-		if ( is_wp_error( $response ) ) {
+	public function active_before($response, $plugin) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
 		// Only enable maintenance mode when in cron (background update).
-		if ( ! wp_doing_cron() ) {
+		if (!wp_doing_cron()) {
 			return $response;
 		}
 
-		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
+		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
 
 		// Only run if plugin is active.
-		if ( ! is_plugin_active( $plugin ) ) {
+		if (!is_plugin_active($plugin)) {
 			return $response;
 		}
 
 		// Change to maintenance mode. Bulk edit handles this separately.
-		if ( ! $this->bulk ) {
-			$this->maintenance_mode( true );
+		if (!$this->bulk) {
+			$this->maintenance_mode(true);
 		}
 
 		return $response;
@@ -580,26 +580,26 @@ 
 	 * @param array         $plugin   Plugin package arguments.
 	 * @return bool|WP_Error The original `$response` parameter or WP_Error.
 	 */
-	public function active_after( $response, $plugin ) {
-		if ( is_wp_error( $response ) ) {
+	public function active_after($response, $plugin) {
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
 		// Only disable maintenance mode when in cron (background update).
-		if ( ! wp_doing_cron() ) {
+		if (!wp_doing_cron()) {
 			return $response;
 		}
 
-		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
+		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
 
 		// Only run if plugin is active.
-		if ( ! is_plugin_active( $plugin ) ) {
+		if (!is_plugin_active($plugin)) {
 			return $response;
 		}
 
 		// Time to remove maintenance mode. Bulk edit handles this separately.
-		if ( ! $this->bulk ) {
-			$this->maintenance_mode( false );
+		if (!$this->bulk) {
+			$this->maintenance_mode(false);
 		}
 
 		return $response;
@@ -622,35 +622,35 @@ 
 	 * @param array         $plugin             Extra arguments passed to hooked filters.
 	 * @return bool|WP_Error
 	 */
-	public function delete_old_plugin( $removed, $local_destination, $remote_destination, $plugin ) {
+	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) ) {
+		if (is_wp_error($removed)) {
 			return $removed; // Pass errors through.
 		}
 
-		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
-		if ( empty( $plugin ) ) {
-			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
+		if (empty($plugin)) {
+			return new WP_Error('bad_request', $this->strings['bad_request']);
 		}
 
 		$plugins_dir     = $wp_filesystem->wp_plugins_dir();
-		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin ) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir . $plugin));
 
-		if ( ! $wp_filesystem->exists( $this_plugin_dir ) ) { // If it's already vanished.
+		if (!$wp_filesystem->exists($this_plugin_dir)) { // If it's already vanished.
 			return $removed;
 		}
 
 		// If plugin is in its own directory, recursively delete the directory.
 		// Base check on if plugin includes directory separator AND that it's not the root plugin folder.
-		if ( strpos( $plugin, '/' ) && $this_plugin_dir !== $plugins_dir ) {
-			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
+		if (strpos($plugin, '/') && $this_plugin_dir !== $plugins_dir) {
+			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $plugins_dir . $plugin );
+			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
 		}
 
-		if ( ! $deleted ) {
-			return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] );
+		if (!$deleted) {
+			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
 		}
 
 		return true;