ntwb / wordpress

src/wp-admin/includes/ms.php

Doc Comments +1 added lines, -1 removed lines

@@ -736,7 +736,7 @@
  *
  * @global int $wp_db_version The version number of the database.
  *
- * @return false False if the current user is not a super admin.
+ * @return false|null False if the current user is not a super admin.
  */
 function site_admin_notice() {
 	global $wp_db_version;

Braces +100 added lines, -62 removed lines

@@ -16,14 +16,18 @@ 
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
 function check_upload_size( $file ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $file;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $file;
+	}
 
-	if ( $file['error'] != '0' ) // there's already an error
+	if ( $file['error'] != '0' ) {
+		// there's already an error
 		return $file;
+	}
 
-	if ( defined( 'WP_IMPORTING' ) )
-		return $file;
+	if ( defined( 'WP_IMPORTING' ) ) {
+			return $file;
+	}
 
 	$space_left = get_upload_space_available();
 
@@ -148,8 +152,9 @@ 
 			$dh = @opendir( $dir );
 			if ( $dh ) {
 				while ( ( $file = @readdir( $dh ) ) !== false ) {
-					if ( $file == '.' || $file == '..' )
-						continue;
+					if ( $file == '.' || $file == '..' ) {
+											continue;
+					}
 
 					if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
 						$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
@@ -164,16 +169,18 @@ 
 
 		$stack = array_reverse( $stack ); // Last added dirs are deepest
 		foreach ( (array) $stack as $dir ) {
-			if ( $dir != $top_dir)
-			@rmdir( $dir );
+			if ( $dir != $top_dir) {
+						@rmdir( $dir );
+			}
 		}
 
 		clean_blog_cache( $blog );
 	}
 
-	if ( $switch )
-		restore_current_blog();
-}
+	if ( $switch ) {
+			restore_current_blog();
+	}
+	}
 
 /**
  * Delete a user from the network and remove from all sites.
@@ -197,8 +204,9 @@ 
 	$id = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
-		return false;
+	if ( !$user->exists() ) {
+			return false;
+	}
 
 	// Global super-administrators are protected, and cannot be deleted.
 	$_super_admins = get_super_admins();
@@ -231,8 +239,9 @@ 
 			$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
 
 			if ( $link_ids ) {
-				foreach ( $link_ids as $link_id )
-					wp_delete_link( $link_id );
+				foreach ( $link_ids as $link_id ) {
+									wp_delete_link( $link_id );
+				}
 			}
 
 			restore_current_blog();
@@ -240,8 +249,9 @@ 
 	}
 
 	$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-	foreach ( $meta as $mid )
-		delete_metadata_by_mid( 'user', $mid );
+	foreach ( $meta as $mid ) {
+			delete_metadata_by_mid( 'user', $mid );
+	}
 
 	$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 
@@ -262,8 +272,9 @@ 
  * @param string $value     The new email address.
  */
 function update_option_new_admin_email( $old_value, $value ) {
-	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
-		return;
+	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) ) {
+			return;
+	}
 
 	$hash = md5( $value. time() .mt_rand() );
 	$new_admin_email = array(
@@ -328,11 +339,13 @@ 
 function send_confirmation_on_profile_email() {
 	global $errors, $wpdb;
 	$current_user = wp_get_current_user();
-	if ( ! is_object($errors) )
-		$errors = new WP_Error();
+	if ( ! is_object($errors) ) {
+			$errors = new WP_Error();
+	}
 
-	if ( $current_user->ID != $_POST['user_id'] )
-		return false;
+	if ( $current_user->ID != $_POST['user_id'] ) {
+			return false;
+	}
 
 	if ( $current_user->user_email != $_POST['email'] ) {
 		if ( !is_email( $_POST['email'] ) ) {
@@ -423,8 +436,9 @@ 
  * @return bool True if user is over upload space quota, otherwise false.
  */
 function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return false;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return false;
+	}
 
 	$space_allowed = get_space_allowed();
 	if ( ! is_numeric( $space_allowed ) ) {
@@ -433,8 +447,9 @@ 
 	$space_used = get_space_used();
 
 	if ( ( $space_allowed - $space_used ) < 0 ) {
-		if ( $echo )
-			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+		if ( $echo ) {
+					_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+		}
 		return true;
 	} else {
 		return false;
@@ -494,8 +509,9 @@ 
 	$quota = get_option( 'blog_upload_space' );
 	restore_current_blog();
 
-	if ( !$quota )
-		$quota = '';
+	if ( !$quota ) {
+			$quota = '';
+	}
 
 	?>
 	<tr>
@@ -527,8 +543,9 @@ 
 function update_user_status( $id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated )
-		_deprecated_argument( __FUNCTION__, '3.0.2' );
+	if ( null !== $deprecated ) {
+			_deprecated_argument( __FUNCTION__, '3.0.2' );
+	}
 
 	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
 
@@ -571,8 +588,9 @@ 
 function refresh_user_details( $id ) {
 	$id = (int) $id;
 
-	if ( !$user = get_userdata( $id ) )
-		return false;
+	if ( !$user = get_userdata( $id ) ) {
+			return false;
+	}
 
 	clean_user_cache( $user );
 
@@ -646,18 +664,21 @@ 
  * @access private
  */
 function _access_denied_splash() {
-	if ( ! is_user_logged_in() || is_network_admin() )
-		return;
+	if ( ! is_user_logged_in() || is_network_admin() ) {
+			return;
+	}
 
 	$blogs = get_blogs_of_user( get_current_user_id() );
 
-	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) )
-		return;
+	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) ) {
+			return;
+	}
 
 	$blog_name = get_bloginfo( 'name' );
 
-	if ( empty( $blogs ) )
-		wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	if ( empty( $blogs ) ) {
+			wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	}
 
 	$output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
 	$output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
@@ -687,8 +708,9 @@ 
  * @return bool True if the user has proper permissions, false if they do not.
  */
 function check_import_new_users( $permission ) {
-	if ( !is_super_admin() )
-		return false;
+	if ( !is_super_admin() ) {
+			return false;
+	}
 	return true;
 }
 // See "import_allow_fetch_attachments" and "import_attachment_size_limit" filters too.
@@ -723,8 +745,10 @@ 
 
 	}
 
-	if ( $flag === false ) // WordPress english
+	if ( $flag === false ) {
+		// WordPress english
 		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
+	}
 
 	// Order by name
 	uksort( $output, 'strnatcasecmp' );
@@ -782,14 +806,18 @@ 
  * @return array The new array of post data after checking for collisions.
  */
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
-	if ( is_subdomain_install() )
-		return $data;
-	if ( $data['post_type'] != 'page' )
-		return $data;
-	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' )
-		return $data;
-	if ( !is_main_site() )
-		return $data;
+	if ( is_subdomain_install() ) {
+			return $data;
+	}
+	if ( $data['post_type'] != 'page' ) {
+			return $data;
+	}
+	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' ) {
+			return $data;
+	}
+	if ( !is_main_site() ) {
+			return $data;
+	}
 
 	$post_name = $data['post_name'];
 	$c = 0;
@@ -826,8 +854,9 @@ 
 			?>
 			<select name="primary_blog" id="primary_blog">
 				<?php foreach ( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
-						$found = true;
+					if ( $primary_blog == $blog->userblog_id ) {
+											$found = true;
+					}
 					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
 				} ?>
 			</select>
@@ -839,8 +868,10 @@ 
 		} elseif ( count( $all_blogs ) == 1 ) {
 			$blog = reset( $all_blogs );
 			echo esc_url( get_home_url( $blog->userblog_id ) );
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
+			if ( $primary_blog != $blog->userblog_id ) {
+				// Set the primary blog again if it's out of sync with blog list.
 				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			}
 		} else {
 			echo "N/A";
 		}
@@ -867,10 +898,11 @@ 
 function can_edit_network( $site_id ) {
 	global $wpdb;
 
-	if ( $site_id == $wpdb->siteid )
-		$result = true;
-	else
-		$result = false;
+	if ( $site_id == $wpdb->siteid ) {
+			$result = true;
+	} else {
+			$result = false;
+	}
 
 	/**
 	 * Filters whether this network can be edited from this page.
@@ -912,8 +944,11 @@ 
 
 	<?php if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' );
+}
+?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
@@ -996,8 +1031,11 @@ 
 
 	if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' );
+}
+?></p>
 	<?php endif;
 
 	submit_button( __('Confirm Deletion'), 'primary' );

Spacing +276 added lines, -276 removed lines

@@ -15,35 +15,35 @@ 
  * @param array $file $_FILES array for a given file.
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
-function check_upload_size( $file ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+function check_upload_size($file) {
+	if (get_site_option('upload_space_check_disabled'))
 		return $file;
 
-	if ( $file['error'] != '0' ) // there's already an error
+	if ($file['error'] != '0') // there's already an error
 		return $file;
 
-	if ( defined( 'WP_IMPORTING' ) )
+	if (defined('WP_IMPORTING'))
 		return $file;
 
 	$space_left = get_upload_space_available();
 
-	$file_size = filesize( $file['tmp_name'] );
-	if ( $space_left < $file_size ) {
+	$file_size = filesize($file['tmp_name']);
+	if ($space_left < $file_size) {
 		/* translators: 1: Required disk space in kilobytes */
-		$file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
+		$file['error'] = sprintf(__('Not enough space to upload. %1$s KB needed.'), number_format(($file_size - $space_left) / KB_IN_BYTES));
 	}
 
-	if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+	if ($file_size > (KB_IN_BYTES * get_site_option('fileupload_maxk', 1500))) {
 		/* translators: 1: Maximum allowed file size in kilobytes */
-		$file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
+		$file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option('fileupload_maxk', 1500));
 	}
 
-	if ( upload_is_user_over_quota( false ) ) {
-		$file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
+	if (upload_is_user_over_quota(false)) {
+		$file['error'] = __('You have used your space quota. Please delete files before uploading.');
 	}
 
-	if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
-		wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
+	if ($file['error'] != '0' && ! isset($_POST['html-upload']) && ! wp_doing_ajax()) {
+		wp_die($file['error'].' <a href="javascript:history.go(-1)">'.__('Back').'</a>');
 	}
 
 	return $file;
@@ -59,16 +59,16 @@ 
  * @param int  $blog_id Site ID.
  * @param bool $drop    True if site's database tables should be dropped. Default is false.
  */
-function wpmu_delete_blog( $blog_id, $drop = false ) {
+function wpmu_delete_blog($blog_id, $drop = false) {
 	global $wpdb;
 
 	$switch = false;
-	if ( get_current_blog_id() != $blog_id ) {
+	if (get_current_blog_id() != $blog_id) {
 		$switch = true;
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 	}
 
-	$blog = get_site( $blog_id );
+	$blog = get_site($blog_id);
 	/**
 	 * Fires before a site is deleted.
 	 *
@@ -77,42 +77,42 @@ 
 	 * @param int  $blog_id The site ID.
 	 * @param bool $drop    True if site's table should be dropped. Default is false.
 	 */
-	do_action( 'delete_blog', $blog_id, $drop );
+	do_action('delete_blog', $blog_id, $drop);
 
-	$users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
+	$users = get_users(array('blog_id' => $blog_id, 'fields' => 'ids'));
 
 	// Remove users from this blog.
-	if ( ! empty( $users ) ) {
-		foreach ( $users as $user_id ) {
-			remove_user_from_blog( $user_id, $blog_id );
+	if ( ! empty($users)) {
+		foreach ($users as $user_id) {
+			remove_user_from_blog($user_id, $blog_id);
 		}
 	}
 
-	update_blog_status( $blog_id, 'deleted', 1 );
+	update_blog_status($blog_id, 'deleted', 1);
 
 	$current_network = get_network();
 
 	// If a full blog object is not available, do not destroy anything.
-	if ( $drop && ! $blog ) {
+	if ($drop && ! $blog) {
 		$drop = false;
 	}
 
 	// Don't destroy the initial, main, or root blog.
-	if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) {
+	if ($drop && (1 == $blog_id || is_main_site($blog_id) || ($blog->path == $current_network->path && $blog->domain == $current_network->domain))) {
 		$drop = false;
 	}
 
-	$upload_path = trim( get_option( 'upload_path' ) );
+	$upload_path = trim(get_option('upload_path'));
 
 	// If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
-	if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+	if ($drop && get_site_option('ms_files_rewriting') && empty($upload_path)) {
 		$drop = false;
 	}
 
-	if ( $drop ) {
+	if ($drop) {
 		$uploads = wp_get_upload_dir();
 
-		$tables = $wpdb->tables( 'blog' );
+		$tables = $wpdb->tables('blog');
 		/**
 		 * Filters the tables to drop when the site is deleted.
 		 *
@@ -121,13 +121,13 @@ 
 		 * @param array $tables  The site tables to be dropped.
 		 * @param int   $blog_id The ID of the site to drop tables for.
 		 */
-		$drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id );
+		$drop_tables = apply_filters('wpmu_drop_tables', $tables, $blog_id);
 
-		foreach ( (array) $drop_tables as $table ) {
-			$wpdb->query( "DROP TABLE IF EXISTS `$table`" );
+		foreach ((array) $drop_tables as $table) {
+			$wpdb->query("DROP TABLE IF EXISTS `$table`");
 		}
 
-		$wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
+		$wpdb->delete($wpdb->blogs, array('blog_id' => $blog_id));
 
 		/**
 		 * Filters the upload base directory to delete when the site is deleted.
@@ -137,43 +137,43 @@ 
 		 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
 		 * @param int    $blog_id            The site ID.
 		 */
-		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
-		$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
+		$dir = apply_filters('wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id);
+		$dir = rtrim($dir, DIRECTORY_SEPARATOR);
 		$top_dir = $dir;
 		$stack = array($dir);
 		$index = 0;
 
-		while ( $index < count( $stack ) ) {
+		while ($index < count($stack)) {
 			// Get indexed directory from stack
 			$dir = $stack[$index];
 
-			$dh = @opendir( $dir );
-			if ( $dh ) {
-				while ( ( $file = @readdir( $dh ) ) !== false ) {
-					if ( $file == '.' || $file == '..' )
+			$dh = @opendir($dir);
+			if ($dh) {
+				while (($file = @readdir($dh)) !== false) {
+					if ($file == '.' || $file == '..')
 						continue;
 
-					if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-						$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
-					} elseif ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-						@unlink( $dir . DIRECTORY_SEPARATOR . $file );
+					if (@is_dir($dir.DIRECTORY_SEPARATOR.$file)) {
+						$stack[] = $dir.DIRECTORY_SEPARATOR.$file;
+					} elseif (@is_file($dir.DIRECTORY_SEPARATOR.$file)) {
+						@unlink($dir.DIRECTORY_SEPARATOR.$file);
 					}
 				}
-				@closedir( $dh );
+				@closedir($dh);
 			}
 			$index++;
 		}
 
-		$stack = array_reverse( $stack ); // Last added dirs are deepest
-		foreach ( (array) $stack as $dir ) {
-			if ( $dir != $top_dir)
-			@rmdir( $dir );
+		$stack = array_reverse($stack); // Last added dirs are deepest
+		foreach ((array) $stack as $dir) {
+			if ($dir != $top_dir)
+			@rmdir($dir);
 		}
 
-		clean_blog_cache( $blog );
+		clean_blog_cache($blog);
 	}
 
-	if ( $switch )
+	if ($switch)
 		restore_current_blog();
 }
 
@@ -189,22 +189,22 @@ 
  * @param int $id The user ID.
  * @return bool True if the user was deleted, otherwise false.
  */
-function wpmu_delete_user( $id ) {
+function wpmu_delete_user($id) {
 	global $wpdb;
 
-	if ( ! is_numeric( $id ) ) {
+	if ( ! is_numeric($id)) {
 		return false;
 	}
 
 	$id = (int) $id;
-	$user = new WP_User( $id );
+	$user = new WP_User($id);
 
-	if ( !$user->exists() )
+	if ( ! $user->exists())
 		return false;
 
 	// Global super-administrators are protected, and cannot be deleted.
 	$_super_admins = get_super_admins();
-	if ( in_array( $user->user_login, $_super_admins, true ) ) {
+	if (in_array($user->user_login, $_super_admins, true)) {
 		return false;
 	}
 
@@ -215,42 +215,42 @@ 
 	 *
 	 * @param int $id ID of the user about to be deleted from the network.
 	 */
-	do_action( 'wpmu_delete_user', $id );
+	do_action('wpmu_delete_user', $id);
 
-	$blogs = get_blogs_of_user( $id );
+	$blogs = get_blogs_of_user($id);
 
-	if ( ! empty( $blogs ) ) {
-		foreach ( $blogs as $blog ) {
-			switch_to_blog( $blog->userblog_id );
-			remove_user_from_blog( $id, $blog->userblog_id );
+	if ( ! empty($blogs)) {
+		foreach ($blogs as $blog) {
+			switch_to_blog($blog->userblog_id);
+			remove_user_from_blog($id, $blog->userblog_id);
 
-			$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-			foreach ( (array) $post_ids as $post_id ) {
-				wp_delete_post( $post_id );
+			$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id));
+			foreach ((array) $post_ids as $post_id) {
+				wp_delete_post($post_id);
 			}
 
 			// Clean links
-			$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+			$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
 
-			if ( $link_ids ) {
-				foreach ( $link_ids as $link_id )
-					wp_delete_link( $link_id );
+			if ($link_ids) {
+				foreach ($link_ids as $link_id)
+					wp_delete_link($link_id);
 			}
 
 			restore_current_blog();
 		}
 	}
 
-	$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-	foreach ( $meta as $mid )
-		delete_metadata_by_mid( 'user', $mid );
+	$meta = $wpdb->get_col($wpdb->prepare("SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id));
+	foreach ($meta as $mid)
+		delete_metadata_by_mid('user', $mid);
 
-	$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+	$wpdb->delete($wpdb->users, array('ID' => $id));
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	/** This action is documented in wp-admin/includes/user.php */
-	do_action( 'deleted_user', $id );
+	do_action('deleted_user', $id);
 
 	return true;
 }
@@ -263,21 +263,21 @@ 
  * @param string $old_value The old email address. Not currently used.
  * @param string $value     The new email address.
  */
-function update_option_new_admin_email( $old_value, $value ) {
-	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
+function update_option_new_admin_email($old_value, $value) {
+	if ($value == get_option('admin_email') || ! is_email($value))
 		return;
 
-	$hash = md5( $value. time() .mt_rand() );
+	$hash = md5($value.time().mt_rand());
 	$new_admin_email = array(
 		'hash' => $hash,
 		'newemail' => $value
 	);
-	update_option( 'adminhash', $new_admin_email );
+	update_option('adminhash', $new_admin_email);
 
-	$switched_locale = switch_to_locale( get_user_locale() );
+	$switched_locale = switch_to_locale(get_user_locale());
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __( 'Howdy ###USERNAME###,
+	$email_text = __('Howdy ###USERNAME###,
 
 You recently requested to have the administration email address on
 your site changed.
@@ -309,18 +309,18 @@ 
 	 * @param string $email_text      Text in the email.
 	 * @param string $new_admin_email New admin email that the current administration email was changed to.
 	 */
-	$content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
+	$content = apply_filters('new_admin_email_content', $email_text, $new_admin_email);
 
 	$current_user = wp_get_current_user();
-	$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash='.$hash ) ), $content );
-	$content = str_replace( '###EMAIL###', $value, $content );
-	$content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
-	$content = str_replace( '###SITEURL###', network_home_url(), $content );
+	$content = str_replace('###USERNAME###', $current_user->user_login, $content);
+	$content = str_replace('###ADMIN_URL###', esc_url(self_admin_url('options.php?adminhash='.$hash)), $content);
+	$content = str_replace('###EMAIL###', $value, $content);
+	$content = str_replace('###SITENAME###', get_site_option('site_name'), $content);
+	$content = str_replace('###SITEURL###', network_home_url(), $content);
 
-	wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+	wp_mail($value, sprintf(__('[%s] New Admin Email Address'), wp_specialchars_decode(get_option('blogname'))), $content);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 }
@@ -336,35 +336,35 @@ 
 function send_confirmation_on_profile_email() {
 	global $errors, $wpdb;
 	$current_user = wp_get_current_user();
-	if ( ! is_object($errors) )
+	if ( ! is_object($errors))
 		$errors = new WP_Error();
 
-	if ( $current_user->ID != $_POST['user_id'] )
+	if ($current_user->ID != $_POST['user_id'])
 		return false;
 
-	if ( $current_user->user_email != $_POST['email'] ) {
-		if ( !is_email( $_POST['email'] ) ) {
-			$errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
+	if ($current_user->user_email != $_POST['email']) {
+		if ( ! is_email($_POST['email'])) {
+			$errors->add('user_email', __("<strong>ERROR</strong>: The email address isn&#8217;t correct."), array('form-field' => 'email'));
 			return;
 		}
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
-			$errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
-			delete_user_meta( $current_user->ID, '_new_email' );
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email']))) {
+			$errors->add('user_email', __("<strong>ERROR</strong>: The email address is already used."), array('form-field' => 'email'));
+			delete_user_meta($current_user->ID, '_new_email');
 			return;
 		}
 
-		$hash = md5( $_POST['email'] . time() . mt_rand() );
+		$hash = md5($_POST['email'].time().mt_rand());
 		$new_user_email = array(
 			'hash' => $hash,
 			'newemail' => $_POST['email']
 		);
-		update_user_meta( $current_user->ID, '_new_email', $new_user_email );
+		update_user_meta($current_user->ID, '_new_email', $new_user_email);
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_locale(get_user_locale());
 
 		/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-		$email_text = __( 'Howdy ###USERNAME###,
+		$email_text = __('Howdy ###USERNAME###,
 
 You recently requested to have the email address on your account changed.
 
@@ -395,18 +395,18 @@ 
 		 * @param string $email_text     Text in the email.
 		 * @param string $new_user_email New user email that the current user has changed to.
 		 */
-		$content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
+		$content = apply_filters('new_user_email_content', $email_text, $new_user_email);
 
-		$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-		$content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'profile.php?newuseremail=' . $hash ) ), $content );
-		$content = str_replace( '###EMAIL###', $_POST['email'], $content);
-		$content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
-		$content = str_replace( '###SITEURL###', network_home_url(), $content );
+		$content = str_replace('###USERNAME###', $current_user->user_login, $content);
+		$content = str_replace('###ADMIN_URL###', esc_url(self_admin_url('profile.php?newuseremail='.$hash)), $content);
+		$content = str_replace('###EMAIL###', $_POST['email'], $content);
+		$content = str_replace('###SITENAME###', get_site_option('site_name'), $content);
+		$content = str_replace('###SITEURL###', network_home_url(), $content);
 
-		wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+		wp_mail($_POST['email'], sprintf(__('[%s] New Email Address'), wp_specialchars_decode(get_option('blogname'))), $content);
 		$_POST['email'] = $current_user->user_email;
 
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 	}
@@ -422,9 +422,9 @@ 
  */
 function new_user_email_admin_notice() {
 	global $pagenow;
-	if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) && $email = get_user_meta( get_current_user_id(), '_new_email', true ) ) {
+	if ('profile.php' === $pagenow && isset($_GET['updated']) && $email = get_user_meta(get_current_user_id(), '_new_email', true)) {
 		/* translators: %s: New email address */
-		echo '<div class="notice notice-info"><p>' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '<code>' . esc_html( $email['newemail'] ) . '</code>' ) . '</p></div>';
+		echo '<div class="notice notice-info"><p>'.sprintf(__('Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.'), '<code>'.esc_html($email['newemail']).'</code>').'</p></div>';
 	}
 }
 
@@ -436,19 +436,19 @@ 
  * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
  * @return bool True if user is over upload space quota, otherwise false.
  */
-function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_user_over_quota($echo = true) {
+	if (get_site_option('upload_space_check_disabled'))
 		return false;
 
 	$space_allowed = get_space_allowed();
-	if ( ! is_numeric( $space_allowed ) ) {
+	if ( ! is_numeric($space_allowed)) {
 		$space_allowed = 10; // Default space allowed is 10 MB
 	}
 	$space_used = get_space_used();
 
-	if ( ( $space_allowed - $space_used ) < 0 ) {
-		if ( $echo )
-			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+	if (($space_allowed - $space_used) < 0) {
+		if ($echo)
+			_e('Sorry, you have used your space allocation. Please delete some files to upload more files.');
 		return true;
 	} else {
 		return false;
@@ -464,21 +464,21 @@ 
 	$space_allowed = get_space_allowed();
 	$space_used = get_space_used();
 
-	$percent_used = ( $space_used / $space_allowed ) * 100;
+	$percent_used = ($space_used / $space_allowed) * 100;
 
-	if ( $space_allowed > 1000 ) {
-		$space = number_format( $space_allowed / KB_IN_BYTES );
+	if ($space_allowed > 1000) {
+		$space = number_format($space_allowed / KB_IN_BYTES);
 		/* translators: Gigabytes */
-		$space .= __( 'GB' );
+		$space .= __('GB');
 	} else {
-		$space = number_format( $space_allowed );
+		$space = number_format($space_allowed);
 		/* translators: Megabytes */
-		$space .= __( 'MB' );
+		$space .= __('MB');
 	}
 	?>
 	<strong><?php
 		/* translators: Storage space that's been used. 1: Percentage of used space, 2: Total space allowed in megabytes or gigabytes */
-		printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space );
+		printf(__('Used: %1$s%% of %2$s'), number_format($percent_used), $space);
 	?></strong>
 	<?php
 }
@@ -491,12 +491,12 @@ 
  * @param int $size Current max size in bytes
  * @return int Max size in bytes
  */
-function fix_import_form_size( $size ) {
-	if ( upload_is_user_over_quota( false ) ) {
+function fix_import_form_size($size) {
+	if (upload_is_user_over_quota(false)) {
 		return 0;
 	}
 	$available = get_upload_space_available();
-	return min( $size, $available );
+	return min($size, $available);
 }
 
 /**
@@ -506,20 +506,20 @@ 
  *
  * @param int $id The ID of the site to display the setting for.
  */
-function upload_space_setting( $id ) {
-	switch_to_blog( $id );
-	$quota = get_option( 'blog_upload_space' );
+function upload_space_setting($id) {
+	switch_to_blog($id);
+	$quota = get_option('blog_upload_space');
 	restore_current_blog();
 
-	if ( !$quota )
+	if ( ! $quota)
 		$quota = '';
 
 	?>
 	<tr>
-		<th><label for="blog-upload-space-number"><?php _e( 'Site Upload Space Quota' ); ?></label></th>
+		<th><label for="blog-upload-space-number"><?php _e('Site Upload Space Quota'); ?></label></th>
 		<td>
 			<input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog-upload-space-number" aria-describedby="blog-upload-space-desc" value="<?php echo $quota; ?>" />
-			<span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e( 'Size in megabytes' ); ?></span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
+			<span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e('Size in megabytes'); ?></span> <?php _e('MB (Leave blank for network default)'); ?></span>
 		</td>
 	</tr>
 	<?php
@@ -541,19 +541,19 @@ 
  * @param null   $deprecated Deprecated as of 3.0.2 and should not be used.
  * @return int   The initially passed $value.
  */
-function update_user_status( $id, $pref, $value, $deprecated = null ) {
+function update_user_status($id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated )
-		_deprecated_argument( __FUNCTION__, '3.0.2' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.0.2');
 
-	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
+	$wpdb->update($wpdb->users, array(sanitize_key($pref) => $value), array('ID' => $id));
 
-	$user = new WP_User( $id );
-	clean_user_cache( $user );
+	$user = new WP_User($id);
+	clean_user_cache($user);
 
-	if ( $pref == 'spam' ) {
-		if ( $value == 1 ) {
+	if ($pref == 'spam') {
+		if ($value == 1) {
 			/**
 			 * Fires after the user is marked as a SPAM user.
 			 *
@@ -561,7 +561,7 @@ 
 			 *
 			 * @param int $id ID of the user marked as SPAM.
 			 */
-			do_action( 'make_spam_user', $id );
+			do_action('make_spam_user', $id);
 		} else {
 			/**
 			 * Fires after the user is marked as a HAM user. Opposite of SPAM.
@@ -570,7 +570,7 @@ 
 			 *
 			 * @param int $id ID of the user marked as HAM.
 			 */
-			do_action( 'make_ham_user', $id );
+			do_action('make_ham_user', $id);
 		}
 	}
 
@@ -585,13 +585,13 @@ 
  * @param int $id The user ID.
  * @return bool|int The ID of the refreshed user or false if the user does not exist.
  */
-function refresh_user_details( $id ) {
+function refresh_user_details($id) {
 	$id = (int) $id;
 
-	if ( !$user = get_userdata( $id ) )
+	if ( ! $user = get_userdata($id))
 		return false;
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	return $id;
 }
@@ -605,8 +605,8 @@ 
  * @return string The language corresponding to $code if it exists. If it does not exist,
  *                then the first two letters of $code is returned.
  */
-function format_code_lang( $code = '' ) {
-	$code = strtolower( substr( $code, 0, 2 ) );
+function format_code_lang($code = '') {
+	$code = strtolower(substr($code, 0, 2));
 	$lang_codes = array(
 		'aa' => 'Afar', 'ab' => 'Abkhazian', 'af' => 'Afrikaans', 'ak' => 'Akan', 'sq' => 'Albanian', 'am' => 'Amharic', 'ar' => 'Arabic', 'an' => 'Aragonese', 'hy' => 'Armenian', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'eu' => 'Basque', 'be' => 'Belarusian', 'bn' => 'Bengali',
 		'bh' => 'Bihari', 'bi' => 'Bislama', 'bs' => 'Bosnian', 'br' => 'Breton', 'bg' => 'Bulgarian', 'my' => 'Burmese', 'ca' => 'Catalan; Valencian', 'ch' => 'Chamorro', 'ce' => 'Chechen', 'zh' => 'Chinese', 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree',
@@ -618,7 +618,7 @@ 
 		'no' => 'Norwegian', 'ny' => 'Chichewa; Chewa; Nyanja', 'oc' => 'Occitan, Provençal', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pa' => 'Panjabi; Punjabi', 'fa' => 'Persian', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'ps' => 'Pushto', 'qu' => 'Quechua', 'rm' => 'Romansh', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian',
 		'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
 		'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
-		've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
+		've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh', 'wa' => 'Walloon', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
 
 	/**
 	 * Filters the language codes.
@@ -628,8 +628,8 @@ 
 	 * @param array  $lang_codes Key/value pair of language codes where key is the short version.
 	 * @param string $code       A two-letter designation of the language.
 	 */
-	$lang_codes = apply_filters( 'lang_codes', $lang_codes, $code );
-	return strtr( $code, $lang_codes );
+	$lang_codes = apply_filters('lang_codes', $lang_codes, $code);
+	return strtr($code, $lang_codes);
 }
 
 /**
@@ -644,12 +644,12 @@ 
  * @return object|array Returns `$term`, after filtering the 'slug' field with sanitize_title()
  *                      if $taxonomy is 'category' or 'post_tag'.
  */
-function sync_category_tag_slugs( $term, $taxonomy ) {
-	if ( global_terms_enabled() && ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) ) {
-		if ( is_object( $term ) ) {
-			$term->slug = sanitize_title( $term->name );
+function sync_category_tag_slugs($term, $taxonomy) {
+	if (global_terms_enabled() && ($taxonomy == 'category' || $taxonomy == 'post_tag')) {
+		if (is_object($term)) {
+			$term->slug = sanitize_title($term->name);
 		} else {
-			$term['slug'] = sanitize_title( $term['name'] );
+			$term['slug'] = sanitize_title($term['name']);
 		}
 	}
 	return $term;
@@ -663,36 +663,36 @@ 
  * @access private
  */
 function _access_denied_splash() {
-	if ( ! is_user_logged_in() || is_network_admin() )
+	if ( ! is_user_logged_in() || is_network_admin())
 		return;
 
-	$blogs = get_blogs_of_user( get_current_user_id() );
+	$blogs = get_blogs_of_user(get_current_user_id());
 
-	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) )
+	if (wp_list_filter($blogs, array('userblog_id' => get_current_blog_id())))
 		return;
 
-	$blog_name = get_bloginfo( 'name' );
+	$blog_name = get_bloginfo('name');
 
-	if ( empty( $blogs ) )
-		wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	if (empty($blogs))
+		wp_die(sprintf(__('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), $blog_name), 403);
 
-	$output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
-	$output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
+	$output = '<p>'.sprintf(__('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), $blog_name).'</p>';
+	$output .= '<p>'.__('If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.').'</p>';
 
-	$output .= '<h3>' . __('Your Sites') . '</h3>';
+	$output .= '<h3>'.__('Your Sites').'</h3>';
 	$output .= '<table>';
 
-	foreach ( $blogs as $blog ) {
+	foreach ($blogs as $blog) {
 		$output .= '<tr>';
 		$output .= "<td>{$blog->blogname}</td>";
-		$output .= '<td><a href="' . esc_url( get_admin_url( $blog->userblog_id ) ) . '">' . __( 'Visit Dashboard' ) . '</a> | ' .
-			'<a href="' . esc_url( get_home_url( $blog->userblog_id ) ). '">' . __( 'View Site' ) . '</a></td>';
+		$output .= '<td><a href="'.esc_url(get_admin_url($blog->userblog_id)).'">'.__('Visit Dashboard').'</a> | '.
+			'<a href="'.esc_url(get_home_url($blog->userblog_id)).'">'.__('View Site').'</a></td>';
 		$output .= '</tr>';
 	}
 
 	$output .= '</table>';
 
-	wp_die( $output, 403 );
+	wp_die($output, 403);
 }
 
 /**
@@ -703,8 +703,8 @@ 
  * @param string $permission A permission to be checked. Currently not used.
  * @return bool True if the user has proper permissions, false if they do not.
  */
-function check_import_new_users( $permission ) {
-	if ( !is_super_admin() )
+function check_import_new_users($permission) {
+	if ( ! is_super_admin())
 		return false;
 	return true;
 }
@@ -718,33 +718,33 @@ 
  * @param array  $lang_files Optional. An array of the language files. Default empty array.
  * @param string $current    Optional. The current language code. Default empty.
  */
-function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
+function mu_dropdown_languages($lang_files = array(), $current = '') {
 	$flag = false;
 	$output = array();
 
-	foreach ( (array) $lang_files as $val ) {
-		$code_lang = basename( $val, '.mo' );
+	foreach ((array) $lang_files as $val) {
+		$code_lang = basename($val, '.mo');
 
-		if ( $code_lang == 'en_US' ) { // American English
+		if ($code_lang == 'en_US') { // American English
 			$flag = true;
-			$ae = __( 'American English' );
-			$output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
-		} elseif ( $code_lang == 'en_GB' ) { // British English
+			$ae = __('American English');
+			$output[$ae] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.$ae.'</option>';
+		} elseif ($code_lang == 'en_GB') { // British English
 			$flag = true;
-			$be = __( 'British English' );
-			$output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
+			$be = __('British English');
+			$output[$be] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.$be.'</option>';
 		} else {
-			$translated = format_code_lang( $code_lang );
-			$output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
+			$translated = format_code_lang($code_lang);
+			$output[$translated] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.esc_html($translated).'</option>';
 		}
 
 	}
 
-	if ( $flag === false ) // WordPress english
-		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
+	if ($flag === false) // WordPress english
+		$output[] = '<option value=""'.selected($current, '', false).'>'.__('English')."</option>";
 
 	// Order by name
-	uksort( $output, 'strnatcasecmp' );
+	uksort($output, 'strnatcasecmp');
 
 	/**
 	 * Filters the languages available in the dropdown.
@@ -755,9 +755,9 @@ 
 	 * @param array $lang_files Available language files.
 	 * @param string $current   The current language code.
 	 */
-	$output = apply_filters( 'mu_dropdown_languages', $output, $lang_files, $current );
+	$output = apply_filters('mu_dropdown_languages', $output, $lang_files, $current);
 
-	echo implode( "\n\t", $output );
+	echo implode("\n\t", $output);
 }
 
 /**
@@ -773,16 +773,16 @@ 
 function site_admin_notice() {
 	global $wp_db_version, $pagenow;
 
-	if ( ! is_super_admin() ) {
+	if ( ! is_super_admin()) {
 		return false;
 	}
 
-	if ( 'upgrade.php' == $pagenow ) {
+	if ('upgrade.php' == $pagenow) {
 		return;
 	}
 
-	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
-		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
+	if (get_site_option('wpmu_upgrade_site') != $wp_db_version) {
+		echo "<div class='update-nag'>".sprintf(__('Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.'), esc_url(network_admin_url('upgrade.php')))."</div>";
 	}
 }
 
@@ -798,23 +798,23 @@ 
  * @param array $postarr An array of posts. Not currently used.
  * @return array The new array of post data after checking for collisions.
  */
-function avoid_blog_page_permalink_collision( $data, $postarr ) {
-	if ( is_subdomain_install() )
+function avoid_blog_page_permalink_collision($data, $postarr) {
+	if (is_subdomain_install())
 		return $data;
-	if ( $data['post_type'] != 'page' )
+	if ($data['post_type'] != 'page')
 		return $data;
-	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' )
+	if ( ! isset($data['post_name']) || $data['post_name'] == '')
 		return $data;
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return $data;
 
 	$post_name = $data['post_name'];
 	$c = 0;
-	while( $c < 10 && get_id_from_blogname( $post_name ) ) {
-		$post_name .= mt_rand( 1, 10 );
-		$c ++;
+	while ($c < 10 && get_id_from_blogname($post_name)) {
+		$post_name .= mt_rand(1, 10);
+		$c++;
 	}
-	if ( $post_name != $data['post_name'] ) {
+	if ($post_name != $data['post_name']) {
 		$data['post_name'] = $post_name;
 	}
 	return $data;
@@ -833,31 +833,31 @@ 
 	<table class="form-table">
 	<tr>
 	<?php /* translators: My sites label */ ?>
-		<th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
+		<th scope="row"><label for="primary_blog"><?php _e('Primary Site'); ?></label></th>
 		<td>
 		<?php
-		$all_blogs = get_blogs_of_user( get_current_user_id() );
-		$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
-		if ( count( $all_blogs ) > 1 ) {
+		$all_blogs = get_blogs_of_user(get_current_user_id());
+		$primary_blog = get_user_meta(get_current_user_id(), 'primary_blog', true);
+		if (count($all_blogs) > 1) {
 			$found = false;
 			?>
 			<select name="primary_blog" id="primary_blog">
-				<?php foreach ( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
+				<?php foreach ((array) $all_blogs as $blog) {
+					if ($primary_blog == $blog->userblog_id)
 						$found = true;
-					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
+					?><option value="<?php echo $blog->userblog_id ?>"<?php selected($primary_blog, $blog->userblog_id); ?>><?php echo esc_url(get_home_url($blog->userblog_id)) ?></option><?php
 				} ?>
 			</select>
 			<?php
-			if ( !$found ) {
-				$blog = reset( $all_blogs );
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			if ( ! $found) {
+				$blog = reset($all_blogs);
+				update_user_meta(get_current_user_id(), 'primary_blog', $blog->userblog_id);
 			}
-		} elseif ( count( $all_blogs ) == 1 ) {
-			$blog = reset( $all_blogs );
-			echo esc_url( get_home_url( $blog->userblog_id ) );
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+		} elseif (count($all_blogs) == 1) {
+			$blog = reset($all_blogs);
+			echo esc_url(get_home_url($blog->userblog_id));
+			if ($primary_blog != $blog->userblog_id) // Set the primary blog again if it's out of sync with blog list.
+				update_user_meta(get_current_user_id(), 'primary_blog', $blog->userblog_id);
 		} else {
 			echo "N/A";
 		}
@@ -881,10 +881,10 @@ 
  * @param int $site_id The network/site ID to check.
  * @return bool True if network can be edited, otherwise false.
  */
-function can_edit_network( $site_id ) {
+function can_edit_network($site_id) {
 	global $wpdb;
 
-	if ( $site_id == $wpdb->siteid )
+	if ($site_id == $wpdb->siteid)
 		$result = true;
 	else
 		$result = false;
@@ -897,7 +897,7 @@ 
 	 * @param bool $result  Whether the network can be edited from this page.
 	 * @param int  $site_id The network/site ID to check.
 	 */
-	return apply_filters( 'can_edit_network', $result, $site_id );
+	return apply_filters('can_edit_network', $result, $site_id);
 }
 
 /**
@@ -910,7 +910,7 @@ 
 function _thickbox_path_admin_subfolder() {
 ?>
 <script type="text/javascript">
-var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
+var tb_pathToImage = "<?php echo includes_url('js/thickbox/loadingAnimation.gif', 'relative'); ?>";
 </script>
 <?php
 }
@@ -919,77 +919,77 @@ 
  *
  * @param array $users
  */
-function confirm_delete_users( $users ) {
+function confirm_delete_users($users) {
 	$current_user = wp_get_current_user();
-	if ( ! is_array( $users ) || empty( $users ) ) {
+	if ( ! is_array($users) || empty($users)) {
 		return false;
 	}
 	?>
-	<h1><?php esc_html_e( 'Users' ); ?></h1>
+	<h1><?php esc_html_e('Users'); ?></h1>
 
-	<?php if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
+	<?php if (1 == count($users)) : ?>
+		<p><?php _e('You have chosen to delete the user from all networks and sites.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+		<p><?php _e('You have chosen to delete the following users from all networks and sites.'); ?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
 	<input type="hidden" name="dodelete" />
 	<?php
-	wp_nonce_field( 'ms-users-delete' );
+	wp_nonce_field('ms-users-delete');
 	$site_admins = get_super_admins();
-	$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+	$admin_out = '<option value="'.esc_attr($current_user->ID).'">'.$current_user->user_login.'</option>'; ?>
 	<table class="form-table">
-	<?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
-		if ( $user_id != '' && $user_id != '0' ) {
-			$delete_user = get_userdata( $user_id );
+	<?php foreach (($allusers = (array) $_POST['allusers']) as $user_id) {
+		if ($user_id != '' && $user_id != '0') {
+			$delete_user = get_userdata($user_id);
 
-			if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
-				wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+			if ( ! current_user_can('delete_user', $delete_user->ID)) {
+				wp_die(sprintf(__('Warning! User %s cannot be deleted.'), $delete_user->user_login));
 			}
 
-			if ( in_array( $delete_user->user_login, $site_admins ) ) {
-				wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+			if (in_array($delete_user->user_login, $site_admins)) {
+				wp_die(sprintf(__('Warning! User cannot be deleted. The user %s is a network administrator.'), '<em>'.$delete_user->user_login.'</em>'));
 			}
 			?>
 			<tr>
 				<th scope="row"><?php echo $delete_user->user_login; ?>
-					<?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
+					<?php echo '<input type="hidden" name="user[]" value="'.esc_attr($user_id).'" />'."\n"; ?>
 				</th>
-			<?php $blogs = get_blogs_of_user( $user_id, true );
+			<?php $blogs = get_blogs_of_user($user_id, true);
 
-			if ( ! empty( $blogs ) ) {
+			if ( ! empty($blogs)) {
 				?>
 				<td><fieldset><p><legend><?php printf(
 					/* translators: user login */
-					__( 'What should be done with content owned by %s?' ),
-					'<em>' . $delete_user->user_login . '</em>'
+					__('What should be done with content owned by %s?'),
+					'<em>'.$delete_user->user_login.'</em>'
 				); ?></legend></p>
 				<?php
-				foreach ( (array) $blogs as $key => $details ) {
-					$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
-					if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
-						$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+				foreach ((array) $blogs as $key => $details) {
+					$blog_users = get_users(array('blog_id' => $details->userblog_id, 'fields' => array('ID', 'user_login')));
+					if (is_array($blog_users) && ! empty($blog_users)) {
+						$user_site = "<a href='".esc_url(get_home_url($details->userblog_id))."'>{$details->blogname}</a>";
+						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">'.__('Select a user').'</label>';
 						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
 						$user_list = '';
-						foreach ( $blog_users as $user ) {
-							if ( ! in_array( $user->ID, $allusers ) ) {
+						foreach ($blog_users as $user) {
+							if ( ! in_array($user->ID, $allusers)) {
 								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
 							}
 						}
-						if ( '' == $user_list ) {
+						if ('' == $user_list) {
 							$user_list = $admin_out;
 						}
 						$user_dropdown .= $user_list;
 						$user_dropdown .= "</select>\n";
 						?>
 						<ul style="list-style:none;">
-							<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-							<?php _e( 'Attribute all content to:' ); ?></label>
+							<li><?php printf(__('Site: %s'), $user_site); ?></li>
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="delete" checked="checked" />
+							<?php _e('Delete all content.'); ?></label></li>
+							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="reassign" />
+							<?php _e('Attribute all content to:'); ?></label>
 							<?php echo $user_dropdown; ?></li>
 						</ul>
 						<?php
@@ -998,7 +998,7 @@ 
 				echo "</fieldset></td></tr>";
 			} else {
 				?>
-				<td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
+				<td><fieldset><p><legend><?php _e('User has no sites or content and will be deleted.'); ?></legend></p>
 			<?php } ?>
 			</tr>
 		<?php
@@ -1009,15 +1009,15 @@ 
 	</table>
 	<?php
 	/** This action is documented in wp-admin/users.php */
-	do_action( 'delete_user_form', $current_user, $allusers );
+	do_action('delete_user_form', $current_user, $allusers);
 
-	if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
+	if (1 == count($users)) : ?>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.'); ?></p>
 	<?php endif;
 
-	submit_button( __('Confirm Deletion'), 'primary' );
+	submit_button(__('Confirm Deletion'), 'primary');
 	?>
 	</form>
 	<?php
@@ -1059,7 +1059,7 @@ 
  *     @type string $selected The ID of the selected link.
  * }
  */
-function network_edit_site_nav( $args = array() ) {
+function network_edit_site_nav($args = array()) {
 
 	/**
 	 * Filters the links that appear on site-editing network pages.
@@ -1080,51 +1080,51 @@ 
 	 *     }
 	 * }
 	 */
-	$links = apply_filters( 'network_edit_site_nav_links', array(
-		'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php',     'cap' => 'manage_sites' ),
-		'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php',    'cap' => 'manage_sites' ),
-		'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php',   'cap' => 'manage_sites' ),
-		'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php', 'cap' => 'manage_sites' )
-	) );
+	$links = apply_filters('network_edit_site_nav_links', array(
+		'site-info'     => array('label' => __('Info'), 'url' => 'site-info.php', 'cap' => 'manage_sites'),
+		'site-users'    => array('label' => __('Users'), 'url' => 'site-users.php', 'cap' => 'manage_sites'),
+		'site-themes'   => array('label' => __('Themes'), 'url' => 'site-themes.php', 'cap' => 'manage_sites'),
+		'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php', 'cap' => 'manage_sites')
+	));
 
 	// Parse arguments
-	$r = wp_parse_args( $args, array(
-		'blog_id'  => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0,
+	$r = wp_parse_args($args, array(
+		'blog_id'  => isset($_GET['blog_id']) ? (int) $_GET['blog_id'] : 0,
 		'links'    => $links,
 		'selected' => 'site-info',
-	) );
+	));
 
 	// Setup the links array
 	$screen_links = array();
 
 	// Loop through tabs
-	foreach ( $r['links'] as $link_id => $link ) {
+	foreach ($r['links'] as $link_id => $link) {
 
 		// Skip link if user can't access
-		if ( ! current_user_can( $link['cap'], $r['blog_id'] ) ) {
+		if ( ! current_user_can($link['cap'], $r['blog_id'])) {
 			continue;
 		}
 
 		// Link classes
-		$classes = array( 'nav-tab' );
+		$classes = array('nav-tab');
 
 		// Selected is set by the parent OR assumed by the $pagenow global
-		if ( $r['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) {
+		if ($r['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow']) {
 			$classes[] = 'nav-tab-active';
 		}
 
 		// Escape each class
-		$esc_classes = implode( ' ', $classes );
+		$esc_classes = implode(' ', $classes);
 
 		// Get the URL for this link
-		$url = add_query_arg( array( 'id' => $r['blog_id'] ), network_admin_url( $link['url'] ) );
+		$url = add_query_arg(array('id' => $r['blog_id']), network_admin_url($link['url']));
 
 		// Add link to nav links
-		$screen_links[ $link_id ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '">' . esc_html( $link['label'] ) . '</a>';
+		$screen_links[$link_id] = '<a href="'.esc_url($url).'" id="'.esc_attr($link_id).'" class="'.$esc_classes.'">'.esc_html($link['label']).'</a>';
 	}
 
 	// All done!
 	echo '<h2 class="nav-tab-wrapper wp-clearfix">';
-	echo implode( '', $screen_links );
+	echo implode('', $screen_links);
 	echo '</h2>';
 }

src/wp-admin/includes/nav-menu.php

Doc Comments +1 added lines, -1 removed lines

@@ -1282,7 +1282,7 @@
  *
  * @param int|string $nav_menu_selected_id (id, slug, or name ) of the currently-selected menu
  * @param string $nav_menu_selected_title Title of the currently-selected menu
- * @return array $messages The menu updated message
+ * @return string[] $messages The menu updated message
  */
 function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
 	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );

Braces +73 added lines, -39 removed lines

@@ -102,8 +102,9 @@ 
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
-				return;
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+							return;
+			}
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
 					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
@@ -155,8 +156,9 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
-		return;
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) {
+			return;
+	}
 
 	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -185,8 +187,9 @@ 
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
-		return;
+	if ( ! $post_types ) {
+			return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -219,8 +222,9 @@ 
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
-		return;
+	if ( !$taxonomies ) {
+			return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -245,8 +249,9 @@ 
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
-		return false;
+	if ( $one_theme_location_no_menus ) {
+			return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -327,8 +332,9 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $box['args']->_default_query ) )
-		$args = array_merge($args, (array) $box['args']->_default_query );
+	if ( isset( $box['args']->_default_query ) ) {
+			$args = array_merge($args, (array) $box['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
@@ -385,17 +391,26 @@ 
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#<?php echo $post_type_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 					<?php _e( 'Search'); ?>
 				</a>
 			</li>
@@ -669,17 +684,26 @@ 
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
 					<?php _e( 'Most Used' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
@@ -904,8 +928,9 @@ 
 		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if ( empty($menu_items) ) {
+					return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filters the Walker class used when adding nav menu items.
@@ -930,10 +955,12 @@ 
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
-				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
-				$some_invalid_menu_items = true;
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+							$some_pending_menu_items = true;
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
+							$some_invalid_menu_items = true;
+			}
 		}
 
 		if ( $some_pending_menu_items ) {
@@ -988,9 +1015,10 @@ 
 	// Delete orphaned draft menu items.
 	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
-}
+	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
+			wp_delete_post( $menu_item_id, true );
+	}
+	}
 
 /**
  * Saves nav menu items
@@ -1006,8 +1034,9 @@ 
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+			$menu_items[$_item->db_id] = $_item;
+	}
 
 	$post_fields = array(
 		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
@@ -1022,12 +1051,14 @@ 
 		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
-				continue;
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+							continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+							$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			}
 
 			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
@@ -1051,14 +1082,17 @@ 
 	// Store 'auto-add' pages.
 	$auto_add = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
-		$nav_menu_option['auto_add'] = array();
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+			$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
-			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+					$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+					unset( $nav_menu_option['auto_add'][$key] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

Spacing +294 added lines, -294 removed lines

@@ -8,10 +8,10 @@ 
  */
 
 /** Walker_Nav_Menu_Edit class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-edit.php');
 
 /** Walker_Nav_Menu_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-checklist.php');
 
 /**
  * Prints the appropriate response to a menu quick search.
@@ -20,41 +20,41 @@ 
  *
  * @param array $request The unsanitized request values.
  */
-function _wp_ajax_menu_quick_search( $request = array() ) {
+function _wp_ajax_menu_quick_search($request = array()) {
 	$args = array();
-	$type = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query = isset( $request['q'] ) ? $request['q'] : '';
-	$response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
+	$type = isset($request['type']) ? $request['type'] : '';
+	$object_type = isset($request['object_type']) ? $request['object_type'] : '';
+	$query = isset($request['q']) ? $request['q'] : '';
+	$response_format = isset($request['response-format']) && in_array($request['response-format'], array('json', 'markup')) ? $request['response-format'] : 'json';
 
-	if ( 'markup' == $response_format ) {
+	if ('markup' == $response_format) {
 		$args['walker'] = new Walker_Nav_Menu_Checklist;
 	}
 
-	if ( 'get-post-item' == $type ) {
-		if ( post_type_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+	if ('get-post-item' == $type) {
+		if (post_type_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($object_id))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
-							'post_title' => get_the_title( $object_id ),
-							'post_type' => get_post_type( $object_id ),
+							'post_title' => get_the_title($object_id),
+							'post_type' => get_post_type($object_id),
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( taxonomy_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+		} elseif (taxonomy_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
-					$post_obj = get_term( $object_id, $object_type );
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_term($object_id, $object_type))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
+					$post_obj = get_term($object_id, $object_type);
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
@@ -68,9 +68,9 @@ 
 
 		}
 
-	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
-		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
-			$post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
+	} elseif (preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches)) {
+		if ('posttype' == $matches[1] && get_post_type_object($matches[2])) {
+			$post_type_obj = _wp_nav_menu_meta_box_object(get_post_type_object($matches[2]));
 			$args = array_merge(
 				$args,
 				array(
@@ -82,40 +82,40 @@ 
 					's'                      => $query,
 				)
 			);
-			if ( isset( $post_type_obj->_default_query ) ) {
-				$args = array_merge( $args, (array) $post_type_obj->_default_query );
+			if (isset($post_type_obj->_default_query)) {
+				$args = array_merge($args, (array) $post_type_obj->_default_query);
 			}
-			$search_results_query = new WP_Query( $args );
-			if ( ! $search_results_query->have_posts() ) {
+			$search_results_query = new WP_Query($args);
+			if ( ! $search_results_query->have_posts()) {
 				return;
 			}
-			while ( $search_results_query->have_posts() ) {
+			while ($search_results_query->have_posts()) {
 				$post = $search_results_query->next_post();
-				if ( 'markup' == $response_format ) {
+				if ('markup' == $response_format) {
 					$var_by_ref = $post->ID;
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($var_by_ref))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $post->ID,
-							'post_title' => get_the_title( $post->ID ),
+							'post_title' => get_the_title($post->ID),
 							'post_type' => $matches[2],
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( 'taxonomy' == $matches[1] ) {
-			$terms = get_terms( $matches[2], array(
+		} elseif ('taxonomy' == $matches[1]) {
+			$terms = get_terms($matches[2], array(
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
+			if (empty($terms) || is_wp_error($terms))
 				return;
-			foreach ( (array) $terms as $term ) {
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+			foreach ((array) $terms as $term) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array($term)), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $term->term_id,
@@ -138,17 +138,17 @@ 
 function wp_nav_menu_setup() {
 	// Register meta boxes
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box('add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default');
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns)
-	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+	add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 	// If first time editing, disable advanced items by default.
-	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+	if (false === get_user_option('managenav-menuscolumnshidden')) {
 		$user = wp_get_current_user();
 		update_user_option($user->ID, 'managenav-menuscolumnshidden',
-			array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
+			array(0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute',),
 			true);
 	}
 }
@@ -163,17 +163,17 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
+	if (get_user_option('metaboxhidden_nav-menus') !== false || ! is_array($wp_meta_boxes))
 		return;
 
-	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category');
 	$hidden_meta_boxes = array();
 
-	foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-		foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-				if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-					unset( $box['id'] );
+	foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+		foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+			foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+				if (in_array($box['id'], $initial_meta_boxes)) {
+					unset($box['id']);
 				} else {
 					$hidden_meta_boxes[] = $box['id'];
 				}
@@ -182,7 +182,7 @@ 
 	}
 
 	$user = wp_get_current_user();
-	update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+	update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 }
 
 /**
@@ -191,12 +191,12 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $post_types )
+	if ( ! $post_types)
 		return;
 
-	foreach ( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		/**
 		 * Filters whether a menu items meta box will be added for the current
 		 * object type.
@@ -209,12 +209,12 @@ 
 		 * @param object $meta_box_object The current object to add a menu items
 		 *                                meta box for.
 		 */
-		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
-		if ( $post_type ) {
+		$post_type = apply_filters('nav_menu_meta_box_object', $post_type);
+		if ($post_type) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
-			$priority = ( 'page' == $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			$priority = ('page' == $post_type->name ? 'core' : 'default');
+			add_meta_box("add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -225,17 +225,17 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+	$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
 
-	if ( !$taxonomies )
+	if ( ! $taxonomies)
 		return;
 
-	foreach ( $taxonomies as $tax ) {
+	foreach ($taxonomies as $tax) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
-		if ( $tax ) {
+		$tax = apply_filters('nav_menu_meta_box_object', $tax);
+		if ($tax) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box("add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax);
 		}
 	}
 }
@@ -250,13 +250,13 @@ 
  * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
  * @return string Disabled attribute if at least one menu exists, false if not
  */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+function wp_nav_menu_disabled_check($nav_menu_selected_id) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
+	if ($one_theme_location_no_menus)
 		return false;
 
-	return disabled( $nav_menu_selected_id, 0 );
+	return disabled($nav_menu_selected_id, 0);
 }
 
 /**
@@ -276,18 +276,18 @@ 
 	<div class="customlinkdiv" id="customlinkdiv">
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+			<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+			<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -314,15 +314,15 @@ 
  *     @type WP_Post_Type $args     Extra meta box arguments (the post type object for this meta box).
  * }
  */
-function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
+function wp_nav_menu_item_post_type_meta_box($object, $box) {
 	global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 	$post_type_name = $box['args']->name;
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$post_type_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'offset' => $offset,
@@ -335,49 +335,49 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $box['args']->_default_query ) )
-		$args = array_merge($args, (array) $box['args']->_default_query );
+	if (isset($box['args']->_default_query))
+		$args = array_merge($args, (array) $box['args']->_default_query);
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
-	$posts = $get_posts->query( $args );
-	if ( ! $get_posts->post_count ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	$posts = $get_posts->query($args);
+	if ( ! $get_posts->post_count) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
 	$num_pages = $get_posts->max_num_pages;
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$post_type_name . '-tab' => 'all',
+				$post_type_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'post_type',
 				'item-object' => $post_type_name,
 			)
 		),
 		'format' => '',
-		'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-		'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-		'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+		'prev_text'          => '<span aria-label="'.esc_attr__('Previous page').'">'.__('&laquo;').'</span>',
+		'next_text'          => '<span aria-label="'.esc_attr__('Next page').'">'.__('&raquo;').'</span>',
+		'before_page_number' => '<span class="screen-reader-text">'.__('Page').'</span> ',
 		'total'   => $num_pages,
 		'current' => $pagenum
 	));
 
 	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	if (is_post_type_hierarchical($post_type_name)) {
+		$db_fields = array('parent' => 'post_parent', 'id' => 'ID');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-recent';
-	if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
-		$current_tab = $_REQUEST[$post_type_name . '-tab'];
+	if (isset($_REQUEST[$post_type_name.'-tab']) && in_array($_REQUEST[$post_type_name.'-tab'], array('all', 'search'))) {
+		$current_tab = $_REQUEST[$post_type_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-posttype-'.$post_type_name])) {
 		$current_tab = 'search';
 	}
 
@@ -393,30 +393,30 @@ 
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
-					<?php _e( 'Most Recent' ); ?>
+			<li <?php echo ('most-recent' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-most-recent" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+					<?php _e('Most Recent'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="<?php echo esc_attr($post_type_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search'); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-search" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
 		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
-			echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
-				$most_recent = $get_posts->query( $recent_args );
+				$recent_args = array_merge($args, array('orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15));
+				$most_recent = $get_posts->query($recent_args);
 				$args['walker'] = $walker;
 
 				/**
@@ -431,50 +431,50 @@ 
 				 * @param array $args        An array of WP_Query arguments.
 				 * @param array $box         Arguments passed to wp_nav_menu_item_post_type_meta_box().
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box );
+				$most_recent = apply_filters("nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box);
 
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
-			if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
-				$search_results = get_posts( array( 's' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) );
+			if (isset($_REQUEST['quick-search-posttype-'.$post_type_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-posttype-'.$post_type_name]);
+				$search_results = get_posts(array('s' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC',));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button(__('Search'), 'small quick-search-submit hide-if-js', 'submit', false, array('id' => 'submit-quick-search-posttype-'.$post_type_name)); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -487,15 +487,15 @@ 
 				 * If we're dealing with pages, let's put a checkbox for the front
 				 * page at the top of the list.
 				 */
-				if ( 'page' == $post_type_name ) {
-					$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
-					if ( ! empty( $front_page ) ) {
-						$front_page_obj = get_post( $front_page );
+				if ('page' == $post_type_name) {
+					$front_page = 'page' == get_option('show_on_front') ? (int) get_option('page_on_front') : 0;
+					if ( ! empty($front_page)) {
+						$front_page_obj = get_post($front_page);
 						$front_page_obj->front_or_home = true;
-						array_unshift( $posts, $front_page_obj );
+						array_unshift($posts, $front_page_obj);
 					} else {
-						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-						array_unshift( $posts, (object) array(
+						$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+						array_unshift($posts, (object) array(
 							'front_or_home' => true,
 							'ID' => 0,
 							'object_id' => $_nav_menu_placeholder,
@@ -506,15 +506,15 @@ 
 							'post_type' => 'nav_menu_item',
 							'type' => 'custom',
 							'url' => home_url('/'),
-						) );
+						));
 					}
 				}
 
-				$post_type = get_post_type_object( $post_type_name );
+				$post_type = get_post_type_object($post_type_name);
 
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-					array_unshift( $posts, (object) array(
+				if ($post_type->has_archive) {
+					$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+					array_unshift($posts, (object) array(
 						'ID' => 0,
 						'object_id' => $_nav_menu_placeholder,
 						'object'     => $post_type_name,
@@ -523,8 +523,8 @@ 
 						'post_title' => $post_type->labels->archives,
 						'post_type' => 'nav_menu_item',
 						'type' => 'post_type_archive',
-						'url' => get_post_type_archive_link( $post_type_name ),
-					) );
+						'url' => get_post_type_archive_link($post_type_name),
+					));
 				}
 
 				/**
@@ -543,11 +543,11 @@ 
 				 * @param array        $args      An array of WP_Query arguments.
 				 * @param WP_Post_Type $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
+				$posts = apply_filters("nav_menu_items_{$post_type_name}", $posts, $args, $post_type);
 
-				$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
+				$checkbox_items = walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args);
 
-				if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
+				if ('all' == $current_tab && ! empty($_REQUEST['selectall'])) {
 					$checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
 
 				}
@@ -555,7 +555,7 @@ 
 				echo $checkbox_items;
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -565,18 +565,18 @@ 
 		<p class="button-controls wp-clearfix">
 			<span class="list-controls">
 				<a href="<?php
-					echo esc_url( add_query_arg(
+					echo esc_url(add_query_arg(
 						array(
-							$post_type_name . '-tab' => 'all',
+							$post_type_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
-						remove_query_arg( $removed_args )
+						remove_query_arg($removed_args)
 					));
-				?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+				?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e('Select All'); ?></a>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr('submit-posttype-'.$post_type_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -602,14 +602,14 @@ 
  *     @type object $args     Extra meta box arguments (the taxonomy object for this meta box).
  * }
  */
-function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
+function wp_nav_menu_item_taxonomy_meta_box($object, $box) {
 	global $nav_menu_selected_id;
 	$taxonomy_name = $box['args']->name;
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$taxonomy_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'child_of' => 0,
@@ -624,45 +624,45 @@ 
 		'pad_counts' => false,
 	);
 
-	$terms = get_terms( $taxonomy_name, $args );
+	$terms = get_terms($taxonomy_name, $args);
 
-	if ( ! $terms || is_wp_error($terms) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	if ( ! $terms || is_wp_error($terms)) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
-	$num_pages = ceil( wp_count_terms( $taxonomy_name , array_merge( $args, array('number' => '', 'offset' => '') ) ) / $per_page );
+	$num_pages = ceil(wp_count_terms($taxonomy_name, array_merge($args, array('number' => '', 'offset' => ''))) / $per_page);
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$taxonomy_name . '-tab' => 'all',
+				$taxonomy_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'taxonomy',
 				'item-object' => $taxonomy_name,
 			)
 		),
 		'format' => '',
-		'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-		'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-		'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+		'prev_text'          => '<span aria-label="'.esc_attr__('Previous page').'">'.__('&laquo;').'</span>',
+		'next_text'          => '<span aria-label="'.esc_attr__('Next page').'">'.__('&raquo;').'</span>',
+		'before_page_number' => '<span class="screen-reader-text">'.__('Page').'</span> ',
 		'total'   => $num_pages,
 		'current' => $pagenum
 	));
 
 	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+	if (is_taxonomy_hierarchical($taxonomy_name)) {
+		$db_fields = array('parent' => 'parent', 'id' => 'term_id');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-used';
-	if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
-		$current_tab = $_REQUEST[$taxonomy_name . '-tab'];
+	if (isset($_REQUEST[$taxonomy_name.'-tab']) && in_array($_REQUEST[$taxonomy_name.'-tab'], array('all', 'most-used', 'search'))) {
+		$current_tab = $_REQUEST[$taxonomy_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
 		$current_tab = 'search';
 	}
 
@@ -678,39 +678,39 @@ 
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-					<?php _e( 'Most Used' ); ?>
+			<li <?php echo ('most-used' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-pop" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+					<?php _e('Most Used'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr($taxonomy_name); ?>" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
-			echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms = get_terms( $taxonomy_name, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+				$popular_terms = get_terms($taxonomy_name, array('orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -718,10 +718,10 @@ 
 			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args);
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -729,33 +729,33 @@ 
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
-			if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-				$search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+			if (isset($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-taxonomy-'.$taxonomy_name]);
+				$search_results = get_terms($taxonomy_name, array('name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button(__('Search'), 'small quick-search-submit hide-if-js', 'submit', false, array('id' => 'submit-quick-search-taxonomy-'.$taxonomy_name)); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
@@ -766,16 +766,16 @@ 
 				<a href="<?php
 					echo esc_url(add_query_arg(
 						array(
-							$taxonomy_name . '-tab' => 'all',
+							$taxonomy_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
 						remove_query_arg($removed_args)
 					));
-				?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+				?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e('Select All'); ?></a>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr('submit-taxonomy-'.$taxonomy_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -793,25 +793,25 @@ 
  * @param array $menu_data The unsanitized posted menu item data.
  * @return array The database IDs of the items saved
  */
-function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
+function wp_save_nav_menu_items($menu_id = 0, $menu_data = array()) {
 	$menu_id = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if (0 == $menu_id || is_nav_menu($menu_id)) {
 
 		// Loop through all the menu items' POST values.
-		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+		foreach ((array) $menu_data as $_possible_db_id => $_item_object_data) {
 			if (
 				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
+				empty($_item_object_data['menu-item-object-id']) &&
 				(
 					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
+					! isset($_item_object_data['menu-item-type']) ||
 					// Or URL is the default.
-					in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
-					! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
+					in_array($_item_object_data['menu-item-url'], array('http://', '')) ||
+					! ('custom' == $_item_object_data['menu-item-type'] && ! isset($_item_object_data['menu-item-db-id'])) || // or it's not a custom menu item (but not the custom home page)
 					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
+					! empty($_item_object_data['menu-item-db-id'])
 				)
 			) {
 				// Then this potential menu item is not getting added to this menu.
@@ -820,8 +820,8 @@ 
 
 			// If this possible menu item doesn't actually have a menu database ID yet.
 			if (
-				empty( $_item_object_data['menu-item-db-id'] ) ||
-				( 0 > $_possible_db_id ) ||
+				empty($_item_object_data['menu-item-db-id']) ||
+				(0 > $_possible_db_id) ||
 				$_possible_db_id != $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
@@ -830,22 +830,22 @@ 
 			}
 
 			$args = array(
-				'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
-				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-db-id' => (isset($_item_object_data['menu-item-db-id']) ? $_item_object_data['menu-item-db-id'] : ''),
+				'menu-item-object-id' => (isset($_item_object_data['menu-item-object-id']) ? $_item_object_data['menu-item-object-id'] : ''),
+				'menu-item-object' => (isset($_item_object_data['menu-item-object']) ? $_item_object_data['menu-item-object'] : ''),
+				'menu-item-parent-id' => (isset($_item_object_data['menu-item-parent-id']) ? $_item_object_data['menu-item-parent-id'] : ''),
+				'menu-item-position' => (isset($_item_object_data['menu-item-position']) ? $_item_object_data['menu-item-position'] : ''),
+				'menu-item-type' => (isset($_item_object_data['menu-item-type']) ? $_item_object_data['menu-item-type'] : ''),
+				'menu-item-title' => (isset($_item_object_data['menu-item-title']) ? $_item_object_data['menu-item-title'] : ''),
+				'menu-item-url' => (isset($_item_object_data['menu-item-url']) ? $_item_object_data['menu-item-url'] : ''),
+				'menu-item-description' => (isset($_item_object_data['menu-item-description']) ? $_item_object_data['menu-item-description'] : ''),
+				'menu-item-attr-title' => (isset($_item_object_data['menu-item-attr-title']) ? $_item_object_data['menu-item-attr-title'] : ''),
+				'menu-item-target' => (isset($_item_object_data['menu-item-target']) ? $_item_object_data['menu-item-target'] : ''),
+				'menu-item-classes' => (isset($_item_object_data['menu-item-classes']) ? $_item_object_data['menu-item-classes'] : ''),
+				'menu-item-xfn' => (isset($_item_object_data['menu-item-xfn']) ? $_item_object_data['menu-item-xfn'] : ''),
 			);
 
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+			$items_saved[] = wp_update_nav_menu_item($menu_id, $_actual_db_id, $args);
 
 		}
 	}
@@ -862,23 +862,23 @@ 
  * @param object $object The post type or taxonomy meta-object.
  * @return object The post type of taxonomy object.
  */
-function _wp_nav_menu_meta_box_object( $object = null ) {
-	if ( isset( $object->name ) ) {
+function _wp_nav_menu_meta_box_object($object = null) {
+	if (isset($object->name)) {
 
-		if ( 'page' == $object->name ) {
+		if ('page' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
 		// Posts should show only published items.
-		} elseif ( 'post' == $object->name ) {
+		} elseif ('post' == $object->name) {
 			$object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
 		// Categories should be in reverse chronological order.
-		} elseif ( 'category' == $object->name ) {
+		} elseif ('category' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'id',
 				'order' => 'DESC',
@@ -903,19 +903,19 @@ 
  * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error $output The menu formatted to edit or error object on failure.
  */
-function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
-	$menu = wp_get_nav_menu_object( $menu_id );
+function wp_get_nav_menu_to_edit($menu_id = 0) {
+	$menu = wp_get_nav_menu_object($menu_id);
 
 	// If the menu exists, get its items.
-	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
+	if (is_nav_menu($menu)) {
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('post_status' => 'any'));
 		$result = '<div id="menu-instructions" class="post-body-plain';
-		$result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result .= ( ! empty($menu_items)) ? ' menu-instructions-inactive">' : '">';
+		$result .= '<p>'.__('Add menu items from the column on the left.').'</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if (empty($menu_items))
+			return $result.' <ul class="menu" id="menu-to-edit"> </ul>';
 
 		/**
 		 * Filters the Walker class used when adding nav menu items.
@@ -925,40 +925,40 @@ 
 		 * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
 		 * @param int    $menu_id ID of the menu being rendered.
 		 */
-		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+		$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id);
 
-		if ( class_exists( $walker_class_name ) ) {
+		if (class_exists($walker_class_name)) {
 			$walker = new $walker_class_name;
 		} else {
-			return new WP_Error( 'menu_walker_not_exist',
+			return new WP_Error('menu_walker_not_exist',
 				/* translators: %s: walker class name */
-				sprintf( __( 'The Walker class named %s does not exist.' ),
-					'<strong>' . $walker_class_name . '</strong>'
+				sprintf(__('The Walker class named %s does not exist.'),
+					'<strong>'.$walker_class_name.'</strong>'
 				)
 			);
 		}
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
-		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
+		foreach ((array) $menu_items as $menu_item) {
+			if (isset($menu_item->post_status) && 'draft' == $menu_item->post_status)
 				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
+			if ( ! empty($menu_item->_invalid))
 				$some_invalid_menu_items = true;
 		}
 
-		if ( $some_pending_menu_items ) {
-			$result .= '<div class="notice notice-info notice-alt inline"><p>' . __( 'Click Save Menu to make pending menu items public.' ) . '</p></div>';
+		if ($some_pending_menu_items) {
+			$result .= '<div class="notice notice-info notice-alt inline"><p>'.__('Click Save Menu to make pending menu items public.').'</p></div>';
 		}
 
-		if ( $some_invalid_menu_items ) {
-			$result .= '<div class="notice notice-error notice-alt inline"><p>' . __( 'There are some invalid menu items. Please check or delete them.' ) . '</p></div>';
+		if ($some_invalid_menu_items) {
+			$result .= '<div class="notice notice-error notice-alt inline"><p>'.__('There are some invalid menu items. Please check or delete them.').'</p></div>';
 		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
+		$result .= walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker));
 		$result .= ' </ul> ';
 		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
+	} elseif (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -973,13 +973,13 @@ 
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'          => __( 'Show advanced menu properties' ),
+		'_title'          => __('Show advanced menu properties'),
 		'cb'              => '<input type="checkbox" />',
-		'link-target'     => __( 'Link Target' ),
-		'title-attribute' => __( 'Title Attribute' ),
-		'css-classes'     => __( 'CSS Classes' ),
-		'xfn'             => __( 'Link Relationship (XFN)' ),
-		'description'     => __( 'Description' ),
+		'link-target'     => __('Link Target'),
+		'title-attribute' => __('Title Attribute'),
+		'css-classes'     => __('CSS Classes'),
+		'xfn'             => __('Link Relationship (XFN)'),
+		'description'     => __('Description'),
 	);
 }
 
@@ -993,13 +993,13 @@ 
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp));
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_items_to_delete as $menu_item_id)
+		wp_delete_post($menu_item_id, true);
 }
 
 /**
@@ -1011,12 +1011,12 @@ 
  * @param string $nav_menu_selected_title Title of the currently-selected menu
  * @return array $messages The menu updated message
  */
-function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
-	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
+function wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title) {
+	$unsorted_menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish'));
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
+	foreach ($unsorted_menu_items as $_item)
 		$menu_items[$_item->db_id] = $_item;
 
 	$post_fields = array(
@@ -1026,66 +1026,66 @@ 
 		'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
 	);
 
-	wp_defer_term_counting( true );
+	wp_defer_term_counting(true);
 	// Loop through all the menu items' POST variables
-	if ( ! empty( $_POST['menu-item-db-id'] ) ) {
-		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+	if ( ! empty($_POST['menu-item-db-id'])) {
+		foreach ((array) $_POST['menu-item-db-id'] as $_key => $k) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+			if ( ! isset($_POST['menu-item-title'][$_key]) || '' == $_POST['menu-item-title'][$_key])
 				continue;
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ($post_fields as $field)
+				$args[$field] = isset($_POST[$field][$_key]) ? $_POST[$field][$_key] : '';
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item($nav_menu_selected_id, ($_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key), $args);
 
-			if ( is_wp_error( $menu_item_db_id ) ) {
-				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+			if (is_wp_error($menu_item_db_id)) {
+				$messages[] = '<div id="message" class="error"><p>'.$menu_item_db_id->get_error_message().'</p></div>';
 			} else {
-				unset( $menu_items[ $menu_item_db_id ] );
+				unset($menu_items[$menu_item_db_id]);
 			}
 		}
 	}
 
 	// Remove menu items from the menu that weren't in $_POST
-	if ( ! empty( $menu_items ) ) {
-		foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-			if ( is_nav_menu_item( $menu_item_id ) ) {
-				wp_delete_post( $menu_item_id );
+	if ( ! empty($menu_items)) {
+		foreach (array_keys($menu_items) as $menu_item_id) {
+			if (is_nav_menu_item($menu_item_id)) {
+				wp_delete_post($menu_item_id);
 			}
 		}
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
+	$auto_add = ! empty($_POST['auto-add-pages']);
+	$nav_menu_option = (array) get_option('nav_menu_options');
+	if ( ! isset($nav_menu_option['auto_add']))
 		$nav_menu_option['auto_add'] = array();
-	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+	if ($auto_add) {
+		if ( ! in_array($nav_menu_selected_id, $nav_menu_option['auto_add']))
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if (false !== ($key = array_search($nav_menu_selected_id, $nav_menu_option['auto_add'])))
+			unset($nav_menu_option['auto_add'][$key]);
 	}
 	// Remove nonexistent/deleted menus
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
-	update_option( 'nav_menu_options', $nav_menu_option );
+	$nav_menu_option['auto_add'] = array_intersect($nav_menu_option['auto_add'], wp_get_nav_menus(array('fields' => 'ids')));
+	update_option('nav_menu_options', $nav_menu_option);
 
-	wp_defer_term_counting( false );
+	wp_defer_term_counting(false);
 
 	/** This action is documented in wp-includes/nav-menu.php */
-	do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+	do_action('wp_update_nav_menu', $nav_menu_selected_id);
 
-	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.
 		/* translators: %s: nav menu title */
-		sprintf( __( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
-		) . '</p></div>';
+		sprintf(__('%s has been updated.'),
+			'<strong>'.$nav_menu_selected_title.'</strong>'
+		).'</p></div>';
 
-	unset( $menu_items, $unsorted_menu_items );
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }
@@ -1099,36 +1099,36 @@ 
  * @access private
  */
 function _wp_expand_nav_menu_post_data() {
-	if ( ! isset( $_POST['nav-menu-data'] ) ) {
+	if ( ! isset($_POST['nav-menu-data'])) {
 		return;
 	}
 
-	$data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
+	$data = json_decode(stripslashes($_POST['nav-menu-data']));
 
-	if ( ! is_null( $data ) && $data ) {
-		foreach ( $data as $post_input_data ) {
+	if ( ! is_null($data) && $data) {
+		foreach ($data as $post_input_data) {
 			// For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
 			// derive the array path keys via regex and set the value in $_POST.
-			preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
+			preg_match('#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches);
 
-			$array_bits = array( $matches[1] );
+			$array_bits = array($matches[1]);
 
-			if ( isset( $matches[3] ) ) {
-				$array_bits = array_merge( $array_bits, explode( '][', $matches[3] ) );
+			if (isset($matches[3])) {
+				$array_bits = array_merge($array_bits, explode('][', $matches[3]));
 			}
 
 			$new_post_data = array();
 
 			// Build the new array value from leaf to trunk.
-			for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
-				if ( $i == count( $array_bits ) - 1 ) {
-					$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
+			for ($i = count($array_bits) - 1; $i >= 0; $i--) {
+				if ($i == count($array_bits) - 1) {
+					$new_post_data[$array_bits[$i]] = wp_slash($post_input_data->value);
 				} else {
-					$new_post_data = array( $array_bits[ $i ] => $new_post_data );
+					$new_post_data = array($array_bits[$i] => $new_post_data);
 				}
 			}
 
-			$_POST = array_replace_recursive( $_POST, $new_post_data );
+			$_POST = array_replace_recursive($_POST, $new_post_data);
 		}
 	}
 }

src/wp-admin/includes/upgrade.php

Doc Comments +2 added lines, -2 removed lines

@@ -1795,7 +1795,7 @@ 
  *
  * @param string $table Database table name.
  * @param string $index Index name to drop.
- * @return true True, when finished.
+ * @return boolean True, when finished.
  */
 function drop_index($table, $index) {
 	global $wpdb;
@@ -1818,7 +1818,7 @@ 
  *
  * @param string $table Database table name.
  * @param string $index Database table index column.
- * @return true True, when done with execution.
+ * @return boolean True, when done with execution.
  */
 function add_clean_index($table, $index) {
 	global $wpdb;

Indentation +1 added lines, -1 removed lines

@@ -2114,7 +2114,7 @@
 	global $wpdb;
 
 	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+		$queries = wp_get_db_schema( $queries );
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {

Switch Indentation +16 added lines, -16 removed lines

@@ -2710,22 +2710,22 @@
  */
 function translate_level_to_role($level) {
 	switch ($level) {
-	case 10:
-	case 9:
-	case 8:
-		return 'administrator';
-	case 7:
-	case 6:
-	case 5:
-		return 'editor';
-	case 4:
-	case 3:
-	case 2:
-		return 'author';
-	case 1:
-		return 'contributor';
-	case 0:
-		return 'subscriber';
+		case 10:
+		case 9:
+		case 8:
+			return 'administrator';
+		case 7:
+		case 6:
+		case 5:
+			return 'editor';
+		case 4:
+		case 3:
+		case 2:
+			return 'author';
+		case 1:
+			return 'contributor';
+		case 0:
+			return 'subscriber';
 	}
 }
 

Braces +368 added lines, -238 removed lines

@@ -9,8 +9,9 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
+if ( file_exists(WP_CONTENT_DIR . '/install.php') ) {
 	require (WP_CONTENT_DIR . '/install.php');
+}
 
 /** WordPress Administration API */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -37,8 +38,9 @@ 
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6.0' );
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -59,8 +61,9 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
+	if ( ! $public ) {
+			update_option('default_pingback_flag', 0);
+	}
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
@@ -223,8 +226,9 @@ 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
+	if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page', $first_page );
+	}
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 		'post_author' => $user_id,
@@ -255,10 +259,11 @@ 
 	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
 
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	}
 
 	if ( is_multisite() ) {
 		// Flush rules to pick up the new page.
@@ -273,8 +278,9 @@ 
 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( !is_super_admin( $user_id ) && $user_id != 1 ) {
+					$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		}
 	}
 }
 endif;
@@ -411,26 +417,30 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
-	if ( ! is_blog_installed() )
-		return;
+	if ( ! is_blog_installed() ) {
+			return;
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
+	if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+	}
 	wp_cache_flush();
 
 	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+					$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		} else {
+					$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		}
 	}
 
 	/**
@@ -462,8 +472,9 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
@@ -471,12 +482,14 @@ 
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
-			$wp_current_db_version = 2541;
+		if ( !empty($template) ) {
+					$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
+	if ( $wp_current_db_version < 6039 ) {
+			upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -487,77 +500,101 @@ 
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
-		upgrade_160();
+	if ( $wp_current_db_version < 3308 ) {
+			upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
-		upgrade_210();
+	if ( $wp_current_db_version < 4772 ) {
+			upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
-		upgrade_old_slugs();
+	if ( $wp_current_db_version < 4351 ) {
+			upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
-		upgrade_230();
+	if ( $wp_current_db_version < 5539 ) {
+			upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
-		upgrade_230_old_tables();
+	if ( $wp_current_db_version < 6124 ) {
+			upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
-		upgrade_250();
+	if ( $wp_current_db_version < 7499 ) {
+			upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
-		upgrade_252();
+	if ( $wp_current_db_version < 7935 ) {
+			upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
-		upgrade_260();
+	if ( $wp_current_db_version < 8201 ) {
+			upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
-		upgrade_270();
+	if ( $wp_current_db_version < 8989 ) {
+			upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
-		upgrade_280();
+	if ( $wp_current_db_version < 10360 ) {
+			upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
-		upgrade_290();
+	if ( $wp_current_db_version < 11958 ) {
+			upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
-		upgrade_300();
+	if ( $wp_current_db_version < 15260 ) {
+			upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
-		upgrade_330();
+	if ( $wp_current_db_version < 19389 ) {
+			upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
-		upgrade_340();
+	if ( $wp_current_db_version < 20080 ) {
+			upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
-		upgrade_350();
+	if ( $wp_current_db_version < 22422 ) {
+			upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
-		upgrade_370();
+	if ( $wp_current_db_version < 25824 ) {
+			upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
-		upgrade_372();
+	if ( $wp_current_db_version < 26148 ) {
+			upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
-		upgrade_380();
+	if ( $wp_current_db_version < 26691 ) {
+			upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
-		upgrade_400();
+	if ( $wp_current_db_version < 29630 ) {
+			upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
-		upgrade_430();
+	if ( $wp_current_db_version < 33055 ) {
+			upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
-		upgrade_431();
+	if ( $wp_current_db_version < 33056 ) {
+			upgrade_431();
+	}
 
-	if ( $wp_current_db_version < 35700 )
-		upgrade_440();
+	if ( $wp_current_db_version < 35700 ) {
+			upgrade_440();
+	}
 
-	if ( $wp_current_db_version < 36686 )
-		upgrade_450();
+	if ( $wp_current_db_version < 36686 ) {
+			upgrade_450();
+	}
 
-	if ( $wp_current_db_version < 37965 )
-		upgrade_460();
+	if ( $wp_current_db_version < 37965 ) {
+			upgrade_460();
+	}
 
 	maybe_disable_link_manager();
 
@@ -610,8 +647,10 @@ 
 			$done_posts[] = $done_id->post_id;
 		endforeach;
 		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
-	else:
+	else {
+		:
 		$catwhere = '';
+	}
 	endif;
 
 	$allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
@@ -728,10 +767,11 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
-				$guid = $post->guid;
+			if ( empty($post->guid) ) {
+							$guid = get_permalink($post->ID);
+			} else {
+							$guid = $post->guid;
+			}
 
 			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
 
@@ -813,34 +853,57 @@ 
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		if ( !empty( $user->user_firstname ) ) {
+					update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
+		}
+		if ( !empty( $user->user_lastname ) ) {
+					update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
+		}
+		if ( !empty( $user->user_nickname ) ) {
+					update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
+		}
+		if ( !empty( $user->user_level ) ) {
+					update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+		}
+		if ( !empty( $user->user_icq ) ) {
+					update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_aim ) ) {
+					update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
+		}
+		if ( !empty( $user->user_msn ) ) {
+					update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
+		}
+		if ( !empty( $user->user_yim ) ) {
+					update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_description ) ) {
+					update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
 
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
+			if ($idmode == 'nickname') {
+				$id = $user->user_nickname;
+			}
+			if ($idmode == 'login') {
+				$id = $user->user_login;
+			}
+			if ($idmode == 'firstname') {
+				$id = $user->user_firstname;
+			}
+			if ($idmode == 'lastname') {
+				$id = $user->user_lastname;
+			}
+			if ($idmode == 'namefl') {
+				$id = $user->user_firstname.' '.$user->user_lastname;
+			}
+			if ($idmode == 'namelf') {
+				$id = $user->user_lastname.' '.$user->user_firstname;
+			}
+			if (!$idmode) {
+				$id = $user->user_nickname;
+			}
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 
@@ -855,15 +918,17 @@ 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
+	if ( is_array( $comments ) ) {
+			foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
@@ -878,8 +943,9 @@ 
 										 array( 'ID' => $object->ID ) );
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']) ) {
+							update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -900,8 +966,10 @@ 
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts) ) {
+			foreach ($posts as $post) {
 			$status = $post->post_status;
+		}
 			$type = 'post';
 
 			if ( 'static' == $status ) {
@@ -926,9 +994,10 @@ 
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( !empty($posts) ) {
+					foreach ( $posts as $post )
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		}
 	}
 }
 
@@ -1014,19 +1083,22 @@ 
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
-		$select .= ', rel_type';
+	if ( $have_tags ) {
+			$select .= ', rel_type';
+	}
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
 	foreach ( $posts as $post ) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
-			$taxonomy = 'tag';
+		if ( !empty($post->rel_type) && 'tag' == $post->rel_type) {
+					$taxonomy = 'tag';
+		}
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
-			continue;
+		if ( empty($tt_id) ) {
+					continue;
+		}
 
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
@@ -1068,15 +1140,19 @@ 
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
+		if ( !empty($links) ) {
+			foreach ( $links as $link ) {
 			if ( 0 == $link->link_category )
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
+		}
+			if ( ! isset($link_cat_id_map[$link->link_category]) ) {
+							continue;
+			}
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
 		}
@@ -1090,8 +1166,9 @@ 
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
 		}
 	}
@@ -1104,10 +1181,11 @@ 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) ) {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		} else {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		}
 		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
 	}
 }
@@ -1124,8 +1202,9 @@ 
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	}
 	$wpdb->show_errors();
 }
 
@@ -1200,9 +1279,10 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
-		populate_roles_260();
-}
+	if ( $wp_current_db_version < 8000 ) {
+			populate_roles_260();
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.7.
@@ -1216,13 +1296,15 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
-		populate_roles_270();
+	if ( $wp_current_db_version < 8980 ) {
+			populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
-}
+	if ( $wp_current_db_version < 8921 ) {
+			$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.8.
@@ -1236,15 +1318,17 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
-		populate_roles_280();
+	if ( $wp_current_db_version < 10360 ) {
+			populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
 		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1287,11 +1371,13 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
-		populate_roles_300();
+	if ( $wp_current_db_version < 15093 ) {
+			populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
+			add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
@@ -1339,23 +1425,26 @@ 
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
-		return;
+	if ( $wp_current_db_version >= 11548 ) {
+			return;
+	}
 
 	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
-		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
-		$sidebars_widgets['array_version'] = 1;
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) ) {
+			$sidebars_widgets['array_version'] = 3;
+	} elseif ( !isset($sidebars_widgets['array_version']) ) {
+			$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+						if ( is_array($sidebar) )
 			foreach ( (array) $sidebar as $i => $name ) {
 				$id = strtolower($name);
+			}
 				if ( isset($wp_registered_widgets[$id]) ) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
@@ -1380,8 +1469,9 @@ 
 					}
 				}
 
-				if ( $found )
-					continue;
+				if ( $found ) {
+									continue;
+				}
 
 				unset($_sidebars_widgets[$index][$i]);
 			}
@@ -1445,14 +1535,17 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 1 );
+	}
+	// Previously set to 0 by populate_options()
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+						$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1460,9 +1553,10 @@ 
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
-}
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
+			wp_delete_term( $term->term_id, 'post_format' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.
@@ -1474,9 +1568,10 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
-}
+	if ( $wp_current_db_version < 25824 ) {
+			wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.2.
@@ -1489,9 +1584,10 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
-}
+	if ( $wp_current_db_version < 26148 ) {
+			wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.8.0.
@@ -1758,10 +1854,11 @@ 
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
-				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			if ( !$active_sitewide_plugins ) {
+							$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			} else {
+							$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1772,8 +1869,9 @@ 
 		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1783,16 +1881,19 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ( $wp_current_db_version < 13576 ) {
+			update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19390 ) {
+			update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
+					update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
@@ -1804,8 +1905,9 @@ 
 			$converted = array();
 			$themes = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) ) {
+									$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1813,8 +1915,9 @@ 
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ( $wp_current_db_version < 21823 ) {
+			update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
@@ -2045,8 +2148,9 @@ 
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
+							$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -2068,19 +2172,23 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 
 	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ( 'home' == $setting && '' == $option ) {
+			return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
+			$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2133,8 +2241,9 @@ 
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		    $queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {
@@ -2209,8 +2318,9 @@ 
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
-			continue;
+		if ( ! $tablefields ) {
+					continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = array();
@@ -2502,7 +2612,9 @@ 
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ($alterations as $alteration) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2537,8 +2649,9 @@ 
 	$home_path = get_home_path();
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
-		return false;
+	if (! file_exists("$home_path/index.php")) {
+			return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
@@ -2547,25 +2660,28 @@ 
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
 	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
-			$oldpath = $home_path;
-		else
-			$oldpath = ABSPATH;
+		if ($oldfile == 'index.php') {
+					$oldpath = $home_path;
+		} else {
+					$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
-					return false;
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) {
+									return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
-			return false;
+		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) {
+					return false;
+		}
 
 		chmod("$site_dir/$newfile", 0777);
 
@@ -2575,8 +2691,9 @@ 
 			$f = fopen("$site_dir/$newfile", 'w');
 
 			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+				if (preg_match('/require.*wp-blog-header/', $line)) {
+									$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2626,10 +2743,12 @@ 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
-				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
-				return;
+			if (is_dir("$default_dir/$theme_file")) {
+							continue;
+			}
+			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file")) {
+							return;
+			}
 			chmod("$site_dir/$theme_file", 0777);
 		}
 	}
@@ -2641,11 +2760,17 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+			if (strpos($line, 'Theme Name:') !== false) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif (strpos($line, 'Theme URI:') !== false) {
+				$line = 'Theme URI: ' . __get_option('url');
+			} elseif (strpos($line, 'Description:') !== false) {
+				$line = 'Description: Your theme.';
+			} elseif (strpos($line, 'Version:') !== false) {
+				$line = 'Version: 1';
+			} elseif (strpos($line, 'Author:') !== false) {
+				$line = 'Author: You';
+			}
 			fwrite($f, $line . "\n");
 		}
 		fclose($f);
@@ -2660,10 +2785,12 @@ 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
 		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
-				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
-				return;
+			if (is_dir("$default_dir/images/$image")) {
+							continue;
+			}
+			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image")) {
+							return;
+			}
 			chmod("$site_dir/images/$image", 0777);
 		}
 	}
@@ -2706,9 +2833,10 @@ 
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO: rm -rf the site theme directory.
+		if (! make_site_theme_from_default($theme_name, $template)) {
+					// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
@@ -2759,9 +2887,10 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
-}
+	if ( is_wp_error( $result ) ) {
+			die( $result->get_error_message() );
+	}
+	}
 
 /**
  * Disables the Automattic widgets plugin, which was merged into core.
@@ -2791,9 +2920,10 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
-}
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 0 );
+	}
+	}
 
 /**
  * Runs before the schema is upgraded.

Spacing +609 added lines, -609 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
-	require (WP_CONTENT_DIR . '/install.php');
+if (file_exists(WP_CONTENT_DIR.'/install.php'))
+	require (WP_CONTENT_DIR.'/install.php');
 
 /** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
+require_once(ABSPATH.'wp-admin/includes/schema.php');
 
-if ( !function_exists('wp_install') ) :
+if ( ! function_exists('wp_install')) :
 /**
  * Installs the site.
  *
@@ -36,9 +36,9 @@ 
  * @param string $language      Optional. Language chosen. Default empty.
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6.0' );
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.6.0');
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -51,10 +51,10 @@ 
 	update_option('blog_public', $public);
 
 	// Freshness of site - in the future, this could get more specific about actions taken, perhaps.
-	update_option( 'fresh_site', 1 );
+	update_option('fresh_site', 1);
 
-	if ( $language ) {
-		update_option( 'WPLANG', $language );
+	if ($language) {
+		update_option('WPLANG', $language);
 	}
 
 	$guessurl = wp_guess_url();
@@ -62,7 +62,7 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
+	if ( ! $public)
 		update_option('default_pingback_flag', 0);
 
 	/*
@@ -72,13 +72,13 @@ 
 	$user_id = username_exists($user_name);
 	$user_password = trim($user_password);
 	$email_password = false;
-	if ( !$user_id && empty($user_password) ) {
-		$user_password = wp_generate_password( 12, false );
+	if ( ! $user_id && empty($user_password)) {
+		$user_password = wp_generate_password(12, false);
 		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
 		update_user_option($user_id, 'default_password_nag', true, true);
 		$email_password = true;
-	} elseif ( ! $user_id ) {
+	} elseif ( ! $user_id) {
 		// Password has been provided
 		$message = '<em>'.__('Your chosen password.').'</em>';
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
@@ -95,7 +95,7 @@ 
 
 	flush_rewrite_rules();
 
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
+	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.')));
 
 	wp_cache_flush();
 
@@ -106,13 +106,13 @@ 
 	 *
 	 * @param WP_User $user The site owner.
 	 */
-	do_action( 'wp_install', $user );
+	do_action('wp_install', $user);
 
 	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
 
-if ( !function_exists('wp_install_defaults') ) :
+if ( ! function_exists('wp_install_defaults')) :
 /**
  * Creates the initial content for a newly-installed site.
  *
@@ -127,7 +127,7 @@ 
  *
  * @param int $user_id User ID.
  */
-function wp_install_defaults( $user_id ) {
+function wp_install_defaults($user_id) {
 	global $wpdb, $wp_rewrite, $table_prefix;
 
 	// Default category
@@ -135,10 +135,10 @@ 
 	/* translators: Default category slug */
 	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
 
-	if ( global_terms_enabled() ) {
-		$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-		if ( $cat_id == null ) {
-			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+	if (global_terms_enabled()) {
+		$cat_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug));
+		if ($cat_id == null) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)));
 			$cat_id = $wpdb->insert_id;
 		}
 		update_option('default_category', $cat_id);
@@ -146,35 +146,35 @@ 
 		$cat_id = 1;
 	}
 
-	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+	$wpdb->insert($wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0));
+	$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
 	$cat_tt_id = $wpdb->insert_id;
 
 	// First post
-	$now = current_time( 'mysql' );
-	$now_gmt = current_time( 'mysql', 1 );
-	$first_post_guid = get_option( 'home' ) . '/?p=1';
+	$now = current_time('mysql');
+	$now_gmt = current_time('mysql', 1);
+	$first_post_guid = get_option('home').'/?p=1';
 
-	if ( is_multisite() ) {
-		$first_post = get_site_option( 'first_post' );
+	if (is_multisite()) {
+		$first_post = get_site_option('first_post');
 
-		if ( ! $first_post ) {
+		if ( ! $first_post) {
 			/* translators: %s: site link */
-			$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
+			$first_post = __('Welcome to %s. This is your first post. Edit or delete it, then start blogging!');
 		}
 
-		$first_post = sprintf( $first_post,
-			sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
+		$first_post = sprintf($first_post,
+			sprintf('<a href="%s">%s</a>', esc_url(network_home_url()), get_network()->site_name)
 		);
 
 		// Back-compat for pre-4.4
-		$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
-		$first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
+		$first_post = str_replace('SITE_URL', esc_url(network_home_url()), $first_post);
+		$first_post = str_replace('SITE_NAME', get_network()->site_name, $first_post);
 	} else {
-		$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
+		$first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start writing!');
 	}
 
-	$wpdb->insert( $wpdb->posts, array(
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
@@ -182,7 +182,7 @@ 
 		'post_excerpt' => '',
 		'post_title' => __('Hello world!'),
 		/* translators: Default post slug */
-		'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
+		'post_name' => sanitize_title(_x('hello-world', 'Default post slug')),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -191,22 +191,22 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
+	$wpdb->insert($wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1));
 
 	// Default comment
-	$first_comment_author = __( 'A WordPress Commenter' );
+	$first_comment_author = __('A WordPress Commenter');
 	$first_comment_email = 'wapuu@wordpress.example';
 	$first_comment_url = 'https://wordpress.org/';
-	$first_comment = __( 'Hi, this is a comment.
+	$first_comment = __('Hi, this is a comment.
 To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
 Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
-	if ( is_multisite() ) {
-		$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
-		$first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
-		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-		$first_comment = get_site_option( 'first_comment', $first_comment );
+	if (is_multisite()) {
+		$first_comment_author = get_site_option('first_comment_author', $first_comment_author);
+		$first_comment_email = get_site_option('first_comment_email', $first_comment_email);
+		$first_comment_url = get_site_option('first_comment_url', network_home_url());
+		$first_comment = get_site_option('first_comment', $first_comment);
 	}
-	$wpdb->insert( $wpdb->comments, array(
+	$wpdb->insert($wpdb->comments, array(
 		'comment_post_ID' => 1,
 		'comment_author' => $first_comment_author,
 		'comment_author_email' => $first_comment_email,
@@ -217,7 +217,7 @@ 
 	));
 
 	// First Page
-	$first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+	$first_page = sprintf(__("This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
 
@@ -225,20 +225,20 @@ 
 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
-	$first_post_guid = get_option('home') . '/?page_id=2';
-	$wpdb->insert( $wpdb->posts, array(
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url());
+	if (is_multisite())
+		$first_page = get_site_option('first_page', $first_page);
+	$first_post_guid = get_option('home').'/?page_id=2';
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
 		'post_content' => $first_page,
 		'post_excerpt' => '',
 		'comment_status' => 'closed',
-		'post_title' => __( 'Sample Page' ),
+		'post_title' => __('Sample Page'),
 		/* translators: Default page slug */
-		'post_name' => __( 'sample-page' ),
+		'post_name' => __('sample-page'),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -247,36 +247,36 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+	$wpdb->insert($wpdb->postmeta, array('post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default'));
 
 	// Set up default widgets for default theme.
-	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3 ) );
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
-
-	if ( is_multisite() ) {
+	update_option('widget_search', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('widget_recent-posts', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_recent-comments', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_archives', array(2 => array('title' => '', 'count' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_categories', array(2 => array('title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_meta', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('sidebars_widgets', array('wp_inactive_widgets' => array(), 'sidebar-1' => array(0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2'), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3));
+	if ( ! is_multisite())
+		update_user_meta($user_id, 'show_welcome_panel', 1);
+	elseif ( ! is_super_admin($user_id) && ! metadata_exists('user', $user_id, 'show_welcome_panel'))
+		update_user_meta($user_id, 'show_welcome_panel', 2);
+
+	if (is_multisite()) {
 		// Flush rules to pick up the new page.
 		$wp_rewrite->init();
 		$wp_rewrite->flush_rules();
 
 		$user = new WP_User($user_id);
-		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+		$wpdb->update($wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email'));
 
 		// Remove all perms except for the login user.
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level'));
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities'));
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( ! is_super_admin($user_id) && $user_id != 1)
+			$wpdb->delete($wpdb->usermeta, array('user_id' => $user_id, 'meta_key' => $wpdb->base_prefix.'1_capabilities'));
 	}
 }
 endif;
@@ -296,7 +296,7 @@ 
 	global $wp_rewrite;
 
 	// Bail if a permalink structure is already enabled.
-	if ( get_option( 'permalink_structure' ) ) {
+	if (get_option('permalink_structure')) {
 		return true;
 	}
 
@@ -313,21 +313,21 @@ 
 		'/index.php/%year%/%monthnum%/%day%/%postname%/'
 	);
 
-	foreach ( (array) $permalink_structures as $permalink_structure ) {
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+	foreach ((array) $permalink_structures as $permalink_structure) {
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 
 		/*
 	 	 * Flush rules with the hard option to force refresh of the web-server's
 	 	 * rewrite config file (e.g. .htaccess or web.config).
 	 	 */
-		$wp_rewrite->flush_rules( true );
+		$wp_rewrite->flush_rules(true);
 
 		$test_url = '';
 
 		// Test against a real WordPress Post
-		$first_post = get_page_by_path( sanitize_title( _x( 'hello-world', 'Default post slug' ) ), OBJECT, 'post' );
-		if ( $first_post ) {
-			$test_url = get_permalink( $first_post->ID );
+		$first_post = get_page_by_path(sanitize_title(_x('hello-world', 'Default post slug')), OBJECT, 'post');
+		if ($first_post) {
+			$test_url = get_permalink($first_post->ID);
 		}
 
 		/*
@@ -337,11 +337,11 @@ 
 	 	 * Uses wp_remote_get() instead of wp_remote_head() because web servers
 	 	 * can block head requests.
 	 	 */
-		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
-		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
-		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
+		$response          = wp_remote_get($test_url, array('timeout' => 5));
+		$x_pingback_header = wp_remote_retrieve_header($response, 'x-pingback');
+		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo('pingback_url');
 
-		if ( $pretty_permalinks ) {
+		if ($pretty_permalinks) {
 			return true;
 		}
 	}
@@ -350,13 +350,13 @@ 
 	 * If it makes it this far, pretty permalinks failed.
 	 * Fallback to query-string permalinks.
 	 */
-	$wp_rewrite->set_permalink_structure( '' );
-	$wp_rewrite->flush_rules( true );
+	$wp_rewrite->set_permalink_structure('');
+	$wp_rewrite->flush_rules(true);
 
 	return false;
 }
 
-if ( !function_exists('wp_new_blog_notification') ) :
+if ( ! function_exists('wp_new_blog_notification')) :
 /**
  * Notifies the site admin that the setup is complete.
  *
@@ -371,12 +371,12 @@ 
  * @param string $password   User's Password.
  */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 	$email = $user->user_email;
 	$name = $user->user_login;
 	$login_url = wp_login_url();
 	/* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
-	$message = sprintf( __( "Your new WordPress site has been successfully set up at:
+	$message = sprintf(__("Your new WordPress site has been successfully set up at:
 
 %1\$s
 
@@ -390,13 +390,13 @@ 
 
 --The WordPress Team
 https://wordpress.org/
-"), $blog_url, $name, $password, $login_url );
+"), $blog_url, $name, $password, $login_url);
 
 	@wp_mail($email, __('New WordPress Site'), $message);
 }
 endif;
 
-if ( !function_exists('wp_upgrade') ) :
+if ( ! function_exists('wp_upgrade')) :
 /**
  * Runs WordPress Upgrade functions.
  *
@@ -414,10 +414,10 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
-	if ( ! is_blog_installed() )
+	if ( ! is_blog_installed())
 		return;
 
 	wp_check_mysql_version();
@@ -425,15 +425,15 @@ 
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
+	if (is_multisite() && is_main_site())
 		upgrade_network();
 	wp_cache_flush();
 
-	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+	if (is_multisite()) {
+		if ($wpdb->get_row("SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'"))
+			$wpdb->query("UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'");
 		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+			$wpdb->query("INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());");
 	}
 
 	/**
@@ -444,7 +444,7 @@ 
 	 * @param int $wp_db_version         The new $wp_db_version.
 	 * @param int $wp_current_db_version The old (current) $wp_db_version.
 	 */
-	do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
+	do_action('wp_upgrade', $wp_db_version, $wp_current_db_version);
 }
 endif;
 
@@ -465,109 +465,109 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
 	// If the version is not set in the DB, try to guess the version.
-	if ( empty($wp_current_db_version) ) {
+	if (empty($wp_current_db_version)) {
 		$wp_current_db_version = 0;
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
+		if ( ! empty($template))
 			$wp_current_db_version = 2541;
 	}
 
-	if ( $wp_current_db_version < 6039 )
+	if ($wp_current_db_version < 6039)
 		upgrade_230_options_table();
 
 	populate_options();
 
-	if ( $wp_current_db_version < 2541 ) {
+	if ($wp_current_db_version < 2541) {
 		upgrade_100();
 		upgrade_101();
 		upgrade_110();
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
+	if ($wp_current_db_version < 3308)
 		upgrade_160();
 
-	if ( $wp_current_db_version < 4772 )
+	if ($wp_current_db_version < 4772)
 		upgrade_210();
 
-	if ( $wp_current_db_version < 4351 )
+	if ($wp_current_db_version < 4351)
 		upgrade_old_slugs();
 
-	if ( $wp_current_db_version < 5539 )
+	if ($wp_current_db_version < 5539)
 		upgrade_230();
 
-	if ( $wp_current_db_version < 6124 )
+	if ($wp_current_db_version < 6124)
 		upgrade_230_old_tables();
 
-	if ( $wp_current_db_version < 7499 )
+	if ($wp_current_db_version < 7499)
 		upgrade_250();
 
-	if ( $wp_current_db_version < 7935 )
+	if ($wp_current_db_version < 7935)
 		upgrade_252();
 
-	if ( $wp_current_db_version < 8201 )
+	if ($wp_current_db_version < 8201)
 		upgrade_260();
 
-	if ( $wp_current_db_version < 8989 )
+	if ($wp_current_db_version < 8989)
 		upgrade_270();
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		upgrade_280();
 
-	if ( $wp_current_db_version < 11958 )
+	if ($wp_current_db_version < 11958)
 		upgrade_290();
 
-	if ( $wp_current_db_version < 15260 )
+	if ($wp_current_db_version < 15260)
 		upgrade_300();
 
-	if ( $wp_current_db_version < 19389 )
+	if ($wp_current_db_version < 19389)
 		upgrade_330();
 
-	if ( $wp_current_db_version < 20080 )
+	if ($wp_current_db_version < 20080)
 		upgrade_340();
 
-	if ( $wp_current_db_version < 22422 )
+	if ($wp_current_db_version < 22422)
 		upgrade_350();
 
-	if ( $wp_current_db_version < 25824 )
+	if ($wp_current_db_version < 25824)
 		upgrade_370();
 
-	if ( $wp_current_db_version < 26148 )
+	if ($wp_current_db_version < 26148)
 		upgrade_372();
 
-	if ( $wp_current_db_version < 26691 )
+	if ($wp_current_db_version < 26691)
 		upgrade_380();
 
-	if ( $wp_current_db_version < 29630 )
+	if ($wp_current_db_version < 29630)
 		upgrade_400();
 
-	if ( $wp_current_db_version < 33055 )
+	if ($wp_current_db_version < 33055)
 		upgrade_430();
 
-	if ( $wp_current_db_version < 33056 )
+	if ($wp_current_db_version < 33056)
 		upgrade_431();
 
-	if ( $wp_current_db_version < 35700 )
+	if ($wp_current_db_version < 35700)
 		upgrade_440();
 
-	if ( $wp_current_db_version < 36686 )
+	if ($wp_current_db_version < 36686)
 		upgrade_450();
 
-	if ( $wp_current_db_version < 37965 )
+	if ($wp_current_db_version < 37965)
 		upgrade_460();
 
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
 
-	update_option( 'db_version', $wp_db_version );
-	update_option( 'db_upgraded', true );
+	update_option('db_version', $wp_db_version);
+	update_option('db_upgraded', true);
 }
 
 /**
@@ -587,7 +587,7 @@ 
 		foreach ($posts as $post) {
 			if ('' == $post->post_name) {
 				$newtitle = sanitize_title($post->post_title);
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID));
 			}
 		}
 	}
@@ -596,7 +596,7 @@ 
 	foreach ($categories as $category) {
 		if ('' == $category->category_nicename) {
 			$newtitle = sanitize_title($category->cat_name);
-			$wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+			$wpdb->update($wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID));
 		}
 	}
 
@@ -604,7 +604,7 @@ 
 		SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
 		WHERE option_name LIKE %s
 		AND option_value LIKE %s";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('links_rating_image').'%', $wpdb->esc_like('wp-links/links-images/').'%'));
 
 	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
 	if ($done_ids) :
@@ -612,7 +612,7 @@ 
 		foreach ($done_ids as $done_id) :
 			$done_posts[] = $done_id->post_id;
 		endforeach;
-		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
+		$catwhere = ' AND ID NOT IN ('.implode(',', $done_posts).')';
 	else:
 		$catwhere = '';
 	endif;
@@ -621,9 +621,9 @@ 
 	if ($allposts) :
 		foreach ($allposts as $post) {
 			// Check to see if it's already been imported
-			$cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
-			if (!$cat && 0 != $post->post_category) { // If there's no result
-				$wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
+			$cat = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category));
+			if ( ! $cat && 0 != $post->post_category) { // If there's no result
+				$wpdb->insert($wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category));
 			}
 		}
 	endif;
@@ -646,8 +646,8 @@ 
 	add_clean_index($wpdb->categories, 'category_nicename');
 	add_clean_index($wpdb->comments, 'comment_approved');
 	add_clean_index($wpdb->comments, 'comment_post_ID');
-	add_clean_index($wpdb->links , 'link_category');
-	add_clean_index($wpdb->links , 'link_visible');
+	add_clean_index($wpdb->links, 'link_category');
+	add_clean_index($wpdb->links, 'link_visible');
 }
 
 /**
@@ -666,14 +666,14 @@ 
 	foreach ($users as $user) {
 		if ('' == $user->user_nicename) {
 			$newname = sanitize_title($user->user_nickname);
-			$wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+			$wpdb->update($wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID));
 		}
 	}
 
 	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
 	foreach ($users as $row) {
-		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			$wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+		if ( ! preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
+			$wpdb->update($wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID));
 		}
 	}
 
@@ -682,7 +682,7 @@ 
 
 	$time_difference = $all_options->time_difference;
 
-		$server_time = time()+date('Z');
+		$server_time = time() + date('Z');
 	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
 	$gmt_time = time();
 
@@ -699,7 +699,7 @@ 
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
 	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 
-	if (!$got_gmt_fields) {
+	if ( ! $got_gmt_fields) {
 
 		// Add or subtract time to all dates, to get GMT dates
 		$add_hours = intval($diff_gmt_weblogger);
@@ -731,12 +731,12 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
+			if (empty($post->guid))
 				$guid = get_permalink($post->ID);
 			else
 				$guid = $post->guid;
 
-			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+			$wpdb->update($wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID));
 
 		}
 	}
@@ -748,7 +748,7 @@ 
 			$comment_content = deslash($comment->comment_content);
 			$comment_author = deslash($comment->comment_author);
 
-			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID));
 		}
 	}
 
@@ -759,7 +759,7 @@ 
 			$link_name = deslash($link->link_name);
 			$link_description = deslash($link->link_description);
 
-			$wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+			$wpdb->update($wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id));
 		}
 	}
 
@@ -769,16 +769,16 @@ 
 	 * If plugins are not stored in an array, they're stored in the old
 	 * newline separated format. Convert to new format.
 	 */
-	if ( !is_array( $active_plugins ) ) {
+	if ( ! is_array($active_plugins)) {
 		$active_plugins = explode("\n", trim($active_plugins));
 		update_option('active_plugins', $active_plugins);
 	}
 
 	// Obsolete tables
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optionvalues');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiontypes');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroups');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroup_options');
 
 	// Update comments table to use comment_type
 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
@@ -786,11 +786,11 @@ 
 
 	// Some versions have multiple duplicate option_name rows with the same values
 	$options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
-	foreach ( $options as $option ) {
-		if ( 1 != $option->dupes ) { // Could this be done in the query?
+	foreach ($options as $option) {
+		if (1 != $option->dupes) { // Could this be done in the query?
 			$limit = $option->dupes - 1;
-			$dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
-			if ( $dupe_ids ) {
+			$dupe_ids = $wpdb->get_col($wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit));
+			if ($dupe_ids) {
 				$dupe_ids = join($dupe_ids, ',');
 				$wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
 			}
@@ -815,27 +815,27 @@ 
 	populate_roles_160();
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
-
-		if ( isset( $user->user_idmode ) ):
+	foreach ($users as $user) :
+		if ( ! empty($user->user_firstname))
+			update_user_meta($user->ID, 'first_name', wp_slash($user->user_firstname));
+		if ( ! empty($user->user_lastname))
+			update_user_meta($user->ID, 'last_name', wp_slash($user->user_lastname));
+		if ( ! empty($user->user_nickname))
+			update_user_meta($user->ID, 'nickname', wp_slash($user->user_nickname));
+		if ( ! empty($user->user_level))
+			update_user_meta($user->ID, $wpdb->prefix.'user_level', $user->user_level);
+		if ( ! empty($user->user_icq))
+			update_user_meta($user->ID, 'icq', wp_slash($user->user_icq));
+		if ( ! empty($user->user_aim))
+			update_user_meta($user->ID, 'aim', wp_slash($user->user_aim));
+		if ( ! empty($user->user_msn))
+			update_user_meta($user->ID, 'msn', wp_slash($user->user_msn));
+		if ( ! empty($user->user_yim))
+			update_user_meta($user->ID, 'yim', wp_slash($user->user_icq));
+		if ( ! empty($user->user_description))
+			update_user_meta($user->ID, 'description', wp_slash($user->user_description));
+
+		if (isset($user->user_idmode)):
 			$idmode = $user->user_idmode;
 			if ($idmode == 'nickname') $id = $user->user_nickname;
 			if ($idmode == 'login') $id = $user->user_login;
@@ -843,46 +843,46 @@ 
 			if ($idmode == 'lastname') $id = $user->user_lastname;
 			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
 			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
-			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+			if ( ! $idmode) $id = $user->user_nickname;
+			$wpdb->update($wpdb->users, array('display_name' => $id), array('ID' => $user->ID));
 		endif;
 
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
-		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
+		$caps = get_user_meta($user->ID, $wpdb->prefix.'capabilities');
+		if (empty($caps) || defined('RESET_CAPS')) {
+			$level = get_user_meta($user->ID, $wpdb->prefix.'user_level', true);
 			$role = translate_level_to_role($level);
-			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+			update_user_meta($user->ID, $wpdb->prefix.'capabilities', array($role => true));
 		}
 
 	endforeach;
-	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
+	$old_user_fields = array('user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level');
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
+	foreach ($old_user_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
-	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
+	$comments = $wpdb->get_results("SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID");
+	if (is_array($comments))
 		foreach ($comments as $comment)
-			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+			$wpdb->update($wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID));
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
 	 * and put the mime type in post_type instead of post_mime_type.
 	 */
-	if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
+	if ($wp_current_db_version > 2541 && $wp_current_db_version <= 3091) {
 		$objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
 		foreach ($objects as $object) {
-			$wpdb->update( $wpdb->posts, array(	'post_status' => 'attachment',
+			$wpdb->update($wpdb->posts, array('post_status' => 'attachment',
 												'post_mime_type' => $object->post_type,
 												'post_type' => ''),
-										 array( 'ID' => $object->ID ) );
+										 array('ID' => $object->ID));
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']))
+				update_attached_file($object->ID, $meta['file']);
 		}
 	}
 }
@@ -899,38 +899,38 @@ 
 function upgrade_210() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 3506 ) {
+	if ($wp_current_db_version < 3506) {
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts)) foreach ($posts as $post) {
 			$status = $post->post_status;
 			$type = 'post';
 
-			if ( 'static' == $status ) {
+			if ('static' == $status) {
 				$status = 'publish';
 				$type = 'page';
-			} elseif ( 'attachment' == $status ) {
+			} elseif ('attachment' == $status) {
 				$status = 'inherit';
 				$type = 'attachment';
 			}
 
-			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID));
 		}
 	}
 
-	if ( $wp_current_db_version < 3845 ) {
+	if ($wp_current_db_version < 3845) {
 		populate_roles_210();
 	}
 
-	if ( $wp_current_db_version < 3531 ) {
+	if ($wp_current_db_version < 3531) {
 		// Give future posts a post_status of future.
 		$now = gmdate('Y-m-d H:i:59');
-		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
+		$wpdb->query("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( ! empty($posts))
+			foreach ($posts as $post)
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
 	}
 }
@@ -947,7 +947,7 @@ 
 function upgrade_230() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 5200 ) {
+	if ($wp_current_db_version < 5200) {
 		populate_roles_230();
 	}
 
@@ -964,78 +964,78 @@ 
 		$term_group = 0;
 
 		// Associate terms with the same slug in a term group and make slugs unique.
-		if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+		if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 			$term_group = $exists[0]->term_group;
 			$id = $exists[0]->term_id;
 			$num = 2;
 			do {
-				$alt_slug = $slug . "-$num";
+				$alt_slug = $slug."-$num";
 				$num++;
-				$slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
-			} while ( $slug_check );
+				$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+			} while ($slug_check);
 
 			$slug = $alt_slug;
 
-			if ( empty( $term_group ) ) {
+			if (empty($term_group)) {
 				$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id));
 			}
 		}
 
-		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
-		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+		$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
+		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group));
 
 		$count = 0;
-		if ( !empty($category->category_count) ) {
+		if ( ! empty($category->category_count)) {
 			$count = (int) $category->category_count;
 			$taxonomy = 'category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->link_count) ) {
+		if ( ! empty($category->link_count)) {
 			$count = (int) $category->link_count;
 			$taxonomy = 'link_category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->tag_count) ) {
+		if ( ! empty($category->tag_count)) {
 			$have_tags = true;
 			$count = (int) $category->tag_count;
 			$taxonomy = 'post_tag';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( empty($count) ) {
+		if (empty($count)) {
 			$count = 0;
 			$taxonomy = 'category';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
+	if ($have_tags)
 		$select .= ', rel_type';
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+		if ( ! empty($post->rel_type) && 'tag' == $post->rel_type)
 			$taxonomy = 'tag';
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
+		if (empty($tt_id))
 			continue;
 
-		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id));
 	}
 
 	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
-	if ( $wp_current_db_version < 3570 ) {
+	if ($wp_current_db_version < 3570) {
 		/*
 		 * Create link_category terms for link categories. Create a map of link
 		 * cat IDs to link_category terms.
@@ -1043,8 +1043,8 @@ 
 		$link_cat_id_map = array();
 		$default_link_cat = 0;
 		$tt_ids = array();
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
-		foreach ( $link_cats as $category) {
+		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM ".$wpdb->prefix.'linkcategories');
+		foreach ($link_cats as $category) {
 			$cat_id = (int) $category->cat_id;
 			$term_id = 0;
 			$name = wp_slash($category->cat_name);
@@ -1052,66 +1052,66 @@ 
 			$term_group = 0;
 
 			// Associate terms with the same slug in a term group and make slugs unique.
-			if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+			if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 				$term_group = $exists[0]->term_group;
 				$term_id = $exists[0]->term_id;
 			}
 
-			if ( empty($term_id) ) {
-				$wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+			if (empty($term_id)) {
+				$wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'));
 				$term_id = (int) $wpdb->insert_id;
 			}
 
 			$link_cat_id_map[$cat_id] = $term_id;
 			$default_link_cat = $term_id;
 
-			$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
+			$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0));
 			$tt_ids[$term_id] = (int) $wpdb->insert_id;
 		}
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
-			if ( 0 == $link->link_category )
+		if ( ! empty($links)) foreach ($links as $link) {
+			if (0 == $link->link_category)
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
+			if ( ! isset($link_cat_id_map[$link->link_category]))
 				continue;
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
 
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id));
 		}
 
 		// Set default to the last category we grabbed during the upgrade loop.
 		update_option('default_link_category', $default_link_cat);
 	} else {
 		$links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
-		foreach ( $links as $link ) {
+		foreach ($links as $link) {
 			$link_id = (int) $link->link_id;
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id));
 		}
 	}
 
-	if ( $wp_current_db_version < 4772 ) {
+	if ($wp_current_db_version < 4772) {
 		// Obsolete linkcategories table
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+		$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'linkcategories');
 	}
 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
-	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+	foreach ((array) $terms as $term) {
+		if (('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy))
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id));
 		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id));
+		$wpdb->update($wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id));
 	}
 }
 
@@ -1125,9 +1125,9 @@ 
  */
 function upgrade_230_options_table() {
 	global $wpdb;
-	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
+	$old_options_fields = array('option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level');
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
+	foreach ($old_options_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
 	$wpdb->show_errors();
 }
@@ -1142,9 +1142,9 @@ 
  */
 function upgrade_230_old_tables() {
 	global $wpdb;
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'categories');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'link2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'post2cat');
 }
 
 /**
@@ -1172,7 +1172,7 @@ 
 function upgrade_250() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 6689 ) {
+	if ($wp_current_db_version < 6689) {
 		populate_roles_250();
 	}
 
@@ -1203,7 +1203,7 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
+	if ($wp_current_db_version < 8000)
 		populate_roles_260();
 }
 
@@ -1219,12 +1219,12 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
+	if ($wp_current_db_version < 8980)
 		populate_roles_270();
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	if ($wp_current_db_version < 8921)
+		$wpdb->query("UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'");
 }
 
 /**
@@ -1239,22 +1239,22 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		populate_roles_280();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->option_value ) {
-					update_option( $row->option_name, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->option_value) {
+					update_option($row->option_name, $value);
 				}
 			}
 			$start += 20;
 		}
-		refresh_blog_details( $wpdb->blogid );
+		refresh_blog_details($wpdb->blogid);
 	}
 }
 
@@ -1269,11 +1269,11 @@ 
 function upgrade_290() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 11958 ) {
+	if ($wp_current_db_version < 11958) {
 		// Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
-		if ( get_option( 'thread_comments_depth' ) == '1' ) {
-			update_option( 'thread_comments_depth', 2 );
-			update_option( 'thread_comments', 0 );
+		if (get_option('thread_comments_depth') == '1') {
+			update_option('thread_comments_depth', 2);
+			update_option('thread_comments', 0);
 		}
 	}
 }
@@ -1290,14 +1290,14 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
+	if ($wp_current_db_version < 15093)
 		populate_roles_300();
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ($wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined('MULTISITE') && get_site_option('siteurl') === false)
+		add_site_option('siteurl', '');
 
 	// 3.0 screen options key name changes.
-	if ( wp_should_upgrade_global_tables() ) {
+	if (wp_should_upgrade_global_tables()) {
 		$sql = "DELETE FROM $wpdb->usermeta
 			WHERE meta_key LIKE %s
 			OR meta_key LIKE %s
@@ -1311,15 +1311,15 @@ 
 			OR meta_key = 'manageeditcolumnshidden'
 			OR meta_key = 'categories_per_page'
 			OR meta_key = 'edit_tags_per_page'";
-		$prefix = $wpdb->esc_like( $wpdb->base_prefix );
-		$wpdb->query( $wpdb->prepare( $sql,
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'manage-'	   ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-order'  ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'metaboxorder'    ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'screen_layout'   ) . '%'
-		) );
+		$prefix = $wpdb->esc_like($wpdb->base_prefix);
+		$wpdb->query($wpdb->prepare($sql,
+			$prefix.'%'.$wpdb->esc_like('meta-box-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('closedpostboxes').'%',
+			$prefix.'%'.$wpdb->esc_like('manage-').'%'.$wpdb->esc_like('-columns-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('meta-box-order').'%',
+			$prefix.'%'.$wpdb->esc_like('metaboxorder').'%',
+			$prefix.'%'.$wpdb->esc_like('screen_layout').'%'
+		));
 	}
 
 }
@@ -1338,52 +1338,52 @@ 
 function upgrade_330() {
 	global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
 
-	if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
+	if ($wp_current_db_version < 19061 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')");
 	}
 
-	if ( $wp_current_db_version >= 11548 )
+	if ($wp_current_db_version >= 11548)
 		return;
 
-	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$sidebars_widgets = get_option('sidebars_widgets', array());
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+	if (isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets))
 		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
+	elseif ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 1;
 
-	switch ( $sidebars_widgets['array_version'] ) {
+	switch ($sidebars_widgets['array_version']) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
-			foreach ( (array) $sidebar as $i => $name ) {
+			foreach ((array) $sidebars_widgets as $index => $sidebar)
+			if (is_array($sidebar))
+			foreach ((array) $sidebar as $i => $name) {
 				$id = strtolower($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 				$id = sanitize_title($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 
 				$found = false;
 
-				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-					if ( strtolower($widget['name']) == strtolower($name) ) {
+				foreach ($wp_registered_widgets as $widget_id => $widget) {
+					if (strtolower($widget['name']) == strtolower($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
-					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+					} elseif (sanitize_title($widget['name']) == sanitize_title($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
 					}
 				}
 
-				if ( $found )
+				if ($found)
 					continue;
 
 				unset($_sidebars_widgets[$index][$i]);
@@ -1395,7 +1395,7 @@ 
 		case 2 :
 			$sidebars_widgets = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
-			update_option( 'sidebars_widgets', $sidebars_widgets );
+			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 }
 
@@ -1411,27 +1411,27 @@ 
 function upgrade_340() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 19798 ) {
+	if ($wp_current_db_version < 19798) {
 		$wpdb->hide_errors();
-		$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+		$wpdb->query("ALTER TABLE $wpdb->options DROP COLUMN blog_id");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 19799 ) {
+	if ($wp_current_db_version < 19799) {
 		$wpdb->hide_errors();
 		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
+	if ($wp_current_db_version < 20022 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'");
 	}
 
-	if ( $wp_current_db_version < 20080 ) {
-		if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
-			$uninstall_plugins = get_option( 'uninstall_plugins' );
-			delete_option( 'uninstall_plugins' );
-			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+	if ($wp_current_db_version < 20080) {
+		if ('yes' == $wpdb->get_var("SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'")) {
+			$uninstall_plugins = get_option('uninstall_plugins');
+			delete_option('uninstall_plugins');
+			add_option('uninstall_plugins', $uninstall_plugins, null, 'no');
 		}
 	}
 }
@@ -1448,23 +1448,23 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ($wp_current_db_version < 22006 && $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 1); // Previously set to 0 by populate_options()
 
-	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 21811 && wp_should_upgrade_global_tables()) {
 		$meta_keys = array();
-		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+		foreach (array_merge(get_post_types(), get_taxonomies()) as $name) {
+			if (false !== strpos($name, '-'))
+			$meta_keys[] = 'edit_'.str_replace('-', '_', $name).'_per_page';
 		}
-		if ( $meta_keys ) {
-			$meta_keys = implode( "', '", $meta_keys );
-			$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" );
+		if ($meta_keys) {
+			$meta_keys = implode("', '", $meta_keys);
+			$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')");
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
+	if ($wp_current_db_version < 22422 && $term = get_term_by('slug', 'post-format-standard', 'post_format'))
+		wp_delete_term($term->term_id, 'post_format');
 }
 
 /**
@@ -1477,8 +1477,8 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	if ($wp_current_db_version < 25824)
+		wp_clear_scheduled_hook('wp_auto_updates_maybe_update');
 }
 
 /**
@@ -1492,8 +1492,8 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 26148)
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 }
 
 /**
@@ -1506,8 +1506,8 @@ 
  */
 function upgrade_380() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26691 ) {
-		deactivate_plugins( array( 'mp6/mp6.php' ), true );
+	if ($wp_current_db_version < 26691) {
+		deactivate_plugins(array('mp6/mp6.php'), true);
 	}
 }
 
@@ -1521,12 +1521,12 @@ 
  */
 function upgrade_400() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 29630 ) {
-		if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
-				update_option( 'WPLANG', WPLANG );
+	if ($wp_current_db_version < 29630) {
+		if ( ! is_multisite() && false === get_option('WPLANG')) {
+			if (defined('WPLANG') && ('' !== WPLANG) && in_array(WPLANG, get_available_languages())) {
+				update_option('WPLANG', WPLANG);
 			} else {
-				update_option( 'WPLANG', '' );
+				update_option('WPLANG', '');
 			}
 		}
 	}
@@ -1555,29 +1555,29 @@ 
 function upgrade_430() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 32364 ) {
+	if ($wp_current_db_version < 32364) {
 		upgrade_430_fix_comments();
 	}
 
 	// Shared terms are split in a separate process.
-	if ( $wp_current_db_version < 32814 ) {
-		update_option( 'finished_splitting_shared_terms', 0 );
-		wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	if ($wp_current_db_version < 32814) {
+		update_option('finished_splitting_shared_terms', 0);
+		wp_schedule_single_event(time() + (1 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 	}
 
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( is_multisite() ) {
-			$tables = $wpdb->tables( 'blog' );
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (is_multisite()) {
+			$tables = $wpdb->tables('blog');
 		} else {
-			$tables = $wpdb->tables( 'all' );
-			if ( ! wp_should_upgrade_global_tables() ) {
-				$global_tables = $wpdb->tables( 'global' );
-				$tables = array_diff_assoc( $tables, $global_tables );
+			$tables = $wpdb->tables('all');
+			if ( ! wp_should_upgrade_global_tables()) {
+				$global_tables = $wpdb->tables('global');
+				$tables = array_diff_assoc($tables, $global_tables);
 			}
 		}
 
-		foreach ( $tables as $table ) {
-			maybe_convert_table_to_utf8mb4( $table );
+		foreach ($tables as $table) {
+			maybe_convert_table_to_utf8mb4($table);
 		}
 	}
 }
@@ -1594,18 +1594,18 @@ 
 function upgrade_430_fix_comments() {
 	global $wp_current_db_version, $wpdb;
 
-	$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
+	$content_length = $wpdb->get_col_length($wpdb->comments, 'comment_content');
 
-	if ( is_wp_error( $content_length ) ) {
+	if (is_wp_error($content_length)) {
 		return;
 	}
 
-	if ( false === $content_length ) {
+	if (false === $content_length) {
 		$content_length = array(
 			'type'   => 'byte',
 			'length' => 65535,
 		);
-	} elseif ( ! is_array( $content_length ) ) {
+	} elseif ( ! is_array($content_length)) {
 		$length = (int) $content_length > 0 ? (int) $content_length : 65535;
 		$content_length = array(
 			'type'	 => 'byte',
@@ -1613,12 +1613,12 @@ 
 		);
 	}
 
-	if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
+	if ('byte' !== $content_length['type'] || 0 === $content_length['length']) {
 		// Sites with malformed DB schemas are on their own.
 		return;
 	}
 
-	$allowed_length = intval( $content_length['length'] ) - 10;
+	$allowed_length = intval($content_length['length']) - 10;
 
 	$comments = $wpdb->get_results(
 		"SELECT `comment_ID` FROM `{$wpdb->comments}`
@@ -1627,8 +1627,8 @@ 
 			AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
 	);
 
-	foreach ( $comments as $comment ) {
-		wp_delete_comment( $comment->comment_ID, true );
+	foreach ($comments as $comment) {
+		wp_delete_comment($comment->comment_ID, true);
 	}
 }
 
@@ -1641,9 +1641,9 @@ 
 function upgrade_431() {
 	// Fix incorrect cron entries for term splitting
 	$cron_array = _get_cron_array();
-	if ( isset( $cron_array['wp_batch_split_terms'] ) ) {
-		unset( $cron_array['wp_batch_split_terms'] );
-		_set_cron_array( $cron_array );
+	if (isset($cron_array['wp_batch_split_terms'])) {
+		unset($cron_array['wp_batch_split_terms']);
+		_set_cron_array($cron_array);
 	}
 }
 
@@ -1659,15 +1659,15 @@ 
 function upgrade_440() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 34030 ) {
-		$wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" );
+	if ($wp_current_db_version < 34030) {
+		$wpdb->query("ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)");
 	}
 
 	// Remove the unused 'add_users' role.
 	$roles = wp_roles();
-	foreach ( $roles->role_objects as $role ) {
-		if ( $role->has_cap( 'add_users' ) ) {
-			$role->remove_cap( 'add_users' );
+	foreach ($roles->role_objects as $role) {
+		if ($role->has_cap('add_users')) {
+			$role->remove_cap('add_users');
 		}
 	}
 }
@@ -1684,17 +1684,17 @@ 
 function upgrade_450() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 36180 ) {
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 36180) {
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 	}
 
 	// Remove unused email confirmation options, moved to usermeta.
-	if ( $wp_current_db_version < 36679 && is_multisite() ) {
-		$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
+	if ($wp_current_db_version < 36679 && is_multisite()) {
+		$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'");
 	}
 
 	// Remove unused user setting for wpLink.
-	delete_user_setting( 'wplink' );
+	delete_user_setting('wplink');
 }
 
 /**
@@ -1709,22 +1709,22 @@ 
 	global $wp_current_db_version;
 
 	// Remove unused post meta.
-	if ( $wp_current_db_version < 37854 ) {
-		delete_post_meta_by_key( '_post_restored_from' );
+	if ($wp_current_db_version < 37854) {
+		delete_post_meta_by_key('_post_restored_from');
 	}
 
 	// Remove plugins with callback as an array object/method as the uninstall hook, see #13786.
-	if ( $wp_current_db_version < 37965 ) {
-		$uninstall_plugins = get_option( 'uninstall_plugins', array() );
+	if ($wp_current_db_version < 37965) {
+		$uninstall_plugins = get_option('uninstall_plugins', array());
 
-		if ( ! empty( $uninstall_plugins ) ) {
-			foreach ( $uninstall_plugins as $basename => $callback ) {
-				if ( is_array( $callback ) && is_object( $callback[0] ) ) {
-					unset( $uninstall_plugins[ $basename ] );
+		if ( ! empty($uninstall_plugins)) {
+			foreach ($uninstall_plugins as $basename => $callback) {
+				if (is_array($callback) && is_object($callback[0])) {
+					unset($uninstall_plugins[$basename]);
 				}
 			}
 
-			update_option( 'uninstall_plugins', $uninstall_plugins );
+			update_option('uninstall_plugins', $uninstall_plugins);
 		}
 	}
 }
@@ -1741,7 +1741,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Always.
-	if ( is_main_network() ) {
+	if (is_main_network()) {
 		/*
 		 * Deletes all expired transients. The multi-table delete syntax is used
 		 * to delete the transient record from table a, and the corresponding
@@ -1753,32 +1753,32 @@ 
 			AND a.meta_key NOT LIKE %s
 			AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 			AND b.meta_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 
 	// 2.8.
-	if ( $wp_current_db_version < 11549 ) {
-		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
-		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
-		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
+	if ($wp_current_db_version < 11549) {
+		$wpmu_sitewide_plugins = get_site_option('wpmu_sitewide_plugins');
+		$active_sitewide_plugins = get_site_option('active_sitewide_plugins');
+		if ($wpmu_sitewide_plugins) {
+			if ( ! $active_sitewide_plugins)
 				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
 			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+				$sitewide_plugins = array_merge((array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins);
 
-			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+			update_site_option('active_sitewide_plugins', $sitewide_plugins);
 		}
-		delete_site_option( 'wpmu_sitewide_plugins' );
-		delete_site_option( 'deactivated_sitewide_plugins' );
+		delete_site_option('wpmu_sitewide_plugins');
+		delete_site_option('deactivated_sitewide_plugins');
 
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->meta_value ) {
-					update_site_option( $row->meta_key, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->meta_value) {
+					update_site_option($row->meta_key, $value);
 				}
 			}
 			$start += 20;
@@ -1786,95 +1786,95 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ($wp_current_db_version < 13576)
+		update_site_option('global_terms_enabled', '1');
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ($wp_current_db_version < 19390)
+		update_site_option('initial_db_version', $wp_current_db_version);
 
-	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+	if ($wp_current_db_version < 19470) {
+		if (false === get_site_option('active_sitewide_plugins'))
+			update_site_option('active_sitewide_plugins', array());
 	}
 
 	// 3.4
-	if ( $wp_current_db_version < 20148 ) {
+	if ($wp_current_db_version < 20148) {
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		$allowedthemes  = get_site_option( 'allowedthemes'  );
-		$allowed_themes = get_site_option( 'allowed_themes' );
-		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
+		$allowedthemes  = get_site_option('allowedthemes');
+		$allowed_themes = get_site_option('allowed_themes');
+		if (false === $allowedthemes && is_array($allowed_themes) && $allowed_themes) {
 			$converted = array();
 			$themes = wp_get_themes();
-			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+			foreach ($themes as $stylesheet => $theme_data) {
+				if (isset($allowed_themes[$theme_data->get('Name')]))
+					$converted[$stylesheet] = true;
 			}
-			update_site_option( 'allowedthemes', $converted );
-			delete_site_option( 'allowed_themes' );
+			update_site_option('allowedthemes', $converted);
+			delete_site_option('allowed_themes');
 		}
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ($wp_current_db_version < 21823)
+		update_site_option('ms_files_rewriting', '1');
 
 	// 3.5.2
-	if ( $wp_current_db_version < 24448 ) {
-		$illegal_names = get_site_option( 'illegal_names' );
-		if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
-			$illegal_name = reset( $illegal_names );
-			$illegal_names = explode( ' ', $illegal_name );
-			update_site_option( 'illegal_names', $illegal_names );
+	if ($wp_current_db_version < 24448) {
+		$illegal_names = get_site_option('illegal_names');
+		if (is_array($illegal_names) && count($illegal_names) === 1) {
+			$illegal_name = reset($illegal_names);
+			$illegal_names = explode(' ', $illegal_name);
+			update_site_option('illegal_names', $illegal_names);
 		}
 	}
 
 	// 4.2
-	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-		if ( wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
-			$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+	if ($wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4') {
+		if (wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))");
+			$wpdb->query("ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
 
 	// 4.3
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (wp_should_upgrade_global_tables()) {
 			$upgrade = false;
-			$indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
-			foreach ( $indexes as $index ) {
-				if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+			$indexes = $wpdb->get_results("SHOW INDEXES FROM $wpdb->signups");
+			foreach ($indexes as $index) {
+				if ('domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part) {
 					$upgrade = true;
 					break;
 				}
 			}
 
-			if ( $upgrade ) {
-				$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+			if ($upgrade) {
+				$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 			}
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
@@ -1902,9 +1902,9 @@ 
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
 
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
 
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 
@@ -1912,7 +1912,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 	return false;
@@ -1973,7 +1973,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1983,7 +1983,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -2001,37 +2001,37 @@ 
  * @param string $table The table to convert.
  * @return bool true if the table was converted, false if it wasn't.
  */
-function maybe_convert_table_to_utf8mb4( $table ) {
+function maybe_convert_table_to_utf8mb4($table) {
 	global $wpdb;
 
-	$results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" );
-	if ( ! $results ) {
+	$results = $wpdb->get_results("SHOW FULL COLUMNS FROM `$table`");
+	if ( ! $results) {
 		return false;
 	}
 
-	foreach ( $results as $column ) {
-		if ( $column->Collation ) {
-			list( $charset ) = explode( '_', $column->Collation );
-			$charset = strtolower( $charset );
-			if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+	foreach ($results as $column) {
+		if ($column->Collation) {
+			list($charset) = explode('_', $column->Collation);
+			$charset = strtolower($charset);
+			if ('utf8' !== $charset && 'utf8mb4' !== $charset) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
 			}
 		}
 	}
 
-	$table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" );
-	if ( ! $table_details ) {
+	$table_details = $wpdb->get_row("SHOW TABLE STATUS LIKE '$table'");
+	if ( ! $table_details) {
 		return false;
 	}
 
-	list( $table_charset ) = explode( '_', $table_details->Collation );
-	$table_charset = strtolower( $table_charset );
-	if ( 'utf8mb4' === $table_charset ) {
+	list($table_charset) = explode('_', $table_details->Collation);
+	$table_charset = strtolower($table_charset);
+	if ('utf8mb4' === $table_charset) {
 		return true;
 	}
 
-	return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" );
+	return $wpdb->query("ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
 }
 
 /**
@@ -2046,11 +2046,11 @@ 
 function get_alloptions_110() {
 	global $wpdb;
 	$all_options = new stdClass;
-	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
-		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
-			$all_options->{$option->option_name} = stripslashes( $option->option_value );
+	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+		foreach ($options as $option) {
+			if ('siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name)
+				$option->option_value = untrailingslashit($option->option_value);
+			$all_options->{$option->option_name} = stripslashes($option->option_value);
 		}
 	}
 	return $all_options;
@@ -2071,21 +2071,21 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ($setting == 'home' && defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ($setting == 'siteurl' && defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+	$option = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting));
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ('home' == $setting && '' == $option)
+		return __get_option('siteurl');
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ('siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting)
+		$option = untrailingslashit($option);
 
-	return maybe_unserialize( $option );
+	return maybe_unserialize($option);
 }
 
 /**
@@ -2133,16 +2133,16 @@ 
  *                              Default true.
  * @return array Strings containing the results of the various update queries.
  */
-function dbDelta( $queries = '', $execute = true ) {
+function dbDelta($queries = '', $execute = true) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if (in_array($queries, array('', 'all', 'blog', 'global', 'ms_global'), true))
+	    $queries = wp_get_db_schema($queries);
 
 	// Separate individual queries into an array
-	if ( !is_array($queries) ) {
-		$queries = explode( ';', $queries );
-		$queries = array_filter( $queries );
+	if ( ! is_array($queries)) {
+		$queries = explode(';', $queries);
+		$queries = array_filter($queries);
 	}
 
 	/**
@@ -2152,7 +2152,7 @@ 
 	 *
 	 * @param array $queries An array of dbDelta SQL queries.
 	 */
-	$queries = apply_filters( 'dbdelta_queries', $queries );
+	$queries = apply_filters('dbdelta_queries', $queries);
 
 	$cqueries = array(); // Creation Queries
 	$iqueries = array(); // Insertion Queries
@@ -2160,14 +2160,14 @@ 
 
 	// Create a tablename index for an array ($cqueries) of queries
 	foreach ($queries as $qry) {
-		if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
-			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
+		if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+			$cqueries[trim($matches[1], '`')] = $qry;
 			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		} elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
-			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
+			array_unshift($cqueries, $qry);
+		} elseif (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
 		} else {
 			// Unrecognized query type
@@ -2183,7 +2183,7 @@ 
 	 *
 	 * @param array $cqueries An array of dbDelta create SQL queries.
 	 */
-	$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
+	$cqueries = apply_filters('dbdelta_create_queries', $cqueries);
 
 	/**
 	 * Filters the dbDelta SQL queries for inserting or updating.
@@ -2194,25 +2194,25 @@ 
 	 *
 	 * @param array $iqueries An array of dbDelta insert or update SQL queries.
 	 */
-	$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
+	$iqueries = apply_filters('dbdelta_insert_queries', $iqueries);
 
-	$text_fields = array( 'tinytext', 'text', 'mediumtext', 'longtext' );
-	$blob_fields = array( 'tinyblob', 'blob', 'mediumblob', 'longblob' );
+	$text_fields = array('tinytext', 'text', 'mediumtext', 'longtext');
+	$blob_fields = array('tinyblob', 'blob', 'mediumblob', 'longblob');
 
-	$global_tables = $wpdb->tables( 'global' );
-	foreach ( $cqueries as $table => $qry ) {
+	$global_tables = $wpdb->tables('global');
+	foreach ($cqueries as $table => $qry) {
 		// Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
-		if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
-			unset( $cqueries[ $table ], $for_update[ $table ] );
+		if (in_array($table, $global_tables) && ! wp_should_upgrade_global_tables()) {
+			unset($cqueries[$table], $for_update[$table]);
 			continue;
 		}
 
 		// Fetch the table column structure from the database
 		$suppress = $wpdb->suppress_errors();
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
-		$wpdb->suppress_errors( $suppress );
+		$wpdb->suppress_errors($suppress);
 
-		if ( ! $tablefields )
+		if ( ! $tablefields)
 			continue;
 
 		// Clear the field and index arrays.
@@ -2226,17 +2226,17 @@ 
 		$flds = explode("\n", $qryline);
 
 		// For every field line specified in the query.
-		foreach ( $flds as $fld ) {
-			$fld = trim( $fld, " \t\n\r\0\x0B," ); // Default trim characters, plus ','.
+		foreach ($flds as $fld) {
+			$fld = trim($fld, " \t\n\r\0\x0B,"); // Default trim characters, plus ','.
 
 			// Extract the field name.
-			preg_match( '|^([^ ]*)|', $fld, $fvals );
-			$fieldname = trim( $fvals[1], '`' );
-			$fieldname_lowercased = strtolower( $fieldname );
+			preg_match('|^([^ ]*)|', $fld, $fvals);
+			$fieldname = trim($fvals[1], '`');
+			$fieldname_lowercased = strtolower($fieldname);
 
 			// Verify the found field name.
 			$validfield = true;
-			switch ( $fieldname_lowercased ) {
+			switch ($fieldname_lowercased) {
 				case '':
 				case 'primary':
 				case 'index':
@@ -2280,19 +2280,19 @@ 
 					);
 
 					// Uppercase the index type and normalize space characters.
-					$index_type = strtoupper( preg_replace( '/\s+/', ' ', trim( $index_matches['index_type'] ) ) );
+					$index_type = strtoupper(preg_replace('/\s+/', ' ', trim($index_matches['index_type'])));
 
 					// 'INDEX' is a synonym for 'KEY', standardize on 'KEY'.
-					$index_type = str_replace( 'INDEX', 'KEY', $index_type );
+					$index_type = str_replace('INDEX', 'KEY', $index_type);
 
 					// Escape the index name with backticks. An index for a primary key has no name.
-					$index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . strtolower( $index_matches['index_name'] ) . '`';
+					$index_name = ('PRIMARY KEY' === $index_type) ? '' : '`'.strtolower($index_matches['index_name']).'`';
 
 					// Parse the columns. Multiple columns are separated by a comma.
-					$index_columns = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
+					$index_columns = array_map('trim', explode(',', $index_matches['index_columns']));
 
 					// Normalize columns.
-					foreach ( $index_columns as &$index_column ) {
+					foreach ($index_columns as &$index_column) {
 						// Extract column name and number of indexed characters (sub_part).
 						preg_match(
 							  '/'
@@ -2317,66 +2317,66 @@ 
 						);
 
 						// Escape the column name with backticks.
-						$index_column = '`' . $index_column_matches['column_name'] . '`';
+						$index_column = '`'.$index_column_matches['column_name'].'`';
 
 						// Append the optional sup part with the number of indexed characters.
-						if ( isset( $index_column_matches['sub_part'] ) ) {
-							$index_column .= '(' . $index_column_matches['sub_part'] . ')';
+						if (isset($index_column_matches['sub_part'])) {
+							$index_column .= '('.$index_column_matches['sub_part'].')';
 						}
 					}
 
 					// Build the normalized index definition and add it to the list of indices.
-					$indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ")";
+					$indices[] = "{$index_type} {$index_name} (".implode(',', $index_columns).")";
 
 					// Destroy no longer needed variables.
-					unset( $index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns );
+					unset($index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns);
 
 					break;
 			}
 
 			// If it's a valid field, add it to the field array.
-			if ( $validfield ) {
-				$cfields[ $fieldname_lowercased ] = $fld;
+			if ($validfield) {
+				$cfields[$fieldname_lowercased] = $fld;
 			}
 		}
 
 		// For every field in the table.
-		foreach ( $tablefields as $tablefield ) {
-			$tablefield_field_lowercased = strtolower( $tablefield->Field );
-			$tablefield_type_lowercased = strtolower( $tablefield->Type );
+		foreach ($tablefields as $tablefield) {
+			$tablefield_field_lowercased = strtolower($tablefield->Field);
+			$tablefield_type_lowercased = strtolower($tablefield->Type);
 
 			// If the table field exists in the field array ...
-			if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
+			if (array_key_exists($tablefield_field_lowercased, $cfields)) {
 
 				// Get the field type from the query.
-				preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
+				preg_match('|`?'.$tablefield->Field.'`? ([^ ]*( unsigned)?)|i', $cfields[$tablefield_field_lowercased], $matches);
 				$fieldtype = $matches[1];
-				$fieldtype_lowercased = strtolower( $fieldtype );
+				$fieldtype_lowercased = strtolower($fieldtype);
 
 				// Is actual field type different from the field type in query?
 				if ($tablefield->Type != $fieldtype) {
 					$do_change = true;
-					if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
-						if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
+					if (in_array($fieldtype_lowercased, $text_fields) && in_array($tablefield_type_lowercased, $text_fields)) {
+						if (array_search($fieldtype_lowercased, $text_fields) < array_search($tablefield_type_lowercased, $text_fields)) {
 							$do_change = false;
 						}
 					}
 
-					if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
-						if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
+					if (in_array($fieldtype_lowercased, $blob_fields) && in_array($tablefield_type_lowercased, $blob_fields)) {
+						if (array_search($fieldtype_lowercased, $blob_fields) < array_search($tablefield_type_lowercased, $blob_fields)) {
 							$do_change = false;
 						}
 					}
 
-					if ( $do_change ) {
+					if ($do_change) {
 						// Add a query to change the column type.
-						$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
+						$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` ".$cfields[$tablefield_field_lowercased];
 						$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
 					}
 				}
 
 				// Get the default value from the array.
-				if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
+				if (preg_match("| DEFAULT '(.*?)'|i", $cfields[$tablefield_field_lowercased], $matches)) {
 					$default_value = $matches[1];
 					if ($tablefield->Default != $default_value) {
 						// Add a query to change the column's default value
@@ -2386,7 +2386,7 @@ 
 				}
 
 				// Remove the field from the array (so it's not added).
-				unset( $cfields[ $tablefield_field_lowercased ] );
+				unset($cfields[$tablefield_field_lowercased]);
 			} else {
 				// This field exists in the table, but not in the creation queries?
 			}
@@ -2410,9 +2410,9 @@ 
 			foreach ($tableindices as $tableindex) {
 
 				// Add the index to the index data array.
-				$keyname = strtolower( $tableindex->Key_name );
+				$keyname = strtolower($tableindex->Key_name);
 				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
+				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0) ? true : false;
 				$index_ary[$keyname]['index_type'] = $tableindex->Index_type;
 			}
 
@@ -2423,36 +2423,36 @@ 
 				$index_string = '';
 				if ($index_name == 'primary') {
 					$index_string .= 'PRIMARY ';
-				} elseif ( $index_data['unique'] ) {
+				} elseif ($index_data['unique']) {
 					$index_string .= 'UNIQUE ';
 				}
-				if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
+				if ('FULLTEXT' === strtoupper($index_data['index_type'])) {
 					$index_string .= 'FULLTEXT ';
 				}
-				if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
+				if ('SPATIAL' === strtoupper($index_data['index_type'])) {
 					$index_string .= 'SPATIAL ';
 				}
 				$index_string .= 'KEY ';
-				if ( 'primary' !== $index_name  ) {
-					$index_string .= '`' . $index_name . '`';
+				if ('primary' !== $index_name) {
+					$index_string .= '`'.$index_name.'`';
 				}
 				$index_columns = '';
 
 				// For each column in the index.
 				foreach ($index_data['columns'] as $column_data) {
-					if ( $index_columns != '' ) {
+					if ($index_columns != '') {
 						$index_columns .= ',';
 					}
 
 					// Add the field to the column list string.
-					$index_columns .= '`' . $column_data['fieldname'] . '`';
+					$index_columns .= '`'.$column_data['fieldname'].'`';
 					if ($column_data['subpart'] != '') {
 						$index_columns .= '('.$column_data['subpart'].')';
 					}
 				}
 
 				// The alternative index string doesn't care about subparts
-				$alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+				$alt_index_columns = preg_replace('/\([^)]*\)/', '', $index_columns);
 
 				// Add the column list to the index create string.
 				$index_strings = array(
@@ -2460,9 +2460,9 @@ 
 					"$index_string ($alt_index_columns)",
 				);
 
-				foreach ( $index_strings as $index_string ) {
-					if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
-						unset( $indices[ $aindex ] );
+				foreach ($index_strings as $index_string) {
+					if ( ! (($aindex = array_search($index_string, $indices)) === false)) {
+						unset($indices[$aindex]);
 						break;
 					}
 				}
@@ -2470,14 +2470,14 @@ 
 		}
 
 		// For every remaining index specified for the table.
-		foreach ( (array) $indices as $index ) {
+		foreach ((array) $indices as $index) {
 			// Push a query line into $cqueries that adds the index to that table.
 			$cqueries[] = "ALTER TABLE {$table} ADD $index";
-			$for_update[] = 'Added index ' . $table . ' ' . $index;
+			$for_update[] = 'Added index '.$table.' '.$index;
 		}
 
 		// Remove the original table creation query from processing.
-		unset( $cqueries[ $table ], $for_update[ $table ] );
+		unset($cqueries[$table], $for_update[$table]);
 	}
 
 	$allqueries = array_merge($cqueries, $iqueries);
@@ -2502,8 +2502,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current( $tables = 'all' ) {
-	$alterations = dbDelta( $tables );
+function make_db_current($tables = 'all') {
+	$alterations = dbDelta($tables);
 	echo "<ol>\n";
 	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
 	echo "</ol>\n";
@@ -2521,8 +2521,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current_silent( $tables = 'all' ) {
-	dbDelta( $tables );
+function make_db_current_silent($tables = 'all') {
+	dbDelta($tables);
 }
 
 /**
@@ -2538,9 +2538,9 @@ 
  */
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
+	if ( ! file_exists("$home_path/index.php"))
 		return false;
 
 	/*
@@ -2559,7 +2559,7 @@ 
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
+				if ( ! @copy(WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME.'/index.php', "$site_dir/$newfile"))
 					return false;
 
 				// Don't copy anything.
@@ -2567,7 +2567,7 @@ 
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+		if ( ! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
 			return false;
 
 		chmod("$site_dir/$newfile", 0777);
@@ -2579,7 +2579,7 @@ 
 
 			foreach ($lines as $line) {
 				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+					$line = '//'.$line;
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2594,7 +2594,7 @@ 
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: ".__get_option('siteurl')."\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
 	$stylelines = file_get_contents("$site_dir/style.css");
 	if ($stylelines) {
@@ -2620,18 +2620,18 @@ 
  * @return false|void
  */
 function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
-	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
+	$default_dir = WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME;
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
-		while(($theme_file = readdir( $theme_dir )) !== false) {
+		while (($theme_file = readdir($theme_dir)) !== false) {
 			if (is_dir("$default_dir/$theme_file"))
 				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+			if ( ! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
 				return;
 			chmod("$site_dir/$theme_file", 0777);
 		}
@@ -2644,28 +2644,28 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: '.$theme_name;
+			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: '.__get_option('url');
 			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
 			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
 			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
-			fwrite($f, $line . "\n");
+			fwrite($f, $line."\n");
 		}
 		fclose($f);
 	}
 
 	// Copy the images.
 	umask(0);
-	if (! mkdir("$site_dir/images", 0777)) {
+	if ( ! mkdir("$site_dir/images", 0777)) {
 		return false;
 	}
 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
-		while(($image = readdir($images_dir)) !== false) {
+		while (($image = readdir($images_dir)) !== false) {
 			if (is_dir("$default_dir/images/$image"))
 				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+			if ( ! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
 				return;
 			chmod("$site_dir/images/$image", 0777);
 		}
@@ -2686,30 +2686,30 @@ 
 	// Name the theme after the blog.
 	$theme_name = __get_option('blogname');
 	$template = sanitize_title($theme_name);
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
 	// If the theme already exists, nothing to do.
-	if ( is_dir($site_dir)) {
+	if (is_dir($site_dir)) {
 		return false;
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+	if ( ! is_writable(WP_CONTENT_DIR."/themes")) {
 		return false;
 	}
 
 	umask(0);
-	if (! mkdir($site_dir, 0777)) {
+	if ( ! mkdir($site_dir, 0777)) {
 		return false;
 	}
 
-	if (file_exists(ABSPATH . 'wp-layout.css')) {
-		if (! make_site_theme_from_oldschool($theme_name, $template)) {
+	if (file_exists(ABSPATH.'wp-layout.css')) {
+		if ( ! make_site_theme_from_oldschool($theme_name, $template)) {
 			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
+		if ( ! make_site_theme_from_default($theme_name, $template))
 			// TODO: rm -rf the site theme directory.
 			return false;
 	}
@@ -2762,8 +2762,8 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
+	if (is_wp_error($result))
+		die($result->get_error_message());
 }
 
 /**
@@ -2772,12 +2772,12 @@ 
  * @since 2.2.0
  */
 function maybe_disable_automattic_widgets() {
-	$plugins = __get_option( 'active_plugins' );
+	$plugins = __get_option('active_plugins');
 
-	foreach ( (array) $plugins as $plugin ) {
-		if ( basename( $plugin ) == 'widgets.php' ) {
-			array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
-			update_option( 'active_plugins', $plugins );
+	foreach ((array) $plugins as $plugin) {
+		if (basename($plugin) == 'widgets.php') {
+			array_splice($plugins, array_search($plugin, $plugins), 1);
+			update_option('active_plugins', $plugins);
 			break;
 		}
 	}
@@ -2794,8 +2794,8 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
+	if ($wp_current_db_version >= 22006 && get_option('link_manager_enabled') && ! $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 0);
 }
 
 /**
@@ -2810,7 +2810,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Upgrade versions prior to 2.9
-	if ( $wp_current_db_version < 11557 ) {
+	if ($wp_current_db_version < 11557) {
 		// Delete duplicate options. Keep the option with the highest option_id.
 		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
 
@@ -2822,40 +2822,40 @@ 
 	}
 
 	// Multisite schema upgrades.
-	if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables()) {
 
 		// Upgrade versions prior to 3.7
-		if ( $wp_current_db_version < 25179 ) {
+		if ($wp_current_db_version < 25179) {
 			// New primary key for signups.
-			$wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+			$wpdb->query("ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain");
 		}
 
-		if ( $wp_current_db_version < 25448 ) {
+		if ($wp_current_db_version < 25448) {
 			// Convert archived from enum to tinyint.
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'");
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0");
 		}
 	}
 
 	// Upgrade versions prior to 4.2.
-	if ( $wp_current_db_version < 31351 ) {
-		if ( ! is_multisite() && wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
+	if ($wp_current_db_version < 31351) {
+		if ( ! is_multisite() && wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
 		}
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" );
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))");
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))");
+		$wpdb->query("ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))");
 	}
 
 	// Upgrade versions prior to 4.4.
-	if ( $wp_current_db_version < 34978 ) {
+	if ($wp_current_db_version < 34978) {
 		// If compatible termmeta table is found, use it, but enforce a proper index and update collation.
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->termmeta}'" ) && $wpdb->get_results( "SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'" ) ) {
-			$wpdb->query( "ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			maybe_convert_table_to_utf8mb4( $wpdb->termmeta );
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->termmeta}'") && $wpdb->get_results("SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'")) {
+			$wpdb->query("ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			maybe_convert_table_to_utf8mb4($wpdb->termmeta);
 		}
 	}
 }
@@ -2868,7 +2868,7 @@ 
  * @global wpdb   $wpdb
  * @global string $charset_collate
  */
-if ( !function_exists( 'install_global_terms' ) ) :
+if ( ! function_exists('install_global_terms')) :
 function install_global_terms() {
 	global $wpdb, $charset_collate;
 	$ms_queries = "
@@ -2883,7 +2883,7 @@ 
 ) $charset_collate;
 ";
 // now create tables
-	dbDelta( $ms_queries );
+	dbDelta($ms_queries);
 }
 endif;
 
@@ -2908,7 +2908,7 @@ 
 function wp_should_upgrade_global_tables() {
 
 	// Return false early if explicitly not upgrading
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 		return false;
 	}
 
@@ -2916,12 +2916,12 @@ 
 	$should_upgrade = true;
 
 	// Set to false if not on main network (does not matter if not multi-network)
-	if ( ! is_main_network() ) {
+	if ( ! is_main_network()) {
 		$should_upgrade = false;
 	}
 
 	// Set to false if not on main site of current network (does not matter if not multi-site)
-	if ( ! is_main_site() ) {
+	if ( ! is_main_site()) {
 		$should_upgrade = false;
 	}
 
@@ -2930,5 +2930,5 @@ 
 	 *
 	 * @param bool $should_upgrade Whether to run the upgrade routines on global tables.
 	 */
-	return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade );
+	return apply_filters('wp_should_upgrade_global_tables', $should_upgrade);
 }

src/wp-content/themes/twentyeleven/functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -387,7 +387,7 @@ 
  * @since Twenty Eleven 1.0
  *
  * @param string $more The Read More text.
- * @return The filtered Read More text.
+ * @return string filtered Read More text.
  */
 function twentyeleven_auto_excerpt_more( $more ) {
 	if ( ! is_admin() ) {
@@ -540,7 +540,7 @@ 
  *
  * @since Twenty Eleven 1.0
  *
- * @return string|bool URL or false when no link is present.
+ * @return false|string URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
 	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )

Braces +52 added lines, -34 removed lines

@@ -39,8 +39,9 @@ 
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 584;
+}
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
@@ -98,10 +99,11 @@ 
 	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
 
 	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
-		$default_background_color = '1d1d1d';
-	else
-		$default_background_color = 'e2e2e2';
+	if ( 'dark' == $theme_options['color_scheme'] ) {
+			$default_background_color = '1d1d1d';
+	} else {
+			$default_background_color = 'e2e2e2';
+	}
 
 	// Add support for custom backgrounds.
 	add_theme_support( 'custom-background', array(
@@ -239,8 +241,9 @@ 
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
-		return;
+	if ( $text_color == HEADER_TEXTCOLOR ) {
+			return;
+	}
 
 	// If we get this far, we have custom styles. Let's do this.
 	?>
@@ -257,11 +260,14 @@ 
 		}
 	<?php
 		// If the user has set a custom color for the text use that
-		else :
+		else {
+			:
 	?>
 		#site-title a,
 		#site-description {
-			color: #<?php echo $text_color; ?>;
+			color: #<?php echo $text_color;
+		}
+		?>;
 		}
 	<?php endif; ?>
 	</style>
@@ -425,8 +431,9 @@ 
  * @return array The filtered page menu arguments.
  */
 function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
-		$args['show_home'] = true;
+	if ( ! isset( $args['show_home'] ) ) {
+			$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
@@ -528,8 +535,9 @@ 
 	$content = get_the_content();
 	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
 
-	if ( ! $has_url )
-		$has_url = twentyeleven_url_grabber();
+	if ( ! $has_url ) {
+			$has_url = twentyeleven_url_grabber();
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
@@ -543,8 +551,9 @@ 
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
-		return false;
+	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) ) {
+			return false;
+	}
 
 	return esc_url_raw( $matches[1] );
 }
@@ -557,14 +566,17 @@ 
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-3' ) ) {
+			$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-4' ) ) {
+			$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-5' ) ) {
+			$count++;
+	}
 
 	$class = '';
 
@@ -580,9 +592,10 @@ 
 			break;
 	}
 
-	if ( $class )
-		echo 'class="' . esc_attr( $class ) . '"';
-}
+	if ( $class ) {
+			echo 'class="' . esc_attr( $class ) . '"';
+	}
+	}
 
 if ( ! function_exists( 'twentyeleven_comment' ) ) :
 /**
@@ -617,8 +630,9 @@ 
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
-							$avatar_size = 39;
+						if ( '0' != $comment->comment_parent ) {
+													$avatar_size = 39;
+						}
 
 						echo get_avatar( $comment, $avatar_size );
 
@@ -691,11 +705,13 @@ 
  */
 function twentyeleven_body_classes( $classes ) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
-		$classes[] = 'single-author';
+	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() ) {
+			$classes[] = 'single-author';
+	}
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
-		$classes[] = 'singular';
+	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) ) {
+			$classes[] = 'singular';
+	}
 
 	return $classes;
 }
@@ -716,14 +732,16 @@ 
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
-			$images = explode( ',', $galleries[0]['ids'] );
+		if ( isset( $galleries[0]['ids'] ) ) {
+					$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
-			$images = explode( ',', $atts['ids'] );
+		if ( isset( $atts['ids'] ) ) {
+					$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {

Spacing +140 added lines, -140 removed lines

@@ -39,15 +39,15 @@ 
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset($content_width))
 	$content_width = 584;
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
  */
-add_action( 'after_setup_theme', 'twentyeleven_setup' );
+add_action('after_setup_theme', 'twentyeleven_setup');
 
-if ( ! function_exists( 'twentyeleven_setup' ) ):
+if ( ! function_exists('twentyeleven_setup')):
 /**
  * Set up theme defaults and registers support for various WordPress features.
  *
@@ -77,43 +77,43 @@ 
 	 * a find and replace to change 'twentyeleven' to the name
 	 * of your theme in all the template files.
 	 */
-	load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+	load_theme_textdomain('twentyeleven', get_template_directory().'/languages');
 
 	// This theme styles the visual editor with editor-style.css to match the theme style.
 	add_editor_style();
 
 	// Load up our theme options page and related code.
-	require( get_template_directory() . '/inc/theme-options.php' );
+	require(get_template_directory().'/inc/theme-options.php');
 
 	// Grab Twenty Eleven's Ephemera widget.
-	require( get_template_directory() . '/inc/widgets.php' );
+	require(get_template_directory().'/inc/widgets.php');
 
 	// Add default posts and comments RSS feed links to <head>.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
+	register_nav_menu('primary', __('Primary Menu', 'twentyeleven'));
 
 	// Add support for a variety of post formats
-	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
+	add_theme_support('post-formats', array('aside', 'link', 'gallery', 'status', 'quote', 'image'));
 
 	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
+	if ('dark' == $theme_options['color_scheme'])
 		$default_background_color = '1d1d1d';
 	else
 		$default_background_color = 'e2e2e2';
 
 	// Add support for custom backgrounds.
-	add_theme_support( 'custom-background', array(
+	add_theme_support('custom-background', array(
 		/*
 		 * Let WordPress know what our default background color is.
 		 * This is dependent on our current color scheme.
 		 */
 		'default-color' => $default_background_color,
-	) );
+	));
 
 	// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
-	add_theme_support( 'post-thumbnails' );
+	add_theme_support('post-thumbnails');
 
 	// Add support for custom headers.
 	$custom_header_support = array(
@@ -127,7 +127,7 @@ 
 		 *
 		 * @param int The default header image width in pixels. Default 1000.
 		 */
-		'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
+		'width' => apply_filters('twentyeleven_header_image_width', 1000),
 		/**
 		 * Filter the Twenty Eleven default header image height.
 		 *
@@ -135,7 +135,7 @@ 
 		 *
 		 * @param int The default header image height in pixels. Default 288.
 		 */
-		'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
+		'height' => apply_filters('twentyeleven_header_image_height', 288),
 		// Support flexible heights.
 		'flex-height' => true,
 		// Random image rotation by default.
@@ -148,15 +148,15 @@ 
 		'admin-preview-callback' => 'twentyeleven_admin_header_image',
 	);
 
-	add_theme_support( 'custom-header', $custom_header_support );
+	add_theme_support('custom-header', $custom_header_support);
 
-	if ( ! function_exists( 'get_custom_header' ) ) {
+	if ( ! function_exists('get_custom_header')) {
 		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
-		define( 'HEADER_IMAGE', '' );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
+		define('HEADER_TEXTCOLOR', $custom_header_support['default-text-color']);
+		define('HEADER_IMAGE', '');
+		define('HEADER_IMAGE_WIDTH', $custom_header_support['width']);
+		define('HEADER_IMAGE_HEIGHT', $custom_header_support['height']);
+		add_custom_image_header($custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback']);
 		add_custom_background();
 	}
 
@@ -165,74 +165,74 @@ 
 	 * We want them to be the size of the header image that we just defined.
 	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
 	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+	set_post_thumbnail_size($custom_header_support['width'], $custom_header_support['height'], true);
 
 	/*
 	 * Add Twenty Eleven's custom image sizes.
 	 * Used for large feature (header) images.
 	 */
-	add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
+	add_image_size('large-feature', $custom_header_support['width'], $custom_header_support['height'], true);
 	// Used for featured posts if a large-feature doesn't exist.
-	add_image_size( 'small-feature', 500, 300 );
+	add_image_size('small-feature', 500, 300);
 
 	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
+	register_default_headers(array(
 		'wheel' => array(
 			'url' => '%s/images/headers/wheel.jpg',
 			'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Wheel', 'twentyeleven' )
+			'description' => __('Wheel', 'twentyeleven')
 		),
 		'shore' => array(
 			'url' => '%s/images/headers/shore.jpg',
 			'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Shore', 'twentyeleven' )
+			'description' => __('Shore', 'twentyeleven')
 		),
 		'trolley' => array(
 			'url' => '%s/images/headers/trolley.jpg',
 			'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Trolley', 'twentyeleven' )
+			'description' => __('Trolley', 'twentyeleven')
 		),
 		'pine-cone' => array(
 			'url' => '%s/images/headers/pine-cone.jpg',
 			'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Pine Cone', 'twentyeleven' )
+			'description' => __('Pine Cone', 'twentyeleven')
 		),
 		'chessboard' => array(
 			'url' => '%s/images/headers/chessboard.jpg',
 			'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Chessboard', 'twentyeleven' )
+			'description' => __('Chessboard', 'twentyeleven')
 		),
 		'lanterns' => array(
 			'url' => '%s/images/headers/lanterns.jpg',
 			'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Lanterns', 'twentyeleven' )
+			'description' => __('Lanterns', 'twentyeleven')
 		),
 		'willow' => array(
 			'url' => '%s/images/headers/willow.jpg',
 			'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Willow', 'twentyeleven' )
+			'description' => __('Willow', 'twentyeleven')
 		),
 		'hanoi' => array(
 			'url' => '%s/images/headers/hanoi.jpg',
 			'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Hanoi Plant', 'twentyeleven' )
+			'description' => __('Hanoi Plant', 'twentyeleven')
 		)
-	) );
+	));
 
 	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
+	add_theme_support('customize-selective-refresh-widgets');
 }
 endif; // twentyeleven_setup
 
-if ( ! function_exists( 'twentyeleven_header_style' ) ) :
+if ( ! function_exists('twentyeleven_header_style')) :
 /**
  * Styles the header image and text displayed on the blog.
  *
@@ -242,7 +242,7 @@ 
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
+	if ($text_color == HEADER_TEXTCOLOR)
 		return;
 
 	// If we get this far, we have custom styles. Let's do this.
@@ -250,7 +250,7 @@ 
 	<style type="text/css" id="twentyeleven-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( 'blank' == $text_color ) :
+		if ('blank' == $text_color) :
 	?>
 		#site-title,
 		#site-description {
@@ -272,7 +272,7 @@ 
 }
 endif; // twentyeleven_header_style
 
-if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
+if ( ! function_exists('twentyeleven_admin_header_style')) :
 /**
  * Styles the header image displayed on the Appearance > Header admin panel.
  *
@@ -305,7 +305,7 @@ 
 	}
 	<?php
 		// If the user has set a custom color for the text use that
-		if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
+		if (get_header_textcolor() != HEADER_TEXTCOLOR) :
 	?>
 		#site-title a,
 		#site-description {
@@ -322,7 +322,7 @@ 
 }
 endif; // twentyeleven_admin_header_style
 
-if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
+if ( ! function_exists('twentyeleven_admin_header_image')) :
 /**
  * Custom header image markup displayed on the Appearance > Header admin panel.
  *
@@ -336,14 +336,14 @@ 
 		$color = get_header_textcolor();
 		$image = get_header_image();
 		$style = 'display: none;';
-		if ( $color && $color != 'blank' ) {
-			$style = 'color: #' . $color . ';';
+		if ($color && $color != 'blank') {
+			$style = 'color: #'.$color.';';
 		}
 		?>
-		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
-  		<?php if ( $image ) : ?>
-			<img src="<?php echo esc_url( $image ); ?>" alt="" />
+		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr($style); ?>" onclick="return false;" href="<?php echo esc_url(home_url('/')); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
+		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr($style); ?>"><?php bloginfo('description'); ?></div>
+  		<?php if ($image) : ?>
+			<img src="<?php echo esc_url($image); ?>" alt="" />
 		<?php endif; ?>
 	</div>
 <?php }
@@ -361,12 +361,12 @@ 
  * @param int $length The number of excerpt characters.
  * @return int The filtered number of characters.
  */
-function twentyeleven_excerpt_length( $length ) {
+function twentyeleven_excerpt_length($length) {
 	return 40;
 }
-add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
+add_filter('excerpt_length', 'twentyeleven_excerpt_length');
 
-if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
+if ( ! function_exists('twentyeleven_continue_reading_link')) :
 /**
  * Return a "Continue Reading" link for excerpts
  *
@@ -375,7 +375,7 @@ 
  * @return string The "Continue Reading" HTML link.
  */
 function twentyeleven_continue_reading_link() {
-	return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
+	return ' <a href="'.esc_url(get_permalink()).'">'.__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven').'</a>';
 }
 endif; // twentyeleven_continue_reading_link
 
@@ -392,13 +392,13 @@ 
  * @param string $more The Read More text.
  * @return The filtered Read More text.
  */
-function twentyeleven_auto_excerpt_more( $more ) {
-	if ( ! is_admin() ) {
-		return ' &hellip;' . twentyeleven_continue_reading_link();
+function twentyeleven_auto_excerpt_more($more) {
+	if ( ! is_admin()) {
+		return ' &hellip;'.twentyeleven_continue_reading_link();
 	}
 	return $more;
 }
-add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
+add_filter('excerpt_more', 'twentyeleven_auto_excerpt_more');
 
 /**
  * Add a pretty "Continue Reading" link to custom post excerpts.
@@ -411,13 +411,13 @@ 
  * @param string $output The "Continue Reading" link.
  * @return string The filtered "Continue Reading" link.
  */
-function twentyeleven_custom_excerpt_more( $output ) {
-	if ( has_excerpt() && ! is_attachment() && ! is_admin() ) {
+function twentyeleven_custom_excerpt_more($output) {
+	if (has_excerpt() && ! is_attachment() && ! is_admin()) {
 		$output .= twentyeleven_continue_reading_link();
 	}
 	return $output;
 }
-add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
+add_filter('get_the_excerpt', 'twentyeleven_custom_excerpt_more');
 
 /**
  * Show a home link for the wp_nav_menu() fallback, wp_page_menu().
@@ -427,12 +427,12 @@ 
  * @param array $args The page menu arguments. @see wp_page_menu()
  * @return array The filtered page menu arguments.
  */
-function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+function twentyeleven_page_menu_args($args) {
+	if ( ! isset($args['show_home']))
 		$args['show_home'] = true;
 	return $args;
 }
-add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
+add_filter('wp_page_menu_args', 'twentyeleven_page_menu_args');
 
 /**
  * Register sidebars and widgetized areas.
@@ -443,60 +443,60 @@ 
  */
 function twentyeleven_widgets_init() {
 
-	register_widget( 'Twenty_Eleven_Ephemera_Widget' );
+	register_widget('Twenty_Eleven_Ephemera_Widget');
 
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Main Sidebar', 'twentyeleven'),
 		'id' => 'sidebar-1',
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Showcase Sidebar', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Showcase Sidebar', 'twentyeleven'),
 		'id' => 'sidebar-2',
-		'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
+		'description' => __('The sidebar for the optional Showcase Template', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area One', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area One', 'twentyeleven'),
 		'id' => 'sidebar-3',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Two', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area Two', 'twentyeleven'),
 		'id' => 'sidebar-4',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Three', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area Three', 'twentyeleven'),
 		'id' => 'sidebar-5',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentyeleven_widgets_init' );
+add_action('widgets_init', 'twentyeleven_widgets_init');
 
-if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
+if ( ! function_exists('twentyeleven_content_nav')) :
 /**
  * Display navigation to next/previous pages when applicable.
  *
@@ -504,14 +504,14 @@ 
  *
  * @param string $html_id The HTML id attribute.
  */
-function twentyeleven_content_nav( $html_id ) {
+function twentyeleven_content_nav($html_id) {
 	global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
+	if ($wp_query->max_num_pages > 1) : ?>
+		<nav id="<?php echo esc_attr($html_id); ?>">
+			<h3 class="assistive-text"><?php _e('Post navigation', 'twentyeleven'); ?></h3>
+			<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven')); ?></div>
+			<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?></div>
 		</nav><!-- #nav-above -->
 	<?php endif;
 }
@@ -529,13 +529,13 @@ 
  */
 function twentyeleven_get_first_url() {
 	$content = get_the_content();
-	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
+	$has_url = function_exists('get_url_in_content') ? get_url_in_content($content) : false;
 
-	if ( ! $has_url )
+	if ( ! $has_url)
 		$has_url = twentyeleven_url_grabber();
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	return ($has_url) ? $has_url : apply_filters('the_permalink', get_permalink());
 }
 
 /**
@@ -546,10 +546,10 @@ 
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
+	if ( ! preg_match('/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches))
 		return false;
 
-	return esc_url_raw( $matches[1] );
+	return esc_url_raw($matches[1]);
 }
 
 /**
@@ -560,18 +560,18 @@ 
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
+	if (is_active_sidebar('sidebar-3'))
 		$count++;
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
+	if (is_active_sidebar('sidebar-4'))
 		$count++;
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
+	if (is_active_sidebar('sidebar-5'))
 		$count++;
 
 	$class = '';
 
-	switch ( $count ) {
+	switch ($count) {
 		case '1':
 			$class = 'one';
 			break;
@@ -583,11 +583,11 @@ 
 			break;
 	}
 
-	if ( $class )
-		echo 'class="' . esc_attr( $class ) . '"';
+	if ($class)
+		echo 'class="'.esc_attr($class).'"';
 }
 
-if ( ! function_exists( 'twentyeleven_comment' ) ) :
+if ( ! function_exists('twentyeleven_comment')) :
 /**
  * Template for comments and pingbacks.
  *
@@ -602,14 +602,14 @@ 
  * @param array  $args    An array of comment arguments. @see get_comment_reply_link()
  * @param int    $depth   The depth of the comment.
  */
-function twentyeleven_comment( $comment, $args, $depth ) {
+function twentyeleven_comment($comment, $args, $depth) {
 	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
+	switch ($comment->comment_type) :
 		case 'pingback' :
 		case 'trackback' :
 	?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
+		<p><?php _e('Pingback:', 'twentyeleven'); ?> <?php comment_author_link(); ?><?php edit_comment_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?></p>
 	<?php
 			break;
 		default :
@@ -620,28 +620,28 @@ 
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
+						if ('0' != $comment->comment_parent)
 							$avatar_size = 39;
 
-						echo get_avatar( $comment, $avatar_size );
+						echo get_avatar($comment, $avatar_size);
 
 						/* translators: 1: comment author, 2: date and time */
-						printf( __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
-							sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
-							sprintf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
-								esc_url( get_comment_link( $comment->comment_ID ) ),
-								get_comment_time( 'c' ),
+						printf(__('%1$s on %2$s <span class="says">said:</span>', 'twentyeleven'),
+							sprintf('<span class="fn">%s</span>', get_comment_author_link()),
+							sprintf('<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+								esc_url(get_comment_link($comment->comment_ID)),
+								get_comment_time('c'),
 								/* translators: 1: date, 2: time */
-								sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
+								sprintf(__('%1$s at %2$s', 'twentyeleven'), get_comment_date(), get_comment_time())
 							)
 						);
 					?>
 
-					<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+					<?php edit_comment_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 				</div><!-- .comment-author .vcard -->
 
-				<?php if ( $comment->comment_approved == '0' ) : ?>
-					<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
+				<?php if ($comment->comment_approved == '0') : ?>
+					<em class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.', 'twentyeleven'); ?></em>
 					<br />
 				<?php endif; ?>
 
@@ -650,7 +650,7 @@ 
 			<div class="comment-content"><?php comment_text(); ?></div>
 
 			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+				<?php comment_reply_link(array_merge($args, array('reply_text' => __('Reply <span>&darr;</span>', 'twentyeleven'), 'depth' => $depth, 'max_depth' => $args['max_depth']))); ?>
 			</div><!-- .reply -->
 		</article><!-- #comment-## -->
 
@@ -660,7 +660,7 @@ 
 }
 endif; // ends check for twentyeleven_comment()
 
-if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
+if ( ! function_exists('twentyeleven_posted_on')) :
 /**
  * Print HTML with meta information for the current post-date/time and author.
  *
@@ -669,13 +669,13 @@ 
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_posted_on() {
-	printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+	printf(__('<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven'),
+		esc_url(get_permalink()),
+		esc_attr(get_the_time()),
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date()),
+		esc_url(get_author_posts_url(get_the_author_meta('ID'))),
+		esc_attr(sprintf(__('View all posts by %s', 'twentyeleven'), get_the_author())),
 		get_the_author()
 	);
 }
@@ -692,17 +692,17 @@ 
  * @param array $classes Existing body classes.
  * @return array The filtered array of body classes.
  */
-function twentyeleven_body_classes( $classes ) {
+function twentyeleven_body_classes($classes) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
+	if (function_exists('is_multi_author') && ! is_multi_author())
 		$classes[] = 'single-author';
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
+	if (is_singular() && ! is_home() && ! is_page_template('showcase.php') && ! is_page_template('sidebar-page.php'))
 		$classes[] = 'singular';
 
 	return $classes;
 }
-add_filter( 'body_class', 'twentyeleven_body_classes' );
+add_filter('body_class', 'twentyeleven_body_classes');
 
 /**
  * Retrieve the IDs for images in a gallery.
@@ -717,20 +717,20 @@ 
 function twentyeleven_get_gallery_images() {
 	$images = array();
 
-	if ( function_exists( 'get_post_galleries' ) ) {
-		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
-			$images = explode( ',', $galleries[0]['ids'] );
+	if (function_exists('get_post_galleries')) {
+		$galleries = get_post_galleries(get_the_ID(), false);
+		if (isset($galleries[0]['ids']))
+			$images = explode(',', $galleries[0]['ids']);
 	} else {
 		$pattern = get_shortcode_regex();
-		preg_match( "/$pattern/s", get_the_content(), $match );
-		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
-			$images = explode( ',', $atts['ids'] );
+		preg_match("/$pattern/s", get_the_content(), $match);
+		$atts = shortcode_parse_atts($match[3]);
+		if (isset($atts['ids']))
+			$images = explode(',', $atts['ids']);
 	}
 
-	if ( ! $images ) {
-		$images = get_posts( array(
+	if ( ! $images) {
+		$images = get_posts(array(
 			'fields'         => 'ids',
 			'numberposts'    => 999,
 			'order'          => 'ASC',
@@ -738,7 +738,7 @@ 
 			'post_mime_type' => 'image',
 			'post_parent'    => get_the_ID(),
 			'post_type'      => 'attachment',
-		) );
+		));
 	}
 
 	return $images;

src/wp-includes/canonical.php

Doc Comments +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
  * @access private
  *
  * @param string $query_string
- * @param array $args_to_check
+ * @param string[] $args_to_check
  * @param string $url
  * @return string The altered query string
  */

Braces +143 added lines, -99 removed lines

@@ -75,10 +75,12 @@ 
 	$redirect_url = false;
 
 	// Notice fixing
-	if ( !isset($redirect['path']) )
-		$redirect['path'] = '';
-	if ( !isset($redirect['query']) )
-		$redirect['query'] = '';
+	if ( !isset($redirect['path']) ) {
+			$redirect['path'] = '';
+	}
+	if ( !isset($redirect['query']) ) {
+			$redirect['query'] = '';
+	}
 
 	// If the original URL ended with non-breaking spaces, they were almost
 	// certainly inserted by accident. Let's remove them, so the reader doesn't
@@ -102,11 +104,13 @@ 
 		$vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
 
 		if ( isset($vars[0]) && $vars = $vars[0] ) {
-			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )
-				$id = $vars->post_parent;
+			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 ) {
+							$id = $vars->post_parent;
+			}
 
-			if ( $redirect_url = get_permalink($id) )
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+			if ( $redirect_url = get_permalink($id) ) {
+							$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+			}
 		}
 	}
 
@@ -164,19 +168,23 @@ 
 				$redirect_url = get_attachment_link();
 			}
 		} elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('p')) )
-				$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
+			if ( $redirect_url = get_permalink(get_query_var('p')) ) {
+							$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
+			}
 		} elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
-				$redirect['query'] = remove_query_arg('name', $redirect['query']);
+			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) {
+							$redirect['query'] = remove_query_arg('name', $redirect['query']);
+			}
 		} elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('page_id')) )
-				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+			if ( $redirect_url = get_permalink(get_query_var('page_id')) ) {
+							$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+			}
 		} elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front')  && ! $redirect_url ) {
 			$redirect_url = home_url('/');
 		} elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
-				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+			if ( $redirect_url = get_permalink(get_option('page_for_posts')) ) {
+							$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+			}
 		} elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
 			$m = get_query_var('m');
 			switch ( strlen($m) ) {
@@ -190,29 +198,35 @@ 
 					$redirect_url = get_day_link(substr($m, 0, 4), substr($m, 4, 2), substr($m, 6, 2));
 					break;
 			}
-			if ( $redirect_url )
-				$redirect['query'] = remove_query_arg('m', $redirect['query']);
+			if ( $redirect_url ) {
+							$redirect['query'] = remove_query_arg('m', $redirect['query']);
+			}
 		// now moving on to non ?m=X year/month/day links
 		} elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && !empty($_GET['day']) ) {
-			if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
-				$redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
+			if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) ) {
+							$redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
+			}
 		} elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
-			if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
-				$redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
+			if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) ) {
+							$redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
+			}
 		} elseif ( is_year() && !empty($_GET['year']) ) {
-			if ( $redirect_url = get_year_link(get_query_var('year')) )
-				$redirect['query'] = remove_query_arg('year', $redirect['query']);
+			if ( $redirect_url = get_year_link(get_query_var('year')) ) {
+							$redirect['query'] = remove_query_arg('year', $redirect['query']);
+			}
 		} elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
 			$author = get_userdata(get_query_var('author'));
 			if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
-				if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
-					$redirect['query'] = remove_query_arg('author', $redirect['query']);
+				if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) ) {
+									$redirect['query'] = remove_query_arg('author', $redirect['query']);
+				}
 			}
 		} elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
 
 			$term_count = 0;
-			foreach ( $wp_query->tax_query->queried_terms as $tax_query )
-				$term_count += count( $tax_query['terms'] );
+			foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {
+							$term_count += count( $tax_query['terms'] );
+			}
 
 			$obj = $wp_query->get_queried_object();
 			if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
@@ -227,8 +241,9 @@ 
 						$qv_remove[] = 'tag_id';
 					} else { // Custom taxonomies will have a custom query var, remove those too:
 						$tax_obj = get_taxonomy( $obj->taxonomy );
-						if ( false !== $tax_obj->query_var )
-							$qv_remove[] = $tax_obj->query_var;
+						if ( false !== $tax_obj->query_var ) {
+													$qv_remove[] = $tax_obj->query_var;
+						}
 					}
 
 					$rewrite_vars = array_diff( array_keys($wp_query->query), array_keys($_GET) );
@@ -247,8 +262,9 @@ 
 
 					} else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
 						foreach ( $qv_remove as $_qv ) {
-							if ( isset($rewrite_vars[$_qv]) )
-								$redirect['query'] = remove_query_arg($_qv, $redirect['query']);
+							if ( isset($rewrite_vars[$_qv]) ) {
+															$redirect['query'] = remove_query_arg($_qv, $redirect['query']);
+							}
 						}
 					}
 				}
@@ -264,8 +280,9 @@ 
 
 		// Post Paging
 		if ( is_singular() && get_query_var('page') ) {
-			if ( !$redirect_url )
-				$redirect_url = get_permalink( get_queried_object_id() );
+			if ( !$redirect_url ) {
+							$redirect_url = get_permalink( get_queried_object_id() );
+			}
 
 			$page = get_query_var( 'page' );
 			if ( $page > 1 ) {
@@ -290,12 +307,14 @@ 
 			$addl_path = '';
 			if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
 				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-				if ( !is_singular() && get_query_var( 'withcomments' ) )
-					$addl_path .= 'comments/';
-				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
-				else
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+				if ( !is_singular() && get_query_var( 'withcomments' ) ) {
+									$addl_path .= 'comments/';
+				}
+				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') ) {
+									$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
+				} else {
+									$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+				}
 				$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
 			} elseif ( is_feed() && 'old' == get_query_var('feed') ) {
 				$old_feed_files = array(
@@ -336,10 +355,12 @@ 
 			}
 
 			$redirect['path'] = user_trailingslashit( preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
-			if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
-				$redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
-			if ( !empty( $addl_path ) )
-				$redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
+			if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false ) {
+							$redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
+			}
+			if ( !empty( $addl_path ) ) {
+							$redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
+			}
 			$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
 		}
 
@@ -365,29 +386,34 @@ 
 		if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
 			parse_str( $redirect['query'], $_parsed_redirect_query );
 
-			if ( empty( $_parsed_redirect_query['name'] ) )
-				unset( $_parsed_query['name'] );
+			if ( empty( $_parsed_redirect_query['name'] ) ) {
+							unset( $_parsed_query['name'] );
+			}
 		}
 
 		$_parsed_query = rawurlencode_deep( $_parsed_query );
 		$redirect_url = add_query_arg( $_parsed_query, $redirect_url );
 	}
 
-	if ( $redirect_url )
-		$redirect = @parse_url($redirect_url);
+	if ( $redirect_url ) {
+			$redirect = @parse_url($redirect_url);
+	}
 
 	// www.example.com vs example.com
 	$user_home = @parse_url(home_url());
-	if ( !empty($user_home['host']) )
-		$redirect['host'] = $user_home['host'];
-	if ( empty($user_home['path']) )
-		$user_home['path'] = '/';
+	if ( !empty($user_home['host']) ) {
+			$redirect['host'] = $user_home['host'];
+	}
+	if ( empty($user_home['path']) ) {
+			$user_home['path'] = '/';
+	}
 
 	// Handle ports
-	if ( !empty($user_home['port']) )
-		$redirect['port'] = $user_home['port'];
-	else
-		unset($redirect['port']);
+	if ( !empty($user_home['port']) ) {
+			$redirect['port'] = $user_home['port'];
+	} else {
+			unset($redirect['port']);
+	}
 
 	// trailing /index.php
 	$redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
@@ -410,8 +436,9 @@ 
 	}
 
 	// strip /index.php/ when we're not using PATHINFO permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
+	if ( !$wp_rewrite->using_index_permalinks() ) {
+			$redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
+	}
 
 	// trailing slashes
 	if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
@@ -433,42 +460,51 @@ 
 	}
 
 	// Strip multiple slashes out of the URL
-	if ( strpos($redirect['path'], '//') > -1 )
-		$redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
+	if ( strpos($redirect['path'], '//') > -1 ) {
+			$redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
+	}
 
 	// Always trailing slash the Front Page URL
-	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
-		$redirect['path'] = trailingslashit($redirect['path']);
+	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) ) {
+			$redirect['path'] = trailingslashit($redirect['path']);
+	}
 
 	// Ignore differences in host capitalization, as this can lead to infinite redirects
 	// Only redirect no-www <=> yes-www
 	if ( strtolower($original['host']) == strtolower($redirect['host']) ||
-		( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
-		$redirect['host'] = $original['host'];
+		( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) ) {
+			$redirect['host'] = $original['host'];
+	}
 
 	$compare_original = array( $original['host'], $original['path'] );
 
-	if ( !empty( $original['port'] ) )
-		$compare_original[] = $original['port'];
+	if ( !empty( $original['port'] ) ) {
+			$compare_original[] = $original['port'];
+	}
 
-	if ( !empty( $original['query'] ) )
-		$compare_original[] = $original['query'];
+	if ( !empty( $original['query'] ) ) {
+			$compare_original[] = $original['query'];
+	}
 
 	$compare_redirect = array( $redirect['host'], $redirect['path'] );
 
-	if ( !empty( $redirect['port'] ) )
-		$compare_redirect[] = $redirect['port'];
+	if ( !empty( $redirect['port'] ) ) {
+			$compare_redirect[] = $redirect['port'];
+	}
 
-	if ( !empty( $redirect['query'] ) )
-		$compare_redirect[] = $redirect['query'];
+	if ( !empty( $redirect['query'] ) ) {
+			$compare_redirect[] = $redirect['query'];
+	}
 
 	if ( $compare_original !== $compare_redirect ) {
 		$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
-		if ( !empty($redirect['port']) )
-			$redirect_url .= ':' . $redirect['port'];
+		if ( !empty($redirect['port']) ) {
+					$redirect_url .= ':' . $redirect['port'];
+		}
 		$redirect_url .= $redirect['path'];
-		if ( !empty($redirect['query']) )
-			$redirect_url .= '?' . $redirect['query'];
+		if ( !empty($redirect['query']) ) {
+					$redirect_url .= '?' . $redirect['query'];
+		}
 	}
 
 	if ( ! $redirect_url || $redirect_url == $requested_url ) {
@@ -534,8 +570,9 @@ 
 	if ( ! empty( $parsed_url['query'] ) ) {
 		parse_str( $parsed_url['query'], $parsed_query );
 		foreach ( $args_to_check as $qv ) {
-			if ( !isset( $parsed_query[$qv] ) )
-				$query_string = remove_query_arg( $qv, $query_string );
+			if ( !isset( $parsed_query[$qv] ) ) {
+							$query_string = remove_query_arg( $qv, $query_string );
+			}
 		}
 	} else {
 		$query_string = remove_query_arg( $args_to_check, $query_string );
@@ -584,27 +621,33 @@ 
 		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
 
 		// if any of post_type, year, monthnum, or day are set, use them to refine the query
-		if ( get_query_var('post_type') )
-			$where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
-		else
-			$where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
-
-		if ( get_query_var('year') )
-			$where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-		if ( get_query_var('monthnum') )
-			$where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-		if ( get_query_var('day') )
-			$where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+		if ( get_query_var('post_type') ) {
+					$where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
+		} else {
+					$where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
+		}
+
+		if ( get_query_var('year') ) {
+					$where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
+		}
+		if ( get_query_var('monthnum') ) {
+					$where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
+		}
+		if ( get_query_var('day') ) {
+					$where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+		}
 
 		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-		if ( ! $post_id )
-			return false;
-		if ( get_query_var( 'feed' ) )
-			return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-		elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
-			return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
-		else
-			return get_permalink( $post_id );
+		if ( ! $post_id ) {
+					return false;
+		}
+		if ( get_query_var( 'feed' ) ) {
+					return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
+		} elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) ) {
+					return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+		} else {
+					return get_permalink( $post_id );
+		}
 	}
 
 	return false;
@@ -622,8 +665,9 @@ 
  */
 function wp_redirect_admin_locations() {
 	global $wp_rewrite;
-	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
-		return;
+	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) {
+			return;
+	}
 
 	$admins = array(
 		home_url( 'wp-admin', 'relative' ),

Spacing +238 added lines, -238 removed lines

@@ -38,28 +38,28 @@ 
  * @param bool $do_redirect Optional. Redirect to the new URL.
  * @return string|void The string of the URL, if redirect needed.
  */
-function redirect_canonical( $requested_url = null, $do_redirect = true ) {
+function redirect_canonical($requested_url = null, $do_redirect = true) {
 	global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
 
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && ! in_array(strtoupper($_SERVER['REQUEST_METHOD']), array('GET', 'HEAD'))) {
 		return;
 	}
 
 	// If we're not in wp-admin and the post has been published and preview nonce
 	// is non-existent or invalid then no need for preview in query
-	if ( is_preview() && get_query_var( 'p' ) && 'publish' == get_post_status( get_query_var( 'p' ) ) ) {
-		if ( ! isset( $_GET['preview_id'] )
-			|| ! isset( $_GET['preview_nonce'] )
-			|| ! wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . (int) $_GET['preview_id'] ) ) {
+	if (is_preview() && get_query_var('p') && 'publish' == get_post_status(get_query_var('p'))) {
+		if ( ! isset($_GET['preview_id'])
+			|| ! isset($_GET['preview_nonce'])
+			|| ! wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.(int) $_GET['preview_id'])) {
 			$wp_query->is_preview = false;
 		}
 	}
 
-	if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) {
+	if (is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ($is_IIS && ! iis7_supports_permalinks())) {
 		return;
 	}
 
-	if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) {
+	if ( ! $requested_url && isset($_SERVER['HTTP_HOST'])) {
 		// build the URL in the address bar
 		$requested_url  = is_ssl() ? 'https://' : 'http://';
 		$requested_url .= $_SERVER['HTTP_HOST'];
@@ -67,7 +67,7 @@ 
 	}
 
 	$original = @parse_url($requested_url);
-	if ( false === $original ) {
+	if (false === $original) {
 		return;
 	}
 
@@ -75,170 +75,170 @@ 
 	$redirect_url = false;
 
 	// Notice fixing
-	if ( !isset($redirect['path']) )
+	if ( ! isset($redirect['path']))
 		$redirect['path'] = '';
-	if ( !isset($redirect['query']) )
+	if ( ! isset($redirect['query']))
 		$redirect['query'] = '';
 
 	// If the original URL ended with non-breaking spaces, they were almost
 	// certainly inserted by accident. Let's remove them, so the reader doesn't
 	// see a 404 error with no obvious cause.
-	$redirect['path'] = preg_replace( '|(%C2%A0)+$|i', '', $redirect['path'] );
+	$redirect['path'] = preg_replace('|(%C2%A0)+$|i', '', $redirect['path']);
 
 	// It's not a preview, so remove it from URL
-	if ( get_query_var( 'preview' ) ) {
-		$redirect['query'] = remove_query_arg( 'preview', $redirect['query'] );
+	if (get_query_var('preview')) {
+		$redirect['query'] = remove_query_arg('preview', $redirect['query']);
 	}
 
-	if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {
-		if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) {
-			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url );
-			$redirect['path'] = parse_url( $redirect_url, PHP_URL_PATH );
+	if (is_feed() && ($id = get_query_var('p'))) {
+		if ($redirect_url = get_post_comments_feed_link($id, get_query_var('feed'))) {
+			$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url);
+			$redirect['path'] = parse_url($redirect_url, PHP_URL_PATH);
 		}
 	}
 
-	if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
+	if (is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p'))) {
 
-		$vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+		$vars = $wpdb->get_results($wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id));
 
-		if ( isset($vars[0]) && $vars = $vars[0] ) {
-			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )
+		if (isset($vars[0]) && $vars = $vars[0]) {
+			if ('revision' == $vars->post_type && $vars->post_parent > 0)
 				$id = $vars->post_parent;
 
-			if ( $redirect_url = get_permalink($id) )
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+			if ($redirect_url = get_permalink($id))
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 		}
 	}
 
 	// These tests give us a WP-generated permalink
-	if ( is_404() ) {
+	if (is_404()) {
 
 		// Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
-		$id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') );
-		if ( $id && $redirect_post = get_post($id) ) {
+		$id = max(get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id'));
+		if ($id && $redirect_post = get_post($id)) {
 			$post_type_obj = get_post_type_object($redirect_post->post_type);
-			if ( $post_type_obj->public && 'auto-draft' != $redirect_post->post_status ) {
+			if ($post_type_obj->public && 'auto-draft' != $redirect_post->post_status) {
 				$redirect_url = get_permalink($redirect_post);
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 			}
 		}
 
-		if ( get_query_var( 'day' ) && get_query_var( 'monthnum' ) && get_query_var( 'year' ) ) {
-			$year  = get_query_var( 'year' );
-			$month = get_query_var( 'monthnum' );
-			$day   = get_query_var( 'day' );
-			$date  = sprintf( '%04d-%02d-%02d', $year, $month, $day );
-			if ( ! wp_checkdate( $month, $day, $year, $date ) ) {
-				$redirect_url = get_month_link( $year, $month );
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum', 'day' ), $redirect_url );
+		if (get_query_var('day') && get_query_var('monthnum') && get_query_var('year')) {
+			$year  = get_query_var('year');
+			$month = get_query_var('monthnum');
+			$day   = get_query_var('day');
+			$date  = sprintf('%04d-%02d-%02d', $year, $month, $day);
+			if ( ! wp_checkdate($month, $day, $year, $date)) {
+				$redirect_url = get_month_link($year, $month);
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('year', 'monthnum', 'day'), $redirect_url);
 			}
-		} elseif ( get_query_var( 'monthnum' ) && get_query_var( 'year' ) && 12 < get_query_var( 'monthnum' ) ) {
-			$redirect_url = get_year_link( get_query_var( 'year' ) );
-			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum' ), $redirect_url );
+		} elseif (get_query_var('monthnum') && get_query_var('year') && 12 < get_query_var('monthnum')) {
+			$redirect_url = get_year_link(get_query_var('year'));
+			$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('year', 'monthnum'), $redirect_url);
 		}
 
-		if ( ! $redirect_url ) {
-			if ( $redirect_url = redirect_guess_404_permalink() ) {
-				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+		if ( ! $redirect_url) {
+			if ($redirect_url = redirect_guess_404_permalink()) {
+				$redirect['query'] = _remove_qs_args_if_not_in_url($redirect['query'], array('page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type'), $redirect_url);
 			}
 		}
 
-		if ( get_query_var( 'page' ) && $wp_query->post &&
-			false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
-			$redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
-			$redirect_url = get_permalink( $wp_query->post->ID );
+		if (get_query_var('page') && $wp_query->post &&
+			false !== strpos($wp_query->post->post_content, '<!--nextpage-->')) {
+			$redirect['path'] = rtrim($redirect['path'], (int) get_query_var('page').'/');
+			$redirect['query'] = remove_query_arg('page', $redirect['query']);
+			$redirect_url = get_permalink($wp_query->post->ID);
 		}
 
-	} elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
+	} elseif (is_object($wp_rewrite) && $wp_rewrite->using_permalinks()) {
 		// rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
-		if ( is_attachment() &&
-			! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&
-			! $redirect_url ) {
-			if ( ! empty( $_GET['attachment_id'] ) ) {
-				$redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
-				if ( $redirect_url ) {
-					$redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] );
+		if (is_attachment() &&
+			! array_diff(array_keys($wp->query_vars), array('attachment', 'attachment_id')) &&
+			! $redirect_url) {
+			if ( ! empty($_GET['attachment_id'])) {
+				$redirect_url = get_attachment_link(get_query_var('attachment_id'));
+				if ($redirect_url) {
+					$redirect['query'] = remove_query_arg('attachment_id', $redirect['query']);
 				}
 			} else {
 				$redirect_url = get_attachment_link();
 			}
-		} elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('p')) )
+		} elseif (is_single() && ! empty($_GET['p']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_query_var('p')))
 				$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
-		} elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
+		} elseif (is_single() && ! empty($_GET['name']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink($wp_query->get_queried_object_id()))
 				$redirect['query'] = remove_query_arg('name', $redirect['query']);
-		} elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('page_id')) )
+		} elseif (is_page() && ! empty($_GET['page_id']) && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_query_var('page_id')))
 				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front')  && ! $redirect_url ) {
+		} elseif (is_page() && ! is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front') && ! $redirect_url) {
 			$redirect_url = home_url('/');
-		} elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
+		} elseif (is_home() && ! empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts') && ! $redirect_url) {
+			if ($redirect_url = get_permalink(get_option('page_for_posts')))
 				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
+		} elseif ( ! empty($_GET['m']) && (is_year() || is_month() || is_day())) {
 			$m = get_query_var('m');
-			switch ( strlen($m) ) {
+			switch (strlen($m)) {
 				case 4: // Yearly
 					$redirect_url = get_year_link($m);
 					break;
 				case 6: // Monthly
-					$redirect_url = get_month_link( substr($m, 0, 4), substr($m, 4, 2) );
+					$redirect_url = get_month_link(substr($m, 0, 4), substr($m, 4, 2));
 					break;
 				case 8: // Daily
 					$redirect_url = get_day_link(substr($m, 0, 4), substr($m, 4, 2), substr($m, 6, 2));
 					break;
 			}
-			if ( $redirect_url )
+			if ($redirect_url)
 				$redirect['query'] = remove_query_arg('m', $redirect['query']);
 		// now moving on to non ?m=X year/month/day links
-		} elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && !empty($_GET['day']) ) {
-			if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
+		} elseif (is_day() && get_query_var('year') && get_query_var('monthnum') && ! empty($_GET['day'])) {
+			if ($redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')))
 				$redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
-		} elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
-			if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
+		} elseif (is_month() && get_query_var('year') && ! empty($_GET['monthnum'])) {
+			if ($redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')))
 				$redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
-		} elseif ( is_year() && !empty($_GET['year']) ) {
-			if ( $redirect_url = get_year_link(get_query_var('year')) )
+		} elseif (is_year() && ! empty($_GET['year'])) {
+			if ($redirect_url = get_year_link(get_query_var('year')))
 				$redirect['query'] = remove_query_arg('year', $redirect['query']);
-		} elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
+		} elseif (is_author() && ! empty($_GET['author']) && preg_match('|^[0-9]+$|', $_GET['author'])) {
 			$author = get_userdata(get_query_var('author'));
-			if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
-				if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
+			if ((false !== $author) && $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID))) {
+				if ($redirect_url = get_author_posts_url($author->ID, $author->user_nicename))
 					$redirect['query'] = remove_query_arg('author', $redirect['query']);
 			}
-		} elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
+		} elseif (is_category() || is_tag() || is_tax()) { // Terms (Tags/categories)
 
 			$term_count = 0;
-			foreach ( $wp_query->tax_query->queried_terms as $tax_query )
-				$term_count += count( $tax_query['terms'] );
+			foreach ($wp_query->tax_query->queried_terms as $tax_query)
+				$term_count += count($tax_query['terms']);
 
 			$obj = $wp_query->get_queried_object();
-			if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
-				if ( !empty($redirect['query']) ) {
+			if ($term_count <= 1 && ! empty($obj->term_id) && ($tax_url = get_term_link((int) $obj->term_id, $obj->taxonomy)) && ! is_wp_error($tax_url)) {
+				if ( ! empty($redirect['query'])) {
 					// Strip taxonomy query vars off the url.
-					$qv_remove = array( 'term', 'taxonomy');
-					if ( is_category() ) {
+					$qv_remove = array('term', 'taxonomy');
+					if (is_category()) {
 						$qv_remove[] = 'category_name';
 						$qv_remove[] = 'cat';
-					} elseif ( is_tag() ) {
+					} elseif (is_tag()) {
 						$qv_remove[] = 'tag';
 						$qv_remove[] = 'tag_id';
 					} else { // Custom taxonomies will have a custom query var, remove those too:
-						$tax_obj = get_taxonomy( $obj->taxonomy );
-						if ( false !== $tax_obj->query_var )
+						$tax_obj = get_taxonomy($obj->taxonomy);
+						if (false !== $tax_obj->query_var)
 							$qv_remove[] = $tax_obj->query_var;
 					}
 
-					$rewrite_vars = array_diff( array_keys($wp_query->query), array_keys($_GET) );
+					$rewrite_vars = array_diff(array_keys($wp_query->query), array_keys($_GET));
 
-					if ( !array_diff($rewrite_vars, array_keys($_GET))  ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
+					if ( ! array_diff($rewrite_vars, array_keys($_GET))) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
 						$redirect['query'] = remove_query_arg($qv_remove, $redirect['query']); //Remove all of the per-tax qv's
 
 						// Create the destination url for this taxonomy
 						$tax_url = parse_url($tax_url);
-						if ( ! empty($tax_url['query']) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
+						if ( ! empty($tax_url['query'])) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
 							parse_str($tax_url['query'], $query_vars);
 							$redirect['query'] = add_query_arg($query_vars, $redirect['query']);
 						} else { // Taxonomy is accessible via a "pretty-URL"
@@ -246,40 +246,40 @@ 
 						}
 
 					} else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
-						foreach ( $qv_remove as $_qv ) {
-							if ( isset($rewrite_vars[$_qv]) )
+						foreach ($qv_remove as $_qv) {
+							if (isset($rewrite_vars[$_qv]))
 								$redirect['query'] = remove_query_arg($_qv, $redirect['query']);
 						}
 					}
 				}
 
 			}
-		} elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
-			$category = get_category_by_path( $cat );
-			if ( ( ! $category || is_wp_error( $category ) ) || ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() ) ) {
+		} elseif (is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var('category_name')) {
+			$category = get_category_by_path($cat);
+			if (( ! $category || is_wp_error($category)) || ! has_term($category->term_id, 'category', $wp_query->get_queried_object_id())) {
 				$redirect_url = get_permalink($wp_query->get_queried_object_id());
 			}
 		}
 
 		// Post Paging
-		if ( is_singular() && get_query_var('page') ) {
-			if ( !$redirect_url )
-				$redirect_url = get_permalink( get_queried_object_id() );
-
-			$page = get_query_var( 'page' );
-			if ( $page > 1 ) {
-				if ( is_front_page() ) {
-					$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( "$wp_rewrite->pagination_base/$page", 'paged' );
+		if (is_singular() && get_query_var('page')) {
+			if ( ! $redirect_url)
+				$redirect_url = get_permalink(get_queried_object_id());
+
+			$page = get_query_var('page');
+			if ($page > 1) {
+				if (is_front_page()) {
+					$redirect_url = trailingslashit($redirect_url).user_trailingslashit("$wp_rewrite->pagination_base/$page", 'paged');
 				} else {
-					$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( $page, 'single_paged' );
+					$redirect_url = trailingslashit($redirect_url).user_trailingslashit($page, 'single_paged');
 				}
 			}
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+			$redirect['query'] = remove_query_arg('page', $redirect['query']);
 		}
 
 		// paging and feeds
-		if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
-			while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
+		if (get_query_var('paged') || is_feed() || get_query_var('cpage')) {
+			while (preg_match("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path']) || preg_match('#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path']) || preg_match("#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'])) {
 				// Strip off paging and feed
 				$redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
 				$redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
@@ -287,16 +287,16 @@ 
 			}
 
 			$addl_path = '';
-			if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
-				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-				if ( !is_singular() && get_query_var( 'withcomments' ) )
+			if (is_feed() && in_array(get_query_var('feed'), $wp_rewrite->feeds)) {
+				$addl_path = ! empty($addl_path) ? trailingslashit($addl_path) : '';
+				if ( ! is_singular() && get_query_var('withcomments'))
 					$addl_path .= 'comments/';
-				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
+				if (('rss' == get_default_feed() && 'feed' == get_query_var('feed')) || 'rss' == get_query_var('feed'))
+					$addl_path .= user_trailingslashit('feed/'.((get_default_feed() == 'rss2') ? '' : 'rss2'), 'feed');
 				else
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
-				$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
-			} elseif ( is_feed() && 'old' == get_query_var('feed') ) {
+					$addl_path .= user_trailingslashit('feed/'.((get_default_feed() == get_query_var('feed') || 'feed' == get_query_var('feed')) ? '' : get_query_var('feed')), 'feed');
+				$redirect['query'] = remove_query_arg('feed', $redirect['query']);
+			} elseif (is_feed() && 'old' == get_query_var('feed')) {
 				$old_feed_files = array(
 					'wp-atom.php'         => 'atom',
 					'wp-commentsrss2.php' => 'comments_rss2',
@@ -305,178 +305,178 @@ 
 					'wp-rss.php'          => 'rss2',
 					'wp-rss2.php'         => 'rss2',
 				);
-				if ( isset( $old_feed_files[ basename( $redirect['path'] ) ] ) ) {
-					$redirect_url = get_feed_link( $old_feed_files[ basename( $redirect['path'] ) ] );
-					wp_redirect( $redirect_url, 301 );
+				if (isset($old_feed_files[basename($redirect['path'])])) {
+					$redirect_url = get_feed_link($old_feed_files[basename($redirect['path'])]);
+					wp_redirect($redirect_url, 301);
 					die();
 				}
 			}
 
-			if ( get_query_var('paged') > 0 ) {
+			if (get_query_var('paged') > 0) {
 				$paged = get_query_var('paged');
-				$redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
-				if ( !is_feed() ) {
-					if ( $paged > 1 && !is_single() ) {
-						$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
-					} elseif ( !is_single() ) {
-						$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
+				$redirect['query'] = remove_query_arg('paged', $redirect['query']);
+				if ( ! is_feed()) {
+					if ($paged > 1 && ! is_single()) {
+						$addl_path = ( ! empty($addl_path) ? trailingslashit($addl_path) : '').user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
+					} elseif ( ! is_single()) {
+						$addl_path = ! empty($addl_path) ? trailingslashit($addl_path) : '';
 					}
-				} elseif ( $paged > 1 ) {
-					$redirect['query'] = add_query_arg( 'paged', $paged, $redirect['query'] );
+				} elseif ($paged > 1) {
+					$redirect['query'] = add_query_arg('paged', $paged, $redirect['query']);
 				}
 			}
 
-			if ( get_option( 'page_comments' ) && (
-				( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) ||
-				( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 )
-			) ) {
-				$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' );
-				$redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
+			if (get_option('page_comments') && (
+				('newest' == get_option('default_comments_page') && get_query_var('cpage') > 0) ||
+				('newest' != get_option('default_comments_page') && get_query_var('cpage') > 1)
+			)) {
+				$addl_path = ( ! empty($addl_path) ? trailingslashit($addl_path) : '').user_trailingslashit($wp_rewrite->comments_pagination_base.'-'.get_query_var('cpage'), 'commentpaged');
+				$redirect['query'] = remove_query_arg('cpage', $redirect['query']);
 			}
 
-			$redirect['path'] = user_trailingslashit( preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
-			if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
-				$redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
-			if ( !empty( $addl_path ) )
-				$redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
-			$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
+			$redirect['path'] = user_trailingslashit(preg_replace('|/'.preg_quote($wp_rewrite->index, '|').'/?$|', '/', $redirect['path'])); // strip off trailing /index.php/
+			if ( ! empty($addl_path) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/'.$wp_rewrite->index.'/') === false)
+				$redirect['path'] = trailingslashit($redirect['path']).$wp_rewrite->index.'/';
+			if ( ! empty($addl_path))
+				$redirect['path'] = trailingslashit($redirect['path']).$addl_path;
+			$redirect_url = $redirect['scheme'].'://'.$redirect['host'].$redirect['path'];
 		}
 
-		if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
-			if ( is_multisite() ) {
+		if ('wp-register.php' == basename($redirect['path'])) {
+			if (is_multisite()) {
 				/** This filter is documented in wp-login.php */
-				$redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+				$redirect_url = apply_filters('wp_signup_location', network_site_url('wp-signup.php'));
 			} else {
 				$redirect_url = wp_registration_url();
 			}
 
-			wp_redirect( $redirect_url, 301 );
+			wp_redirect($redirect_url, 301);
 			die();
 		}
 	}
 
 	// tack on any additional query vars
-	$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
-	if ( $redirect_url && !empty($redirect['query']) ) {
-		parse_str( $redirect['query'], $_parsed_query );
+	$redirect['query'] = preg_replace('#^\??&*?#', '', $redirect['query']);
+	if ($redirect_url && ! empty($redirect['query'])) {
+		parse_str($redirect['query'], $_parsed_query);
 		$redirect = @parse_url($redirect_url);
 
-		if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
-			parse_str( $redirect['query'], $_parsed_redirect_query );
+		if ( ! empty($_parsed_query['name']) && ! empty($redirect['query'])) {
+			parse_str($redirect['query'], $_parsed_redirect_query);
 
-			if ( empty( $_parsed_redirect_query['name'] ) )
-				unset( $_parsed_query['name'] );
+			if (empty($_parsed_redirect_query['name']))
+				unset($_parsed_query['name']);
 		}
 
-		$_parsed_query = rawurlencode_deep( $_parsed_query );
-		$redirect_url = add_query_arg( $_parsed_query, $redirect_url );
+		$_parsed_query = rawurlencode_deep($_parsed_query);
+		$redirect_url = add_query_arg($_parsed_query, $redirect_url);
 	}
 
-	if ( $redirect_url )
+	if ($redirect_url)
 		$redirect = @parse_url($redirect_url);
 
 	// www.example.com vs example.com
 	$user_home = @parse_url(home_url());
-	if ( !empty($user_home['host']) )
+	if ( ! empty($user_home['host']))
 		$redirect['host'] = $user_home['host'];
-	if ( empty($user_home['path']) )
+	if (empty($user_home['path']))
 		$user_home['path'] = '/';
 
 	// Handle ports
-	if ( !empty($user_home['port']) )
+	if ( ! empty($user_home['port']))
 		$redirect['port'] = $user_home['port'];
 	else
 		unset($redirect['port']);
 
 	// trailing /index.php
-	$redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
+	$redirect['path'] = preg_replace('|/'.preg_quote($wp_rewrite->index, '|').'/*?$|', '/', $redirect['path']);
 
 	// Remove trailing spaces from the path
-	$redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
+	$redirect['path'] = preg_replace('#(%20| )+$#', '', $redirect['path']);
 
-	if ( !empty( $redirect['query'] ) ) {
+	if ( ! empty($redirect['query'])) {
 		// Remove trailing spaces from certain terminating query string args
-		$redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+		$redirect['query'] = preg_replace('#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query']);
 
 		// Clean up empty query strings
-		$redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
+		$redirect['query'] = trim(preg_replace('#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
 		// Redirect obsolete feeds
-		$redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query'] );
+		$redirect['query'] = preg_replace('#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query']);
 
 		// Remove redundant leading ampersands
-		$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
+		$redirect['query'] = preg_replace('#^\??&*?#', '', $redirect['query']);
 	}
 
 	// strip /index.php/ when we're not using PATHINFO permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
+	if ( ! $wp_rewrite->using_index_permalinks())
+		$redirect['path'] = str_replace('/'.$wp_rewrite->index.'/', '/', $redirect['path']);
 
 	// trailing slashes
-	if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
+	if (is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && ! is_404() && ( ! is_front_page() || (is_front_page() && (get_query_var('paged') > 1)))) {
 		$user_ts_type = '';
-		if ( get_query_var('paged') > 0 ) {
+		if (get_query_var('paged') > 0) {
 			$user_ts_type = 'paged';
 		} else {
-			foreach ( array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type ) {
-				$func = 'is_' . $type;
-				if ( call_user_func($func) ) {
+			foreach (array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type) {
+				$func = 'is_'.$type;
+				if (call_user_func($func)) {
 					$user_ts_type = $type;
 					break;
 				}
 			}
 		}
 		$redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
-	} elseif ( is_front_page() ) {
+	} elseif (is_front_page()) {
 		$redirect['path'] = trailingslashit($redirect['path']);
 	}
 
 	// Strip multiple slashes out of the URL
-	if ( strpos($redirect['path'], '//') > -1 )
+	if (strpos($redirect['path'], '//') > -1)
 		$redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
 
 	// Always trailing slash the Front Page URL
-	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
+	if (trailingslashit($redirect['path']) == trailingslashit($user_home['path']))
 		$redirect['path'] = trailingslashit($redirect['path']);
 
 	// Ignore differences in host capitalization, as this can lead to infinite redirects
 	// Only redirect no-www <=> yes-www
-	if ( strtolower($original['host']) == strtolower($redirect['host']) ||
-		( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
+	if (strtolower($original['host']) == strtolower($redirect['host']) ||
+		(strtolower($original['host']) != 'www.'.strtolower($redirect['host']) && 'www.'.strtolower($original['host']) != strtolower($redirect['host'])))
 		$redirect['host'] = $original['host'];
 
-	$compare_original = array( $original['host'], $original['path'] );
+	$compare_original = array($original['host'], $original['path']);
 
-	if ( !empty( $original['port'] ) )
+	if ( ! empty($original['port']))
 		$compare_original[] = $original['port'];
 
-	if ( !empty( $original['query'] ) )
+	if ( ! empty($original['query']))
 		$compare_original[] = $original['query'];
 
-	$compare_redirect = array( $redirect['host'], $redirect['path'] );
+	$compare_redirect = array($redirect['host'], $redirect['path']);
 
-	if ( !empty( $redirect['port'] ) )
+	if ( ! empty($redirect['port']))
 		$compare_redirect[] = $redirect['port'];
 
-	if ( !empty( $redirect['query'] ) )
+	if ( ! empty($redirect['query']))
 		$compare_redirect[] = $redirect['query'];
 
-	if ( $compare_original !== $compare_redirect ) {
-		$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
-		if ( !empty($redirect['port']) )
-			$redirect_url .= ':' . $redirect['port'];
+	if ($compare_original !== $compare_redirect) {
+		$redirect_url = $redirect['scheme'].'://'.$redirect['host'];
+		if ( ! empty($redirect['port']))
+			$redirect_url .= ':'.$redirect['port'];
 		$redirect_url .= $redirect['path'];
-		if ( !empty($redirect['query']) )
-			$redirect_url .= '?' . $redirect['query'];
+		if ( ! empty($redirect['query']))
+			$redirect_url .= '?'.$redirect['query'];
 	}
 
-	if ( ! $redirect_url || $redirect_url == $requested_url ) {
+	if ( ! $redirect_url || $redirect_url == $requested_url) {
 		return;
 	}
 
 	// Hex encoded octets are case-insensitive.
-	if ( false !== strpos($requested_url, '%') ) {
-		if ( !function_exists('lowercase_octets') ) {
+	if (false !== strpos($requested_url, '%')) {
+		if ( ! function_exists('lowercase_octets')) {
 			/**
 			 * Converts the first hex-encoded octet match to lowercase.
 			 *
@@ -487,7 +487,7 @@ 
 			 * @return string Lowercased version of the first match.
 			 */
 			function lowercase_octets($matches) {
-				return strtolower( $matches[0] );
+				return strtolower($matches[0]);
 			}
 		}
 		$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
@@ -503,16 +503,16 @@ 
 	 * @param string $redirect_url  The redirect URL.
 	 * @param string $requested_url The requested URL.
 	 */
-	$redirect_url = apply_filters( 'redirect_canonical', $redirect_url, $requested_url );
+	$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
 
 	// yes, again -- in case the filter aborted the request
-	if ( ! $redirect_url || strip_fragment_from_url( $redirect_url ) == strip_fragment_from_url( $requested_url ) ) {
+	if ( ! $redirect_url || strip_fragment_from_url($redirect_url) == strip_fragment_from_url($requested_url)) {
 		return;
 	}
 
-	if ( $do_redirect ) {
+	if ($do_redirect) {
 		// protect against chained redirects
-		if ( !redirect_canonical($redirect_url, false) ) {
+		if ( ! redirect_canonical($redirect_url, false)) {
 			wp_redirect($redirect_url, 301);
 			exit();
 		} else {
@@ -537,16 +537,16 @@ 
  * @param string $url
  * @return string The altered query string
  */
-function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
-	$parsed_url = @parse_url( $url );
-	if ( ! empty( $parsed_url['query'] ) ) {
-		parse_str( $parsed_url['query'], $parsed_query );
-		foreach ( $args_to_check as $qv ) {
-			if ( !isset( $parsed_query[$qv] ) )
-				$query_string = remove_query_arg( $qv, $query_string );
+function _remove_qs_args_if_not_in_url($query_string, Array $args_to_check, $url) {
+	$parsed_url = @parse_url($url);
+	if ( ! empty($parsed_url['query'])) {
+		parse_str($parsed_url['query'], $parsed_query);
+		foreach ($args_to_check as $qv) {
+			if ( ! isset($parsed_query[$qv]))
+				$query_string = remove_query_arg($qv, $query_string);
 		}
 	} else {
-		$query_string = remove_query_arg( $args_to_check, $query_string );
+		$query_string = remove_query_arg($args_to_check, $query_string);
 	}
 	return $query_string;
 }
@@ -559,17 +559,17 @@ 
  * @param string $url The URL to strip.
  * @return string The altered URL.
  */
-function strip_fragment_from_url( $url ) {
-	$parsed_url = @parse_url( $url );
-	if ( ! empty( $parsed_url['host'] ) ) {
+function strip_fragment_from_url($url) {
+	$parsed_url = @parse_url($url);
+	if ( ! empty($parsed_url['host'])) {
 		// This mirrors code in redirect_canonical(). It does not handle every case.
-		$url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
-		if ( ! empty( $parsed_url['port'] ) ) {
-			$url .= ':' . $parsed_url['port'];
+		$url = $parsed_url['scheme'].'://'.$parsed_url['host'];
+		if ( ! empty($parsed_url['port'])) {
+			$url .= ':'.$parsed_url['port'];
 		}
 		$url .= $parsed_url['path'];
-		if ( ! empty( $parsed_url['query'] ) ) {
-			$url .= '?' . $parsed_url['query'];
+		if ( ! empty($parsed_url['query'])) {
+			$url .= '?'.$parsed_url['query'];
 		}
 	}
 
@@ -588,31 +588,31 @@ 
 function redirect_guess_404_permalink() {
 	global $wpdb;
 
-	if ( get_query_var('name') ) {
-		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
+	if (get_query_var('name')) {
+		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like(get_query_var('name')).'%');
 
 		// if any of post_type, year, monthnum, or day are set, use them to refine the query
-		if ( get_query_var('post_type') )
+		if (get_query_var('post_type'))
 			$where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
 		else
-			$where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
+			$where .= " AND post_type IN ('".implode("', '", get_post_types(array('public' => true)))."')";
 
-		if ( get_query_var('year') )
+		if (get_query_var('year'))
 			$where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-		if ( get_query_var('monthnum') )
+		if (get_query_var('monthnum'))
 			$where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-		if ( get_query_var('day') )
+		if (get_query_var('day'))
 			$where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
 
 		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-		if ( ! $post_id )
+		if ( ! $post_id)
 			return false;
-		if ( get_query_var( 'feed' ) )
-			return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-		elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
-			return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+		if (get_query_var('feed'))
+			return get_post_comments_feed_link($post_id, get_query_var('feed'));
+		elseif (get_query_var('page') && 1 < get_query_var('page'))
+			return trailingslashit(get_permalink($post_id)).user_trailingslashit(get_query_var('page'), 'single_paged');
 		else
-			return get_permalink( $post_id );
+			return get_permalink($post_id);
 	}
 
 	return false;
@@ -630,28 +630,28 @@ 
  */
 function wp_redirect_admin_locations() {
 	global $wp_rewrite;
-	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
+	if ( ! (is_404() && $wp_rewrite->using_permalinks()))
 		return;
 
 	$admins = array(
-		home_url( 'wp-admin', 'relative' ),
-		home_url( 'dashboard', 'relative' ),
-		home_url( 'admin', 'relative' ),
-		site_url( 'dashboard', 'relative' ),
-		site_url( 'admin', 'relative' ),
+		home_url('wp-admin', 'relative'),
+		home_url('dashboard', 'relative'),
+		home_url('admin', 'relative'),
+		site_url('dashboard', 'relative'),
+		site_url('admin', 'relative'),
 	);
-	if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
-		wp_redirect( admin_url() );
+	if (in_array(untrailingslashit($_SERVER['REQUEST_URI']), $admins)) {
+		wp_redirect(admin_url());
 		exit;
 	}
 
 	$logins = array(
-		home_url( 'wp-login.php', 'relative' ),
-		home_url( 'login', 'relative' ),
-		site_url( 'login', 'relative' ),
+		home_url('wp-login.php', 'relative'),
+		home_url('login', 'relative'),
+		site_url('login', 'relative'),
 	);
-	if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
-		wp_redirect( wp_login_url() );
+	if (in_array(untrailingslashit($_SERVER['REQUEST_URI']), $logins)) {
+		wp_redirect(wp_login_url());
 		exit;
 	}
 }

src/wp-includes/class-phpass.php

Doc Comments +18 added lines

@@ -62,6 +62,9 @@ 
 		self::__construct( $iteration_count_log2, $portable_hashes );
 	}
 
+	/**
+	 * @param integer $count
+	 */
 	function get_random_bytes($count)
 	{
 		$output = '';
@@ -85,6 +88,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param integer $count
+	 */
 	function encode64($input, $count)
 	{
 		$output = '';
@@ -108,6 +114,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $input
+	 */
 	function gensalt_private($input)
 	{
 		$output = '$P$';
@@ -163,6 +172,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $input
+	 */
 	function gensalt_extended($input)
 	{
 		$count_log2 = min($this->iteration_count_log2 + 8, 24);
@@ -181,6 +193,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $input
+	 */
 	function gensalt_blowfish($input)
 	{
 		# This one needs to use a different order of characters and a
@@ -222,6 +237,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $password
+	 */
 	function HashPassword($password)
 	{
 		if ( strlen( $password ) > 4096 ) {

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $iteration_count_log2, $portable_hashes )
+	function __construct($iteration_count_log2, $portable_hashes)
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
@@ -52,20 +52,20 @@ 
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime() . uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
+		$this->random_state = microtime().uniqid(rand(), TRUE); // removed getmypid() for compatibility reasons
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function PasswordHash( $iteration_count_log2, $portable_hashes ) {
-		self::__construct( $iteration_count_log2, $portable_hashes );
+	public function PasswordHash($iteration_count_log2, $portable_hashes) {
+		self::__construct($iteration_count_log2, $portable_hashes);
 	}
 
 	function get_random_bytes($count)
 	{
 		$output = '';
-		if ( @is_readable('/dev/urandom') &&
+		if (@is_readable('/dev/urandom') &&
 		    ($fh = @fopen('/dev/urandom', 'rb'))) {
 			$output = fread($fh, $count);
 			fclose($fh);
@@ -75,7 +75,7 @@ 
 			$output = '';
 			for ($i = 0; $i < $count; $i += 16) {
 				$this->random_state =
-				    md5(microtime() . $this->random_state);
+				    md5(microtime().$this->random_state);
 				$output .=
 				    pack('H*', md5($this->random_state));
 			}
@@ -146,14 +146,14 @@ 
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
 		if (PHP_VERSION >= '5') {
-			$hash = md5($salt . $password, TRUE);
+			$hash = md5($salt.$password, TRUE);
 			do {
-				$hash = md5($hash . $password, TRUE);
+				$hash = md5($hash.$password, TRUE);
 			} while (--$count);
 		} else {
-			$hash = pack('H*', md5($salt . $password));
+			$hash = pack('H*', md5($salt.$password));
 			do {
-				$hash = pack('H*', md5($hash . $password));
+				$hash = pack('H*', md5($hash.$password));
 			} while (--$count);
 		}
 
@@ -224,13 +224,13 @@ 
 
 	function HashPassword($password)
 	{
-		if ( strlen( $password ) > 4096 ) {
+		if (strlen($password) > 4096) {
 			return '*';
 		}
 
 		$random = '';
 
-		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+		if (CRYPT_BLOWFISH == 1 && ! $this->portable_hashes) {
 			$random = $this->get_random_bytes(16);
 			$hash =
 			    crypt($password, $this->gensalt_blowfish($random));
@@ -238,7 +238,7 @@ 
 				return $hash;
 		}
 
-		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+		if (CRYPT_EXT_DES == 1 && ! $this->portable_hashes) {
 			if (strlen($random) < 3)
 				$random = $this->get_random_bytes(3);
 			$hash =
@@ -263,7 +263,7 @@ 
 
 	function CheckPassword($password, $stored_hash)
 	{
-		if ( strlen( $password ) > 4096 ) {
+		if (strlen($password) > 4096) {
 			return false;
 		}
 

Braces +45 added lines, -30 removed lines

@@ -46,8 +46,9 @@ 
 	{
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
-		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-			$iteration_count_log2 = 8;
+		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
+					$iteration_count_log2 = 8;
+		}
 		$this->iteration_count_log2 = $iteration_count_log2;
 
 		$this->portable_hashes = $portable_hashes;
@@ -92,16 +93,20 @@ 
 		do {
 			$value = ord($input[$i++]);
 			$output .= $this->itoa64[$value & 0x3f];
-			if ($i < $count)
-				$value |= ord($input[$i]) << 8;
+			if ($i < $count) {
+							$value |= ord($input[$i]) << 8;
+			}
 			$output .= $this->itoa64[($value >> 6) & 0x3f];
-			if ($i++ >= $count)
-				break;
-			if ($i < $count)
-				$value |= ord($input[$i]) << 16;
+			if ($i++ >= $count) {
+							break;
+			}
+			if ($i < $count) {
+							$value |= ord($input[$i]) << 16;
+			}
 			$output .= $this->itoa64[($value >> 12) & 0x3f];
-			if ($i++ >= $count)
-				break;
+			if ($i++ >= $count) {
+							break;
+			}
 			$output .= $this->itoa64[($value >> 18) & 0x3f];
 		} while ($i < $count);
 
@@ -121,23 +126,27 @@ 
 	function crypt_private($password, $setting)
 	{
 		$output = '*0';
-		if (substr($setting, 0, 2) == $output)
-			$output = '*1';
+		if (substr($setting, 0, 2) == $output) {
+					$output = '*1';
+		}
 
 		$id = substr($setting, 0, 3);
 		# We use "$P$", phpBB3 uses "$H$" for the same thing
-		if ($id != '$P$' && $id != '$H$')
-			return $output;
+		if ($id != '$P$' && $id != '$H$') {
+					return $output;
+		}
 
 		$count_log2 = strpos($this->itoa64, $setting[3]);
-		if ($count_log2 < 7 || $count_log2 > 30)
-			return $output;
+		if ($count_log2 < 7 || $count_log2 > 30) {
+					return $output;
+		}
 
 		$count = 1 << $count_log2;
 
 		$salt = substr($setting, 4, 8);
-		if (strlen($salt) != 8)
-			return $output;
+		if (strlen($salt) != 8) {
+					return $output;
+		}
 
 		# We're kind of forced to use MD5 here since it's the only
 		# cryptographic primitive available in all versions of PHP
@@ -234,26 +243,31 @@ 
 			$random = $this->get_random_bytes(16);
 			$hash =
 			    crypt($password, $this->gensalt_blowfish($random));
-			if (strlen($hash) == 60)
-				return $hash;
+			if (strlen($hash) == 60) {
+							return $hash;
+			}
 		}
 
 		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
-			if (strlen($random) < 3)
-				$random = $this->get_random_bytes(3);
+			if (strlen($random) < 3) {
+							$random = $this->get_random_bytes(3);
+			}
 			$hash =
 			    crypt($password, $this->gensalt_extended($random));
-			if (strlen($hash) == 20)
-				return $hash;
+			if (strlen($hash) == 20) {
+							return $hash;
+			}
 		}
 
-		if (strlen($random) < 6)
-			$random = $this->get_random_bytes(6);
+		if (strlen($random) < 6) {
+					$random = $this->get_random_bytes(6);
+		}
 		$hash =
 		    $this->crypt_private($password,
 		    $this->gensalt_private($random));
-		if (strlen($hash) == 34)
-			return $hash;
+		if (strlen($hash) == 34) {
+					return $hash;
+		}
 
 		# Returning '*' on error is safe here, but would _not_ be safe
 		# in a crypt(3)-like function used _both_ for generating new
@@ -268,8 +282,9 @@ 
 		}
 
 		$hash = $this->crypt_private($password, $stored_hash);
-		if ($hash[0] == '*')
-			$hash = crypt($password, $stored_hash);
+		if ($hash[0] == '*') {
+					$hash = crypt($password, $stored_hash);
+		}
 
 		return $hash === $stored_hash;
 	}

Indentation +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
 	{
 		$output = '';
 		if ( @is_readable('/dev/urandom') &&
-		    ($fh = @fopen('/dev/urandom', 'rb'))) {
+			($fh = @fopen('/dev/urandom', 'rb'))) {
 			$output = fread($fh, $count);
 			fclose($fh);
 		}
@@ -75,9 +75,9 @@ 
 			$output = '';
 			for ($i = 0; $i < $count; $i += 16) {
 				$this->random_state =
-				    md5(microtime() . $this->random_state);
+					md5(microtime() . $this->random_state);
 				$output .=
-				    pack('H*', md5($this->random_state));
+					pack('H*', md5($this->random_state));
 			}
 			$output = substr($output, 0, $count);
 		}
@@ -233,7 +233,7 @@ 
 		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
 			$random = $this->get_random_bytes(16);
 			$hash =
-			    crypt($password, $this->gensalt_blowfish($random));
+				crypt($password, $this->gensalt_blowfish($random));
 			if (strlen($hash) == 60)
 				return $hash;
 		}
@@ -242,7 +242,7 @@ 
 			if (strlen($random) < 3)
 				$random = $this->get_random_bytes(3);
 			$hash =
-			    crypt($password, $this->gensalt_extended($random));
+				crypt($password, $this->gensalt_extended($random));
 			if (strlen($hash) == 20)
 				return $hash;
 		}
@@ -250,8 +250,8 @@ 
 		if (strlen($random) < 6)
 			$random = $this->get_random_bytes(6);
 		$hash =
-		    $this->crypt_private($password,
-		    $this->gensalt_private($random));
+			$this->crypt_private($password,
+			$this->gensalt_private($random));
 		if (strlen($hash) == 34)
 			return $hash;
 

src/wp-includes/class-pop3.php

Doc Comments +3 added lines

@@ -626,6 +626,9 @@
         }
     }
 
+    /**
+     * @param string $server_text
+     */
     function parse_banner ( $server_text ) {
         $outside = true;
         $banner = "";

Spacing +182 added lines, -182 removed lines

@@ -17,49 +17,49 @@ 
  */
 
 class POP3 {
-    var $ERROR      = '';       //  Error string.
+    var $ERROR      = ''; //  Error string.
 
-    var $TIMEOUT    = 60;       //  Default timeout before giving up on a
+    var $TIMEOUT    = 60; //  Default timeout before giving up on a
                                 //  network operation.
 
-    var $COUNT      = -1;       //  Mailbox msg count
+    var $COUNT      = -1; //  Mailbox msg count
 
-    var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
+    var $BUFFER     = 512; //  Socket buffer for socket fgets() calls.
                                 //  Per RFC 1939 the returned line a POP3
                                 //  server can send is 512 bytes.
 
-    var $FP         = '';       //  The connection to the server's
+    var $FP         = ''; //  The connection to the server's
                                 //  file descriptor
 
-    var $MAILSERVER = '';       // Set this to hard code the server name
+    var $MAILSERVER = ''; // Set this to hard code the server name
 
-    var $DEBUG      = FALSE;    // set to true to echo pop3
+    var $DEBUG      = FALSE; // set to true to echo pop3
                                 // commands and responses to error_log
                                 // this WILL log passwords!
 
-    var $BANNER     = '';       //  Holds the banner returned by the
+    var $BANNER     = ''; //  Holds the banner returned by the
                                 //  pop server - used for apop()
 
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
+    var $ALLOWAPOP  = FALSE; //  Allow or disallow apop()
                                 //  This must be set to true
                                 //  manually
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct ( $server = '', $timeout = '' ) {
-        settype($this->BUFFER,"integer");
-        if( !empty($server) ) {
+    function __construct($server = '', $timeout = '') {
+        settype($this->BUFFER, "integer");
+        if ( ! empty($server)) {
             // Do not allow programs to alter MAILSERVER
             // if it is already specified. They can get around
             // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
+            if (empty($this->MAILSERVER))
                 $this->MAILSERVER = $server;
         }
-        if(!empty($timeout)) {
-            settype($timeout,"integer");
+        if ( ! empty($timeout)) {
+            settype($timeout, "integer");
             $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
+            if ( ! ini_get('safe_mode'))
                 set_time_limit($timeout);
         }
         return true;
@@ -68,48 +68,48 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POP3( $server = '', $timeout = '' ) {
-		self::__construct( $server, $timeout );
+	public function POP3($server = '', $timeout = '') {
+		self::__construct($server, $timeout);
 	}
 
-    function update_timer () {
-        if (!ini_get('safe_mode'))
+    function update_timer() {
+        if ( ! ini_get('safe_mode'))
             set_time_limit($this->TIMEOUT);
         return true;
     }
 
-    function connect ($server, $port = 110)  {
+    function connect($server, $port = 110) {
         //  Opens a socket to the specified server. Unless overridden,
         //  port defaults to 110. Returns true on success, false on fail
 
         // If MAILSERVER is set, override $server with it's value
 
-    if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
+    if ( ! isset($port) || ! $port) {$port = 110; }
+        if ( ! empty($this->MAILSERVER))
             $server = $this->MAILSERVER;
 
-        if(empty($server)){
-            $this->ERROR = "POP3 connect: " . _("No server specified");
+        if (empty($server)) {
+            $this->ERROR = "POP3 connect: "._("No server specified");
             unset($this->FP);
             return false;
         }
 
         $fp = @fsockopen("$server", $port, $errno, $errstr);
 
-        if(!$fp) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
+        if ( ! $fp) {
+            $this->ERROR = "POP3 connect: "._("Error ")."[$errno] [$errstr]";
             unset($this->FP);
             return false;
         }
 
-        socket_set_blocking($fp,-1);
+        socket_set_blocking($fp, -1);
         $this->update_timer();
-        $reply = fgets($fp,$this->BUFFER);
+        $reply = fgets($fp, $this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
-        if(!$this->is_ok($reply)) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
+        if ($this->DEBUG)
+            error_log("POP3 SEND [connect: $server] GOT [$reply]", 0);
+        if ( ! $this->is_ok($reply)) {
+            $this->ERROR = "POP3 connect: "._("Error ")."[$reply]";
             unset($this->FP);
             return false;
         }
@@ -118,39 +118,39 @@ 
         return true;
     }
 
-    function user ($user = "") {
+    function user($user = "") {
         // Sends the USER command, returns true or false
 
-        if( empty($user) ) {
-            $this->ERROR = "POP3 user: " . _("no login ID submitted");
+        if (empty($user)) {
+            $this->ERROR = "POP3 user: "._("no login ID submitted");
             return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 user: " . _("connection not established");
+        } elseif ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 user: "._("connection not established");
             return false;
         } else {
             $reply = $this->send_cmd("USER $user");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
+            if ( ! $this->is_ok($reply)) {
+                $this->ERROR = "POP3 user: "._("Error ")."[$reply]";
                 return false;
             } else
                 return true;
         }
     }
 
-    function pass ($pass = "")     {
+    function pass($pass = "") {
         // Sends the PASS command, returns # of msgs in mailbox,
         // returns false (undef) on Auth failure
 
-        if(empty($pass)) {
-            $this->ERROR = "POP3 pass: " . _("No password submitted");
+        if (empty($pass)) {
+            $this->ERROR = "POP3 pass: "._("No password submitted");
             return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 pass: " . _("connection not established");
+        } elseif ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 pass: "._("connection not established");
             return false;
         } else {
             $reply = $this->send_cmd("PASS $pass");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
+            if ( ! $this->is_ok($reply)) {
+                $this->ERROR = "POP3 pass: "._("Authentication failed")." [$reply]";
                 $this->quit();
                 return false;
             } else {
@@ -162,29 +162,29 @@ 
         }
     }
 
-    function apop ($login,$pass) {
+    function apop($login, $pass) {
         //  Attempts an APOP login. If this fails, it'll
         //  try a standard login. YOUR SERVER MUST SUPPORT
         //  THE USE OF THE APOP COMMAND!
         //  (apop is optional per rfc1939)
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 apop: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 apop: "._("No connection to server");
             return false;
-        } elseif(!$this->ALLOWAPOP) {
-            $retVal = $this->login($login,$pass);
+        } elseif ( ! $this->ALLOWAPOP) {
+            $retVal = $this->login($login, $pass);
             return $retVal;
-        } elseif(empty($login)) {
-            $this->ERROR = "POP3 apop: " . _("No login ID submitted");
+        } elseif (empty($login)) {
+            $this->ERROR = "POP3 apop: "._("No login ID submitted");
             return false;
-        } elseif(empty($pass)) {
-            $this->ERROR = "POP3 apop: " . _("No password submitted");
+        } elseif (empty($pass)) {
+            $this->ERROR = "POP3 apop: "._("No password submitted");
             return false;
         } else {
             $banner = $this->BANNER;
-            if( (!$banner) or (empty($banner)) ) {
-                $this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
-                $retVal = $this->login($login,$pass);
+            if (( ! $banner) or (empty($banner))) {
+                $this->ERROR = "POP3 apop: "._("No server banner").' - '._("abort");
+                $retVal = $this->login($login, $pass);
                 return $retVal;
             } else {
                 $AuthString = $banner;
@@ -192,9 +192,9 @@ 
                 $APOPString = md5($AuthString);
                 $cmd = "APOP $login $APOPString";
                 $reply = $this->send_cmd($cmd);
-                if(!$this->is_ok($reply)) {
-                    $this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
-                    $retVal = $this->login($login,$pass);
+                if ( ! $this->is_ok($reply)) {
+                    $this->ERROR = "POP3 apop: "._("apop authentication failed").' - '._("abort");
+                    $retVal = $this->login($login, $pass);
                     return $retVal;
                 } else {
                     //  Auth successful.
@@ -206,22 +206,22 @@ 
         }
     }
 
-    function login ($login = "", $pass = "") {
+    function login($login = "", $pass = "") {
         // Sends both user and pass. Returns # of msgs in mailbox or
         // false on failure (or -1, if the error occurs while getting
         // the number of messages.)
 
-        if( !isset($this->FP) ) {
-            $this->ERROR = "POP3 login: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 login: "._("No connection to server");
             return false;
         } else {
             $fp = $this->FP;
-            if( !$this->user( $login ) ) {
+            if ( ! $this->user($login)) {
                 //  Preserve the error generated by user()
                 return false;
             } else {
                 $count = $this->pass($pass);
-                if( (!$count) || ($count == -1) ) {
+                if (( ! $count) || ($count == -1)) {
                     //  Preserve the error generated by last() and pass()
                     return false;
                 } else
@@ -230,14 +230,14 @@ 
         }
     }
 
-    function top ($msgNum, $numLines = "0") {
+    function top($msgNum, $numLines = "0") {
         //  Gets the header and first $numLines of the msg body
         //  returns data in an array with each returned line being
         //  an array element. If $numLines is empty, returns
         //  only the header information, and none of the body.
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 top: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 top: "._("No connection to server");
             return false;
         }
         $this->update_timer();
@@ -248,94 +248,94 @@ 
         fwrite($fp, "TOP $msgNum $numLines\r\n");
         $reply = fgets($fp, $buffer);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) {
-            @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+        if ($this->DEBUG) {
+            @error_log("POP3 SEND [$cmd] GOT [$reply]", 0);
         }
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 top: "._("Error ")."[$reply]";
             return false;
         }
 
         $count = 0;
         $MsgArray = array();
 
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
+        $line = fgets($fp, $buffer);
+        while ( ! preg_match('/^\.\r\n/', $line))
         {
             $MsgArray[$count] = $line;
             $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
+            $line = fgets($fp, $buffer);
+            if (empty($line)) { break; }
         }
 
         return $MsgArray;
     }
 
-    function pop_list ($msgNum = "") {
+    function pop_list($msgNum = "") {
         //  If called with an argument, returns that msgs' size in octets
         //  No argument returns an associative array of undeleted
         //  msg numbers and their sizes in octets
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 pop_list: " . _("No connection to server");
+            $this->ERROR = "POP3 pop_list: "._("No connection to server");
             return false;
         }
         $fp = $this->FP;
         $Total = $this->COUNT;
-        if( (!$Total) or ($Total == -1) )
+        if (( ! $Total) or ($Total == -1))
         {
             return false;
         }
-        if($Total == 0)
+        if ($Total == 0)
         {
-            return array("0","0");
+            return array("0", "0");
             // return -1;   // mailbox empty
         }
 
         $this->update_timer();
 
-        if(!empty($msgNum))
+        if ( ! empty($msgNum))
         {
             $cmd = "LIST $msgNum";
-            fwrite($fp,"$cmd\r\n");
-            $reply = fgets($fp,$this->BUFFER);
+            fwrite($fp, "$cmd\r\n");
+            $reply = fgets($fp, $this->BUFFER);
             $reply = $this->strip_clf($reply);
-            if($this->DEBUG) {
-                @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+            if ($this->DEBUG) {
+                @error_log("POP3 SEND [$cmd] GOT [$reply]", 0);
             }
-            if(!$this->is_ok($reply))
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 pop_list: "._("Error ")."[$reply]";
                 return false;
             }
-            list($junk,$num,$size) = preg_split('/\s+/',$reply);
+            list($junk, $num, $size) = preg_split('/\s+/', $reply);
             return $size;
         }
         $cmd = "LIST";
         $reply = $this->send_cmd($cmd);
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
             $reply = $this->strip_clf($reply);
-            $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
+            $this->ERROR = "POP3 pop_list: "._("Error ")."[$reply]";
             return false;
         }
         $MsgArray = array();
         $MsgArray[0] = $Total;
-        for($msgC=1;$msgC <= $Total; $msgC++)
+        for ($msgC = 1; $msgC <= $Total; $msgC++)
         {
-            if($msgC > $Total) { break; }
-            $line = fgets($fp,$this->BUFFER);
+            if ($msgC > $Total) { break; }
+            $line = fgets($fp, $this->BUFFER);
             $line = $this->strip_clf($line);
-            if(strpos($line, '.') === 0)
+            if (strpos($line, '.') === 0)
             {
-                $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
+                $this->ERROR = "POP3 pop_list: "._("Premature end of list");
                 return false;
             }
-            list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
-            settype($thisMsg,"integer");
-            if($thisMsg != $msgC)
+            list($thisMsg, $msgSize) = preg_split('/\s+/', $line);
+            settype($thisMsg, "integer");
+            if ($thisMsg != $msgC)
             {
                 $MsgArray[$msgC] = "deleted";
             }
@@ -347,13 +347,13 @@ 
         return $MsgArray;
     }
 
-    function get ($msgNum) {
+    function get($msgNum) {
         //  Retrieve the specified msg number. Returns an array
         //  where each line of the msg is an array element.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 get: " . _("No connection to server");
+            $this->ERROR = "POP3 get: "._("No connection to server");
             return false;
         }
 
@@ -364,83 +364,83 @@ 
         $cmd = "RETR $msgNum";
         $reply = $this->send_cmd($cmd);
 
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 get: "._("Error ")."[$reply]";
             return false;
         }
 
         $count = 0;
         $MsgArray = array();
 
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
+        $line = fgets($fp, $buffer);
+        while ( ! preg_match('/^\.\r\n/', $line))
         {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
+            if ($line{0} == '.') { $line = substr($line, 1); }
             $MsgArray[$count] = $line;
             $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
+            $line = fgets($fp, $buffer);
+            if (empty($line)) { break; }
         }
         return $MsgArray;
     }
 
-    function last ( $type = "count" ) {
+    function last($type = "count") {
         //  Returns the highest msg number in the mailbox.
         //  returns -1 on error, 0+ on success, if type != count
         //  results in a popstat() call (2 element array returned)
 
         $last = -1;
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 last: " . _("No connection to server");
+            $this->ERROR = "POP3 last: "._("No connection to server");
             return $last;
         }
 
         $reply = $this->send_cmd("STAT");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 last: "._("Error ")."[$reply]";
             return $last;
         }
 
-        $Vars = preg_split('/\s+/',$reply);
+        $Vars = preg_split('/\s+/', $reply);
         $count = $Vars[1];
         $size = $Vars[2];
-        settype($count,"integer");
-        settype($size,"integer");
-        if($type != "count")
+        settype($count, "integer");
+        settype($size, "integer");
+        if ($type != "count")
         {
-            return array($count,$size);
+            return array($count, $size);
         }
         return $count;
     }
 
-    function reset () {
+    function reset() {
         //  Resets the status of the remote server. This includes
         //  resetting the status of ALL msgs to not be deleted.
         //  This method automatically closes the connection to the server.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 reset: " . _("No connection to server");
+            $this->ERROR = "POP3 reset: "._("No connection to server");
             return false;
         }
         $reply = $this->send_cmd("RSET");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
             //  The POP3 RSET command -never- gives a -ERR
             //  response - if it ever does, something truely
             //  wild is going on.
 
-            $this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
-            @error_log("POP3 reset: ERROR [$reply]",0);
+            $this->ERROR = "POP3 reset: "._("Error ")."[$reply]";
+            @error_log("POP3 reset: ERROR [$reply]", 0);
         }
         $this->quit();
         return true;
     }
 
-    function send_cmd ( $cmd = "" )
+    function send_cmd($cmd = "")
     {
         //  Sends a user defined command string to the
         //  POP server and returns the results. Useful for
@@ -455,25 +455,25 @@ 
         //  This method works best if $cmd responds with only
         //  one line of data.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 send_cmd: " . _("No connection to server");
+            $this->ERROR = "POP3 send_cmd: "._("No connection to server");
             return false;
         }
 
-        if(empty($cmd))
+        if (empty($cmd))
         {
-            $this->ERROR = "POP3 send_cmd: " . _("Empty command string");
+            $this->ERROR = "POP3 send_cmd: "._("Empty command string");
             return "";
         }
 
         $fp = $this->FP;
         $buffer = $this->BUFFER;
         $this->update_timer();
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$buffer);
+        fwrite($fp, "$cmd\r\n");
+        $reply = fgets($fp, $buffer);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+        if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
         return $reply;
     }
 
@@ -481,61 +481,61 @@ 
         //  Closes the connection to the POP3 server, deleting
         //  any msgs marked as deleted.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 quit: " . _("connection does not exist");
+            $this->ERROR = "POP3 quit: "._("connection does not exist");
             return false;
         }
         $fp = $this->FP;
         $cmd = "QUIT";
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$this->BUFFER);
+        fwrite($fp, "$cmd\r\n");
+        $reply = fgets($fp, $this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+        if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
         fclose($fp);
         unset($this->FP);
         return true;
     }
 
-    function popstat () {
+    function popstat() {
         //  Returns an array of 2 elements. The number of undeleted
         //  msgs in the mailbox, and the size of the mbox in octets.
 
         $PopArray = $this->last("array");
 
-        if($PopArray == -1) { return false; }
+        if ($PopArray == -1) { return false; }
 
-        if( (!$PopArray) or (empty($PopArray)) )
+        if (( ! $PopArray) or (empty($PopArray)))
         {
             return false;
         }
         return $PopArray;
     }
 
-    function uidl ($msgNum = "")
+    function uidl($msgNum = "")
     {
         //  Returns the UIDL of the msg specified. If called with
         //  no arguments, returns an associative array where each
         //  undeleted msg num is a key, and the msg's uidl is the element
         //  Array element 0 will contain the total number of msgs
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 uidl: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 uidl: "._("No connection to server");
             return false;
         }
 
         $fp = $this->FP;
         $buffer = $this->BUFFER;
 
-        if(!empty($msgNum)) {
+        if ( ! empty($msgNum)) {
             $cmd = "UIDL $msgNum";
             $reply = $this->send_cmd($cmd);
-            if(!$this->is_ok($reply))
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 uidl: "._("Error ")."[$reply]";
                 return false;
             }
-            list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
+            list ($ok, $num, $myUidl) = preg_split('/\s+/', $reply);
             return $myUidl;
         } else {
             $this->update_timer();
@@ -552,20 +552,20 @@ 
             fwrite($fp, "UIDL\r\n");
             $reply = fgets($fp, $buffer);
             $reply = $this->strip_clf($reply);
-            if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-            if(!$this->is_ok($reply))
+            if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 uidl: "._("Error ")."[$reply]";
                 return false;
             }
 
             $line = "";
             $count = 1;
-            $line = fgets($fp,$buffer);
-            while ( !preg_match('/^\.\r\n/',$line)) {
-                list ($msg,$msgUidl) = preg_split('/\s+/',$line);
+            $line = fgets($fp, $buffer);
+            while ( ! preg_match('/^\.\r\n/', $line)) {
+                list ($msg, $msgUidl) = preg_split('/\s+/', $line);
                 $msgUidl = $this->strip_clf($msgUidl);
-                if($count == $msg) {
+                if ($count == $msg) {
                     $UIDLArray[$msg] = $msgUidl;
                 }
                 else
@@ -573,30 +573,30 @@ 
                     $UIDLArray[$count] = 'deleted';
                 }
                 $count++;
-                $line = fgets($fp,$buffer);
+                $line = fgets($fp, $buffer);
             }
         }
         return $UIDLArray;
     }
 
-    function delete ($msgNum = "") {
+    function delete($msgNum = "") {
         //  Flags a specified msg as deleted. The msg will not
         //  be deleted until a quit() method is called.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 delete: " . _("No connection to server");
+            $this->ERROR = "POP3 delete: "._("No connection to server");
             return false;
         }
-        if(empty($msgNum))
+        if (empty($msgNum))
         {
-            $this->ERROR = "POP3 delete: " . _("No msg number submitted");
+            $this->ERROR = "POP3 delete: "._("No msg number submitted");
             return false;
         }
         $reply = $this->send_cmd("DELE $msgNum");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
+            $this->ERROR = "POP3 delete: "._("Command failed ")."[$reply]";
             return false;
         }
         return true;
@@ -606,35 +606,35 @@ 
 
     //  The following methods are internal to the class.
 
-    function is_ok ($cmd = "") {
+    function is_ok($cmd = "") {
         //  Return true or false on +OK or -ERR
 
-        if( empty($cmd) )
+        if (empty($cmd))
             return false;
         else
-            return( stripos($cmd, '+OK') !== false );
+            return(stripos($cmd, '+OK') !== false);
     }
 
-    function strip_clf ($text = "") {
+    function strip_clf($text = "") {
         // Strips \r\n from server responses
 
-        if(empty($text))
+        if (empty($text))
             return $text;
         else {
-            $stripped = str_replace(array("\r","\n"),'',$text);
+            $stripped = str_replace(array("\r", "\n"), '', $text);
             return $stripped;
         }
     }
 
-    function parse_banner ( $server_text ) {
+    function parse_banner($server_text) {
         $outside = true;
         $banner = "";
         $length = strlen($server_text);
-        for($count =0; $count < $length; $count++)
+        for ($count = 0; $count < $length; $count++)
         {
-            $digit = substr($server_text,$count,1);
-            if(!empty($digit))             {
-                if( (!$outside) && ($digit != '<') && ($digit != '>') )
+            $digit = substr($server_text, $count, 1);
+            if ( ! empty($digit)) {
+                if (( ! $outside) && ($digit != '<') && ($digit != '>'))
                 {
                     $banner .= $digit;
                 }
@@ -642,21 +642,21 @@ 
                 {
                     $outside = false;
                 }
-                if($digit == '>')
+                if ($digit == '>')
                 {
                     $outside = true;
                 }
             }
         }
-        $banner = $this->strip_clf($banner);    // Just in case
+        $banner = $this->strip_clf($banner); // Just in case
         return "<$banner>";
     }
 
 }   // End class
 
 // For php4 compatibility
-if (!function_exists("stripos")) {
-    function stripos($haystack, $needle){
-        return strpos($haystack, stristr( $haystack, $needle ));
+if ( ! function_exists("stripos")) {
+    function stripos($haystack, $needle) {
+        return strpos($haystack, stristr($haystack, $needle));
     }
 }

Braces +31 added lines, -25 removed lines

@@ -53,14 +53,16 @@ 
             // Do not allow programs to alter MAILSERVER
             // if it is already specified. They can get around
             // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
-                $this->MAILSERVER = $server;
+            if(empty($this->MAILSERVER)) {
+                            $this->MAILSERVER = $server;
+            }
         }
         if(!empty($timeout)) {
             settype($timeout,"integer");
             $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
-                set_time_limit($timeout);
+            if (!ini_get('safe_mode')) {
+                            set_time_limit($timeout);
+            }
         }
         return true;
     }
@@ -73,8 +75,9 @@ 
 	}
 
     function update_timer () {
-        if (!ini_get('safe_mode'))
-            set_time_limit($this->TIMEOUT);
+        if (!ini_get('safe_mode')) {
+                    set_time_limit($this->TIMEOUT);
+        }
         return true;
     }
 
@@ -85,8 +88,9 @@ 
         // If MAILSERVER is set, override $server with it's value
 
     if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
-            $server = $this->MAILSERVER;
+        if(!empty($this->MAILSERVER)) {
+                    $server = $this->MAILSERVER;
+        }
 
         if(empty($server)){
             $this->ERROR = "POP3 connect: " . _("No server specified");
@@ -106,8 +110,9 @@ 
         $this->update_timer();
         $reply = fgets($fp,$this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+        if($this->DEBUG) {
+                    error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+        }
         if(!$this->is_ok($reply)) {
             $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
             unset($this->FP);
@@ -132,8 +137,9 @@ 
             if(!$this->is_ok($reply)) {
                 $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
                 return false;
-            } else
-                return true;
+            } else {
+                            return true;
+            }
         }
     }
 
@@ -224,8 +230,9 @@ 
                 if( (!$count) || ($count == -1) ) {
                     //  Preserve the error generated by last() and pass()
                     return false;
-                } else
-                    return $count;
+                } else {
+                                    return $count;
+                }
             }
         }
     }
@@ -338,8 +345,7 @@ 
             if($thisMsg != $msgC)
             {
                 $MsgArray[$msgC] = "deleted";
-            }
-            else
+            } else
             {
                 $MsgArray[$msgC] = $msgSize;
             }
@@ -567,8 +573,7 @@ 
                 $msgUidl = $this->strip_clf($msgUidl);
                 if($count == $msg) {
                     $UIDLArray[$msg] = $msgUidl;
-                }
-                else
+                } else
                 {
                     $UIDLArray[$count] = 'deleted';
                 }
@@ -609,18 +614,19 @@ 
     function is_ok ($cmd = "") {
         //  Return true or false on +OK or -ERR
 
-        if( empty($cmd) )
-            return false;
-        else
-            return( stripos($cmd, '+OK') !== false );
+        if( empty($cmd) ) {
+                    return false;
+        } else {
+                    return( stripos($cmd, '+OK') !== false );
+        }
     }
 
     function strip_clf ($text = "") {
         // Strips \r\n from server responses
 
-        if(empty($text))
-            return $text;
-        else {
+        if(empty($text)) {
+                    return $text;
+        } else {
             $stripped = str_replace(array("\r","\n"),'',$text);
             return $stripped;
         }

Indentation +617 added lines, -617 removed lines

@@ -17,53 +17,53 @@ 
  */
 
 class POP3 {
-    var $ERROR      = '';       //  Error string.
+	var $ERROR      = '';       //  Error string.
 
-    var $TIMEOUT    = 60;       //  Default timeout before giving up on a
-                                //  network operation.
+	var $TIMEOUT    = 60;       //  Default timeout before giving up on a
+								//  network operation.
 
-    var $COUNT      = -1;       //  Mailbox msg count
+	var $COUNT      = -1;       //  Mailbox msg count
 
-    var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
-                                //  Per RFC 1939 the returned line a POP3
-                                //  server can send is 512 bytes.
+	var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
+								//  Per RFC 1939 the returned line a POP3
+								//  server can send is 512 bytes.
 
-    var $FP         = '';       //  The connection to the server's
-                                //  file descriptor
+	var $FP         = '';       //  The connection to the server's
+								//  file descriptor
 
-    var $MAILSERVER = '';       // Set this to hard code the server name
+	var $MAILSERVER = '';       // Set this to hard code the server name
 
-    var $DEBUG      = FALSE;    // set to true to echo pop3
-                                // commands and responses to error_log
-                                // this WILL log passwords!
+	var $DEBUG      = FALSE;    // set to true to echo pop3
+								// commands and responses to error_log
+								// this WILL log passwords!
 
-    var $BANNER     = '';       //  Holds the banner returned by the
-                                //  pop server - used for apop()
+	var $BANNER     = '';       //  Holds the banner returned by the
+								//  pop server - used for apop()
 
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
-                                //  This must be set to true
-                                //  manually
+	var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
+								//  This must be set to true
+								//  manually
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct ( $server = '', $timeout = '' ) {
-        settype($this->BUFFER,"integer");
-        if( !empty($server) ) {
-            // Do not allow programs to alter MAILSERVER
-            // if it is already specified. They can get around
-            // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
-                $this->MAILSERVER = $server;
-        }
-        if(!empty($timeout)) {
-            settype($timeout,"integer");
-            $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
-                set_time_limit($timeout);
-        }
-        return true;
-    }
+	function __construct ( $server = '', $timeout = '' ) {
+		settype($this->BUFFER,"integer");
+		if( !empty($server) ) {
+			// Do not allow programs to alter MAILSERVER
+			// if it is already specified. They can get around
+			// this if they -really- want to, so don't count on it.
+			if(empty($this->MAILSERVER))
+				$this->MAILSERVER = $server;
+		}
+		if(!empty($timeout)) {
+			settype($timeout,"integer");
+			$this->TIMEOUT = $timeout;
+			if (!ini_get('safe_mode'))
+				set_time_limit($timeout);
+		}
+		return true;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -72,591 +72,591 @@ 
 		self::__construct( $server, $timeout );
 	}
 
-    function update_timer () {
-        if (!ini_get('safe_mode'))
-            set_time_limit($this->TIMEOUT);
-        return true;
-    }
-
-    function connect ($server, $port = 110)  {
-        //  Opens a socket to the specified server. Unless overridden,
-        //  port defaults to 110. Returns true on success, false on fail
-
-        // If MAILSERVER is set, override $server with its value.
-
-    if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
-            $server = $this->MAILSERVER;
-
-        if(empty($server)){
-            $this->ERROR = "POP3 connect: " . _("No server specified");
-            unset($this->FP);
-            return false;
-        }
-
-        $fp = @fsockopen("$server", $port, $errno, $errstr);
-
-        if(!$fp) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
-            unset($this->FP);
-            return false;
-        }
-
-        socket_set_blocking($fp,-1);
-        $this->update_timer();
-        $reply = fgets($fp,$this->BUFFER);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
-        if(!$this->is_ok($reply)) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
-            unset($this->FP);
-            return false;
-        }
-        $this->FP = $fp;
-        $this->BANNER = $this->parse_banner($reply);
-        return true;
-    }
-
-    function user ($user = "") {
-        // Sends the USER command, returns true or false
-
-        if( empty($user) ) {
-            $this->ERROR = "POP3 user: " . _("no login ID submitted");
-            return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 user: " . _("connection not established");
-            return false;
-        } else {
-            $reply = $this->send_cmd("USER $user");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
-                return false;
-            } else
-                return true;
-        }
-    }
-
-    function pass ($pass = "")     {
-        // Sends the PASS command, returns # of msgs in mailbox,
-        // returns false (undef) on Auth failure
-
-        if(empty($pass)) {
-            $this->ERROR = "POP3 pass: " . _("No password submitted");
-            return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 pass: " . _("connection not established");
-            return false;
-        } else {
-            $reply = $this->send_cmd("PASS $pass");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
-                $this->quit();
-                return false;
-            } else {
-                //  Auth successful.
-                $count = $this->last("count");
-                $this->COUNT = $count;
-                return $count;
-            }
-        }
-    }
-
-    function apop ($login,$pass) {
-        //  Attempts an APOP login. If this fails, it'll
-        //  try a standard login. YOUR SERVER MUST SUPPORT
-        //  THE USE OF THE APOP COMMAND!
-        //  (apop is optional per rfc1939)
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 apop: " . _("No connection to server");
-            return false;
-        } elseif(!$this->ALLOWAPOP) {
-            $retVal = $this->login($login,$pass);
-            return $retVal;
-        } elseif(empty($login)) {
-            $this->ERROR = "POP3 apop: " . _("No login ID submitted");
-            return false;
-        } elseif(empty($pass)) {
-            $this->ERROR = "POP3 apop: " . _("No password submitted");
-            return false;
-        } else {
-            $banner = $this->BANNER;
-            if( (!$banner) or (empty($banner)) ) {
-                $this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
-                $retVal = $this->login($login,$pass);
-                return $retVal;
-            } else {
-                $AuthString = $banner;
-                $AuthString .= $pass;
-                $APOPString = md5($AuthString);
-                $cmd = "APOP $login $APOPString";
-                $reply = $this->send_cmd($cmd);
-                if(!$this->is_ok($reply)) {
-                    $this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
-                    $retVal = $this->login($login,$pass);
-                    return $retVal;
-                } else {
-                    //  Auth successful.
-                    $count = $this->last("count");
-                    $this->COUNT = $count;
-                    return $count;
-                }
-            }
-        }
-    }
-
-    function login ($login = "", $pass = "") {
-        // Sends both user and pass. Returns # of msgs in mailbox or
-        // false on failure (or -1, if the error occurs while getting
-        // the number of messages.)
-
-        if( !isset($this->FP) ) {
-            $this->ERROR = "POP3 login: " . _("No connection to server");
-            return false;
-        } else {
-            $fp = $this->FP;
-            if( !$this->user( $login ) ) {
-                //  Preserve the error generated by user()
-                return false;
-            } else {
-                $count = $this->pass($pass);
-                if( (!$count) || ($count == -1) ) {
-                    //  Preserve the error generated by last() and pass()
-                    return false;
-                } else
-                    return $count;
-            }
-        }
-    }
-
-    function top ($msgNum, $numLines = "0") {
-        //  Gets the header and first $numLines of the msg body
-        //  returns data in an array with each returned line being
-        //  an array element. If $numLines is empty, returns
-        //  only the header information, and none of the body.
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 top: " . _("No connection to server");
-            return false;
-        }
-        $this->update_timer();
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $cmd = "TOP $msgNum $numLines";
-        fwrite($fp, "TOP $msgNum $numLines\r\n");
-        $reply = fgets($fp, $buffer);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) {
-            @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
-        }
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
-            return false;
-        }
-
-        $count = 0;
-        $MsgArray = array();
-
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
-        {
-            $MsgArray[$count] = $line;
-            $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
-        }
-
-        return $MsgArray;
-    }
-
-    function pop_list ($msgNum = "") {
-        //  If called with an argument, returns that msgs' size in octets
-        //  No argument returns an associative array of undeleted
-        //  msg numbers and their sizes in octets
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 pop_list: " . _("No connection to server");
-            return false;
-        }
-        $fp = $this->FP;
-        $Total = $this->COUNT;
-        if( (!$Total) or ($Total == -1) )
-        {
-            return false;
-        }
-        if($Total == 0)
-        {
-            return array("0","0");
-            // return -1;   // mailbox empty
-        }
-
-        $this->update_timer();
-
-        if(!empty($msgNum))
-        {
-            $cmd = "LIST $msgNum";
-            fwrite($fp,"$cmd\r\n");
-            $reply = fgets($fp,$this->BUFFER);
-            $reply = $this->strip_clf($reply);
-            if($this->DEBUG) {
-                @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
-            }
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
-                return false;
-            }
-            list($junk,$num,$size) = preg_split('/\s+/',$reply);
-            return $size;
-        }
-        $cmd = "LIST";
-        $reply = $this->send_cmd($cmd);
-        if(!$this->is_ok($reply))
-        {
-            $reply = $this->strip_clf($reply);
-            $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
-            return false;
-        }
-        $MsgArray = array();
-        $MsgArray[0] = $Total;
-        for($msgC=1;$msgC <= $Total; $msgC++)
-        {
-            if($msgC > $Total) { break; }
-            $line = fgets($fp,$this->BUFFER);
-            $line = $this->strip_clf($line);
-            if(strpos($line, '.') === 0)
-            {
-                $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
-                return false;
-            }
-            list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
-            settype($thisMsg,"integer");
-            if($thisMsg != $msgC)
-            {
-                $MsgArray[$msgC] = "deleted";
-            }
-            else
-            {
-                $MsgArray[$msgC] = $msgSize;
-            }
-        }
-        return $MsgArray;
-    }
-
-    function get ($msgNum) {
-        //  Retrieve the specified msg number. Returns an array
-        //  where each line of the msg is an array element.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 get: " . _("No connection to server");
-            return false;
-        }
-
-        $this->update_timer();
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $cmd = "RETR $msgNum";
-        $reply = $this->send_cmd($cmd);
-
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
-            return false;
-        }
-
-        $count = 0;
-        $MsgArray = array();
-
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
-        {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
-            $MsgArray[$count] = $line;
-            $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
-        }
-        return $MsgArray;
-    }
-
-    function last ( $type = "count" ) {
-        //  Returns the highest msg number in the mailbox.
-        //  returns -1 on error, 0+ on success, if type != count
-        //  results in a popstat() call (2 element array returned)
-
-        $last = -1;
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 last: " . _("No connection to server");
-            return $last;
-        }
-
-        $reply = $this->send_cmd("STAT");
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
-            return $last;
-        }
-
-        $Vars = preg_split('/\s+/',$reply);
-        $count = $Vars[1];
-        $size = $Vars[2];
-        settype($count,"integer");
-        settype($size,"integer");
-        if($type != "count")
-        {
-            return array($count,$size);
-        }
-        return $count;
-    }
-
-    function reset () {
-        //  Resets the status of the remote server. This includes
-        //  resetting the status of ALL msgs to not be deleted.
-        //  This method automatically closes the connection to the server.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 reset: " . _("No connection to server");
-            return false;
-        }
-        $reply = $this->send_cmd("RSET");
-        if(!$this->is_ok($reply))
-        {
-            //  The POP3 RSET command -never- gives a -ERR
-            //  response - if it ever does, something truly
-            //  wild is going on.
-
-            $this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
-            @error_log("POP3 reset: ERROR [$reply]",0);
-        }
-        $this->quit();
-        return true;
-    }
-
-    function send_cmd ( $cmd = "" )
-    {
-        //  Sends a user defined command string to the
-        //  POP server and returns the results. Useful for
-        //  non-compliant or custom POP servers.
-        //  Do NOT includ the \r\n as part of your command
-        //  string - it will be appended automatically.
-
-        //  The return value is a standard fgets() call, which
-        //  will read up to $this->BUFFER bytes of data, until it
-        //  encounters a new line, or EOF, whichever happens first.
-
-        //  This method works best if $cmd responds with only
-        //  one line of data.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 send_cmd: " . _("No connection to server");
-            return false;
-        }
-
-        if(empty($cmd))
-        {
-            $this->ERROR = "POP3 send_cmd: " . _("Empty command string");
-            return "";
-        }
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $this->update_timer();
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$buffer);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-        return $reply;
-    }
-
-    function quit() {
-        //  Closes the connection to the POP3 server, deleting
-        //  any msgs marked as deleted.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 quit: " . _("connection does not exist");
-            return false;
-        }
-        $fp = $this->FP;
-        $cmd = "QUIT";
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$this->BUFFER);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-        fclose($fp);
-        unset($this->FP);
-        return true;
-    }
-
-    function popstat () {
-        //  Returns an array of 2 elements. The number of undeleted
-        //  msgs in the mailbox, and the size of the mbox in octets.
-
-        $PopArray = $this->last("array");
-
-        if($PopArray == -1) { return false; }
-
-        if( (!$PopArray) or (empty($PopArray)) )
-        {
-            return false;
-        }
-        return $PopArray;
-    }
-
-    function uidl ($msgNum = "")
-    {
-        //  Returns the UIDL of the msg specified. If called with
-        //  no arguments, returns an associative array where each
-        //  undeleted msg num is a key, and the msg's uidl is the element
-        //  Array element 0 will contain the total number of msgs
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 uidl: " . _("No connection to server");
-            return false;
-        }
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-
-        if(!empty($msgNum)) {
-            $cmd = "UIDL $msgNum";
-            $reply = $this->send_cmd($cmd);
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
-                return false;
-            }
-            list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
-            return $myUidl;
-        } else {
-            $this->update_timer();
-
-            $UIDLArray = array();
-            $Total = $this->COUNT;
-            $UIDLArray[0] = $Total;
-
-            if ($Total < 1)
-            {
-                return $UIDLArray;
-            }
-            $cmd = "UIDL";
-            fwrite($fp, "UIDL\r\n");
-            $reply = fgets($fp, $buffer);
-            $reply = $this->strip_clf($reply);
-            if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
-                return false;
-            }
-
-            $line = "";
-            $count = 1;
-            $line = fgets($fp,$buffer);
-            while ( !preg_match('/^\.\r\n/',$line)) {
-                list ($msg,$msgUidl) = preg_split('/\s+/',$line);
-                $msgUidl = $this->strip_clf($msgUidl);
-                if($count == $msg) {
-                    $UIDLArray[$msg] = $msgUidl;
-                }
-                else
-                {
-                    $UIDLArray[$count] = 'deleted';
-                }
-                $count++;
-                $line = fgets($fp,$buffer);
-            }
-        }
-        return $UIDLArray;
-    }
-
-    function delete ($msgNum = "") {
-        //  Flags a specified msg as deleted. The msg will not
-        //  be deleted until a quit() method is called.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 delete: " . _("No connection to server");
-            return false;
-        }
-        if(empty($msgNum))
-        {
-            $this->ERROR = "POP3 delete: " . _("No msg number submitted");
-            return false;
-        }
-        $reply = $this->send_cmd("DELE $msgNum");
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
-            return false;
-        }
-        return true;
-    }
-
-    //  *********************************************************
-
-    //  The following methods are internal to the class.
-
-    function is_ok ($cmd = "") {
-        //  Return true or false on +OK or -ERR
-
-        if( empty($cmd) )
-            return false;
-        else
-            return( stripos($cmd, '+OK') !== false );
-    }
-
-    function strip_clf ($text = "") {
-        // Strips \r\n from server responses
-
-        if(empty($text))
-            return $text;
-        else {
-            $stripped = str_replace(array("\r","\n"),'',$text);
-            return $stripped;
-        }
-    }
-
-    function parse_banner ( $server_text ) {
-        $outside = true;
-        $banner = "";
-        $length = strlen($server_text);
-        for($count =0; $count < $length; $count++)
-        {
-            $digit = substr($server_text,$count,1);
-            if(!empty($digit))             {
-                if( (!$outside) && ($digit != '<') && ($digit != '>') )
-                {
-                    $banner .= $digit;
-                }
-                if ($digit == '<')
-                {
-                    $outside = false;
-                }
-                if($digit == '>')
-                {
-                    $outside = true;
-                }
-            }
-        }
-        $banner = $this->strip_clf($banner);    // Just in case
-        return "<$banner>";
-    }
+	function update_timer () {
+		if (!ini_get('safe_mode'))
+			set_time_limit($this->TIMEOUT);
+		return true;
+	}
+
+	function connect ($server, $port = 110)  {
+		//  Opens a socket to the specified server. Unless overridden,
+		//  port defaults to 110. Returns true on success, false on fail
+
+		// If MAILSERVER is set, override $server with its value.
+
+	if (!isset($port) || !$port) {$port = 110;}
+		if(!empty($this->MAILSERVER))
+			$server = $this->MAILSERVER;
+
+		if(empty($server)){
+			$this->ERROR = "POP3 connect: " . _("No server specified");
+			unset($this->FP);
+			return false;
+		}
+
+		$fp = @fsockopen("$server", $port, $errno, $errstr);
+
+		if(!$fp) {
+			$this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
+			unset($this->FP);
+			return false;
+		}
+
+		socket_set_blocking($fp,-1);
+		$this->update_timer();
+		$reply = fgets($fp,$this->BUFFER);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG)
+			error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+		if(!$this->is_ok($reply)) {
+			$this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
+			unset($this->FP);
+			return false;
+		}
+		$this->FP = $fp;
+		$this->BANNER = $this->parse_banner($reply);
+		return true;
+	}
+
+	function user ($user = "") {
+		// Sends the USER command, returns true or false
+
+		if( empty($user) ) {
+			$this->ERROR = "POP3 user: " . _("no login ID submitted");
+			return false;
+		} elseif(!isset($this->FP)) {
+			$this->ERROR = "POP3 user: " . _("connection not established");
+			return false;
+		} else {
+			$reply = $this->send_cmd("USER $user");
+			if(!$this->is_ok($reply)) {
+				$this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
+				return false;
+			} else
+				return true;
+		}
+	}
+
+	function pass ($pass = "")     {
+		// Sends the PASS command, returns # of msgs in mailbox,
+		// returns false (undef) on Auth failure
+
+		if(empty($pass)) {
+			$this->ERROR = "POP3 pass: " . _("No password submitted");
+			return false;
+		} elseif(!isset($this->FP)) {
+			$this->ERROR = "POP3 pass: " . _("connection not established");
+			return false;
+		} else {
+			$reply = $this->send_cmd("PASS $pass");
+			if(!$this->is_ok($reply)) {
+				$this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
+				$this->quit();
+				return false;
+			} else {
+				//  Auth successful.
+				$count = $this->last("count");
+				$this->COUNT = $count;
+				return $count;
+			}
+		}
+	}
+
+	function apop ($login,$pass) {
+		//  Attempts an APOP login. If this fails, it'll
+		//  try a standard login. YOUR SERVER MUST SUPPORT
+		//  THE USE OF THE APOP COMMAND!
+		//  (apop is optional per rfc1939)
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 apop: " . _("No connection to server");
+			return false;
+		} elseif(!$this->ALLOWAPOP) {
+			$retVal = $this->login($login,$pass);
+			return $retVal;
+		} elseif(empty($login)) {
+			$this->ERROR = "POP3 apop: " . _("No login ID submitted");
+			return false;
+		} elseif(empty($pass)) {
+			$this->ERROR = "POP3 apop: " . _("No password submitted");
+			return false;
+		} else {
+			$banner = $this->BANNER;
+			if( (!$banner) or (empty($banner)) ) {
+				$this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
+				$retVal = $this->login($login,$pass);
+				return $retVal;
+			} else {
+				$AuthString = $banner;
+				$AuthString .= $pass;
+				$APOPString = md5($AuthString);
+				$cmd = "APOP $login $APOPString";
+				$reply = $this->send_cmd($cmd);
+				if(!$this->is_ok($reply)) {
+					$this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
+					$retVal = $this->login($login,$pass);
+					return $retVal;
+				} else {
+					//  Auth successful.
+					$count = $this->last("count");
+					$this->COUNT = $count;
+					return $count;
+				}
+			}
+		}
+	}
+
+	function login ($login = "", $pass = "") {
+		// Sends both user and pass. Returns # of msgs in mailbox or
+		// false on failure (or -1, if the error occurs while getting
+		// the number of messages.)
+
+		if( !isset($this->FP) ) {
+			$this->ERROR = "POP3 login: " . _("No connection to server");
+			return false;
+		} else {
+			$fp = $this->FP;
+			if( !$this->user( $login ) ) {
+				//  Preserve the error generated by user()
+				return false;
+			} else {
+				$count = $this->pass($pass);
+				if( (!$count) || ($count == -1) ) {
+					//  Preserve the error generated by last() and pass()
+					return false;
+				} else
+					return $count;
+			}
+		}
+	}
+
+	function top ($msgNum, $numLines = "0") {
+		//  Gets the header and first $numLines of the msg body
+		//  returns data in an array with each returned line being
+		//  an array element. If $numLines is empty, returns
+		//  only the header information, and none of the body.
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 top: " . _("No connection to server");
+			return false;
+		}
+		$this->update_timer();
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$cmd = "TOP $msgNum $numLines";
+		fwrite($fp, "TOP $msgNum $numLines\r\n");
+		$reply = fgets($fp, $buffer);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) {
+			@error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+		}
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
+			return false;
+		}
+
+		$count = 0;
+		$MsgArray = array();
+
+		$line = fgets($fp,$buffer);
+		while ( !preg_match('/^\.\r\n/',$line))
+		{
+			$MsgArray[$count] = $line;
+			$count++;
+			$line = fgets($fp,$buffer);
+			if(empty($line))    { break; }
+		}
+
+		return $MsgArray;
+	}
+
+	function pop_list ($msgNum = "") {
+		//  If called with an argument, returns that msgs' size in octets
+		//  No argument returns an associative array of undeleted
+		//  msg numbers and their sizes in octets
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 pop_list: " . _("No connection to server");
+			return false;
+		}
+		$fp = $this->FP;
+		$Total = $this->COUNT;
+		if( (!$Total) or ($Total == -1) )
+		{
+			return false;
+		}
+		if($Total == 0)
+		{
+			return array("0","0");
+			// return -1;   // mailbox empty
+		}
+
+		$this->update_timer();
+
+		if(!empty($msgNum))
+		{
+			$cmd = "LIST $msgNum";
+			fwrite($fp,"$cmd\r\n");
+			$reply = fgets($fp,$this->BUFFER);
+			$reply = $this->strip_clf($reply);
+			if($this->DEBUG) {
+				@error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+			}
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
+				return false;
+			}
+			list($junk,$num,$size) = preg_split('/\s+/',$reply);
+			return $size;
+		}
+		$cmd = "LIST";
+		$reply = $this->send_cmd($cmd);
+		if(!$this->is_ok($reply))
+		{
+			$reply = $this->strip_clf($reply);
+			$this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
+			return false;
+		}
+		$MsgArray = array();
+		$MsgArray[0] = $Total;
+		for($msgC=1;$msgC <= $Total; $msgC++)
+		{
+			if($msgC > $Total) { break; }
+			$line = fgets($fp,$this->BUFFER);
+			$line = $this->strip_clf($line);
+			if(strpos($line, '.') === 0)
+			{
+				$this->ERROR = "POP3 pop_list: " . _("Premature end of list");
+				return false;
+			}
+			list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
+			settype($thisMsg,"integer");
+			if($thisMsg != $msgC)
+			{
+				$MsgArray[$msgC] = "deleted";
+			}
+			else
+			{
+				$MsgArray[$msgC] = $msgSize;
+			}
+		}
+		return $MsgArray;
+	}
+
+	function get ($msgNum) {
+		//  Retrieve the specified msg number. Returns an array
+		//  where each line of the msg is an array element.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 get: " . _("No connection to server");
+			return false;
+		}
+
+		$this->update_timer();
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$cmd = "RETR $msgNum";
+		$reply = $this->send_cmd($cmd);
+
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
+			return false;
+		}
+
+		$count = 0;
+		$MsgArray = array();
+
+		$line = fgets($fp,$buffer);
+		while ( !preg_match('/^\.\r\n/',$line))
+		{
+			if ( $line{0} == '.' ) { $line = substr($line,1); }
+			$MsgArray[$count] = $line;
+			$count++;
+			$line = fgets($fp,$buffer);
+			if(empty($line))    { break; }
+		}
+		return $MsgArray;
+	}
+
+	function last ( $type = "count" ) {
+		//  Returns the highest msg number in the mailbox.
+		//  returns -1 on error, 0+ on success, if type != count
+		//  results in a popstat() call (2 element array returned)
+
+		$last = -1;
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 last: " . _("No connection to server");
+			return $last;
+		}
+
+		$reply = $this->send_cmd("STAT");
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
+			return $last;
+		}
+
+		$Vars = preg_split('/\s+/',$reply);
+		$count = $Vars[1];
+		$size = $Vars[2];
+		settype($count,"integer");
+		settype($size,"integer");
+		if($type != "count")
+		{
+			return array($count,$size);
+		}
+		return $count;
+	}
+
+	function reset () {
+		//  Resets the status of the remote server. This includes
+		//  resetting the status of ALL msgs to not be deleted.
+		//  This method automatically closes the connection to the server.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 reset: " . _("No connection to server");
+			return false;
+		}
+		$reply = $this->send_cmd("RSET");
+		if(!$this->is_ok($reply))
+		{
+			//  The POP3 RSET command -never- gives a -ERR
+			//  response - if it ever does, something truly
+			//  wild is going on.
+
+			$this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
+			@error_log("POP3 reset: ERROR [$reply]",0);
+		}
+		$this->quit();
+		return true;
+	}
+
+	function send_cmd ( $cmd = "" )
+	{
+		//  Sends a user defined command string to the
+		//  POP server and returns the results. Useful for
+		//  non-compliant or custom POP servers.
+		//  Do NOT includ the \r\n as part of your command
+		//  string - it will be appended automatically.
+
+		//  The return value is a standard fgets() call, which
+		//  will read up to $this->BUFFER bytes of data, until it
+		//  encounters a new line, or EOF, whichever happens first.
+
+		//  This method works best if $cmd responds with only
+		//  one line of data.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 send_cmd: " . _("No connection to server");
+			return false;
+		}
+
+		if(empty($cmd))
+		{
+			$this->ERROR = "POP3 send_cmd: " . _("Empty command string");
+			return "";
+		}
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$this->update_timer();
+		fwrite($fp,"$cmd\r\n");
+		$reply = fgets($fp,$buffer);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+		return $reply;
+	}
+
+	function quit() {
+		//  Closes the connection to the POP3 server, deleting
+		//  any msgs marked as deleted.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 quit: " . _("connection does not exist");
+			return false;
+		}
+		$fp = $this->FP;
+		$cmd = "QUIT";
+		fwrite($fp,"$cmd\r\n");
+		$reply = fgets($fp,$this->BUFFER);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+		fclose($fp);
+		unset($this->FP);
+		return true;
+	}
+
+	function popstat () {
+		//  Returns an array of 2 elements. The number of undeleted
+		//  msgs in the mailbox, and the size of the mbox in octets.
+
+		$PopArray = $this->last("array");
+
+		if($PopArray == -1) { return false; }
+
+		if( (!$PopArray) or (empty($PopArray)) )
+		{
+			return false;
+		}
+		return $PopArray;
+	}
+
+	function uidl ($msgNum = "")
+	{
+		//  Returns the UIDL of the msg specified. If called with
+		//  no arguments, returns an associative array where each
+		//  undeleted msg num is a key, and the msg's uidl is the element
+		//  Array element 0 will contain the total number of msgs
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 uidl: " . _("No connection to server");
+			return false;
+		}
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+
+		if(!empty($msgNum)) {
+			$cmd = "UIDL $msgNum";
+			$reply = $this->send_cmd($cmd);
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+				return false;
+			}
+			list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
+			return $myUidl;
+		} else {
+			$this->update_timer();
+
+			$UIDLArray = array();
+			$Total = $this->COUNT;
+			$UIDLArray[0] = $Total;
+
+			if ($Total < 1)
+			{
+				return $UIDLArray;
+			}
+			$cmd = "UIDL";
+			fwrite($fp, "UIDL\r\n");
+			$reply = fgets($fp, $buffer);
+			$reply = $this->strip_clf($reply);
+			if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+				return false;
+			}
+
+			$line = "";
+			$count = 1;
+			$line = fgets($fp,$buffer);
+			while ( !preg_match('/^\.\r\n/',$line)) {
+				list ($msg,$msgUidl) = preg_split('/\s+/',$line);
+				$msgUidl = $this->strip_clf($msgUidl);
+				if($count == $msg) {
+					$UIDLArray[$msg] = $msgUidl;
+				}
+				else
+				{
+					$UIDLArray[$count] = 'deleted';
+				}
+				$count++;
+				$line = fgets($fp,$buffer);
+			}
+		}
+		return $UIDLArray;
+	}
+
+	function delete ($msgNum = "") {
+		//  Flags a specified msg as deleted. The msg will not
+		//  be deleted until a quit() method is called.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 delete: " . _("No connection to server");
+			return false;
+		}
+		if(empty($msgNum))
+		{
+			$this->ERROR = "POP3 delete: " . _("No msg number submitted");
+			return false;
+		}
+		$reply = $this->send_cmd("DELE $msgNum");
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
+			return false;
+		}
+		return true;
+	}
+
+	//  *********************************************************
+
+	//  The following methods are internal to the class.
+
+	function is_ok ($cmd = "") {
+		//  Return true or false on +OK or -ERR
+
+		if( empty($cmd) )
+			return false;
+		else
+			return( stripos($cmd, '+OK') !== false );
+	}
+
+	function strip_clf ($text = "") {
+		// Strips \r\n from server responses
+
+		if(empty($text))
+			return $text;
+		else {
+			$stripped = str_replace(array("\r","\n"),'',$text);
+			return $stripped;
+		}
+	}
+
+	function parse_banner ( $server_text ) {
+		$outside = true;
+		$banner = "";
+		$length = strlen($server_text);
+		for($count =0; $count < $length; $count++)
+		{
+			$digit = substr($server_text,$count,1);
+			if(!empty($digit))             {
+				if( (!$outside) && ($digit != '<') && ($digit != '>') )
+				{
+					$banner .= $digit;
+				}
+				if ($digit == '<')
+				{
+					$outside = false;
+				}
+				if($digit == '>')
+				{
+					$outside = true;
+				}
+			}
+		}
+		$banner = $this->strip_clf($banner);    // Just in case
+		return "<$banner>";
+	}
 
 }   // End class
 
 // For php4 compatibility
 if (!function_exists("stripos")) {
-    function stripos($haystack, $needle){
-        return strpos($haystack, stristr( $haystack, $needle ));
-    }
+	function stripos($haystack, $needle){
+		return strpos($haystack, stristr( $haystack, $needle ));
+	}
 }

src/wp-includes/class-snoopy.php

Doc Comments +10 added lines

@@ -781,6 +781,9 @@ 
 	Output:
 \*======================================================================*/
 
+	/**
+	 * @param string $http_method
+	 */
 	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		$cookie_headers = '';
@@ -944,6 +947,9 @@ 
 	Output:
 \*======================================================================*/
 
+	/**
+	 * @param string $http_method
+	 */
 	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -1189,6 +1195,10 @@ 
 	Output:		post body
 \*======================================================================*/
 
+	/**
+	 * @param string $formvars
+	 * @param string $formfiles
+	 */
 	function _prepare_post_body($formvars, $formfiles)
 	{
 		settype($formvars, "array");

Indentation +11 added lines, -11 removed lines

@@ -205,8 +205,8 @@ 
 				if(!$this->curl_path)
 					return false;
 				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
-				        return false;
+					if (!is_executable($this->curl_path))
+						return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -364,8 +364,8 @@ 
 				if(!$this->curl_path)
 					return false;
 				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
-				        return false;
+					if (!is_executable($this->curl_path))
+						return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -885,10 +885,10 @@ 
 
 			if(preg_match("|^HTTP/|",$currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+				if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
 				{
 					$this->status= $status[1];
-                }
+				}
 				$this->response_code = $currentHeader;
 			}
 
@@ -897,11 +897,11 @@ 
 
 		$results = '';
 		do {
-    		$_data = fread($fp, $this->maxlength);
-    		if (strlen($_data) == 0) {
-        		break;
-    		}
-    		$results .= $_data;
+			$_data = fread($fp, $this->maxlength);
+			if (strlen($_data) == 0) {
+				break;
+			}
+			$results .= $_data;
 		} while(true);
 
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))

Braces +273 added lines, -205 removed lines

@@ -131,29 +131,33 @@ 
 
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (empty($URI_PARTS["query"]))
-			$URI_PARTS["query"] = '';
-		if (empty($URI_PARTS["path"]))
-			$URI_PARTS["path"] = '';
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
+		if (empty($URI_PARTS["query"])) {
+					$URI_PARTS["query"] = '';
+		}
+		if (empty($URI_PARTS["path"])) {
+					$URI_PARTS["path"] = '';
+		}
 
 		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -189,33 +193,34 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					return false;
 				}
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
-					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if(!$this->curl_path) {
+									return false;
+				}
+				if(function_exists("is_executable")) {
+								    if (!is_executable($this->curl_path))
 				        return false;
+				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -249,9 +254,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}
 				return true;
@@ -283,29 +288,33 @@ 
 		$postdata = $this->_prepare_post_body($formvars, $formfiles);
 
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (empty($URI_PARTS["query"]))
-			$URI_PARTS["query"] = '';
-		if (empty($URI_PARTS["path"]))
-			$URI_PARTS["path"] = '';
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
+		if (empty($URI_PARTS["query"])) {
+					$URI_PARTS["query"] = '';
+		}
+		if (empty($URI_PARTS["path"])) {
+					$URI_PARTS["path"] = '';
+		}
 
 		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -319,8 +328,9 @@ 
 						/* url was redirected, check if we've hit the max depth */
 						if($this->maxredirs > $this->_redirectdepth)
 						{
-							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) {
+															$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							}
 
 							// only follow redirect if it's on this site, or offsiteok is true
 							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
@@ -328,10 +338,13 @@ 
 								/* follow the redirect */
 								$this->_redirectdepth++;
 								$this->lastredirectaddr=$this->_redirectaddr;
-								if( strpos( $this->_redirectaddr, "?" ) > 0 )
-									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-								else
-									$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								if( strpos( $this->_redirectaddr, "?" ) > 0 ) {
+																	$this->fetch($this->_redirectaddr);
+								}
+								// the redirect has changed the request method from post to get
+								else {
+																	$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								}
 							}
 						}
 					}
@@ -347,34 +360,35 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}
 
-				}
-				else
+				} else
 				{
 					return false;
 				}
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
-					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if(!$this->curl_path) {
+									return false;
+				}
+				if(function_exists("is_executable")) {
+								    if (!is_executable($this->curl_path))
 				        return false;
+				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -386,8 +400,9 @@ 
 					/* url was redirected, check if we've hit the max depth */
 					if($this->maxredirs > $this->_redirectdepth)
 					{
-						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) {
+													$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						}
 
 						// only follow redirect if it's on this site, or offsiteok is true
 						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
@@ -395,10 +410,13 @@ 
 							/* follow the redirect */
 							$this->_redirectdepth++;
 							$this->lastredirectaddr=$this->_redirectaddr;
-							if( strpos( $this->_redirectaddr, "?" ) > 0 )
-								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-							else
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+							if( strpos( $this->_redirectaddr, "?" ) > 0 ) {
+															$this->fetch($this->_redirectaddr);
+							}
+							// the redirect has changed the request method from post to get
+							else {
+															$this->submit($this->_redirectaddr,$formvars, $formfiles);
+							}
 						}
 					}
 				}
@@ -414,9 +432,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}
 				return true;
@@ -442,22 +460,25 @@ 
 	{
 		if ($this->fetch($URI))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_striplinks($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_striplinks($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_striplinks($this->results);
 			}
-			else
-				$this->results = $this->_striplinks($this->results);
 
-			if($this->expandlinks)
-				$this->results = $this->_expandlinks($this->results, $URI);
+			if($this->expandlinks) {
+							$this->results = $this->_expandlinks($this->results, $URI);
+			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -475,16 +496,17 @@ 
 
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_stripform($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_stripform($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_stripform($this->results);
 			}
-			else
-				$this->results = $this->_stripform($this->results);
 
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 
@@ -501,15 +523,16 @@ 
 		{
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_striptext($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_striptext($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_striptext($this->results);
 			}
-			else
-				$this->results = $this->_striptext($this->results);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -523,27 +546,29 @@ 
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
 				{
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if($this->expandlinks) {
+											$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->results = $this->_striplinks($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if($this->expandlinks) {
+									$this->results = $this->_expandlinks($this->results,$URI);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -557,27 +582,29 @@ 
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
 				{
 					$this->results[$x] = $this->_striptext($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if($this->expandlinks) {
+											$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->results = $this->_striptext($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if($this->expandlinks) {
+									$this->results = $this->_expandlinks($this->results,$URI);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 
@@ -631,14 +658,16 @@ 
 
 		while(list($key,$val) = each($links[2]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}
 
 		while(list($key,$val) = each($links[3]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}
 
 		// return the links
@@ -784,29 +813,36 @@ 
 	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		$cookie_headers = '';
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
+		if(!empty($this->agent)) {
+					$headers .= "User-Agent: ".$this->agent."\r\n";
+		}
 		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port) && $this->port != 80)
-				$headers .= ":".$this->port;
+			if(!empty($this->port) && $this->port != 80) {
+							$headers .= ":".$this->port;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->accept)) {
+					$headers .= "Accept: ".$this->accept."\r\n";
+		}
+		if(!empty($this->referer)) {
+					$headers .= "Referer: ".$this->referer."\r\n";
+		}
 		if(!empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -819,32 +855,39 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers .= $headerKey.": ".$headerVal."\r\n";
+			}
 		}
 		if(!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
+			if ($content_type == "multipart/form-data") {
+							$headers .= "; boundary=".$this->_mime_boundary;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($body))
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))
-			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
+		if(!empty($body)) {
+					$headers .= "Content-length: ".strlen($body)."\r\n";
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
+		}
 
 		//add proxy auth headers
-		if(!empty($this->proxy_user))
-			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		if(!empty($this->proxy_user)) {
+					$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		}
 
 
 		$headers .= "\r\n";
 
 		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
+		if ($this->read_timeout > 0) {
+					socket_set_timeout($fp, $this->read_timeout);
+		}
 		$this->timed_out = false;
 
 		fwrite($fp,$headers.$body,strlen($headers.$body));
@@ -860,8 +903,9 @@ 
 				return false;
 			}
 
-			if($currentHeader == "\r\n")
-				break;
+			if($currentHeader == "\r\n") {
+							break;
+			}
 
 			// if a header begins with Location: or URI:, set the redirect
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
@@ -874,13 +918,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -922,15 +967,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		return true;
 	}
@@ -946,31 +994,38 @@ 
 
 	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$headers = array();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			if(!empty($this->port))
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					if(!empty($this->port))
 				$headers[] = "Host: ".$this->host.":".$this->port;
-			else
-				$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		} else {
+							$headers[] = "Host: ".$this->host;
+			}
+		if(!empty($this->accept)) {
+					$headers[] = "Accept: ".$this->accept;
+		}
+		if(!empty($this->referer)) {
+					$headers[] = "Referer: ".$this->referer;
+		}
 		if(!empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -983,21 +1038,26 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers[] = $headerKey.": ".$headerVal;
+			}
 		}
 		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
+			if ($content_type == "multipart/form-data") {
+							$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			} else {
+							$headers[] = "Content-type: $content_type";
+			}
+		}
+		if(!empty($body)) {
+					$headers[] = "Content-length: ".strlen($body);
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 		}
-		if(!empty($body))
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
 		$headerfile = tempnam( $this->temp_dir, "sno" );
 		$cmdline_params = '-k -D ' . escapeshellarg( $headerfile );
@@ -1045,17 +1105,19 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-				$this->response_code = $result_headers[$currentHeader];
+			if(preg_match("|^HTTP/|",$result_headers[$currentHeader])) {
+							$this->response_code = $result_headers[$currentHeader];
+			}
 
 			$this->headers[] = $result_headers[$currentHeader];
 		}
@@ -1071,15 +1133,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		unlink("$headerfile");
 
@@ -1095,8 +1160,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
-			$this->cookies[$match[1]] = urldecode($match[2]);
+		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = urldecode($match[2]);
+		}
 		}
 	}
 
@@ -1133,8 +1199,7 @@ 
 
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -1153,8 +1218,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -1198,8 +1262,9 @@ 
 		settype($formfiles, "array");
 		$postdata = '';
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+		if (count($formvars) == 0 && count($formfiles) == 0) {
+					return;
+		}
 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
@@ -1209,8 +1274,9 @@ 
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
 						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
+					} else {
+											$postdata .= urlencode($key)."=".urlencode($val)."&";
+					}
 				}
 				break;
 
@@ -1236,7 +1302,9 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if (!is_readable($file_name)) {
+							continue;
+						}
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

Spacing +254 added lines, -254 removed lines

@@ -3,9 +3,9 @@ 
 /**
  * Deprecated. Use WP_HTTP (http.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0.0', WPINC . '/http.php' );
+_deprecated_file(basename(__FILE__), '3.0.0', WPINC.'/http.php');
 
-if ( ! class_exists( 'Snoopy', false ) ) :
+if ( ! class_exists('Snoopy', false)) :
 /*************************************************
 
 Snoopy - the PHP net client
@@ -41,54 +41,54 @@ 
 
 	/* user definable vars */
 
-	var $host			=	"www.php.net";		// host name we are connecting to
-	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
-	var $proxy_user		=	"";					// proxy user to use
-	var $proxy_pass		=	"";					// proxy password to use
+	var $host			= "www.php.net"; // host name we are connecting to
+	var $port			= 80; // port we are connecting to
+	var $proxy_host		= ""; // proxy host to use
+	var $proxy_port		= ""; // proxy port to use
+	var $proxy_user		= ""; // proxy user to use
+	var $proxy_pass		= ""; // proxy password to use
 
-	var $agent			=	"Snoopy v1.2.4";	// agent we masquerade as
-	var	$referer		=	"";					// referer info to pass
-	var $cookies		=	array();			// array of cookies to pass
+	var $agent = "Snoopy v1.2.4"; // agent we masquerade as
+	var	$referer		= ""; // referer info to pass
+	var $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	var	$rawheaders		=	array();			// array of raw headers to send
+	var	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	var $lastredirectaddr	=	"";				// contains address of last redirected address
-	var	$offsiteok		=	true;				// allows redirection off-site
-	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	var $expandlinks	=	true;				// expand links to fully qualified URLs.
+	var $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	var $lastredirectaddr = ""; // contains address of last redirected address
+	var	$offsiteok		= true; // allows redirection off-site
+	var $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	var $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// submitlinks(), and submittext()
-	var $passcookies	=	true;				// pass set cookies back through redirects
+	var $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
+	var	$user			= ""; // user for http authentication
+	var	$pass			= ""; // password for http authentication
 
 	// http accept types
-	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	var $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 
-	var $results		=	"";					// where the content is put
+	var $results		= ""; // where the content is put
 
-	var $error			=	"";					// error messages sent here
-	var	$response_code	=	"";					// response code returned from server
-	var	$headers		=	array();			// headers returned from server sent here
-	var	$maxlength		=	500000;				// max return data length (body)
-	var $read_timeout	=	0;					// timeout on read operations, in seconds
+	var $error = ""; // error messages sent here
+	var	$response_code = ""; // response code returned from server
+	var	$headers = array(); // headers returned from server sent here
+	var	$maxlength = 500000; // max return data length (body)
+	var $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	var $timed_out		=	false;				// if a read operation timed out
-	var	$status			=	0;					// http request status
+	var $timed_out = false; // if a read operation timed out
+	var	$status = 0; // http request status
 
-	var $temp_dir		=	"/tmp";				// temporary directory that the webserver
+	var $temp_dir = "/tmp"; // temporary directory that the webserver
 												// has permission to write to.
 												// under Windows, this should be C:\temp
 
-	var	$curl_path		=	"/usr/local/bin/curl";
+	var	$curl_path = "/usr/local/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -102,20 +102,20 @@ 
 
 	/**** Private variables ****/
 
-	var	$_maxlinelen	=	4096;				// max line length (headers)
+	var	$_maxlinelen	= 4096; // max line length (headers)
 
-	var $_httpmethod	=	"GET";				// default http request method
-	var $_httpversion	=	"HTTP/1.0";			// default http request version
-	var $_submit_method	=	"POST";				// default submit method
-	var $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	var $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	var $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	var $_redirectdepth	=	0;					// increments on an http redirect
-	var $_frameurls		= 	array();			// frame src urls
-	var $_framedepth	=	0;					// increments on frame depth
+	var $_httpmethod	= "GET"; // default http request method
+	var $_httpversion	= "HTTP/1.0"; // default http request version
+	var $_submit_method	= "POST"; // default submit method
+	var $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	var $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	var $_redirectaddr = false; // will be set if page fetched is a redirect
+	var $_redirectdepth	= 0; // increments on an http redirect
+	var $_frameurls		= array(); // frame src urls
+	var $_framedepth	= 0; // increments on frame depth
 
-	var $_isproxy		=	false;				// set if using a proxy server
-	var $_fp_timeout	=	30;					// timeout for socket connection
+	var $_isproxy = false; // set if using a proxy server
+	var $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -131,27 +131,27 @@ 
 
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -162,30 +162,30 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -202,18 +202,18 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -222,30 +222,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -258,7 +258,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -276,34 +276,34 @@ 
 	Output:		$this->results	the text output from the post
 \*======================================================================*/
 
-	function submit($URI, $formvars="", $formfiles="")
+	function submit($URI, $formvars = "", $formfiles = "")
 	{
 		unset($postdata);
 
 		$postdata = $this->_prepare_post_body($formvars, $formfiles);
 
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata);
+						$this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 					}
 					else
 					{
@@ -314,36 +314,36 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
-							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								if( strpos( $this->_redirectaddr, "?" ) > 0 )
+								$this->lastredirectaddr = $this->_redirectaddr;
+								if (strpos($this->_redirectaddr, "?") > 0)
 									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 								else
-									$this->submit($this->_redirectaddr,$formvars, $formfiles);
+									$this->submit($this->_redirectaddr, $formvars, $formfiles);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -361,15 +361,15 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
@@ -381,36 +381,36 @@ 
 					$this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
-						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							if( strpos( $this->_redirectaddr, "?" ) > 0 )
+							$this->lastredirectaddr = $this->_redirectaddr;
+							if (strpos($this->_redirectaddr, "?") > 0)
 								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 							else
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								$this->submit($this->_redirectaddr, $formvars, $formfiles);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -424,7 +424,7 @@ 
 
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -442,17 +442,17 @@ 
 	{
 		if ($this->fetch($URI))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
 			}
 			else
 				$this->results = $this->_striplinks($this->results);
 
-			if($this->expandlinks)
+			if ($this->expandlinks)
 				$this->results = $this->_expandlinks($this->results, $URI);
 			return true;
 		}
@@ -473,9 +473,9 @@ 
 		if ($this->fetch($URI))
 		{
 
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_stripform($this->results[$x]);
 			}
 			else
@@ -497,11 +497,11 @@ 
 
 	function fetchtext($URI)
 	{
-		if($this->fetch($URI))
+		if ($this->fetch($URI))
 		{
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striptext($this->results[$x]);
 			}
 			else
@@ -519,26 +519,26 @@ 
 	Output:		$this->results	an array of the links from the post
 \*======================================================================*/
 
-	function submitlinks($URI, $formvars="", $formfiles="")
+	function submitlinks($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striplinks($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -555,24 +555,24 @@ 
 
 	function submittext($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striptext($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striptext($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -624,20 +624,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
@@ -654,10 +654,10 @@ 
 
 	function _stripform($document)
 	{
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 
 		// return the links
 		return $match;
@@ -679,11 +679,11 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quot|#34|#034|#x22);'i",		// replace html entities
-						"'&(amp|#38|#038|#x26);'i",			// added hexadecimal values
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quot|#34|#034|#x22);'i", // replace html entities
+						"'&(amp|#38|#038|#x26);'i", // added hexadecimal values
 						"'&(lt|#60|#060|#x3c);'i",
 						"'&(gt|#62|#062|#x3e);'i",
 						"'&(nbsp|#160|#xa0);'i",
@@ -694,8 +694,8 @@ 
 						"'&(reg|#174);'i",
 						"'&(deg|#176);'i",
 						"'&(#39|#039|#x27);'",
-						"'&(euro|#8364);'i",				// europe
-						"'&a(uml|UML);'",					// german
+						"'&(euro|#8364);'i", // europe
+						"'&a(uml|UML);'", // german
 						"'&o(uml|UML);'",
 						"'&u(uml|UML);'",
 						"'&A(uml|UML);'",
@@ -703,7 +703,7 @@ 
 						"'&U(uml|UML);'",
 						"'&szlig;'i",
 						);
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -728,7 +728,7 @@ 
 							chr(0xDF), // ANSI &szlig;
 						);
 
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 
 		return $text;
 	}
@@ -741,32 +741,32 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	function _expandlinks($links,$URI)
+	function _expandlinks($links, $URI)
 	{
 
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
-		$match = preg_replace("|/$|","",$match);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
+		$match = preg_replace("|/$|", "", $match);
 		$match_part = parse_url($match);
 		$match_root =
 		$match_part["scheme"]."://".$match_part["host"];
 
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(\/)|i",
 							"|^(?!http://)(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 
-		$replace = array(	"",
+		$replace = array("",
 							$match_root."/",
 							$match."/",
 							"/",
 							"/"
 						);
 
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -781,63 +781,63 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
 		$cookie_headers = '';
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+		if ( ! empty($this->host) && ! isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port) && $this->port != 80)
+			if ( ! empty($this->port) && $this->port != 80)
 				$headers .= ":".$this->port;
 			$headers .= "\r\n";
 		}
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		//add proxy auth headers
-		if(!empty($this->proxy_user))
-			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		if ( ! empty($this->proxy_user))
+			$headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
 		$headers .= "\r\n";
@@ -847,34 +847,34 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 
-			if($currentHeader == "\r\n")
+			if ($currentHeader == "\r\n")
 				break;
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)[ ]+(.*)/i",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)[ ]+(.*)/i", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -883,11 +883,11 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }
 				$this->response_code = $currentHeader;
 			}
@@ -902,31 +902,31 @@ 
         		break;
     		}
     		$results .= $_data;
-		} while(true);
+		} while (true);
 
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -944,108 +944,108 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			if(!empty($this->port))
+		if ( ! empty($this->host))
+			if ( ! empty($this->port))
 				$headers[] = "Host: ".$this->host.":".$this->port;
 			else
 				$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
-		$headerfile = tempnam( $this->temp_dir, "sno" );
-		$cmdline_params = '-k -D ' . escapeshellarg( $headerfile );
+		$headerfile = tempnam($this->temp_dir, "sno");
+		$cmdline_params = '-k -D '.escapeshellarg($headerfile);
 
-		foreach ( $headers as $header ) {
-			$cmdline_params .= ' -H ' . escapeshellarg( $header );
+		foreach ($headers as $header) {
+			$cmdline_params .= ' -H '.escapeshellarg($header);
 		}
 
-		if ( ! empty( $body ) ) {
-			$cmdline_params .= ' -d ' . escapeshellarg( $body );
+		if ( ! empty($body)) {
+			$cmdline_params .= ' -d '.escapeshellarg($body);
 		}
 
-		if ( $this->read_timeout > 0 ) {
-			$cmdline_params .= ' -m ' . escapeshellarg( $this->read_timeout );
+		if ($this->read_timeout > 0) {
+			$cmdline_params .= ' -m '.escapeshellarg($this->read_timeout);
 		}
 
 
-		exec( $this->curl_path . ' ' . $cmdline_params . ' ' . escapeshellarg( $URI ), $results, $return );
+		exec($this->curl_path.' '.$cmdline_params.' '.escapeshellarg($URI), $results, $return);
 
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 
 
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 
 		$result_headers = file("$headerfile");
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)\s+(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)\s+(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -1054,7 +1054,7 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 				$this->response_code = $result_headers[$currentHeader];
 
 			$this->headers[] = $result_headers[$currentHeader];
@@ -1062,20 +1062,20 @@ 
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -1093,9 +1093,9 @@ 
 
 	function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
+		if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
 			$this->cookies[$match[1]] = urldecode($match[2]);
 		}
 	}
@@ -1127,7 +1127,7 @@ 
 
 	function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if ( ! empty($this->proxy_host) && ! empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 
@@ -1142,7 +1142,7 @@ 
 
 		$this->status = 0;
 
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -1158,16 +1158,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -1204,7 +1204,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -1218,7 +1218,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";
@@ -1236,7 +1236,7 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if ( ! is_readable($file_name)) continue;
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

src/wp-includes/class-wp-customize-nav-menus.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * @since 4.3.0
 	 * @access public
 	 *
-	 * @param object $manager An instance of the WP_Customize_Manager class.
+	 * @param WP_Customize_Manager $manager An instance of the WP_Customize_Manager class.
 	 */
 	public function __construct( $manager ) {
 		$this->previewed_menus = array();
@@ -876,7 +876,7 @@ 
 	 *
 	 * @param string $nav_menu_content The HTML content for the navigation menu.
 	 * @param object $args             An object containing wp_nav_menu() arguments.
-	 * @return null
+	 * @return string
 	 */
 	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
 		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {

Spacing +378 added lines, -378 removed lines

@@ -44,33 +44,33 @@ 
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->previewed_menus = array();
 		$this->manager         = $manager;
 
 		// See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L469-L499
-		add_action( 'customize_register', array( $this, 'customize_register' ), 11 );
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_dynamic_setting_args' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_dynamic_setting_class' ), 10, 3 );
+		add_action('customize_register', array($this, 'customize_register'), 11);
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_dynamic_setting_args'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_dynamic_setting_class'), 10, 3);
 
 		// Skip remaining hooks when the user can't manage nav menus anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
-		add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
-		add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
-		add_action( 'wp_ajax_customize-nav-menus-insert-auto-draft', array( $this, 'ajax_insert_auto_draft_post' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
-		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
-		add_action( 'customize_preview_init', array( $this, 'make_auto_draft_status_previewable' ) );
-		add_action( 'customize_save_nav_menus_created_posts', array( $this, 'save_nav_menus_created_posts' ) );
+		add_filter('customize_refresh_nonces', array($this, 'filter_nonces'));
+		add_action('wp_ajax_load-available-menu-items-customizer', array($this, 'ajax_load_available_items'));
+		add_action('wp_ajax_search-available-menu-items-customizer', array($this, 'ajax_search_available_items'));
+		add_action('wp_ajax_customize-nav-menus-insert-auto-draft', array($this, 'ajax_insert_auto_draft_post'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_templates'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'available_items_template'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
+		add_action('customize_preview_init', array($this, 'make_auto_draft_status_previewable'));
+		add_action('customize_save_nav_menus_created_posts', array($this, 'save_nav_menus_created_posts'));
 
 		// Selective Refresh partials.
-		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
 	}
 
 	/**
@@ -82,8 +82,8 @@ 
 	 * @param array $nonces Array of nonces.
 	 * @return array $nonces Modified array of nonces.
 	 */
-	public function filter_nonces( $nonces ) {
-		$nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
+	public function filter_nonces($nonces) {
+		$nonces['customize-menus'] = wp_create_nonce('customize-menus');
 		return $nonces;
 	}
 
@@ -94,41 +94,41 @@ 
 	 * @access public
 	 */
 	public function ajax_load_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
 		$all_items = array();
 		$item_types = array();
-		if ( isset( $_POST['item_types'] ) && is_array( $_POST['item_types'] ) ) {
-			$item_types = wp_unslash( $_POST['item_types'] );
-		} elseif ( isset( $_POST['type'] ) && isset( $_POST['object'] ) ) { // Back compat.
+		if (isset($_POST['item_types']) && is_array($_POST['item_types'])) {
+			$item_types = wp_unslash($_POST['item_types']);
+		} elseif (isset($_POST['type']) && isset($_POST['object'])) { // Back compat.
 			$item_types[] = array(
-				'type' => wp_unslash( $_POST['type'] ),
-				'object' => wp_unslash( $_POST['object'] ),
-				'page' => empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] ),
+				'type' => wp_unslash($_POST['type']),
+				'object' => wp_unslash($_POST['object']),
+				'page' => empty($_POST['page']) ? 0 : absint($_POST['page']),
 			);
 		} else {
-			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+			wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 		}
 
-		foreach ( $item_types as $item_type ) {
-			if ( empty( $item_type['type'] ) || empty( $item_type['object'] ) ) {
-				wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+		foreach ($item_types as $item_type) {
+			if (empty($item_type['type']) || empty($item_type['object'])) {
+				wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 			}
-			$type = sanitize_key( $item_type['type'] );
-			$object = sanitize_key( $item_type['object'] );
-			$page = empty( $item_type['page'] ) ? 0 : absint( $item_type['page'] );
-			$items = $this->load_available_items_query( $type, $object, $page );
-			if ( is_wp_error( $items ) ) {
-				wp_send_json_error( $items->get_error_code() );
+			$type = sanitize_key($item_type['type']);
+			$object = sanitize_key($item_type['object']);
+			$page = empty($item_type['page']) ? 0 : absint($item_type['page']);
+			$items = $this->load_available_items_query($type, $object, $page);
+			if (is_wp_error($items)) {
+				wp_send_json_error($items->get_error_code());
 			}
-			$all_items[ $item_type['type'] . ':' . $item_type['object'] ] = $items;
+			$all_items[$item_type['type'].':'.$item_type['object']] = $items;
 		}
 
-		wp_send_json_success( array( 'items' => $all_items ) );
+		wp_send_json_success(array('items' => $all_items));
 	}
 
 	/**
@@ -143,74 +143,74 @@ 
 	 * @param int    $page   Optional. The page number used to generate the query offset. Default is '0'.
 	 * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
 	 */
-	public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
+	public function load_available_items_query($type = 'post_type', $object = 'page', $page = 0) {
 		$items = array();
 
-		if ( 'post_type' === $type ) {
-			$post_type = get_post_type_object( $object );
-			if ( ! $post_type ) {
-				return new WP_Error( 'nav_menus_invalid_post_type' );
+		if ('post_type' === $type) {
+			$post_type = get_post_type_object($object);
+			if ( ! $post_type) {
+				return new WP_Error('nav_menus_invalid_post_type');
 			}
 
-			if ( 0 === $page && 'page' === $object ) {
+			if (0 === $page && 'page' === $object) {
 				// Add "Home" link. Treat as a page, but switch to custom on add.
 				$items[] = array(
 					'id'         => 'home',
-					'title'      => _x( 'Home', 'nav menu home label' ),
+					'title'      => _x('Home', 'nav menu home label'),
 					'type'       => 'custom',
-					'type_label' => __( 'Custom Link' ),
+					'type_label' => __('Custom Link'),
 					'object'     => '',
 					'url'        => home_url(),
 				);
-			} elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
+			} elseif ('post' !== $object && 0 === $page && $post_type->has_archive) {
 				// Add a post type archive link.
 				$items[] = array(
-					'id'         => $object . '-archive',
+					'id'         => $object.'-archive',
 					'title'      => $post_type->labels->archives,
 					'type'       => 'post_type_archive',
-					'type_label' => __( 'Post Type Archive' ),
+					'type_label' => __('Post Type Archive'),
 					'object'     => $object,
-					'url'        => get_post_type_archive_link( $object ),
+					'url'        => get_post_type_archive_link($object),
 				);
 			}
 
 			// Prepend posts with nav_menus_created_posts on first page.
 			$posts = array();
-			if ( 0 === $page && $this->manager->get_setting( 'nav_menus_created_posts' ) ) {
-				foreach ( $this->manager->get_setting( 'nav_menus_created_posts' )->value() as $post_id ) {
-					$auto_draft_post = get_post( $post_id );
-					if ( $post_type->name === $auto_draft_post->post_type ) {
+			if (0 === $page && $this->manager->get_setting('nav_menus_created_posts')) {
+				foreach ($this->manager->get_setting('nav_menus_created_posts')->value() as $post_id) {
+					$auto_draft_post = get_post($post_id);
+					if ($post_type->name === $auto_draft_post->post_type) {
 						$posts[] = $auto_draft_post;
 					}
 				}
 			}
 
-			$posts = array_merge( $posts, get_posts( array(
+			$posts = array_merge($posts, get_posts(array(
 				'numberposts' => 10,
 				'offset'      => 10 * $page,
 				'orderby'     => 'date',
 				'order'       => 'DESC',
 				'post_type'   => $object,
-			) ) );
+			)));
 
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
 					'id'         => "post-{$post->ID}",
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+					'type_label' => get_post_type_object($post->post_type)->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
-		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
+		} elseif ('taxonomy' === $type) {
+			$terms = get_terms($object, array(
 				'child_of'     => 0,
 				'exclude'      => '',
 				'hide_empty'   => false,
@@ -221,20 +221,20 @@ 
 				'order'        => 'DESC',
 				'orderby'      => 'count',
 				'pad_counts'   => false,
-			) );
-			if ( is_wp_error( $terms ) ) {
+			));
+			if (is_wp_error($terms)) {
 				return $terms;
 			}
 
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				$items[] = array(
 					'id'         => "term-{$term->term_id}",
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -249,7 +249,7 @@ 
 		 * @param string $object The object name.
 		 * @param int    $page   The current page number.
 		 */
-		$items = apply_filters( 'customize_nav_menu_available_items', $items, $type, $object, $page );
+		$items = apply_filters('customize_nav_menu_available_items', $items, $type, $object, $page);
 
 		return $items;
 	}
@@ -261,28 +261,28 @@ 
 	 * @access public
 	 */
 	public function ajax_search_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['search'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_search_parameter' );
+		if (empty($_POST['search'])) {
+			wp_send_json_error('nav_menus_missing_search_parameter');
 		}
 
-		$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
-		if ( $p < 1 ) {
+		$p = isset($_POST['page']) ? absint($_POST['page']) : 0;
+		if ($p < 1) {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s = sanitize_text_field(wp_unslash($_POST['search']));
+		$items = $this->search_available_items_query(array('pagenum' => $p, 's' => $s));
 
-		if ( empty( $items ) ) {
-			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+		if (empty($items)) {
+			wp_send_json_error(array('message' => __('No results found.')));
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -297,12 +297,12 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
 	 */
-	public function search_available_items_query( $args = array() ) {
+	public function search_available_items_query($args = array()) {
 		$items = array();
 
-		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+		$post_type_objects = get_post_types(array('show_in_nav_menus' => true), 'objects');
 		$query = array(
-			'post_type'              => array_keys( $post_type_objects ),
+			'post_type'              => array_keys($post_type_objects),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
@@ -310,70 +310,70 @@ 
 			'posts_per_page'         => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
-		if ( isset( $args['s'] ) ) {
+		if (isset($args['s'])) {
 			$query['s'] = $args['s'];
 		}
 
 		$posts = array();
 
 		// Prepend list of posts with nav_menus_created_posts search results on first page.
-		$nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
-		if ( 1 === $args['pagenum'] && $nav_menus_created_posts_setting && count( $nav_menus_created_posts_setting ) > 0 ) {
-			$stub_post_query = new WP_Query( array_merge(
+		$nav_menus_created_posts_setting = $this->manager->get_setting('nav_menus_created_posts');
+		if (1 === $args['pagenum'] && $nav_menus_created_posts_setting && count($nav_menus_created_posts_setting) > 0) {
+			$stub_post_query = new WP_Query(array_merge(
 				$query,
 				array(
 					'post_status' => 'auto-draft',
 					'post__in' => $nav_menus_created_posts_setting->value(),
 					'posts_per_page' => -1,
 				)
-			) );
-			$posts = array_merge( $posts, $stub_post_query->posts );
+			));
+			$posts = array_merge($posts, $stub_post_query->posts);
 		}
 
 		// Query posts.
-		$get_posts = new WP_Query( $query );
-		$posts = array_merge( $posts, $get_posts->posts );
+		$get_posts = new WP_Query($query);
+		$posts = array_merge($posts, $get_posts->posts);
 
 		// Create items for posts.
-		foreach ( $posts as $post ) {
+		foreach ($posts as $post) {
 			$post_title = $post->post_title;
-			if ( '' === $post_title ) {
+			if ('' === $post_title) {
 				/* translators: %d: ID of a post */
-				$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+				$post_title = sprintf(__('#%d (no title)'), $post->ID);
 			}
 			$items[] = array(
-				'id'         => 'post-' . $post->ID,
-				'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+				'id'         => 'post-'.$post->ID,
+				'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 				'type'       => 'post_type',
-				'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+				'type_label' => $post_type_objects[$post->post_type]->labels->singular_name,
 				'object'     => $post->post_type,
-				'object_id'  => intval( $post->ID ),
-				'url'        => get_permalink( intval( $post->ID ) ),
+				'object_id'  => intval($post->ID),
+				'url'        => get_permalink(intval($post->ID)),
 			);
 		}
 
 		// Query taxonomy terms.
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'names');
+		$terms = get_terms($taxonomies, array(
 			'name__like' => $args['s'],
 			'number'     => 20,
 			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		));
 
 		// Check if any taxonomies were found.
-		if ( ! empty( $terms ) ) {
-			foreach ( $terms as $term ) {
+		if ( ! empty($terms)) {
+			foreach ($terms as $term) {
 				$items[] = array(
-					'id'         => 'term-' . $term->term_id,
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'term-'.$term->term_id,
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -386,7 +386,7 @@ 
 		 * @param array $items The array of menu items.
 		 * @param array $args  Includes 'pagenum' and 's' (search) arguments.
 		 */
-		$items = apply_filters( 'customize_nav_menu_searched_items', $items, $args );
+		$items = apply_filters('customize_nav_menu_searched_items', $items, $args);
 
 		return $items;
 	}
@@ -398,45 +398,45 @@ 
 	 * @access public
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( 'customize-nav-menus' );
-		wp_enqueue_script( 'customize-nav-menus' );
+		wp_enqueue_style('customize-nav-menus');
+		wp_enqueue_script('customize-nav-menus');
 
-		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting( $this->manager, 'nav_menu[-1]' );
-		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->manager, 'nav_menu_item[-1]' );
+		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting($this->manager, 'nav_menu[-1]');
+		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting($this->manager, 'nav_menu_item[-1]');
 
 		// Pass data to JS.
 		$settings = array(
 			'allMenus'             => wp_get_nav_menus(),
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
-				'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
-				'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
-				'custom_label'      => __( 'Custom Link' ),
-				'page_label'        => get_post_type_object( 'page' )->labels->singular_name,
+				'untitled'          => _x('(no label)', 'missing menu item navigation label'),
+				'unnamed'           => _x('(unnamed)', 'Missing menu name.'),
+				'custom_label'      => __('Custom Link'),
+				'page_label'        => get_post_type_object('page')->labels->singular_name,
 				/* translators: %s: menu location */
-				'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
-				'menuNameLabel'     => __( 'Menu Name' ),
-				'itemAdded'         => __( 'Menu item added' ),
-				'itemDeleted'       => __( 'Menu item deleted' ),
-				'menuAdded'         => __( 'Menu created' ),
-				'menuDeleted'       => __( 'Menu deleted' ),
-				'movedUp'           => __( 'Menu item moved up' ),
-				'movedDown'         => __( 'Menu item moved down' ),
-				'movedLeft'         => __( 'Menu item moved out of submenu' ),
-				'movedRight'        => __( 'Menu item is now a sub-item' ),
+				'menuLocation'      => _x('(Currently set to: %s)', 'menu'),
+				'menuNameLabel'     => __('Menu Name'),
+				'itemAdded'         => __('Menu item added'),
+				'itemDeleted'       => __('Menu item deleted'),
+				'menuAdded'         => __('Menu created'),
+				'menuDeleted'       => __('Menu deleted'),
+				'movedUp'           => __('Menu item moved up'),
+				'movedDown'         => __('Menu item moved down'),
+				'movedLeft'         => __('Menu item moved out of submenu'),
+				'movedRight'        => __('Menu item is now a sub-item'),
 				/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-				'customizingMenus'  => sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
+				'customizingMenus'  => sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title)),
 				/* translators: %s: title of menu item which is invalid */
-				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				'invalidTitleTpl'   => __('%s (Invalid)'),
 				/* translators: %s: title of menu item in draft status */
-				'pendingTitleTpl'   => __( '%s (Pending)' ),
-				'itemsFound'        => __( 'Number of items found: %d' ),
-				'itemsFoundMore'    => __( 'Additional items found: %d' ),
-				'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
-				'reorderModeOn'     => __( 'Reorder mode enabled' ),
-				'reorderModeOff'    => __( 'Reorder mode closed' ),
-				'reorderLabelOn'    => esc_attr__( 'Reorder menu items' ),
-				'reorderLabelOff'   => esc_attr__( 'Close reorder mode' ),
+				'pendingTitleTpl'   => __('%s (Pending)'),
+				'itemsFound'        => __('Number of items found: %d'),
+				'itemsFoundMore'    => __('Additional items found: %d'),
+				'itemsLoadingMore'  => __('Loading more results... please wait.'),
+				'reorderModeOn'     => __('Reorder mode enabled'),
+				'reorderModeOff'    => __('Reorder mode closed'),
+				'reorderLabelOn'    => esc_attr__('Reorder menu items'),
+				'reorderLabelOff'   => esc_attr__('Close reorder mode'),
 			),
 			'settingTransport'     => 'postMessage',
 			'phpIntMax'            => PHP_INT_MAX,
@@ -447,29 +447,29 @@ 
 			'locationSlugMappedToName' => get_registered_nav_menus(),
 		);
 
-		$data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );
-		wp_scripts()->add_data( 'customize-nav-menus', 'data', $data );
+		$data = sprintf('var _wpCustomizeNavMenusSettings = %s;', wp_json_encode($settings));
+		wp_scripts()->add_data('customize-nav-menus', 'data', $data);
 
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'       => __('Move up one'),
+			'moveDown'     => __('Move down one'),
+			'moveToTop'    => __('Move to the top'),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'    => __('Move under %s'),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'  => __('Move out from under %s'),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'        => __('Under %s'),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'      => __('Out from under %s'),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 		);
-		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+		wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 	}
 
 	/**
@@ -486,13 +486,13 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return array|false
 	 */
-	public function filter_dynamic_setting_args( $setting_args, $setting_id ) {
-		if ( preg_match( WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id ) ) {
+	public function filter_dynamic_setting_args($setting_args, $setting_id) {
+		if (preg_match(WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Setting::TYPE,
 				'transport' => 'postMessage',
 			);
-		} elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+		} elseif (preg_match(WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Item_Setting::TYPE,
 				'transport' => 'postMessage',
@@ -512,12 +512,12 @@ 
 	 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 	 * @return string
 	 */
-	public function filter_dynamic_setting_class( $setting_class, $setting_id, $setting_args ) {
-		unset( $setting_id );
+	public function filter_dynamic_setting_class($setting_class, $setting_id, $setting_args) {
+		unset($setting_id);
 
-		if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
+		if ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Setting';
-		} elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+		} elseif ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
 		}
 		return $setting_class;
@@ -533,172 +533,172 @@ 
 
 		// Preview settings for nav menus early so that the sections and controls will be added properly.
 		$nav_menus_setting_ids = array();
-		foreach ( array_keys( $this->manager->unsanitized_post_values() ) as $setting_id ) {
-			if ( preg_match( '/^(nav_menu_locations|nav_menu|nav_menu_item)\[/', $setting_id ) ) {
+		foreach (array_keys($this->manager->unsanitized_post_values()) as $setting_id) {
+			if (preg_match('/^(nav_menu_locations|nav_menu|nav_menu_item)\[/', $setting_id)) {
 				$nav_menus_setting_ids[] = $setting_id;
 			}
 		}
-		$this->manager->add_dynamic_settings( $nav_menus_setting_ids );
-		if ( ! $this->manager->doing_ajax( 'customize_save' ) ) {
-			foreach ( $nav_menus_setting_ids as $setting_id ) {
-				$setting = $this->manager->get_setting( $setting_id );
-				if ( $setting ) {
+		$this->manager->add_dynamic_settings($nav_menus_setting_ids);
+		if ( ! $this->manager->doing_ajax('customize_save')) {
+			foreach ($nav_menus_setting_ids as $setting_id) {
+				$setting = $this->manager->get_setting($setting_id);
+				if ($setting) {
 					$setting->preview();
 				}
 			}
 		}
 
 		// Require JS-rendered control types.
-		$this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
+		$this->manager->register_panel_type('WP_Customize_Nav_Menus_Panel');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Name_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Auto_Add_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Item_Control');
 
 		// Create a panel for Menus.
-		$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
-		if ( current_theme_supports( 'widgets' ) ) {
+		$description = '<p>'.__('This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.').'</p>';
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		} else {
-			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
+			$description .= '<p>'.__('Menus can be displayed in locations defined by your theme.').'</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
+		$this->manager->add_panel(new WP_Customize_Nav_Menus_Panel($this->manager, 'nav_menus', array(
+			'title'       => __('Menus'),
 			'description' => $description,
 			'priority'    => 100,
 			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		)));
 		$menus = wp_get_nav_menus();
 
 		// Menu locations.
 		$locations     = get_registered_nav_menus();
-		$num_locations = count( array_keys( $locations ) );
-		if ( 1 == $num_locations ) {
-			$description = '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+		$num_locations = count(array_keys($locations));
+		if (1 == $num_locations) {
+			$description = '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
 			/* translators: %s: number of menu locations */
-			$description = '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			$description = '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
-		if ( current_theme_supports( 'widgets' ) ) {
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		}
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => __( 'Menu Locations' ),
+		$this->manager->add_section('menu_locations', array(
+			'title'       => __('Menu Locations'),
 			'panel'       => 'nav_menus',
 			'priority'    => 5,
 			'description' => $description,
-		) );
+		));
 
-		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
-		foreach ( $menus as $menu ) {
-			$choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '&hellip;' );
+		$choices = array('0' => __('&mdash; Select &mdash;'));
+		foreach ($menus as $menu) {
+			$choices[$menu->term_id] = wp_html_excerpt($menu->name, 40, '&hellip;');
 		}
 
-		foreach ( $locations as $location => $description ) {
+		foreach ($locations as $location => $description) {
 			$setting_id = "nav_menu_locations[{$location}]";
 
-			$setting = $this->manager->get_setting( $setting_id );
-			if ( $setting ) {
+			$setting = $this->manager->get_setting($setting_id);
+			if ($setting) {
 				$setting->transport = 'postMessage';
-				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+				remove_filter("customize_sanitize_{$setting_id}", 'absint');
+				add_filter("customize_sanitize_{$setting_id}", array($this, 'intval_base10'));
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
+				$this->manager->add_setting($setting_id, array(
+					'sanitize_callback' => array($this, 'intval_base10'),
 					'theme_supports'    => 'menus',
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'default'           => 0,
-				) );
+				));
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+			$this->manager->add_control(new WP_Customize_Nav_Menu_Location_Control($this->manager, $setting_id, array(
 				'label'       => $description,
 				'location_id' => $location,
 				'section'     => 'menu_locations',
 				'choices'     => $choices,
-			) ) );
+			)));
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
-		foreach ( $menus as $menu ) {
+		foreach ($menus as $menu) {
 			$menu_id = $menu->term_id;
 
 			// Create a section for each menu.
-			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			$section_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_section(new WP_Customize_Nav_Menu_Section($this->manager, $section_id, array(
+				'title'     => html_entity_decode($menu->name, ENT_QUOTES, get_bloginfo('charset')),
 				'priority'  => 10,
 				'panel'     => 'nav_menus',
-			) ) );
+			)));
 
-			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_setting( new WP_Customize_Nav_Menu_Setting( $this->manager, $nav_menu_setting_id, array(
+			$nav_menu_setting_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_setting(new WP_Customize_Nav_Menu_Setting($this->manager, $nav_menu_setting_id, array(
 				'transport' => 'postMessage',
-			) ) );
+			)));
 
 			// Add the menu contents.
-			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
+			$menu_items = (array) wp_get_nav_menu_items($menu_id);
 
-			foreach ( array_values( $menu_items ) as $i => $item ) {
+			foreach (array_values($menu_items) as $i => $item) {
 
 				// Create a setting for each menu item (which doesn't actually manage data, currently).
-				$menu_item_setting_id = 'nav_menu_item[' . $item->ID . ']';
+				$menu_item_setting_id = 'nav_menu_item['.$item->ID.']';
 
 				$value = (array) $item;
-				if ( empty( $value['post_title'] ) ) {
+				if (empty($value['post_title'])) {
 					$value['title'] = '';
 				}
 
 				$value['nav_menu_term_id'] = $menu_id;
-				$this->manager->add_setting( new WP_Customize_Nav_Menu_Item_Setting( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_setting(new WP_Customize_Nav_Menu_Item_Setting($this->manager, $menu_item_setting_id, array(
 					'value'     => $value,
 					'transport' => 'postMessage',
-				) ) );
+				)));
 
 				// Create a control for each menu item.
-				$this->manager->add_control( new WP_Customize_Nav_Menu_Item_Control( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_control(new WP_Customize_Nav_Menu_Item_Control($this->manager, $menu_item_setting_id, array(
 					'label'    => $item->title,
 					'section'  => $section_id,
 					'priority' => 10 + $i,
-				) ) );
+				)));
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( new WP_Customize_New_Menu_Section( $this->manager, 'add_menu', array(
-			'title'    => __( 'Add a Menu' ),
+		$this->manager->add_section(new WP_Customize_New_Menu_Section($this->manager, 'add_menu', array(
+			'title'    => __('Add a Menu'),
 			'panel'    => 'nav_menus',
 			'priority' => 999,
-		) ) );
+		)));
 
-		$this->manager->add_control( 'new_menu_name', array(
+		$this->manager->add_control('new_menu_name', array(
 			'label'       => '',
 			'section'     => 'add_menu',
 			'type'        => 'text',
 			'settings'    => array(),
 			'input_attrs' => array(
 				'class'       => 'menu-name-field',
-				'placeholder' => __( 'New menu name' ),
+				'placeholder' => __('New menu name'),
 			),
-		) );
+		));
 
-		$this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
+		$this->manager->add_control(new WP_Customize_New_Menu_Control($this->manager, 'create_new_menu', array(
 			'section'  => 'add_menu',
 			'settings' => array(),
-		) ) );
+		)));
 
-		$this->manager->add_setting( new WP_Customize_Filter_Setting( $this->manager, 'nav_menus_created_posts', array(
+		$this->manager->add_setting(new WP_Customize_Filter_Setting($this->manager, 'nav_menus_created_posts', array(
 			'transport' => 'postMessage',
 			'type' => 'option', // To prevent theme prefix in changeset.
 			'default' => array(),
-			'sanitize_callback' => array( $this, 'sanitize_nav_menus_created_posts' ),
-		) ) );
+			'sanitize_callback' => array($this, 'sanitize_nav_menus_created_posts'),
+		)));
 	}
 
 	/**
@@ -713,8 +713,8 @@ 
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
 	 */
-	public function intval_base10( $value ) {
-		return intval( $value, 10 );
+	public function intval_base10($value) {
+		return intval($value, 10);
 	}
 
 	/**
@@ -729,9 +729,9 @@ 
 	public function available_item_types() {
 		$item_types = array();
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $post_types ) {
-			foreach ( $post_types as $slug => $post_type ) {
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'objects');
+		if ($post_types) {
+			foreach ($post_types as $slug => $post_type) {
 				$item_types[] = array(
 					'title'  => $post_type->labels->name,
 					'type_label' => $post_type->labels->singular_name,
@@ -741,10 +741,10 @@ 
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $slug => $taxonomy ) {
-				if ( 'post_format' === $taxonomy && ! current_theme_supports( 'post-formats' ) ) {
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'objects');
+		if ($taxonomies) {
+			foreach ($taxonomies as $slug => $taxonomy) {
+				if ('post_format' === $taxonomy && ! current_theme_supports('post-formats')) {
 					continue;
 				}
 				$item_types[] = array(
@@ -764,7 +764,7 @@ 
 		 *
 		 * @param array $item_types Custom menu item types.
 		 */
-		$item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );
+		$item_types = apply_filters('customize_nav_menu_available_item_types', $item_types);
 
 		return $item_types;
 	}
@@ -785,37 +785,37 @@ 
 	 * }
 	 * @return WP_Post|WP_Error Inserted auto-draft post object or error.
 	 */
-	public function insert_auto_draft_post( $postarr ) {
-		if ( ! isset( $postarr['post_type'] ) || ! post_type_exists( $postarr['post_type'] )  ) {
-			return new WP_Error( 'unknown_post_type', __( 'Unknown post type' ) );
+	public function insert_auto_draft_post($postarr) {
+		if ( ! isset($postarr['post_type']) || ! post_type_exists($postarr['post_type'])) {
+			return new WP_Error('unknown_post_type', __('Unknown post type'));
 		}
-		if ( empty( $postarr['post_title'] ) ) {
-			return new WP_Error( 'empty_title', __( 'Empty title' ) );
+		if (empty($postarr['post_title'])) {
+			return new WP_Error('empty_title', __('Empty title'));
 		}
-		if ( ! empty( $postarr['post_status'] ) ) {
-			return new WP_Error( 'status_forbidden', __( 'Status is forbidden' ) );
+		if ( ! empty($postarr['post_status'])) {
+			return new WP_Error('status_forbidden', __('Status is forbidden'));
 		}
 
 		$postarr['post_status'] = 'auto-draft';
 
 		// Auto-drafts are allowed to have empty post_names, so it has to be explicitly set.
-		if ( empty( $postarr['post_name'] ) ) {
-			$postarr['post_name'] = sanitize_title( $postarr['post_title'] );
+		if (empty($postarr['post_name'])) {
+			$postarr['post_name'] = sanitize_title($postarr['post_title']);
 		}
-		if ( ! isset( $postarr['meta_input'] ) ) {
+		if ( ! isset($postarr['meta_input'])) {
 			$postarr['meta_input'] = array();
 		}
 		$postarr['meta_input']['_customize_draft_post_name'] = $postarr['post_name'];
-		unset( $postarr['post_name'] );
+		unset($postarr['post_name']);
 
-		add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
-		$r = wp_insert_post( wp_slash( $postarr ), true );
-		remove_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
+		add_filter('wp_insert_post_empty_content', '__return_false', 1000);
+		$r = wp_insert_post(wp_slash($postarr), true);
+		remove_filter('wp_insert_post_empty_content', '__return_false', 1000);
 
-		if ( is_wp_error( $r ) ) {
+		if (is_wp_error($r)) {
 			return $r;
 		} else {
-			return get_post( $r );
+			return get_post($r);
 		}
 	}
 
@@ -826,22 +826,22 @@ 
 	 * @since 4.7.0
 	 */
 	public function ajax_insert_auto_draft_post() {
-		if ( ! check_ajax_referer( 'customize-menus', 'customize-menus-nonce', false ) ) {
-			wp_send_json_error( 'bad_nonce', 400 );
+		if ( ! check_ajax_referer('customize-menus', 'customize-menus-nonce', false)) {
+			wp_send_json_error('bad_nonce', 400);
 		}
 
-		if ( ! current_user_can( 'customize' ) ) {
-			wp_send_json_error( 'customize_not_allowed', 403 );
+		if ( ! current_user_can('customize')) {
+			wp_send_json_error('customize_not_allowed', 403);
 		}
 
-		if ( empty( $_POST['params'] ) || ! is_array( $_POST['params'] ) ) {
-			wp_send_json_error( 'missing_params', 400 );
+		if (empty($_POST['params']) || ! is_array($_POST['params'])) {
+			wp_send_json_error('missing_params', 400);
 		}
 
-		$params = wp_unslash( $_POST['params'] );
-		$illegal_params = array_diff( array_keys( $params ), array( 'post_type', 'post_title' ) );
-		if ( ! empty( $illegal_params ) ) {
-			wp_send_json_error( 'illegal_params', 400 );
+		$params = wp_unslash($_POST['params']);
+		$illegal_params = array_diff(array_keys($params), array('post_type', 'post_title'));
+		if ( ! empty($illegal_params)) {
+			wp_send_json_error('illegal_params', 400);
 		}
 
 		$params = array_merge(
@@ -852,44 +852,44 @@ 
 			$params
 		);
 
-		if ( empty( $params['post_type'] ) || ! post_type_exists( $params['post_type'] ) ) {
-			status_header( 400 );
-			wp_send_json_error( 'missing_post_type_param' );
+		if (empty($params['post_type']) || ! post_type_exists($params['post_type'])) {
+			status_header(400);
+			wp_send_json_error('missing_post_type_param');
 		}
 
-		$post_type_object = get_post_type_object( $params['post_type'] );
-		if ( ! current_user_can( $post_type_object->cap->create_posts ) || ! current_user_can( $post_type_object->cap->publish_posts ) ) {
-			status_header( 403 );
-			wp_send_json_error( 'insufficient_post_permissions' );
+		$post_type_object = get_post_type_object($params['post_type']);
+		if ( ! current_user_can($post_type_object->cap->create_posts) || ! current_user_can($post_type_object->cap->publish_posts)) {
+			status_header(403);
+			wp_send_json_error('insufficient_post_permissions');
 		}
 
-		$params['post_title'] = trim( $params['post_title'] );
-		if ( '' === $params['post_title'] ) {
-			status_header( 400 );
-			wp_send_json_error( 'missing_post_title' );
+		$params['post_title'] = trim($params['post_title']);
+		if ('' === $params['post_title']) {
+			status_header(400);
+			wp_send_json_error('missing_post_title');
 		}
 
-		$r = $this->insert_auto_draft_post( $params );
-		if ( is_wp_error( $r ) ) {
+		$r = $this->insert_auto_draft_post($params);
+		if (is_wp_error($r)) {
 			$error = $r;
-			if ( ! empty( $post_type_object->labels->singular_name ) ) {
+			if ( ! empty($post_type_object->labels->singular_name)) {
 				$singular_name = $post_type_object->labels->singular_name;
 			} else {
-				$singular_name = __( 'Post' );
+				$singular_name = __('Post');
 			}
 
 			$data = array(
 				/* translators: %1$s is the post type name and %2$s is the error message. */
-				'message' => sprintf( __( '%1$s could not be created: %2$s' ), $singular_name, $error->get_error_message() ),
+				'message' => sprintf(__('%1$s could not be created: %2$s'), $singular_name, $error->get_error_message()),
 			);
-			wp_send_json_error( $data );
+			wp_send_json_error($data);
 		} else {
 			$post = $r;
 			$data = array(
 				'post_id' => $post->ID,
-				'url'     => get_permalink( $post->ID ),
+				'url'     => get_permalink($post->ID),
 			);
-			wp_send_json_success( $data );
+			wp_send_json_success($data);
 		}
 	}
 
@@ -914,7 +914,7 @@ 
 						<button type="button" class="button-link item-add">
 							<span class="screen-reader-text"><?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
-								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
+								printf(__('Add to menu: %1$s (%2$s)'), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}');
 							?></span>
 						</button>
 					</div>
@@ -927,10 +927,10 @@ 
 				<?php
 				printf(
 					'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-					__( 'Move up' ),
-					__( 'Move down' ),
-					__( 'Move one level up' ),
-					__( 'Move one level down' )
+					__('Move up'),
+					__('Move down'),
+					__('Move one level up'),
+					__('Move one level down')
 				);
 				?>
 			</div>
@@ -949,27 +949,27 @@ 
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action">
 						<?php
 							/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-							printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
+							printf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title));
 						?>
 					</span>
-					<?php _e( 'Add Menu Items' ); ?>
+					<?php _e('Add Menu Items'); ?>
 				</h3>
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<label class="screen-reader-text" for="menu-items-search"><?php _e('Search Menu Items'); ?></label>
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e('Search menu items&hellip;') ?>" aria-describedby="menu-items-search-desc" />
+					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 					<span class="spinner"></span>
 				</div>
 				<div class="search-icon" aria-hidden="true"></div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
+				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></button>
 				<ul class="accordion-section-content available-menu-items-list" data-type="search"></ul>
 			</div>
 			<?php
@@ -977,20 +977,20 @@ 
 			// Ensure the page post type comes first in the list.
 			$item_types = $this->available_item_types();
 			$page_item_type = null;
-			foreach ( $item_types as $i => $item_type ) {
-				if ( isset( $item_type['object'] ) && 'page' === $item_type['object'] ) {
+			foreach ($item_types as $i => $item_type) {
+				if (isset($item_type['object']) && 'page' === $item_type['object']) {
 					$page_item_type = $item_type;
-					unset( $item_types[ $i ] );
+					unset($item_types[$i]);
 				}
 			}
 
 			$this->print_custom_links_available_menu_item();
-			if ( $page_item_type ) {
-				$this->print_post_type_container( $page_item_type );
+			if ($page_item_type) {
+				$this->print_post_type_container($page_item_type);
 			}
 			// Containers for per-post-type item browsing; items are added with JS.
-			foreach ( $item_types as $item_type ) {
-				$this->print_post_type_container( $item_type );
+			foreach ($item_types as $item_type) {
+				$this->print_post_type_container($item_type);
 			}
 			?>
 		</div><!-- #available-menu-items -->
@@ -1008,32 +1008,32 @@ 
 	 * @param array $available_item_type Menu item data to output, including title, type, and label.
 	 * @return void
 	 */
-	protected function print_post_type_container( $available_item_type ) {
-		$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+	protected function print_post_type_container($available_item_type) {
+		$id = sprintf('available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object']);
 		?>
-		<div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+		<div id="<?php echo esc_attr($id); ?>" class="accordion-section">
 			<h4 class="accordion-section-title" role="presentation">
-				<?php echo esc_html( $available_item_type['title'] ); ?>
+				<?php echo esc_html($available_item_type['title']); ?>
 				<span class="spinner"></span>
-				<span class="no-items"><?php _e( 'No items' ); ?></span>
+				<span class="no-items"><?php _e('No items'); ?></span>
 				<button type="button" class="button-link" aria-expanded="false">
 					<span class="screen-reader-text"><?php
 						/* translators: %s: Title of a section with menu items */
-						printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+						printf(__('Toggle section: %s'), esc_html($available_item_type['title'])); ?></span>
 					<span class="toggle-indicator" aria-hidden="true"></span>
 				</button>
 			</h4>
 			<div class="accordion-section-content">
-				<?php if ( 'post_type' === $available_item_type['type'] ) : ?>
-					<?php $post_type_obj = get_post_type_object( $available_item_type['object'] ); ?>
-					<?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) ) : ?>
+				<?php if ('post_type' === $available_item_type['type']) : ?>
+					<?php $post_type_obj = get_post_type_object($available_item_type['object']); ?>
+					<?php if (current_user_can($post_type_obj->cap->create_posts) && current_user_can($post_type_obj->cap->publish_posts)) : ?>
 						<div class="new-content-item">
-							<input type="text" class="create-item-input" placeholder="<?php echo esc_attr( $post_type_obj->labels->add_new_item ); ?>">
-							<button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
+							<input type="text" class="create-item-input" placeholder="<?php echo esc_attr($post_type_obj->labels->add_new_item); ?>">
+							<button type="button" class="button add-content"><?php _e('Add'); ?></button>
 						</div>
 					<?php endif; ?>
 				<?php endif; ?>
-				<ul class="available-menu-items-list" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>" data-type_label="<?php echo esc_attr( isset( $available_item_type['type_label'] ) ? $available_item_type['type_label'] : $available_item_type['type'] ); ?>"></ul>
+				<ul class="available-menu-items-list" data-type="<?php echo esc_attr($available_item_type['type']); ?>" data-object="<?php echo esc_attr($available_item_type['object']); ?>" data-type_label="<?php echo esc_attr(isset($available_item_type['type_label']) ? $available_item_type['type_label'] : $available_item_type['type']); ?>"></ul>
 			</div>
 		</div>
 		<?php
@@ -1051,25 +1051,25 @@ 
 		?>
 		<div id="new-custom-menu-item" class="accordion-section">
 			<h4 class="accordion-section-title" role="presentation">
-				<?php _e( 'Custom Links' ); ?>
+				<?php _e('Custom Links'); ?>
 				<button type="button" class="button-link" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Toggle section: Custom Links'); ?></span>
 					<span class="toggle-indicator" aria-hidden="true"></span>
 				</button>
 			</h4>
 			<div class="accordion-section-content customlinkdiv">
 				<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
 				<p id="menu-item-url-wrap" class="wp-clearfix">
-					<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+					<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 					<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
 				</p>
 				<p id="menu-item-name-wrap" class="wp-clearfix">
-					<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+					<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 					<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
 				</p>
 				<p class="button-controls">
 					<span class="add-to-menu">
-						<input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+						<input type="submit" class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
 						<span class="spinner"></span>
 					</span>
 				</p>
@@ -1101,17 +1101,17 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array Partial args.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
 
-		if ( preg_match( '/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'nav_menu_instance',
-					'render_callback'     => array( $this, 'render_nav_menu_partial' ),
+					'render_callback'     => array($this, 'render_nav_menu_partial'),
 					'container_inclusive' => true,
 					'settings'            => array(), // Empty because the nav menu instance may relate to a menu or a location.
 					'capability'          => 'edit_theme_options',
@@ -1129,11 +1129,11 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
-		add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
-		add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
-		add_filter( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
-		add_filter( 'customize_render_partials_response', array( $this, 'export_partial_rendered_nav_menu_instances' ) );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
+		add_filter('wp_nav_menu_args', array($this, 'filter_wp_nav_menu_args'), 1000);
+		add_filter('wp_nav_menu', array($this, 'filter_wp_nav_menu'), 10, 2);
+		add_filter('wp_footer', array($this, 'export_preview_data'), 1);
+		add_filter('customize_render_partials_response', array($this, 'export_partial_rendered_nav_menu_instances'));
 	}
 
 	/**
@@ -1156,21 +1156,21 @@ 
 	 * @param array $value Post IDs.
 	 * @returns array Post IDs.
 	 */
-	public function sanitize_nav_menus_created_posts( $value ) {
+	public function sanitize_nav_menus_created_posts($value) {
 		$post_ids = array();
-		foreach ( wp_parse_id_list( $value ) as $post_id ) {
-			if ( empty( $post_id ) ) {
+		foreach (wp_parse_id_list($value) as $post_id) {
+			if (empty($post_id)) {
 				continue;
 			}
-			$post = get_post( $post_id );
-			if ( 'auto-draft' !== $post->post_status ) {
+			$post = get_post($post_id);
+			if ('auto-draft' !== $post->post_status) {
 				continue;
 			}
-			$post_type_obj = get_post_type_object( $post->post_type );
-			if ( ! $post_type_obj ) {
+			$post_type_obj = get_post_type_object($post->post_type);
+			if ( ! $post_type_obj) {
 				continue;
 			}
-			if ( ! current_user_can( $post_type_obj->cap->publish_posts ) || ! current_user_can( $post_type_obj->cap->edit_post, $post_id ) ) {
+			if ( ! current_user_can($post_type_obj->cap->publish_posts) || ! current_user_can($post_type_obj->cap->edit_post, $post_id)) {
 				continue;
 			}
 			$post_ids[] = $post->ID;
@@ -1191,24 +1191,24 @@ 
 	 *
 	 * @param WP_Customize_Setting $setting Customizer setting object.
 	 */
-	public function save_nav_menus_created_posts( $setting ) {
+	public function save_nav_menus_created_posts($setting) {
 		$post_ids = $setting->post_value();
-		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id ) {
-				$target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish';
+		if ( ! empty($post_ids)) {
+			foreach ($post_ids as $post_id) {
+				$target_status = 'attachment' === get_post_type($post_id) ? 'inherit' : 'publish';
 				$args = array(
 					'ID' => $post_id,
 					'post_status' => $target_status,
 				);
-				$post_name = get_post_meta( $post_id, '_customize_draft_post_name', true );
-				if ( $post_name ) {
+				$post_name = get_post_meta($post_id, '_customize_draft_post_name', true);
+				if ($post_name) {
 					$args['post_name'] = $post_name;
 				}
 
 				// Note that wp_publish_post() cannot be used because unique slugs need to be assigned.
-				wp_update_post( wp_slash( $args ) );
+				wp_update_post(wp_slash($args));
 
-				delete_post_meta( $post_id, '_customize_draft_post_name' );
+				delete_post_meta($post_id, '_customize_draft_post_name');
 			}
 		}
 	}
@@ -1224,7 +1224,7 @@ 
 	 * @param array $args An array containing wp_nav_menu() arguments.
 	 * @return array Arguments.
 	 */
-	public function filter_wp_nav_menu_args( $args ) {
+	public function filter_wp_nav_menu_args($args) {
 		/*
 		 * The following conditions determine whether or not this instance of
 		 * wp_nav_menu() can use selective refreshed. A wp_nav_menu() can be
@@ -1232,25 +1232,25 @@ 
 		 */
 		$can_partial_refresh = (
 			// ...if wp_nav_menu() is directly echoing out the menu (and thus isn't manipulating the string after generated),
-			! empty( $args['echo'] )
+			! empty($args['echo'])
 			&&
 			// ...and if the fallback_cb can be serialized to JSON, since it will be included in the placement context data,
-			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			(empty($args['fallback_cb']) || is_string($args['fallback_cb']))
 			&&
 			// ...and if the walker can also be serialized to JSON, since it will be included in the placement context data as well,
-			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			(empty($args['walker']) || is_string($args['walker']))
 			// ...and if it has a theme location assigned or an assigned menu to display,
 			&& (
-				! empty( $args['theme_location'] )
+				! empty($args['theme_location'])
 				||
-				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+				( ! empty($args['menu']) && (is_numeric($args['menu']) || is_object($args['menu'])))
 			)
 			&&
 			// ...and if the nav menu would be rendered with a wrapper container element (upon which to attach data-* attributes).
 			(
-				! empty( $args['container'] )
+				! empty($args['container'])
 				||
-				( isset( $args['items_wrap'] ) && '<' === substr( $args['items_wrap'], 0, 1 ) )
+				(isset($args['items_wrap']) && '<' === substr($args['items_wrap'], 0, 1))
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
@@ -1258,7 +1258,7 @@ 
 		$exported_args = $args;
 
 		// Empty out args which may not be JSON-serializable.
-		if ( ! $can_partial_refresh ) {
+		if ( ! $can_partial_refresh) {
 			$exported_args['fallback_cb'] = '';
 			$exported_args['walker'] = '';
 		}
@@ -1267,15 +1267,15 @@ 
 		 * Replace object menu arg with a term_id menu arg, as this exports better
 		 * to JS and is easier to compare hashes.
 		 */
-		if ( ! empty( $exported_args['menu'] ) && is_object( $exported_args['menu'] ) ) {
+		if ( ! empty($exported_args['menu']) && is_object($exported_args['menu'])) {
 			$exported_args['menu'] = $exported_args['menu']->term_id;
 		}
 
-		ksort( $exported_args );
-		$exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
+		ksort($exported_args);
+		$exported_args['args_hmac'] = $this->hash_nav_menu_args($exported_args);
 
 		$args['customize_preview_nav_menus_args'] = $exported_args;
-		$this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+		$this->preview_nav_menu_instance_args[$exported_args['args_hmac']] = $exported_args;
 		return $args;
 	}
 
@@ -1293,12 +1293,12 @@ 
 	 * @param object $args             An object containing wp_nav_menu() arguments.
 	 * @return null
 	 */
-	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
-		if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
-			$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
+	public function filter_wp_nav_menu($nav_menu_content, $args) {
+		if (isset($args->customize_preview_nav_menus_args['can_partial_refresh']) && $args->customize_preview_nav_menus_args['can_partial_refresh']) {
+			$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('nav_menu_instance['.$args->customize_preview_nav_menus_args['args_hmac'].']'));
 			$attributes .= ' data-customize-partial-type="nav_menu_instance"';
-			$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
-			$nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $nav_menu_content, 1 );
+			$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($args->customize_preview_nav_menus_args)));
+			$nav_menu_content = preg_replace('#^(<\w+)#', '$1 '.$attributes, $nav_menu_content, 1);
 		}
 		return $nav_menu_content;
 	}
@@ -1315,8 +1315,8 @@ 
 	 * @param array $args The arguments to hash.
 	 * @return string Hashed nav menu arguments.
 	 */
-	public function hash_nav_menu_args( $args ) {
-		return wp_hash( serialize( $args ) );
+	public function hash_nav_menu_args($args) {
+		return wp_hash(serialize($args));
 	}
 
 	/**
@@ -1326,8 +1326,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		wp_enqueue_script( 'customize-preview-nav-menus' ); // Note that we have overridden this.
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-nav-menus'); // Note that we have overridden this.
+		wp_enqueue_style('customize-preview');
 	}
 
 	/**
@@ -1342,7 +1342,7 @@ 
 		$exports = array(
 			'navMenuInstanceArgs' => $this->preview_nav_menu_instance_args,
 		);
-		printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
+		printf('<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -1354,7 +1354,7 @@ 
 	 * @param array $response Response.
 	 * @return array Response.
 	 */
-	public function export_partial_rendered_nav_menu_instances( $response ) {
+	public function export_partial_rendered_nav_menu_instances($response) {
 		$response['nav_menu_instance_args'] = $this->preview_nav_menu_instance_args;
 		return $response;
 	}
@@ -1371,25 +1371,25 @@ 
 	 * @param array                $nav_menu_args Nav menu args supplied as container context.
 	 * @return string|false
 	 */
-	public function render_nav_menu_partial( $partial, $nav_menu_args ) {
-		unset( $partial );
+	public function render_nav_menu_partial($partial, $nav_menu_args) {
+		unset($partial);
 
-		if ( ! isset( $nav_menu_args['args_hmac'] ) ) {
+		if ( ! isset($nav_menu_args['args_hmac'])) {
 			// Error: missing_args_hmac.
 			return false;
 		}
 
 		$nav_menu_args_hmac = $nav_menu_args['args_hmac'];
-		unset( $nav_menu_args['args_hmac'] );
+		unset($nav_menu_args['args_hmac']);
 
-		ksort( $nav_menu_args );
-		if ( ! hash_equals( $this->hash_nav_menu_args( $nav_menu_args ), $nav_menu_args_hmac ) ) {
+		ksort($nav_menu_args);
+		if ( ! hash_equals($this->hash_nav_menu_args($nav_menu_args), $nav_menu_args_hmac)) {
 			// Error: args_hmac_mismatch.
 			return false;
 		}
 
 		ob_start();
-		wp_nav_menu( $nav_menu_args );
+		wp_nav_menu($nav_menu_args);
 		$content = ob_get_clean();
 
 		return $content;