ntwb / wordpress

src/wp-includes/capabilities.php

Doc Comments +1 added lines, -1 removed lines

@@ -506,7 +506,7 @@
 	 *
 	 * @global wpdb $wpdb
 	 *
-	 * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
+	 * @param integer $id User's ID, a WP_User object, or a user object from the DB.
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Blog ID, defaults to current blog.
 	 */

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Roles and Capabilities.
- *
- * @package WordPress
- * @subpackage User
- */
+	 * WordPress Roles and Capabilities.
+	 *
+	 * @package WordPress
+	 * @subpackage User
+	 */
 
 /**
  * WordPress User Roles.

Switch Indentation +243 added lines, -243 removed lines

@@ -1123,162 +1123,162 @@ 
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		$caps[] = 'remove_users';
-		break;
-	case 'promote_user':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			$caps[] = 'remove_users';
 			break;
+		case 'promote_user':
+			$caps[] = 'promote_users';
+			break;
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+				break;
 
-		// If multisite these caps are allowed only for super admins.
-		if ( is_multisite() && !is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-		}
+			// If multisite these caps are allowed only for super admins.
+			if ( is_multisite() && !is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
+
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
+			$post_type = get_post_type_object( $post->post_type );
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published...
-			if ( 'publish' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published...
+				if ( 'publish' == $post->post_status ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					}
+				} else {
+					// If the post is draft...
+					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published, extra cap required.
-			if ( 'publish' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published, extra cap required.
+				if ( 'publish' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		}
-		break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( empty( $post ) ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
+			// edit_post breaks down to edit_posts, edit_published_posts, or
+			// edit_others_posts
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
+			if ( empty( $post ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
+			$post_type = get_post_type_object( $post->post_type );
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published...
-			if ( 'publish' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published...
+				if ( 'publish' == $post->post_status ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					}
+				} else {
+					// If the post is draft...
+					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published, extra cap required.
+				if ( 'publish' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published, extra cap required.
-			if ( 'publish' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
+			break;
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
+
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
 			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-		}
+			$post_type = get_post_type_object( $post->post_type );
 
-		$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
+				break;
+			}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			$post_type = get_post_type_object( $post->post_type );
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
+			$caps[] = $post_type->cap->publish_posts;
+			break;
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+			$post = get_post( $args[0] );
 			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		$post_type = get_post_type_object( $post->post_type );
-
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
-
-		if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
-			/**
+
+			$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+
+			if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+				/**
 			 * Filter whether the user is allowed to add post meta to a post.
 			 *
 			 * The dynamic portion of the hook name, `$meta_key`, refers to the
@@ -1293,127 +1293,127 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
+				$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
+				if ( ! $allowed )
+					$caps[] = $cap;
+			} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
-			$caps[] = $cap;
-		}
-		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( empty( $comment ) )
+			}
 			break;
-		$post = get_post( $comment->comment_post_ID );
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( empty( $comment ) )
+				break;
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
+			/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'activate_plugins':
-		$caps[] = $cap;
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
+			break;
+		case 'unfiltered_upload':
+			if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'unfiltered_html' :
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+				$caps[] = 'do_not_allow';
+			elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'activate_plugins':
 			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		$caps[] = 'manage_options';
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		$post_type_meta_caps = _post_type_meta_capabilities();
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) )
+					$caps[] = 'manage_network_plugins';
+			}
+			break;
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
+			break;
+		case 'create_users':
+			if ( !is_multisite() )
+				$caps[] = $cap;
+			elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'manage_links' :
+			if ( get_option( 'link_manager_enabled' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'customize' :
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			$caps[] = 'manage_options';
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			$post_type_meta_caps = _post_type_meta_capabilities();
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**

Spacing +291 added lines, -291 removed lines

@@ -89,9 +89,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( '_init' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('_init' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -111,21 +111,21 @@ 
 	 */
 	protected function _init() {
 		global $wpdb, $wp_user_roles;
-		$this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
-		if ( ! empty( $wp_user_roles ) ) {
+		$this->role_key = $wpdb->get_blog_prefix().'user_roles';
+		if ( ! empty($wp_user_roles)) {
 			$this->roles = $wp_user_roles;
 			$this->use_db = false;
 		} else {
-			$this->roles = get_option( $this->role_key );
+			$this->roles = get_option($this->role_key);
 		}
 
-		if ( empty( $this->roles ) )
+		if (empty($this->roles))
 			return;
 
 		$this->role_objects = array();
-		$this->role_names =  array();
-		foreach ( array_keys( $this->roles ) as $role ) {
-			$this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
+		$this->role_names = array();
+		foreach (array_keys($this->roles) as $role) {
+			$this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']);
 			$this->role_names[$role] = $this->roles[$role]['name'];
 		}
 	}
@@ -143,21 +143,21 @@ 
 	 */
 	public function reinit() {
 		// There is no need to reinit if using the wp_user_roles global.
-		if ( ! $this->use_db )
+		if ( ! $this->use_db)
 			return;
 
 		global $wpdb;
 
 		// Duplicated from _init() to avoid an extra function call.
-		$this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
-		$this->roles = get_option( $this->role_key );
-		if ( empty( $this->roles ) )
+		$this->role_key = $wpdb->get_blog_prefix().'user_roles';
+		$this->roles = get_option($this->role_key);
+		if (empty($this->roles))
 			return;
 
 		$this->role_objects = array();
-		$this->role_names =  array();
-		foreach ( array_keys( $this->roles ) as $role ) {
-			$this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
+		$this->role_names = array();
+		foreach (array_keys($this->roles) as $role) {
+			$this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']);
 			$this->role_names[$role] = $this->roles[$role]['name'];
 		}
 	}
@@ -178,17 +178,17 @@ 
 	 * @param array $capabilities List of role capabilities in the above format.
 	 * @return WP_Role|void WP_Role object, if role is added.
 	 */
-	public function add_role( $role, $display_name, $capabilities = array() ) {
-		if ( isset( $this->roles[$role] ) )
+	public function add_role($role, $display_name, $capabilities = array()) {
+		if (isset($this->roles[$role]))
 			return;
 
 		$this->roles[$role] = array(
 			'name' => $display_name,
 			'capabilities' => $capabilities
 			);
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
-		$this->role_objects[$role] = new WP_Role( $role, $capabilities );
+		if ($this->use_db)
+			update_option($this->role_key, $this->roles);
+		$this->role_objects[$role] = new WP_Role($role, $capabilities);
 		$this->role_names[$role] = $display_name;
 		return $this->role_objects[$role];
 	}
@@ -201,19 +201,19 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function remove_role( $role ) {
-		if ( ! isset( $this->role_objects[$role] ) )
+	public function remove_role($role) {
+		if ( ! isset($this->role_objects[$role]))
 			return;
 
-		unset( $this->role_objects[$role] );
-		unset( $this->role_names[$role] );
-		unset( $this->roles[$role] );
+		unset($this->role_objects[$role]);
+		unset($this->role_names[$role]);
+		unset($this->roles[$role]);
 
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ($this->use_db)
+			update_option($this->role_key, $this->roles);
 
-		if ( get_option( 'default_role' ) == $role )
-			update_option( 'default_role', 'subscriber' );
+		if (get_option('default_role') == $role)
+			update_option('default_role', 'subscriber');
 	}
 
 	/**
@@ -226,13 +226,13 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Optional, default is true. Whether role is capable of performing capability.
 	 */
-	public function add_cap( $role, $cap, $grant = true ) {
-		if ( ! isset( $this->roles[$role] ) )
+	public function add_cap($role, $cap, $grant = true) {
+		if ( ! isset($this->roles[$role]))
 			return;
 
 		$this->roles[$role]['capabilities'][$cap] = $grant;
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ($this->use_db)
+			update_option($this->role_key, $this->roles);
 	}
 
 	/**
@@ -244,13 +244,13 @@ 
 	 * @param string $role Role name.
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $role, $cap ) {
-		if ( ! isset( $this->roles[$role] ) )
+	public function remove_cap($role, $cap) {
+		if ( ! isset($this->roles[$role]))
 			return;
 
-		unset( $this->roles[$role]['capabilities'][$cap] );
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		unset($this->roles[$role]['capabilities'][$cap]);
+		if ($this->use_db)
+			update_option($this->role_key, $this->roles);
 	}
 
 	/**
@@ -262,8 +262,8 @@ 
 	 * @param string $role Role name.
 	 * @return WP_Role|null WP_Role object if found, null if the role does not exist.
 	 */
-	public function get_role( $role ) {
-		if ( isset( $this->role_objects[$role] ) )
+	public function get_role($role) {
+		if (isset($this->role_objects[$role]))
 			return $this->role_objects[$role];
 		else
 			return null;
@@ -290,8 +290,8 @@ 
 	 * @param string $role Role name to look up.
 	 * @return bool
 	 */
-	public function is_role( $role ) {
-		return isset( $this->role_names[$role] );
+	public function is_role($role) {
+		return isset($this->role_names[$role]);
 	}
 }
 
@@ -333,7 +333,7 @@ 
 	 * @param string $role Role name.
 	 * @param array $capabilities List of capabilities.
 	 */
-	public function __construct( $role, $capabilities ) {
+	public function __construct($role, $capabilities) {
 		$this->name = $role;
 		$this->capabilities = $capabilities;
 	}
@@ -347,9 +347,9 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether role has capability privilege.
 	 */
-	public function add_cap( $cap, $grant = true ) {
+	public function add_cap($cap, $grant = true) {
 		$this->capabilities[$cap] = $grant;
-		wp_roles()->add_cap( $this->name, $cap, $grant );
+		wp_roles()->add_cap($this->name, $cap, $grant);
 	}
 
 	/**
@@ -365,9 +365,9 @@ 
 	 *
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $cap ) {
-		unset( $this->capabilities[$cap] );
-		wp_roles()->remove_cap( $this->name, $cap );
+	public function remove_cap($cap) {
+		unset($this->capabilities[$cap]);
+		wp_roles()->remove_cap($this->name, $cap);
 	}
 
 	/**
@@ -384,7 +384,7 @@ 
 	 * @param string $cap Capability name.
 	 * @return bool True, if user has capability. False, if doesn't have capability.
 	 */
-	public function has_cap( $cap ) {
+	public function has_cap($cap) {
 		/**
 		 * Filter which capabilities a role has.
 		 *
@@ -394,8 +394,8 @@ 
 		 * @param string $cap          Capability name.
 		 * @param string $name         Role name.
 		 */
-		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
-		if ( !empty( $capabilities[$cap] ) )
+		$capabilities = apply_filters('role_has_cap', $this->capabilities, $cap, $this->name);
+		if ( ! empty($capabilities[$cap]))
 			return $capabilities[$cap];
 		else
 			return false;
@@ -510,40 +510,40 @@ 
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Blog ID, defaults to current blog.
 	 */
-	public function __construct( $id = 0, $name = '', $blog_id = '' ) {
-		if ( ! isset( self::$back_compat_keys ) ) {
+	public function __construct($id = 0, $name = '', $blog_id = '') {
+		if ( ! isset(self::$back_compat_keys)) {
 			$prefix = $GLOBALS['wpdb']->prefix;
 			self::$back_compat_keys = array(
 				'user_firstname' => 'first_name',
 				'user_lastname' => 'last_name',
 				'user_description' => 'description',
-				'user_level' => $prefix . 'user_level',
-				$prefix . 'usersettings' => $prefix . 'user-settings',
-				$prefix . 'usersettingstime' => $prefix . 'user-settings-time',
+				'user_level' => $prefix.'user_level',
+				$prefix.'usersettings' => $prefix.'user-settings',
+				$prefix.'usersettingstime' => $prefix.'user-settings-time',
 			);
 		}
 
-		if ( $id instanceof WP_User ) {
-			$this->init( $id->data, $blog_id );
+		if ($id instanceof WP_User) {
+			$this->init($id->data, $blog_id);
 			return;
-		} elseif ( is_object( $id ) ) {
-			$this->init( $id, $blog_id );
+		} elseif (is_object($id)) {
+			$this->init($id, $blog_id);
 			return;
 		}
 
-		if ( ! empty( $id ) && ! is_numeric( $id ) ) {
+		if ( ! empty($id) && ! is_numeric($id)) {
 			$name = $id;
 			$id = 0;
 		}
 
-		if ( $id ) {
-			$data = self::get_data_by( 'id', $id );
+		if ($id) {
+			$data = self::get_data_by('id', $id);
 		} else {
-			$data = self::get_data_by( 'login', $name );
+			$data = self::get_data_by('login', $name);
 		}
 
-		if ( $data ) {
-			$this->init( $data, $blog_id );
+		if ($data) {
+			$this->init($data, $blog_id);
 		} else {
 			$this->data = new stdClass;
 		}
@@ -555,11 +555,11 @@ 
 	 * @param object $data User DB row object
 	 * @param int $blog_id Optional. The blog id to initialize for
 	 */
-	public function init( $data, $blog_id = '' ) {
+	public function init($data, $blog_id = '') {
 		$this->data = $data;
 		$this->ID = (int) $data->ID;
 
-		$this->for_blog( $blog_id );
+		$this->for_blog($blog_id);
 	}
 
 	/**
@@ -575,25 +575,25 @@ 
 	 * @param string|int $value The field value
 	 * @return object|false Raw user object
 	 */
-	public static function get_data_by( $field, $value ) {
+	public static function get_data_by($field, $value) {
 		global $wpdb;
 
-		if ( 'id' == $field ) {
+		if ('id' == $field) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
+			if ( ! is_numeric($value))
 				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
+			$value = intval($value);
+			if ($value < 1)
 				return false;
 		} else {
-			$value = trim( $value );
+			$value = trim($value);
 		}
 
-		if ( !$value )
+		if ( ! $value)
 			return false;
 
-		switch ( $field ) {
+		switch ($field) {
 			case 'id':
 				$user_id = $value;
 				$db_field = 'ID';
@@ -607,7 +607,7 @@ 
 				$db_field = 'user_email';
 				break;
 			case 'login':
-				$value = sanitize_user( $value );
+				$value = sanitize_user($value);
 				$user_id = wp_cache_get($value, 'userlogins');
 				$db_field = 'user_login';
 				break;
@@ -615,17 +615,17 @@ 
 				return false;
 		}
 
-		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
+		if (false !== $user_id) {
+			if ($user = wp_cache_get($user_id, 'users'))
 				return $user;
 		}
 
-		if ( !$user = $wpdb->get_row( $wpdb->prepare(
+		if ( ! $user = $wpdb->get_row($wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
+		)))
 			return false;
 
-		update_user_caches( $user );
+		update_user_caches($user);
 
 		return $user;
 	}
@@ -640,9 +640,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( '_init_caps' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('_init_caps' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -654,19 +654,19 @@ 
 	 * @param string $key
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+	public function __isset($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1', __('Use <code>WP_User->ID</code> instead.'));
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
+		if (isset($this->data->$key))
 			return true;
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if (isset(self::$back_compat_keys[$key]))
+			$key = self::$back_compat_keys[$key];
 
-		return metadata_exists( 'user', $this->ID, $key );
+		return metadata_exists('user', $this->ID, $key);
 	}
 
 	/**
@@ -676,22 +676,22 @@ 
 	 * @param string $key
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+	public function __get($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1', __('Use <code>WP_User->ID</code> instead.'));
 			return $this->ID;
 		}
 
-		if ( isset( $this->data->$key ) ) {
+		if (isset($this->data->$key)) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
-			$value = get_user_meta( $this->ID, $key, true );
+			if (isset(self::$back_compat_keys[$key]))
+				$key = self::$back_compat_keys[$key];
+			$value = get_user_meta($this->ID, $key, true);
 		}
 
-		if ( $this->filter ) {
-			$value = sanitize_user_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter) {
+			$value = sanitize_user_field($key, $value, $this->ID, $this->filter);
 		}
 
 		return $value;
@@ -702,9 +702,9 @@ 
 	 *
 	 * @since 3.3.0
 	 */
-	public function __set( $key, $value ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+	public function __set($key, $value) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1', __('Use <code>WP_User->ID</code> instead.'));
 			$this->ID = $value;
 			return;
 		}
@@ -721,7 +721,7 @@ 
 	 * @return bool True if user exists in the database, false if not.
 	 */
 	public function exists() {
-		return ! empty( $this->ID );
+		return ! empty($this->ID);
 	}
 
 	/**
@@ -734,8 +734,8 @@ 
 	 * @param string $key Property
 	 * @return mixed
 	 */
-	public function get( $key ) {
-		return $this->__get( $key );
+	public function get($key) {
+		return $this->__get($key);
 	}
 
 	/**
@@ -748,8 +748,8 @@ 
 	 * @param string $key Property
 	 * @return bool
 	 */
-	public function has_prop( $key ) {
-		return $this->__isset( $key );
+	public function has_prop($key) {
+		return $this->__isset($key);
 	}
 
 	/**
@@ -760,7 +760,7 @@ 
 	 * @return array Array representation.
 	 */
 	public function to_array() {
-		return get_object_vars( $this->data );
+		return get_object_vars($this->data);
 	}
 
 	/**
@@ -778,17 +778,17 @@ 
 	 *
 	 * @param string $cap_key Optional capability key
 	 */
-	protected function _init_caps( $cap_key = '' ) {
+	protected function _init_caps($cap_key = '') {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		if (empty($cap_key))
+			$this->cap_key = $wpdb->get_blog_prefix().'capabilities';
 		else
 			$this->cap_key = $cap_key;
 
-		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
+		$this->caps = get_user_meta($this->ID, $this->cap_key, true);
 
-		if ( ! is_array( $this->caps ) )
+		if ( ! is_array($this->caps))
 			$this->caps = array();
 
 		$this->get_role_caps();
@@ -811,16 +811,16 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if (is_array($this->caps))
+			$this->roles = array_filter(array_keys($this->caps), array($wp_roles, 'is_role'));
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
-		foreach ( (array) $this->roles as $role ) {
-			$the_role = $wp_roles->get_role( $role );
-			$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
+		foreach ((array) $this->roles as $role) {
+			$the_role = $wp_roles->get_role($role);
+			$this->allcaps = array_merge((array) $this->allcaps, (array) $the_role->capabilities);
 		}
-		$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
+		$this->allcaps = array_merge((array) $this->allcaps, (array) $this->caps);
 
 		return $this->allcaps;
 	}
@@ -835,9 +835,9 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function add_role( $role ) {
+	public function add_role($role) {
 		$this->caps[$role] = true;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -849,7 +849,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The new role.
 		 */
-		do_action( 'add_user_role', $this->ID, $role );
+		do_action('add_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -860,11 +860,11 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
+	public function remove_role($role) {
+		if ( ! in_array($role, $this->roles))
 			return;
-		unset( $this->caps[$role] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$role]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -876,7 +876,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The removed role.
 		 */
-		do_action( 'remove_user_role', $this->ID, $role );
+		do_action('remove_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -891,21 +891,21 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+	public function set_role($role) {
+		if (1 == count($this->roles) && $role == current($this->roles))
 			return;
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ((array) $this->roles as $oldrole)
+			unset($this->caps[$oldrole]);
 
 		$old_roles = $this->roles;
-		if ( !empty( $role ) ) {
+		if ( ! empty($role)) {
 			$this->caps[$role] = true;
-			$this->roles = array( $role => true );
+			$this->roles = array($role => true);
 		} else {
 			$this->roles = false;
 		}
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -919,7 +919,7 @@ 
 		 * @param string $role      The new role.
 		 * @param array  $old_roles An array of the user's previous roles.
 		 */
-		do_action( 'set_user_role', $this->ID, $role, $old_roles );
+		do_action('set_user_role', $this->ID, $role, $old_roles);
 	}
 
 	/**
@@ -941,10 +941,10 @@ 
 	 * @param string $item Level capability name.
 	 * @return int Max Level.
 	 */
-	public function level_reduction( $max, $item ) {
-		if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
-			$level = intval( $matches[1] );
-			return max( $max, $level );
+	public function level_reduction($max, $item) {
+		if (preg_match('/^level_(10|[0-9])$/i', $item, $matches)) {
+			$level = intval($matches[1]);
+			return max($max, $level);
 		} else {
 			return $max;
 		}
@@ -964,8 +964,8 @@ 
 	 */
 	public function update_user_level_from_caps() {
 		global $wpdb;
-		$this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
-		update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
+		$this->user_level = array_reduce(array_keys($this->allcaps), array($this, 'level_reduction'), 0);
+		update_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level', $this->user_level);
 	}
 
 	/**
@@ -977,9 +977,9 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether to grant capability to user.
 	 */
-	public function add_cap( $cap, $grant = true ) {
+	public function add_cap($cap, $grant = true) {
 		$this->caps[$cap] = $grant;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -992,12 +992,12 @@ 
 	 *
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $cap ) {
-		if ( ! isset( $this->caps[ $cap ] ) ) {
+	public function remove_cap($cap) {
+		if ( ! isset($this->caps[$cap])) {
 			return;
 		}
-		unset( $this->caps[ $cap ] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$cap]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -1013,8 +1013,8 @@ 
 	public function remove_all_caps() {
 		global $wpdb;
 		$this->caps = array();
-		delete_user_meta( $this->ID, $this->cap_key );
-		delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
+		delete_user_meta($this->ID, $this->cap_key);
+		delete_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level');
 		$this->get_role_caps();
 	}
 
@@ -1031,19 +1031,19 @@ 
 	 * @param string|int $cap Capability or role name to search.
 	 * @return bool True, if user has capability; false, if user does not have capability.
 	 */
-	public function has_cap( $cap ) {
-		if ( is_numeric( $cap ) ) {
-			_deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') );
-			$cap = $this->translate_level_to_cap( $cap );
+	public function has_cap($cap) {
+		if (is_numeric($cap)) {
+			_deprecated_argument(__FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.'));
+			$cap = $this->translate_level_to_cap($cap);
 		}
 
-		$args = array_slice( func_get_args(), 1 );
-		$args = array_merge( array( $cap, $this->ID ), $args );
-		$caps = call_user_func_array( 'map_meta_cap', $args );
+		$args = array_slice(func_get_args(), 1);
+		$args = array_merge(array($cap, $this->ID), $args);
+		$caps = call_user_func_array('map_meta_cap', $args);
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
-		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
+		if (is_multisite() && is_super_admin($this->ID)) {
+			if (in_array('do_not_allow', $caps))
 				return false;
 			return true;
 		}
@@ -1060,10 +1060,10 @@ 
 		 * @param WP_User $user    The user object.
 		 */
 		// Must have ALL requested caps
-		$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args, $this );
+		$capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args, $this);
 		$capabilities['exist'] = true; // Everyone is allowed to exist
-		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
+		foreach ((array) $caps as $cap) {
+			if (empty($capabilities[$cap]))
 				return false;
 		}
 
@@ -1081,8 +1081,8 @@ 
 	 * @param int $level Level number, 1 to 10.
 	 * @return string
 	 */
-	public function translate_level_to_cap( $level ) {
-		return 'level_' . $level;
+	public function translate_level_to_cap($level) {
+		return 'level_'.$level;
 	}
 
 	/**
@@ -1094,13 +1094,13 @@ 
 	 *
 	 * @param int $blog_id Optional Blog ID, defaults to current blog.
 	 */
-	public function for_blog( $blog_id = '' ) {
+	public function for_blog($blog_id = '') {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		if ( ! empty($blog_id))
+			$cap_key = $wpdb->get_blog_prefix($blog_id).'capabilities';
 		else
 			$cap_key = '';
-		$this->_init_caps( $cap_key );
+		$this->_init_caps($cap_key);
 	}
 }
 
@@ -1118,11 +1118,11 @@ 
  * @param int $user_id User ID.
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-	$args = array_slice( func_get_args(), 2 );
+function map_meta_cap($cap, $user_id) {
+	$args = array_slice(func_get_args(), 2);
 	$caps = array();
 
-	switch ( $cap ) {
+	switch ($cap) {
 	case 'remove_user':
 		$caps[] = 'remove_users';
 		break;
@@ -1132,40 +1132,40 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		if ('edit_user' == $cap && isset($args[0]) && $user_id == $args[0])
 			break;
 
 		// If multisite these caps are allowed only for super admins.
-		if ( is_multisite() && !is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'edit_users'; // edit_user maps to edit_users.
 		break;
 	case 'delete_post':
 	case 'delete_page':
-		$post = get_post( $args[0] );
+		$post = get_post($args[0]);
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
+			if ('delete_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published...
-			if ( 'publish' == $post->post_status ) {
+			if ('publish' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				if ('publish' == get_post_meta($post->ID, '_wp_trash_meta_status', true)) {
 					$caps[] = $post_type->cap->delete_published_posts;
 				}
 			} else {
@@ -1176,9 +1176,9 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->delete_others_posts;
 			// The post is published, extra cap required.
-			if ( 'publish' == $post->post_status ) {
+			if ('publish' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_private_posts;
 			}
 		}
@@ -1187,33 +1187,33 @@ 
 		// edit_others_posts
 	case 'edit_post':
 	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( empty( $post ) ) {
+		$post = get_post($args[0]);
+		if (empty($post)) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
+			if ('edit_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published...
-			if ( 'publish' == $post->post_status ) {
+			if ('publish' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				if ( 'publish' == get_post_meta( $post->ID, '_wp_trash_meta_status', true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				if ('publish' == get_post_meta($post->ID, '_wp_trash_meta_status', true)) {
 					$caps[] = $post_type->cap->edit_published_posts;
 				}
 			} else {
@@ -1224,60 +1224,60 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->edit_others_posts;
 			// The post is published, extra cap required.
-			if ( 'publish' == $post->post_status ) {
+			if ('publish' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_private_posts;
 			}
 		}
 		break;
 	case 'read_post':
 	case 'read_page':
-		$post = get_post( $args[0] );
+		$post = get_post($args[0]);
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
+			if ('read_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
+		$status_obj = get_post_status_object($post->post_status);
+		if ($status_obj->public) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
+		} elseif ($status_obj->private) {
 			$caps[] = $post_type->cap->read_private_posts;
 		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		}
 		break;
 	case 'publish_post':
-		$post = get_post( $args[0] );
-		$post_type = get_post_type_object( $post->post_type );
+		$post = get_post($args[0]);
+		$post_type = get_post_type_object($post->post_type);
 
 		$caps[] = $post_type->cap->publish_posts;
 		break;
 	case 'edit_post_meta':
 	case 'delete_post_meta':
 	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		$post = get_post($args[0]);
+		$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+		$meta_key = isset($args[1]) ? $args[1] : false;
 
-		if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+		if ($meta_key && has_filter("auth_post_meta_{$meta_key}")) {
 			/**
 			 * Filter whether the user is allowed to add post meta to a post.
 			 *
@@ -1293,40 +1293,40 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
+			$allowed = apply_filters("auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps);
+			if ( ! $allowed)
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
+		} elseif ($meta_key && is_protected_meta($meta_key, 'post')) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( empty( $comment ) )
+		$comment = get_comment($args[0]);
+		if (empty($comment))
 			break;
-		$post = get_post( $comment->comment_post_ID );
+		$post = get_post($comment->comment_post_ID);
 
 		/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		if ($post) {
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
+			$caps = map_meta_cap('edit_posts', $user_id);
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+		if (defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin($user_id)))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+		if (defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -1335,11 +1335,11 @@ 
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+		if (defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT)
 			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		elseif (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -1355,13 +1355,13 @@ 
 	case 'update_core':
 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
 		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+		if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+		} elseif (is_multisite() && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
+		} elseif ('upload_themes' === $cap) {
 			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
+		} elseif ('upload_plugins' === $cap) {
 			$caps[] = 'install_plugins';
 		} else {
 			$caps[] = $cap;
@@ -1369,31 +1369,31 @@ 
 		break;
 	case 'activate_plugins':
 		$caps[] = $cap;
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
+			$menu_perms = get_site_option('menu_items', array());
+			if (empty($menu_perms['plugins']))
 				$caps[] = 'manage_network_plugins';
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'delete_users'; // delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
+		if ( ! is_multisite())
 			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+		elseif (is_super_admin($user_id) || get_site_option('add_new_users'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+		if (get_option('link_manager_enabled'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -1407,9 +1407,9 @@ 
 	default:
 		// Handle meta capabilities for custom post types.
 		$post_type_meta_caps = _post_type_meta_capabilities();
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
+		if (isset($post_type_meta_caps[$cap])) {
+			$args = array_merge(array($post_type_meta_caps[$cap], $user_id), $args);
+			return call_user_func_array('map_meta_cap', $args);
 		}
 
 		// If no meta caps match, return the original cap.
@@ -1426,7 +1426,7 @@ 
 	 * @param int    $user_id The user ID.
 	 * @param array  $args    Adds the context to the cap. Typically the object ID.
 	 */
-	return apply_filters( 'map_meta_cap', $caps, $cap, $user_id, $args );
+	return apply_filters('map_meta_cap', $caps, $cap, $user_id, $args);
 }
 
 /**
@@ -1437,16 +1437,16 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can( $capability ) {
+function current_user_can($capability) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if (empty($current_user))
 		return false;
 
-	$args = array_slice( func_get_args(), 1 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	return call_user_func_array(array($current_user, 'has_cap'), $args);
 }
 
 /**
@@ -1458,24 +1458,24 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
-	$switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
+function current_user_can_for_blog($blog_id, $capability) {
+	$switched = is_multisite() ? switch_to_blog($blog_id) : false;
 
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) ) {
-		if ( $switched ) {
+	if (empty($current_user)) {
+		if ($switched) {
 			restore_current_blog();
 		}
 		return false;
 	}
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	$can = call_user_func_array(array($current_user, 'has_cap'), $args);
 
-	if ( $switched ) {
+	if ($switched) {
 		restore_current_blog();
 	}
 
@@ -1491,19 +1491,19 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+function author_can($post, $capability) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( ! $author )
+	if ( ! $author)
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $author, 'has_cap' ), $args );
+	return call_user_func_array(array($author, 'has_cap'), $args);
 }
 
 /**
@@ -1515,17 +1515,17 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+function user_can($user, $capability) {
+	if ( ! is_object($user))
+		$user = get_userdata($user);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $user, 'has_cap' ), $args );
+	return call_user_func_array(array($user, 'has_cap'), $args);
 }
 
 /**
@@ -1540,7 +1540,7 @@ 
 function wp_roles() {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) ) {
+	if ( ! isset($wp_roles)) {
 		$wp_roles = new WP_Roles();
 	}
 	return $wp_roles;
@@ -1554,8 +1554,8 @@ 
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
-function get_role( $role ) {
-	return wp_roles()->get_role( $role );
+function get_role($role) {
+	return wp_roles()->get_role($role);
 }
 
 /**
@@ -1568,8 +1568,8 @@ 
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
-function add_role( $role, $display_name, $capabilities = array() ) {
-	return wp_roles()->add_role( $role, $display_name, $capabilities );
+function add_role($role, $display_name, $capabilities = array()) {
+	return wp_roles()->add_role($role, $display_name, $capabilities);
 }
 
 /**
@@ -1579,8 +1579,8 @@ 
  *
  * @param string $role Role name.
  */
-function remove_role( $role ) {
-	wp_roles()->remove_role( $role );
+function remove_role($role) {
+	wp_roles()->remove_role($role);
 }
 
 /**
@@ -1595,10 +1595,10 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if (isset($super_admins))
 		return $super_admins;
 	else
-		return get_site_option( 'site_admins', array('admin') );
+		return get_site_option('site_admins', array('admin'));
 }
 
 /**
@@ -1609,21 +1609,21 @@ 
  * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
  * @return bool True if the user is a site admin.
  */
-function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+function is_super_admin($user_id = false) {
+	if ( ! $user_id || $user_id == get_current_user_id())
 		$user = wp_get_current_user();
 	else
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if (is_array($super_admins) && in_array($user->user_login, $super_admins))
 			return true;
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ($user->has_cap('delete_users'))
 			return true;
 	}
 

Braces +202 added lines, -145 removed lines

@@ -119,8 +119,9 @@ 
 			$this->roles = get_option( $this->role_key );
 		}
 
-		if ( empty( $this->roles ) )
-			return;
+		if ( empty( $this->roles ) ) {
+					return;
+		}
 
 		$this->role_objects = array();
 		$this->role_names =  array();
@@ -143,16 +144,18 @@ 
 	 */
 	public function reinit() {
 		// There is no need to reinit if using the wp_user_roles global.
-		if ( ! $this->use_db )
-			return;
+		if ( ! $this->use_db ) {
+					return;
+		}
 
 		global $wpdb;
 
 		// Duplicated from _init() to avoid an extra function call.
 		$this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
 		$this->roles = get_option( $this->role_key );
-		if ( empty( $this->roles ) )
-			return;
+		if ( empty( $this->roles ) ) {
+					return;
+		}
 
 		$this->role_objects = array();
 		$this->role_names =  array();
@@ -179,15 +182,17 @@ 
 	 * @return WP_Role|void WP_Role object, if role is added.
 	 */
 	public function add_role( $role, $display_name, $capabilities = array() ) {
-		if ( isset( $this->roles[$role] ) )
-			return;
+		if ( isset( $this->roles[$role] ) ) {
+					return;
+		}
 
 		$this->roles[$role] = array(
 			'name' => $display_name,
 			'capabilities' => $capabilities
 			);
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ( $this->use_db ) {
+					update_option( $this->role_key, $this->roles );
+		}
 		$this->role_objects[$role] = new WP_Role( $role, $capabilities );
 		$this->role_names[$role] = $display_name;
 		return $this->role_objects[$role];
@@ -202,18 +207,21 @@ 
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( ! isset( $this->role_objects[$role] ) )
-			return;
+		if ( ! isset( $this->role_objects[$role] ) ) {
+					return;
+		}
 
 		unset( $this->role_objects[$role] );
 		unset( $this->role_names[$role] );
 		unset( $this->roles[$role] );
 
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ( $this->use_db ) {
+					update_option( $this->role_key, $this->roles );
+		}
 
-		if ( get_option( 'default_role' ) == $role )
-			update_option( 'default_role', 'subscriber' );
+		if ( get_option( 'default_role' ) == $role ) {
+					update_option( 'default_role', 'subscriber' );
+		}
 	}
 
 	/**
@@ -227,12 +235,14 @@ 
 	 * @param bool $grant Optional, default is true. Whether role is capable of performing capability.
 	 */
 	public function add_cap( $role, $cap, $grant = true ) {
-		if ( ! isset( $this->roles[$role] ) )
-			return;
+		if ( ! isset( $this->roles[$role] ) ) {
+					return;
+		}
 
 		$this->roles[$role]['capabilities'][$cap] = $grant;
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ( $this->use_db ) {
+					update_option( $this->role_key, $this->roles );
+		}
 	}
 
 	/**
@@ -245,12 +255,14 @@ 
 	 * @param string $cap Capability name.
 	 */
 	public function remove_cap( $role, $cap ) {
-		if ( ! isset( $this->roles[$role] ) )
-			return;
+		if ( ! isset( $this->roles[$role] ) ) {
+					return;
+		}
 
 		unset( $this->roles[$role]['capabilities'][$cap] );
-		if ( $this->use_db )
-			update_option( $this->role_key, $this->roles );
+		if ( $this->use_db ) {
+					update_option( $this->role_key, $this->roles );
+		}
 	}
 
 	/**
@@ -263,10 +275,11 @@ 
 	 * @return WP_Role|null WP_Role object if found, null if the role does not exist.
 	 */
 	public function get_role( $role ) {
-		if ( isset( $this->role_objects[$role] ) )
-			return $this->role_objects[$role];
-		else
-			return null;
+		if ( isset( $this->role_objects[$role] ) ) {
+					return $this->role_objects[$role];
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -395,10 +408,11 @@ 
 		 * @param string $name         Role name.
 		 */
 		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
-		if ( !empty( $capabilities[$cap] ) )
-			return $capabilities[$cap];
-		else
-			return false;
+		if ( !empty( $capabilities[$cap] ) ) {
+					return $capabilities[$cap];
+		} else {
+					return false;
+		}
 	}
 
 }
@@ -581,17 +595,20 @@ 
 		if ( 'id' == $field ) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
+			if ( ! is_numeric( $value ) ) {
+							return false;
+			}
 			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
+			if ( $value < 1 ) {
+							return false;
+			}
 		} else {
 			$value = trim( $value );
 		}
 
-		if ( !$value )
-			return false;
+		if ( !$value ) {
+					return false;
+		}
 
 		switch ( $field ) {
 			case 'id':
@@ -616,14 +633,16 @@ 
 		}
 
 		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
-				return $user;
+			if ( $user = wp_cache_get( $user_id, 'users' ) ) {
+							return $user;
+			}
 		}
 
 		if ( !$user = $wpdb->get_row( $wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
-			return false;
+		) ) ) {
+					return false;
+		}
 
 		update_user_caches( $user );
 
@@ -660,11 +679,13 @@ 
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
-			return true;
+		if ( isset( $this->data->$key ) ) {
+					return true;
+		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if ( isset( self::$back_compat_keys[ $key ] ) ) {
+					$key = self::$back_compat_keys[ $key ];
+		}
 
 		return metadata_exists( 'user', $this->ID, $key );
 	}
@@ -685,8 +706,9 @@ 
 		if ( isset( $this->data->$key ) ) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
+			if ( isset( self::$back_compat_keys[ $key ] ) ) {
+							$key = self::$back_compat_keys[ $key ];
+			}
 			$value = get_user_meta( $this->ID, $key, true );
 		}
 
@@ -781,15 +803,17 @@ 
 	protected function _init_caps( $cap_key = '' ) {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
-		else
-			$this->cap_key = $cap_key;
+		if ( empty($cap_key) ) {
+					$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		} else {
+					$this->cap_key = $cap_key;
+		}
 
 		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
 
-		if ( ! is_array( $this->caps ) )
-			$this->caps = array();
+		if ( ! is_array( $this->caps ) ) {
+					$this->caps = array();
+		}
 
 		$this->get_role_caps();
 	}
@@ -811,8 +835,9 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if ( is_array( $this->caps ) ) {
+					$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		}
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
@@ -861,8 +886,9 @@ 
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
-			return;
+		if ( !in_array($role, $this->roles) ) {
+					return;
+		}
 		unset( $this->caps[$role] );
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
@@ -892,11 +918,13 @@ 
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
-			return;
+		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) {
+					return;
+		}
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ( (array) $this->roles as $oldrole ) {
+					unset( $this->caps[$oldrole] );
+		}
 
 		$old_roles = $this->roles;
 		if ( !empty( $role ) ) {
@@ -1043,8 +1071,9 @@ 
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
 		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
-				return false;
+			if ( in_array('do_not_allow', $caps) ) {
+							return false;
+			}
 			return true;
 		}
 
@@ -1063,8 +1092,9 @@ 
 		$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args, $this );
 		$capabilities['exist'] = true; // Everyone is allowed to exist
 		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
-				return false;
+			if ( empty( $capabilities[ $cap ] ) ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -1096,10 +1126,11 @@ 
 	 */
 	public function for_blog( $blog_id = '' ) {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-		else
-			$cap_key = '';
+		if ( ! empty( $blog_id ) ) {
+					$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		} else {
+					$cap_key = '';
+		}
 		$this->_init_caps( $cap_key );
 	}
 }
@@ -1132,14 +1163,17 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
-			break;
+		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
+					break;
+		}
 
 		// If multisite these caps are allowed only for super admins.
-		if ( is_multisite() && !is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
+		if ( is_multisite() && !is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'edit_users';
+		}
+		// edit_user maps to edit_users.
 		break;
 	case 'delete_post':
 	case 'delete_page':
@@ -1154,8 +1188,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'delete_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -1202,8 +1237,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'edit_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -1244,8 +1280,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'read_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -1294,16 +1331,18 @@ 
 			 * @param array  $caps     User capabilities.
 			 */
 			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
-				$caps[] = $cap;
+			if ( ! $allowed ) {
+							$caps[] = $cap;
+			}
 		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
 		$comment = get_comment( $args[0] );
-		if ( empty( $comment ) )
-			break;
+		if ( empty( $comment ) ) {
+					break;
+		}
 		$post = get_post( $comment->comment_post_ID );
 
 		/*
@@ -1317,32 +1356,35 @@ 
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'edit_files':
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'update_plugins':
 	case 'delete_plugins':
@@ -1372,31 +1414,36 @@ 
 		if ( is_multisite() ) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
 			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
+			if ( empty( $menu_perms['plugins'] ) ) {
+							$caps[] = 'manage_network_plugins';
+			}
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
+		if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'delete_users';
+		}
+		// delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( !is_multisite() ) {
+					$caps[] = $cap;
+		} elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( get_option( 'link_manager_enabled' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'customize' :
 		$caps[] = 'edit_theme_options';
@@ -1440,8 +1487,9 @@ 
 function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
-		return false;
+	if ( empty( $current_user ) ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	$args = array_merge( array( $capability ), $args );
@@ -1492,13 +1540,15 @@ 
  * @return bool
  */
 function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
-		return false;
+	if ( !$post = get_post($post) ) {
+			return false;
+	}
 
 	$author = get_userdata( $post->post_author );
 
-	if ( ! $author )
-		return false;
+	if ( ! $author ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -1516,11 +1566,13 @@ 
  * @return bool
  */
 function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+	if ( ! is_object( $user ) ) {
+			$user = get_userdata( $user );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -1595,11 +1647,12 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
-		return $super_admins;
-	else
-		return get_site_option( 'site_admins', array('admin') );
-}
+	if ( isset($super_admins) ) {
+			return $super_admins;
+	} else {
+			return get_site_option( 'site_admins', array('admin') );
+	}
+	}
 
 /**
  * Determine if user is a site admin.
@@ -1610,21 +1663,25 @@ 
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
-		$user = wp_get_current_user();
-	else
-		$user = get_userdata( $user_id );
+	if ( ! $user_id || $user_id == get_current_user_id() ) {
+			$user = wp_get_current_user();
+	} else {
+			$user = get_userdata( $user_id );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	if ( is_multisite() ) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
-			return true;
+		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
+					return true;
+		}
 	} else {
-		if ( $user->has_cap('delete_users') )
-			return true;
+		if ( $user->has_cap('delete_users') ) {
+					return true;
+		}
 	}
 
 	return false;

src/wp-includes/category-template.php

Doc Comments +1 added lines, -1 removed lines

@@ -686,7 +686,7 @@
  * Default topic count scaling for tag links
  *
  * @param int $count number of posts with that tag
- * @return int scaled count
+ * @return double scaled count
  */
 function default_topic_count_scale( $count ) {
 	return round(log10($count + 1) * 100);

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Category Template Tags and API.
- *
- * @package WordPress
- * @subpackage Template
- */
+		 * Category Template Tags and API.
+		 *
+		 * @package WordPress
+		 * @subpackage Template
+		 */
 
 /**
  * Retrieve category link URL.

Spacing +287 added lines, -287 removed lines

@@ -15,13 +15,13 @@ 
  * @param int|object $category Category ID or object.
  * @return string Link on success, empty string if category does not exist.
  */
-function get_category_link( $category ) {
-	if ( ! is_object( $category ) )
+function get_category_link($category) {
+	if ( ! is_object($category))
 		$category = (int) $category;
 
-	$category = get_term_link( $category, 'category' );
+	$category = get_term_link($category, 'category');
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return '';
 
 	return $category;
@@ -39,24 +39,24 @@ 
  * @param array $visited Optional. Already linked to categories to prevent duplicates.
  * @return string|WP_Error A list of category parents on success, WP_Error on failure.
  */
-function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) {
+function get_category_parents($id, $link = false, $separator = '/', $nicename = false, $visited = array()) {
 	$chain = '';
-	$parent = get_term( $id, 'category' );
-	if ( is_wp_error( $parent ) )
+	$parent = get_term($id, 'category');
+	if (is_wp_error($parent))
 		return $parent;
 
-	if ( $nicename )
+	if ($nicename)
 		$name = $parent->slug;
 	else
 		$name = $parent->name;
 
-	if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
+	if ($parent->parent && ($parent->parent != $parent->term_id) && ! in_array($parent->parent, $visited)) {
 		$visited[] = $parent->parent;
-		$chain .= get_category_parents( $parent->parent, $link, $separator, $nicename, $visited );
+		$chain .= get_category_parents($parent->parent, $link, $separator, $nicename, $visited);
 	}
 
-	if ( $link )
-		$chain .= '<a href="' . esc_url( get_category_link( $parent->term_id ) ) . '">'.$name.'</a>' . $separator;
+	if ($link)
+		$chain .= '<a href="'.esc_url(get_category_link($parent->term_id)).'">'.$name.'</a>'.$separator;
 	else
 		$chain .= $name.$separator;
 	return $chain;
@@ -75,15 +75,15 @@ 
  * @param int $id Optional, default to current post ID. The post ID.
  * @return array Array of objects, one for each category assigned to the post.
  */
-function get_the_category( $id = false ) {
-	$categories = get_the_terms( $id, 'category' );
-	if ( ! $categories || is_wp_error( $categories ) )
+function get_the_category($id = false) {
+	$categories = get_the_terms($id, 'category');
+	if ( ! $categories || is_wp_error($categories))
 		$categories = array();
 
-	$categories = array_values( $categories );
+	$categories = array_values($categories);
 
-	foreach ( array_keys( $categories ) as $key ) {
-		_make_cat_compat( $categories[$key] );
+	foreach (array_keys($categories) as $key) {
+		_make_cat_compat($categories[$key]);
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 *
 	 * @param array $categories An array of categories to return for the post.
 	 */
-	return apply_filters( 'get_the_categories', $categories );
+	return apply_filters('get_the_categories', $categories);
 }
 
 /**
@@ -109,8 +109,8 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_name( $a, $b ) {
-	return strcmp( $a->name, $b->name );
+function _usort_terms_by_name($a, $b) {
+	return strcmp($a->name, $b->name);
 }
 
 /**
@@ -126,10 +126,10 @@ 
  * @param object $b
  * @return int
  */
-function _usort_terms_by_ID( $a, $b ) {
-	if ( $a->term_id > $b->term_id )
+function _usort_terms_by_ID($a, $b) {
+	if ($a->term_id > $b->term_id)
 		return 1;
-	elseif ( $a->term_id < $b->term_id )
+	elseif ($a->term_id < $b->term_id)
 		return -1;
 	else
 		return 0;
@@ -143,14 +143,14 @@ 
  * @param int $cat_ID Category ID.
  * @return string|WP_Error Category name on success, WP_Error on failure.
  */
-function get_the_category_by_ID( $cat_ID ) {
+function get_the_category_by_ID($cat_ID) {
 	$cat_ID = (int) $cat_ID;
-	$category = get_term( $cat_ID, 'category' );
+	$category = get_term($cat_ID, 'category');
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return $category;
 
-	return ( $category ) ? $category->name : '';
+	return ($category) ? $category->name : '';
 }
 
 /**
@@ -165,64 +165,64 @@ 
  * @param int $post_id Optional. Post ID to retrieve categories.
  * @return string
  */
-function get_the_category_list( $separator = '', $parents='', $post_id = false ) {
+function get_the_category_list($separator = '', $parents = '', $post_id = false) {
 	global $wp_rewrite;
-	if ( ! is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) ) {
+	if ( ! is_object_in_taxonomy(get_post_type($post_id), 'category')) {
 		/** This filter is documented in wp-includes/category-template.php */
-		return apply_filters( 'the_category', '', $separator, $parents );
+		return apply_filters('the_category', '', $separator, $parents);
 	}
 
-	$categories = get_the_category( $post_id );
-	if ( empty( $categories ) ) {
+	$categories = get_the_category($post_id);
+	if (empty($categories)) {
 		/** This filter is documented in wp-includes/category-template.php */
-		return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents );
+		return apply_filters('the_category', __('Uncategorized'), $separator, $parents);
 	}
 
-	$rel = ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
+	$rel = (is_object($wp_rewrite) && $wp_rewrite->using_permalinks()) ? 'rel="category tag"' : 'rel="category"';
 
 	$thelist = '';
-	if ( '' == $separator ) {
+	if ('' == $separator) {
 		$thelist .= '<ul class="post-categories">';
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$thelist .= "\n\t<li>";
-			switch ( strtolower( $parents ) ) {
+			switch (strtolower($parents)) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, true, $separator);
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a></li>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '"  ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'"  '.$rel.'>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, false, $separator);
 					$thelist .= $category->name.'</a></li>';
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a></li>';
 			}
 		}
 		$thelist .= '</ul>';
 	} else {
 		$i = 0;
-		foreach ( $categories as $category ) {
-			if ( 0 < $i )
+		foreach ($categories as $category) {
+			if (0 < $i)
 				$thelist .= $separator;
-			switch ( strtolower( $parents ) ) {
+			switch (strtolower($parents)) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, true, $separator);
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, false, $separator);
 					$thelist .= "$category->name</a>";
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a>';
 			}
 			++$i;
 		}
@@ -238,7 +238,7 @@ 
 	 * @param string $parents   How to display the category parents. Accepts 'multiple',
 	 *                          'single', or empty.
 	 */
-	return apply_filters( 'the_category', $thelist, $separator, $parents );
+	return apply_filters('the_category', $thelist, $separator, $parents);
 }
 
 /**
@@ -259,11 +259,11 @@ 
  * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
  * @return bool True if the current post is in any of the given categories.
  */
-function in_category( $category, $post = null ) {
-	if ( empty( $category ) )
+function in_category($category, $post = null) {
+	if (empty($category))
 		return false;
 
-	return has_category( $category, $post );
+	return has_category($category, $post);
 }
 
 /**
@@ -275,8 +275,8 @@ 
  * @param string $parents Optional. How to display the parents.
  * @param int $post_id Optional. Post ID to retrieve categories.
  */
-function the_category( $separator = '', $parents='', $post_id = false ) {
-	echo get_the_category_list( $separator, $parents, $post_id );
+function the_category($separator = '', $parents = '', $post_id = false) {
+	echo get_the_category_list($separator, $parents, $post_id);
 }
 
 /**
@@ -287,8 +287,8 @@ 
  * @param int $category Optional. Category ID. Will use global category ID by default.
  * @return string Category description, available.
  */
-function category_description( $category = 0 ) {
-	return term_description( $category, 'category' );
+function category_description($category = 0) {
+	return term_description($category, 'category');
 }
 
 /**
@@ -341,7 +341,7 @@ 
  * }
  * @return string HTML content only if 'echo' argument is 0.
  */
-function wp_dropdown_categories( $args = '' ) {
+function wp_dropdown_categories($args = '') {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => '',
 		'orderby' => 'id', 'order' => 'ASC',
@@ -356,43 +356,43 @@ 
 		'value_field' => 'term_id',
 	);
 
-	$defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
+	$defaults['selected'] = (is_category()) ? get_query_var('cat') : 0;
 
 	// Back compat.
-	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0', '' );
+	if (isset($args['type']) && 'link' == $args['type']) {
+		_deprecated_argument(__FUNCTION__, '3.0', '');
 		$args['taxonomy'] = 'link_category';
 	}
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 	$option_none_value = $r['option_none_value'];
 
-	if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
+	if ( ! isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical']) {
 		$r['pad_counts'] = true;
 	}
 
 	$tab_index = $r['tab_index'];
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 ) {
+	if ((int) $tab_index > 0) {
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 	}
 
 	// Avoid clashes with the 'name' param of get_terms().
 	$get_terms_args = $r;
-	unset( $get_terms_args['name'] );
-	$categories = get_terms( $r['taxonomy'], $get_terms_args );
+	unset($get_terms_args['name']);
+	$categories = get_terms($r['taxonomy'], $get_terms_args);
 
-	$name = esc_attr( $r['name'] );
-	$class = esc_attr( $r['class'] );
-	$id = $r['id'] ? esc_attr( $r['id'] ) : $name;
+	$name = esc_attr($r['name']);
+	$class = esc_attr($r['class']);
+	$id = $r['id'] ? esc_attr($r['id']) : $name;
 
-	if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+	if ( ! $r['hide_if_empty'] || ! empty($categories)) {
 		$output = "<select name='$name' id='$id' class='$class' $tab_index_attribute>\n";
 	} else {
 		$output = '';
 	}
-	if ( empty( $categories ) && ! $r['hide_if_empty'] && ! empty( $r['show_option_none'] ) ) {
+	if (empty($categories) && ! $r['hide_if_empty'] && ! empty($r['show_option_none'])) {
 
 		/**
 		 * Filter a taxonomy drop-down display element.
@@ -408,37 +408,37 @@ 
 		 *
 		 * @param string $element Taxonomy element to list.
 		 */
-		$show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-		$output .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
+		$show_option_none = apply_filters('list_cats', $r['show_option_none']);
+		$output .= "\t<option value='".esc_attr($option_none_value)."' selected='selected'>$show_option_none</option>\n";
 	}
 
-	if ( ! empty( $categories ) ) {
+	if ( ! empty($categories)) {
 
-		if ( $r['show_option_all'] ) {
+		if ($r['show_option_all']) {
 
 			/** This filter is documented in wp-includes/category-template.php */
-			$show_option_all = apply_filters( 'list_cats', $r['show_option_all'] );
-			$selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
+			$show_option_all = apply_filters('list_cats', $r['show_option_all']);
+			$selected = ('0' === strval($r['selected'])) ? " selected='selected'" : '';
 			$output .= "\t<option value='0'$selected>$show_option_all</option>\n";
 		}
 
-		if ( $r['show_option_none'] ) {
+		if ($r['show_option_none']) {
 
 			/** This filter is documented in wp-includes/category-template.php */
-			$show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-			$selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
+			$show_option_none = apply_filters('list_cats', $r['show_option_none']);
+			$selected = selected($option_none_value, $r['selected'], false);
+			$output .= "\t<option value='".esc_attr($option_none_value)."'$selected>$show_option_none</option>\n";
 		}
 
-		if ( $r['hierarchical'] ) {
-			$depth = $r['depth'];  // Walk the full depth.
+		if ($r['hierarchical']) {
+			$depth = $r['depth']; // Walk the full depth.
 		} else {
 			$depth = -1; // Flat.
 		}
-		$output .= walk_category_dropdown_tree( $categories, $depth, $r );
+		$output .= walk_category_dropdown_tree($categories, $depth, $r);
 	}
 
-	if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+	if ( ! $r['hide_if_empty'] || ! empty($categories)) {
 		$output .= "</select>\n";
 	}
 	/**
@@ -449,9 +449,9 @@ 
 	 * @param string $output HTML output.
 	 * @param array  $r      Arguments used to build the drop-down.
 	 */
-	$output = apply_filters( 'wp_dropdown_cats', $output, $r );
+	$output = apply_filters('wp_dropdown_cats', $output, $r);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 	return $output;
@@ -488,7 +488,7 @@ 
  * @param string|array $args Optional. Override default arguments.
  * @return false|string HTML content only if 'echo' argument is 0.
  */
-function wp_list_categories( $args = '' ) {
+function wp_list_categories($args = '') {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => __('No categories'),
 		'orderby' => 'name', 'order' => 'ASC',
@@ -498,93 +498,93 @@ 
 		'feed' => '', 'feed_type' => '',
 		'feed_image' => '', 'exclude' => '',
 		'exclude_tree' => '', 'current_category' => 0,
-		'hierarchical' => true, 'title_li' => __( 'Categories' ),
+		'hierarchical' => true, 'title_li' => __('Categories'),
 		'echo' => 1, 'depth' => 0,
 		'taxonomy' => 'category'
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
+	if ( ! isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical'])
 		$r['pad_counts'] = true;
 
-	if ( true == $r['hierarchical'] ) {
+	if (true == $r['hierarchical']) {
 		$r['exclude_tree'] = $r['exclude'];
 		$r['exclude'] = '';
 	}
 
-	if ( ! isset( $r['class'] ) )
-		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	if ( ! isset($r['class']))
+		$r['class'] = ('category' == $r['taxonomy']) ? 'categories' : $r['taxonomy'];
 
-	if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
+	if ( ! taxonomy_exists($r['taxonomy'])) {
 		return false;
 	}
 
 	$show_option_all = $r['show_option_all'];
 	$show_option_none = $r['show_option_none'];
 
-	$categories = get_categories( $r );
+	$categories = get_categories($r);
 
 	$output = '';
-	if ( $r['title_li'] && 'list' == $r['style'] ) {
-		$output = '<li class="' . esc_attr( $r['class'] ) . '">' . $r['title_li'] . '<ul>';
+	if ($r['title_li'] && 'list' == $r['style']) {
+		$output = '<li class="'.esc_attr($r['class']).'">'.$r['title_li'].'<ul>';
 	}
-	if ( empty( $categories ) ) {
-		if ( ! empty( $show_option_none ) ) {
-			if ( 'list' == $r['style'] ) {
-				$output .= '<li class="cat-item-none">' . $show_option_none . '</li>';
+	if (empty($categories)) {
+		if ( ! empty($show_option_none)) {
+			if ('list' == $r['style']) {
+				$output .= '<li class="cat-item-none">'.$show_option_none.'</li>';
 			} else {
 				$output .= $show_option_none;
 			}
 		}
 	} else {
-		if ( ! empty( $show_option_all ) ) {
+		if ( ! empty($show_option_all)) {
 
 			$posts_page = '';
 
 			// For taxonomies that belong only to custom post types, point to a valid archive.
-			$taxonomy_object = get_taxonomy( $r['taxonomy'] );
-			if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) {
-				foreach ( $taxonomy_object->object_type as $object_type ) {
-					$_object_type = get_post_type_object( $object_type );
+			$taxonomy_object = get_taxonomy($r['taxonomy']);
+			if ( ! in_array('post', $taxonomy_object->object_type) && ! in_array('page', $taxonomy_object->object_type)) {
+				foreach ($taxonomy_object->object_type as $object_type) {
+					$_object_type = get_post_type_object($object_type);
 
 					// Grab the first one.
-					if ( ! empty( $_object_type->has_archive ) ) {
-						$posts_page = get_post_type_archive_link( $object_type );
+					if ( ! empty($_object_type->has_archive)) {
+						$posts_page = get_post_type_archive_link($object_type);
 						break;
 					}
 				}
 			}
 
 			// Fallback for the 'All' link is the front page.
-			if ( ! $posts_page ) {
-				$posts_page = 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' );
+			if ( ! $posts_page) {
+				$posts_page = 'page' == get_option('show_on_front') && get_option('page_for_posts') ? get_permalink(get_option('page_for_posts')) : home_url('/');
 			}
 
-			$posts_page = esc_url( $posts_page );
-			if ( 'list' == $r['style'] ) {
+			$posts_page = esc_url($posts_page);
+			if ('list' == $r['style']) {
 				$output .= "<li class='cat-item-all'><a href='$posts_page'>$show_option_all</a></li>";
 			} else {
 				$output .= "<a href='$posts_page'>$show_option_all</a>";
 			}
 		}
 
-		if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
+		if (empty($r['current_category']) && (is_category() || is_tax() || is_tag())) {
 			$current_term_object = get_queried_object();
-			if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy ) {
+			if ($current_term_object && $r['taxonomy'] === $current_term_object->taxonomy) {
 				$r['current_category'] = get_queried_object_id();
 			}
 		}
 
-		if ( $r['hierarchical'] ) {
+		if ($r['hierarchical']) {
 			$depth = $r['depth'];
 		} else {
 			$depth = -1; // Flat.
 		}
-		$output .= walk_category_tree( $categories, $depth, $r );
+		$output .= walk_category_tree($categories, $depth, $r);
 	}
 
-	if ( $r['title_li'] && 'list' == $r['style'] )
+	if ($r['title_li'] && 'list' == $r['style'])
 		$output .= '</ul></li>';
 
 	/**
@@ -595,9 +595,9 @@ 
 	 * @param string $output HTML output.
 	 * @param array  $args   An array of taxonomy-listing arguments.
 	 */
-	$html = apply_filters( 'wp_list_categories', $output, $args );
+	$html = apply_filters('wp_list_categories', $output, $args);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	} else {
 		return $html;
@@ -639,32 +639,32 @@ 
  * @return void|array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
  *                    Otherwise, this function outputs the tag cloud.
  */
-function wp_tag_cloud( $args = '' ) {
+function wp_tag_cloud($args = '') {
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
 		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
 		'exclude' => '', 'include' => '', 'link' => 'view', 'taxonomy' => 'post_tag', 'post_type' => '', 'echo' => true
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
+	$tags = get_terms($args['taxonomy'], array_merge($args, array('orderby' => 'count', 'order' => 'DESC'))); // Always query top tags
 
-	if ( empty( $tags ) || is_wp_error( $tags ) )
+	if (empty($tags) || is_wp_error($tags))
 		return;
 
-	foreach ( $tags as $key => $tag ) {
-		if ( 'edit' == $args['link'] )
-			$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
+	foreach ($tags as $key => $tag) {
+		if ('edit' == $args['link'])
+			$link = get_edit_term_link($tag->term_id, $tag->taxonomy, $args['post_type']);
 		else
-			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
-		if ( is_wp_error( $link ) )
+			$link = get_term_link(intval($tag->term_id), $tag->taxonomy);
+		if (is_wp_error($link))
 			return;
 
-		$tags[ $key ]->link = $link;
-		$tags[ $key ]->id = $tag->term_id;
+		$tags[$key]->link = $link;
+		$tags[$key]->id = $tag->term_id;
 	}
 
-	$return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args
+	$return = wp_generate_tag_cloud($tags, $args); // Here's where those top tags get sorted according to $args
 
 	/**
 	 * Filter the tag cloud output.
@@ -674,9 +674,9 @@ 
 	 * @param string $return HTML output of the tag cloud.
 	 * @param array  $args   An array of tag cloud arguments.
 	 */
-	$return = apply_filters( 'wp_tag_cloud', $return, $args );
+	$return = apply_filters('wp_tag_cloud', $return, $args);
 
-	if ( 'array' == $args['format'] || empty($args['echo']) )
+	if ('array' == $args['format'] || empty($args['echo']))
 		return $return;
 
 	echo $return;
@@ -688,7 +688,7 @@ 
  * @param int $count number of posts with that tag
  * @return int scaled count
  */
-function default_topic_count_scale( $count ) {
+function default_topic_count_scale($count) {
 	return round(log10($count + 1) * 100);
 }
 
@@ -726,7 +726,7 @@ 
  * @param string|array $args Optional, override default arguments.
  * @return string|array Tag cloud as a string or an array, depending on 'format' argument.
  */
-function wp_generate_tag_cloud( $tags, $args = '' ) {
+function wp_generate_tag_cloud($tags, $args = '') {
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
 		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
@@ -734,31 +734,31 @@ 
 		'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$return = ( 'array' === $args['format'] ) ? array() : '';
+	$return = ('array' === $args['format']) ? array() : '';
 
-	if ( empty( $tags ) ) {
+	if (empty($tags)) {
 		return $return;
 	}
 
 	// Juggle topic count tooltips:
-	if ( isset( $args['topic_count_text'] ) ) {
+	if (isset($args['topic_count_text'])) {
 		// First look for nooped plural support via topic_count_text.
 		$translate_nooped_plural = $args['topic_count_text'];
-	} elseif ( ! empty( $args['topic_count_text_callback'] ) ) {
+	} elseif ( ! empty($args['topic_count_text_callback'])) {
 		// Look for the alternative callback style. Ignore the previous default.
-		if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
-			$translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+		if ($args['topic_count_text_callback'] === 'default_topic_count_text') {
+			$translate_nooped_plural = _n_noop('%s topic', '%s topics');
 		} else {
 			$translate_nooped_plural = false;
 		}
-	} elseif ( isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
+	} elseif (isset($args['single_text']) && isset($args['multiple_text'])) {
 		// If no callback exists, look for the old-style single_text and multiple_text arguments.
-		$translate_nooped_plural = _n_noop( $args['single_text'], $args['multiple_text'] );
+		$translate_nooped_plural = _n_noop($args['single_text'], $args['multiple_text']);
 	} else {
 		// This is the default for when no callback, plural, or argument is passed in.
-		$translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+		$translate_nooped_plural = _n_noop('%s topic', '%s topics');
 	}
 
 	/**
@@ -769,62 +769,62 @@ 
 	 * @param array $tags Ordered array of terms.
 	 * @param array $args An array of tag cloud arguments.
 	 */
-	$tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
-	if ( empty( $tags_sorted ) ) {
+	$tags_sorted = apply_filters('tag_cloud_sort', $tags, $args);
+	if (empty($tags_sorted)) {
 		return $return;
 	}
 
-	if ( $tags_sorted !== $tags ) {
+	if ($tags_sorted !== $tags) {
 		$tags = $tags_sorted;
-		unset( $tags_sorted );
+		unset($tags_sorted);
 	} else {
-		if ( 'RAND' === $args['order'] ) {
-			shuffle( $tags );
+		if ('RAND' === $args['order']) {
+			shuffle($tags);
 		} else {
 			// SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-			if ( 'name' === $args['orderby'] ) {
-				uasort( $tags, '_wp_object_name_sort_cb' );
+			if ('name' === $args['orderby']) {
+				uasort($tags, '_wp_object_name_sort_cb');
 			} else {
-				uasort( $tags, '_wp_object_count_sort_cb' );
+				uasort($tags, '_wp_object_count_sort_cb');
 			}
 
-			if ( 'DESC' === $args['order'] ) {
-				$tags = array_reverse( $tags, true );
+			if ('DESC' === $args['order']) {
+				$tags = array_reverse($tags, true);
 			}
 		}
 	}
 
-	if ( $args['number'] > 0 )
-		$tags = array_slice( $tags, 0, $args['number'] );
+	if ($args['number'] > 0)
+		$tags = array_slice($tags, 0, $args['number']);
 
 	$counts = array();
 	$real_counts = array(); // For the alt tag
-	foreach ( (array) $tags as $key => $tag ) {
-		$real_counts[ $key ] = $tag->count;
-		$counts[ $key ] = call_user_func( $args['topic_count_scale_callback'], $tag->count );
+	foreach ((array) $tags as $key => $tag) {
+		$real_counts[$key] = $tag->count;
+		$counts[$key] = call_user_func($args['topic_count_scale_callback'], $tag->count);
 	}
 
-	$min_count = min( $counts );
-	$spread = max( $counts ) - $min_count;
-	if ( $spread <= 0 )
+	$min_count = min($counts);
+	$spread = max($counts) - $min_count;
+	if ($spread <= 0)
 		$spread = 1;
 	$font_spread = $args['largest'] - $args['smallest'];
-	if ( $font_spread < 0 )
+	if ($font_spread < 0)
 		$font_spread = 1;
 	$font_step = $font_spread / $spread;
 
 	// Assemble the data that will be used to generate the tag cloud markup.
 	$tags_data = array();
-	foreach ( $tags as $key => $tag ) {
-		$tag_id = isset( $tag->id ) ? $tag->id : $key;
+	foreach ($tags as $key => $tag) {
+		$tag_id = isset($tag->id) ? $tag->id : $key;
 
-		$count = $counts[ $key ];
-		$real_count = $real_counts[ $key ];
+		$count = $counts[$key];
+		$real_count = $real_counts[$key];
 
-		if ( $translate_nooped_plural ) {
-			$title = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
+		if ($translate_nooped_plural) {
+			$title = sprintf(translate_nooped_plural($translate_nooped_plural, $real_count), number_format_i18n($real_count));
 		} else {
-			$title = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
+			$title = call_user_func($args['topic_count_text_callback'], $real_count, $tag, $args);
 		}
 
 		$tags_data[] = array(
@@ -834,8 +834,8 @@ 
 			'title'      => $title,
 			'slug'       => $tag->slug,
 			'real_count' => $real_count,
-			'class'	     => 'tag-link-' . $tag_id,
-			'font_size'  => $args['smallest'] + ( $count - $min_count ) * $font_step,
+			'class'	     => 'tag-link-'.$tag_id,
+			'font_size'  => $args['smallest'] + ($count - $min_count) * $font_step,
 		);
 	}
 
@@ -846,30 +846,30 @@ 
 	 *
 	 * @param array $tags_data An array of term data for term used to generate the tag cloud.
 	 */
-	$tags_data = apply_filters( 'wp_generate_tag_cloud_data', $tags_data );
+	$tags_data = apply_filters('wp_generate_tag_cloud_data', $tags_data);
 
 	$a = array();
 
 	// generate the output links array
-	foreach ( $tags_data as $key => $tag_data ) {
-		$a[] = "<a href='" . esc_url( $tag_data['url'] ) . "' class='" . esc_attr( $tag_data['class'] ) . "' title='" . esc_attr( $tag_data['title'] ) . "' style='font-size: " . esc_attr( str_replace( ',', '.', $tag_data['font_size'] ) . $args['unit'] ) . ";'>" . esc_html( $tag_data['name'] ) . "</a>";
+	foreach ($tags_data as $key => $tag_data) {
+		$a[] = "<a href='".esc_url($tag_data['url'])."' class='".esc_attr($tag_data['class'])."' title='".esc_attr($tag_data['title'])."' style='font-size: ".esc_attr(str_replace(',', '.', $tag_data['font_size']).$args['unit']).";'>".esc_html($tag_data['name'])."</a>";
 	}
 
-	switch ( $args['format'] ) {
+	switch ($args['format']) {
 		case 'array' :
-			$return =& $a;
+			$return = & $a;
 			break;
 		case 'list' :
 			$return = "<ul class='wp-tag-cloud'>\n\t<li>";
-			$return .= join( "</li>\n\t<li>", $a );
+			$return .= join("</li>\n\t<li>", $a);
 			$return .= "</li>\n</ul>\n";
 			break;
 		default :
-			$return = join( $args['separator'], $a );
+			$return = join($args['separator'], $a);
 			break;
 	}
 
-	if ( $args['filter'] ) {
+	if ($args['filter']) {
 		/**
 		 * Filter the generated output of a tag cloud.
 		 *
@@ -886,7 +886,7 @@ 
 		 * @param array        $tags   An array of terms used in the tag cloud.
 		 * @param array        $args   An array of wp_generate_tag_cloud() arguments.
 		 */
-		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
+		return apply_filters('wp_generate_tag_cloud', $return, $tags, $args);
 	}
 
 	else
@@ -900,8 +900,8 @@ 
  * @access private
  * @return int
  */
-function _wp_object_name_sort_cb( $a, $b ) {
-	return strnatcasecmp( $a->name, $b->name );
+function _wp_object_name_sort_cb($a, $b) {
+	return strnatcasecmp($a->name, $b->name);
 }
 
 /**
@@ -911,8 +911,8 @@ 
  * @access private
  * @return bool
  */
-function _wp_object_count_sort_cb( $a, $b ) {
-	return ( $a->count > $b->count );
+function _wp_object_count_sort_cb($a, $b) {
+	return ($a->count > $b->count);
 }
 
 //
@@ -930,12 +930,12 @@ 
 function walk_category_tree() {
 	$args = func_get_args();
 	// the user's options are the third parameter
-	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
+	if (empty($args[2]['walker']) || ! ($args[2]['walker'] instanceof Walker)) {
 		$walker = new Walker_Category;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
@@ -949,12 +949,12 @@ 
 function walk_category_dropdown_tree() {
 	$args = func_get_args();
 	// the user's options are the third parameter
-	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
+	if (empty($args[2]['walker']) || ! ($args[2]['walker'] instanceof Walker)) {
 		$walker = new Walker_CategoryDropdown;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
@@ -982,7 +982,7 @@ 
 	 * @todo Decouple this
 	 * @var array
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id');
 
 	/**
 	 * Starts the list before the elements are added.
@@ -996,8 +996,8 @@ 
 	 * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
 	 *                       @see wp_list_categories()
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$indent = str_repeat("\t", $depth);
@@ -1016,8 +1016,8 @@ 
 	 * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
 	 *                       @wsee wp_list_categories()
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$indent = str_repeat("\t", $depth);
@@ -1037,21 +1037,21 @@ 
 	 * @param array  $args     An array of arguments. @see wp_list_categories()
 	 * @param int    $id       ID of the current category.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters(
 			'list_cats',
-			esc_attr( $category->name ),
+			esc_attr($category->name),
 			$category
 		);
 
 		// Don't generate an element if the category name is empty.
-		if ( ! $cat_name ) {
+		if ( ! $cat_name) {
 			return;
 		}
 
-		$link = '<a href="' . esc_url( get_term_link( $category ) ) . '" ';
-		if ( $args['use_desc_for_title'] && ! empty( $category->description ) ) {
+		$link = '<a href="'.esc_url(get_term_link($category)).'" ';
+		if ($args['use_desc_for_title'] && ! empty($category->description)) {
 			/**
 			 * Filter the category description for display.
 			 *
@@ -1060,58 +1060,58 @@ 
 			 * @param string $description Category description.
 			 * @param object $category    Category object.
 			 */
-			$link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"';
+			$link .= 'title="'.esc_attr(strip_tags(apply_filters('category_description', $category->description, $category))).'"';
 		}
 
 		$link .= '>';
-		$link .= $cat_name . '</a>';
+		$link .= $cat_name.'</a>';
 
-		if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) {
+		if ( ! empty($args['feed_image']) || ! empty($args['feed'])) {
 			$link .= ' ';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= '(';
 			}
 
-			$link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
+			$link .= '<a href="'.esc_url(get_term_feed_link($category->term_id, $category->taxonomy, $args['feed_type'])).'"';
 
-			if ( empty( $args['feed'] ) ) {
-				$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
+			if (empty($args['feed'])) {
+				$alt = ' alt="'.sprintf(__('Feed for all posts filed under %s'), $cat_name).'"';
 			} else {
-				$alt = ' alt="' . $args['feed'] . '"';
+				$alt = ' alt="'.$args['feed'].'"';
 				$name = $args['feed'];
-				$link .= empty( $args['title'] ) ? '' : $args['title'];
+				$link .= empty($args['title']) ? '' : $args['title'];
 			}
 
 			$link .= '>';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= $name;
 			} else {
-				$link .= "<img src='" . $args['feed_image'] . "'$alt" . ' />';
+				$link .= "<img src='".$args['feed_image']."'$alt".' />';
 			}
 			$link .= '</a>';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= ')';
 			}
 		}
 
-		if ( ! empty( $args['show_count'] ) ) {
-			$link .= ' (' . number_format_i18n( $category->count ) . ')';
+		if ( ! empty($args['show_count'])) {
+			$link .= ' ('.number_format_i18n($category->count).')';
 		}
-		if ( 'list' == $args['style'] ) {
+		if ('list' == $args['style']) {
 			$output .= "\t<li";
 			$css_classes = array(
 				'cat-item',
-				'cat-item-' . $category->term_id,
+				'cat-item-'.$category->term_id,
 			);
 
-			if ( ! empty( $args['current_category'] ) ) {
-				$_current_category = get_term( $args['current_category'], $category->taxonomy );
-				if ( $category->term_id == $args['current_category'] ) {
+			if ( ! empty($args['current_category'])) {
+				$_current_category = get_term($args['current_category'], $category->taxonomy);
+				if ($category->term_id == $args['current_category']) {
 					$css_classes[] = 'current-cat';
-				} elseif ( $category->term_id == $_current_category->parent ) {
+				} elseif ($category->term_id == $_current_category->parent) {
 					$css_classes[] = 'current-cat-parent';
 				}
 			}
@@ -1128,9 +1128,9 @@ 
 			 * @param int    $depth       Depth of page, used for padding.
 			 * @param array  $args        An array of wp_list_categories() arguments.
 			 */
-			$css_classes = implode( ' ', apply_filters( 'category_css_class', $css_classes, $category, $depth, $args ) );
+			$css_classes = implode(' ', apply_filters('category_css_class', $css_classes, $category, $depth, $args));
 
-			$output .=  ' class="' . $css_classes . '"';
+			$output .= ' class="'.$css_classes.'"';
 			$output .= ">$link\n";
 		} else {
 			$output .= "\t$link<br />\n";
@@ -1149,8 +1149,8 @@ 
 	 * @param int    $depth  Depth of category. Not used.
 	 * @param array  $args   An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories()
 	 */
-	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function end_el(&$output, $page, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$output .= "</li>\n";
@@ -1179,7 +1179,7 @@ 
 	 * @todo Decouple this
 	 * @var array
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id');
 
 	/**
 	 * Start the element output.
@@ -1193,26 +1193,26 @@ 
 	 * @param array  $args     Uses 'selected', 'show_count', and 'value_field' keys, if they exist.
 	 *                         See {@see wp_dropdown_categories()}.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		$pad = str_repeat('&nbsp;', $depth * 3);
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$cat_name = apply_filters( 'list_cats', $category->name, $category );
+		$cat_name = apply_filters('list_cats', $category->name, $category);
 
-		if ( isset( $args['value_field'] ) && isset( $category->{$args['value_field']} ) ) {
+		if (isset($args['value_field']) && isset($category->{$args['value_field']} )) {
 			$value_field = $args['value_field'];
 		} else {
 			$value_field = 'term_id';
 		}
 
-		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
+		$output .= "\t<option class=\"level-$depth\" value=\"".esc_attr($category->{$value_field} )."\"";
 
-		if ( $category->{$value_field} == $args['selected'] )
+		if ($category->{$value_field} == $args['selected'])
 			$output .= ' selected="selected"';
 		$output .= '>';
 		$output .= $pad.$cat_name;
-		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		if ($args['show_count'])
+			$output .= '&nbsp;&nbsp;('.number_format_i18n($category->count).')';
 		$output .= "</option>\n";
 	}
 }
@@ -1230,13 +1230,13 @@ 
  * @param int|object $tag Tag ID or object.
  * @return string Link on success, empty string if tag does not exist.
  */
-function get_tag_link( $tag ) {
-	if ( ! is_object( $tag ) )
+function get_tag_link($tag) {
+	if ( ! is_object($tag))
 		$tag = (int) $tag;
 
-	$tag = get_term_link( $tag, 'post_tag' );
+	$tag = get_term_link($tag, 'post_tag');
 
-	if ( is_wp_error( $tag ) )
+	if (is_wp_error($tag))
 		return '';
 
 	return $tag;
@@ -1250,7 +1250,7 @@ 
  * @param int $id Post ID.
  * @return array|false|WP_Error Array of tag objects on success, false on failure.
  */
-function get_the_tags( $id = 0 ) {
+function get_the_tags($id = 0) {
 
 	/**
 	 * Filter the array of tags for the given post.
@@ -1261,7 +1261,7 @@ 
 	 *
 	 * @param array $terms An array of tags for the given post.
 	 */
-	return apply_filters( 'get_the_tags', get_the_terms( $id, 'post_tag' ) );
+	return apply_filters('get_the_tags', get_the_terms($id, 'post_tag'));
 }
 
 /**
@@ -1275,7 +1275,7 @@ 
  * @param int $id Optional. Post ID. Defaults to the current post.
  * @return string|false|WP_Error A list of tags on success, false if there are no terms, WP_Error on failure.
  */
-function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) {
+function get_the_tag_list($before = '', $sep = '', $after = '', $id = 0) {
 
 	/**
 	 * Filter the tags list for a given post.
@@ -1288,7 +1288,7 @@ 
 	 * @param string $after    String to use after tags.
 	 * @param int    $id       Post ID.
 	 */
-	return apply_filters( 'the_tags', get_the_term_list( $id, 'post_tag', $before, $sep, $after ), $before, $sep, $after, $id );
+	return apply_filters('the_tags', get_the_term_list($id, 'post_tag', $before, $sep, $after), $before, $sep, $after, $id);
 }
 
 /**
@@ -1300,8 +1300,8 @@ 
  * @param string $sep Optional. Separate items using this.
  * @param string $after Optional. After list.
  */
-function the_tags( $before = null, $sep = ', ', $after = '' ) {
-	if ( null === $before )
+function the_tags($before = null, $sep = ', ', $after = '') {
+	if (null === $before)
 		$before = __('Tags: ');
 	echo get_the_tag_list($before, $sep, $after);
 }
@@ -1314,8 +1314,8 @@ 
  * @param int $tag Optional. Tag ID. Will use global tag ID by default.
  * @return string Tag description, available.
  */
-function tag_description( $tag = 0 ) {
-	return term_description( $tag );
+function tag_description($tag = 0) {
+	return term_description($tag);
 }
 
 /**
@@ -1327,16 +1327,16 @@ 
  * @param string $taxonomy Optional taxonomy name. Defaults to 'post_tag'.
  * @return string Term description, available.
  */
-function term_description( $term = 0, $taxonomy = 'post_tag' ) {
-	if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
+function term_description($term = 0, $taxonomy = 'post_tag') {
+	if ( ! $term && (is_tax() || is_tag() || is_category())) {
 		$term = get_queried_object();
-		if ( $term ) {
+		if ($term) {
 			$taxonomy = $term->taxonomy;
 			$term = $term->term_id;
 		}
 	}
-	$description = get_term_field( 'description', $term, $taxonomy );
-	return is_wp_error( $description ) ? '' : $description;
+	$description = get_term_field('description', $term, $taxonomy);
+	return is_wp_error($description) ? '' : $description;
 }
 
 /**
@@ -1349,14 +1349,14 @@ 
  * @return array|false|WP_Error Array of term objects on success, false if there are no terms
  *                              or the post does not exist, WP_Error on failure.
  */
-function get_the_terms( $post, $taxonomy ) {
-	if ( ! $post = get_post( $post ) )
+function get_the_terms($post, $taxonomy) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$terms = get_object_term_cache( $post->ID, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post->ID, $taxonomy );
-		wp_cache_add($post->ID, $terms, $taxonomy . '_relationships');
+	$terms = get_object_term_cache($post->ID, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post->ID, $taxonomy);
+		wp_cache_add($post->ID, $terms, $taxonomy.'_relationships');
 	}
 
 	/**
@@ -1368,9 +1368,9 @@ 
 	 * @param int            $post_id  Post ID.
 	 * @param string         $taxonomy Name of the taxonomy.
 	 */
-	$terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
+	$terms = apply_filters('get_the_terms', $terms, $post->ID, $taxonomy);
 
-	if ( empty( $terms ) )
+	if (empty($terms))
 		return false;
 
 	return $terms;
@@ -1388,23 +1388,23 @@ 
  * @param string $after Optional. After list.
  * @return string|false|WP_Error A list of terms on success, false if there are no terms, WP_Error on failure.
  */
-function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
-	$terms = get_the_terms( $id, $taxonomy );
+function get_the_term_list($id, $taxonomy, $before = '', $sep = '', $after = '') {
+	$terms = get_the_terms($id, $taxonomy);
 
-	if ( is_wp_error( $terms ) )
+	if (is_wp_error($terms))
 		return $terms;
 
-	if ( empty( $terms ) )
+	if (empty($terms))
 		return false;
 
 	$links = array();
 
-	foreach ( $terms as $term ) {
-		$link = get_term_link( $term, $taxonomy );
-		if ( is_wp_error( $link ) ) {
+	foreach ($terms as $term) {
+		$link = get_term_link($term, $taxonomy);
+		if (is_wp_error($link)) {
 			return $link;
 		}
-		$links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
+		$links[] = '<a href="'.esc_url($link).'" rel="tag">'.$term->name.'</a>';
 	}
 
 	/**
@@ -1417,9 +1417,9 @@ 
 	 *
 	 * @param array $links An array of term links.
 	 */
-	$term_links = apply_filters( "term_links-$taxonomy", $links );
+	$term_links = apply_filters("term_links-$taxonomy", $links);
 
-	return $before . join( $sep, $term_links ) . $after;
+	return $before.join($sep, $term_links).$after;
 }
 
 /**
@@ -1434,10 +1434,10 @@ 
  * @param string $after Optional. After list.
  * @return false|void False on WordPress error.
  */
-function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
-	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
+function the_terms($id, $taxonomy, $before = '', $sep = ', ', $after = '') {
+	$term_list = get_the_term_list($id, $taxonomy, $before, $sep, $after);
 
-	if ( is_wp_error( $term_list ) )
+	if (is_wp_error($term_list))
 		return false;
 
 	/**
@@ -1451,7 +1451,7 @@ 
 	 * @param string $sep       String to use between the terms.
 	 * @param string $after     String to use after the terms.
 	 */
-	echo apply_filters( 'the_terms', $term_list, $taxonomy, $before, $sep, $after );
+	echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after);
 }
 
 /**
@@ -1463,8 +1463,8 @@ 
  * @param int|object $post Optional. Post to check instead of the current post.
  * @return bool True if the current post has any of the given categories (or any category, if no category specified).
  */
-function has_category( $category = '', $post = null ) {
-	return has_term( $category, 'category', $post );
+function has_category($category = '', $post = null) {
+	return has_term($category, 'category', $post);
 }
 
 /**
@@ -1484,8 +1484,8 @@ 
  * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
  * @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
  */
-function has_tag( $tag = '', $post = null ) {
-	return has_term( $tag, 'post_tag', $post );
+function has_tag($tag = '', $post = null) {
+	return has_term($tag, 'post_tag', $post);
 }
 
 /**
@@ -1502,14 +1502,14 @@ 
  * @param int|object $post Optional. Post to check instead of the current post.
  * @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
  */
-function has_term( $term = '', $taxonomy = '', $post = null ) {
+function has_term($term = '', $taxonomy = '', $post = null) {
 	$post = get_post($post);
 
-	if ( !$post )
+	if ( ! $post)
 		return false;
 
-	$r = is_object_in_term( $post->ID, $taxonomy, $term );
-	if ( is_wp_error( $r ) )
+	$r = is_object_in_term($post->ID, $taxonomy, $term);
+	if (is_wp_error($r))
 		return false;
 
 	return $r;

Braces +131 added lines, -93 removed lines

@@ -16,13 +16,15 @@ 
  * @return string Link on success, empty string if category does not exist.
  */
 function get_category_link( $category ) {
-	if ( ! is_object( $category ) )
-		$category = (int) $category;
+	if ( ! is_object( $category ) ) {
+			$category = (int) $category;
+	}
 
 	$category = get_term_link( $category, 'category' );
 
-	if ( is_wp_error( $category ) )
-		return '';
+	if ( is_wp_error( $category ) ) {
+			return '';
+	}
 
 	return $category;
 }
@@ -42,23 +44,26 @@ 
 function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) {
 	$chain = '';
 	$parent = get_term( $id, 'category' );
-	if ( is_wp_error( $parent ) )
-		return $parent;
+	if ( is_wp_error( $parent ) ) {
+			return $parent;
+	}
 
-	if ( $nicename )
-		$name = $parent->slug;
-	else
-		$name = $parent->name;
+	if ( $nicename ) {
+			$name = $parent->slug;
+	} else {
+			$name = $parent->name;
+	}
 
 	if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
 		$visited[] = $parent->parent;
 		$chain .= get_category_parents( $parent->parent, $link, $separator, $nicename, $visited );
 	}
 
-	if ( $link )
-		$chain .= '<a href="' . esc_url( get_category_link( $parent->term_id ) ) . '">'.$name.'</a>' . $separator;
-	else
-		$chain .= $name.$separator;
+	if ( $link ) {
+			$chain .= '<a href="' . esc_url( get_category_link( $parent->term_id ) ) . '">'.$name.'</a>' . $separator;
+	} else {
+			$chain .= $name.$separator;
+	}
 	return $chain;
 }
 
@@ -77,8 +82,9 @@ 
  */
 function get_the_category( $id = false ) {
 	$categories = get_the_terms( $id, 'category' );
-	if ( ! $categories || is_wp_error( $categories ) )
-		$categories = array();
+	if ( ! $categories || is_wp_error( $categories ) ) {
+			$categories = array();
+	}
 
 	$categories = array_values( $categories );
 
@@ -127,13 +133,14 @@ 
  * @return int
  */
 function _usort_terms_by_ID( $a, $b ) {
-	if ( $a->term_id > $b->term_id )
-		return 1;
-	elseif ( $a->term_id < $b->term_id )
-		return -1;
-	else
-		return 0;
-}
+	if ( $a->term_id > $b->term_id ) {
+			return 1;
+	} elseif ( $a->term_id < $b->term_id ) {
+			return -1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Retrieve category name based on category ID.
@@ -147,8 +154,9 @@ 
 	$cat_ID = (int) $cat_ID;
 	$category = get_term( $cat_ID, 'category' );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	return ( $category ) ? $category->name : '';
 }
@@ -187,14 +195,16 @@ 
 			$thelist .= "\n\t<li>";
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, true, $separator );
+					}
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '"  ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, false, $separator );
+					}
 					$thelist .= $category->name.'</a></li>';
 					break;
 				case '':
@@ -206,18 +216,21 @@ 
 	} else {
 		$i = 0;
 		foreach ( $categories as $category ) {
-			if ( 0 < $i )
-				$thelist .= $separator;
+			if ( 0 < $i ) {
+							$thelist .= $separator;
+			}
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, true, $separator );
+					}
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, false, $separator );
+					}
 					$thelist .= "$category->name</a>";
 					break;
 				case '':
@@ -260,8 +273,9 @@ 
  * @return bool True if the current post is in any of the given categories.
  */
 function in_category( $category, $post = null ) {
-	if ( empty( $category ) )
-		return false;
+	if ( empty( $category ) ) {
+			return false;
+	}
 
 	return has_category( $category, $post );
 }
@@ -505,16 +519,18 @@ 
 
 	$r = wp_parse_args( $args, $defaults );
 
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
-		$r['pad_counts'] = true;
+	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
+			$r['pad_counts'] = true;
+	}
 
 	if ( true == $r['hierarchical'] ) {
 		$r['exclude_tree'] = $r['exclude'];
 		$r['exclude'] = '';
 	}
 
-	if ( ! isset( $r['class'] ) )
-		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	if ( ! isset( $r['class'] ) ) {
+			$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	}
 
 	if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
 		return false;
@@ -584,8 +600,9 @@ 
 		$output .= walk_category_tree( $categories, $depth, $r );
 	}
 
-	if ( $r['title_li'] && 'list' == $r['style'] )
-		$output .= '</ul></li>';
+	if ( $r['title_li'] && 'list' == $r['style'] ) {
+			$output .= '</ul></li>';
+	}
 
 	/**
 	 * Filter the HTML output of a taxonomy list.
@@ -649,16 +666,19 @@ 
 
 	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
 
-	if ( empty( $tags ) || is_wp_error( $tags ) )
-		return;
+	if ( empty( $tags ) || is_wp_error( $tags ) ) {
+			return;
+	}
 
 	foreach ( $tags as $key => $tag ) {
-		if ( 'edit' == $args['link'] )
-			$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
-		else
-			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
-		if ( is_wp_error( $link ) )
-			return;
+		if ( 'edit' == $args['link'] ) {
+					$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
+		} else {
+					$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
+		}
+		if ( is_wp_error( $link ) ) {
+					return;
+		}
 
 		$tags[ $key ]->link = $link;
 		$tags[ $key ]->id = $tag->term_id;
@@ -676,8 +696,9 @@ 
 	 */
 	$return = apply_filters( 'wp_tag_cloud', $return, $args );
 
-	if ( 'array' == $args['format'] || empty($args['echo']) )
-		return $return;
+	if ( 'array' == $args['format'] || empty($args['echo']) ) {
+			return $return;
+	}
 
 	echo $return;
 }
@@ -794,8 +815,9 @@ 
 		}
 	}
 
-	if ( $args['number'] > 0 )
-		$tags = array_slice( $tags, 0, $args['number'] );
+	if ( $args['number'] > 0 ) {
+			$tags = array_slice( $tags, 0, $args['number'] );
+	}
 
 	$counts = array();
 	$real_counts = array(); // For the alt tag
@@ -806,11 +828,13 @@ 
 
 	$min_count = min( $counts );
 	$spread = max( $counts ) - $min_count;
-	if ( $spread <= 0 )
-		$spread = 1;
+	if ( $spread <= 0 ) {
+			$spread = 1;
+	}
 	$font_spread = $args['largest'] - $args['smallest'];
-	if ( $font_spread < 0 )
-		$font_spread = 1;
+	if ( $font_spread < 0 ) {
+			$font_spread = 1;
+	}
 	$font_step = $font_spread / $spread;
 
 	// Assemble the data that will be used to generate the tag cloud markup.
@@ -887,11 +911,10 @@ 
 		 * @param array        $args   An array of wp_generate_tag_cloud() arguments.
 		 */
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
+	} else {
+			return $return;
+	}
 	}
-
-	else
-		return $return;
-}
 
 /**
  * Callback for comparing objects based on name
@@ -997,8 +1020,9 @@ 
 	 *                       @see wp_list_categories()
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent<ul class='children'>\n";
@@ -1017,8 +1041,9 @@ 
 	 *                       @wsee wp_list_categories()
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
@@ -1150,8 +1175,9 @@ 
 	 * @param array  $args   An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories()
 	 */
 	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$output .= "</li>\n";
 	}
@@ -1207,12 +1233,14 @@ 
 
 		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
 
-		if ( $category->{$value_field} == $args['selected'] )
-			$output .= ' selected="selected"';
+		if ( $category->{$value_field} == $args['selected'] ) {
+					$output .= ' selected="selected"';
+		}
 		$output .= '>';
 		$output .= $pad.$cat_name;
-		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		if ( $args['show_count'] ) {
+					$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		}
 		$output .= "</option>\n";
 	}
 }
@@ -1231,13 +1259,15 @@ 
  * @return string Link on success, empty string if tag does not exist.
  */
 function get_tag_link( $tag ) {
-	if ( ! is_object( $tag ) )
-		$tag = (int) $tag;
+	if ( ! is_object( $tag ) ) {
+			$tag = (int) $tag;
+	}
 
 	$tag = get_term_link( $tag, 'post_tag' );
 
-	if ( is_wp_error( $tag ) )
-		return '';
+	if ( is_wp_error( $tag ) ) {
+			return '';
+	}
 
 	return $tag;
 }
@@ -1301,8 +1331,9 @@ 
  * @param string $after Optional. After list.
  */
 function the_tags( $before = null, $sep = ', ', $after = '' ) {
-	if ( null === $before )
-		$before = __('Tags: ');
+	if ( null === $before ) {
+			$before = __('Tags: ');
+	}
 	echo get_the_tag_list($before, $sep, $after);
 }
 
@@ -1350,8 +1381,9 @@ 
  *                              or the post does not exist, WP_Error on failure.
  */
 function get_the_terms( $post, $taxonomy ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
 	$terms = get_object_term_cache( $post->ID, $taxonomy );
 	if ( false === $terms ) {
@@ -1370,8 +1402,9 @@ 
 	 */
 	$terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
 
-	if ( empty( $terms ) )
-		return false;
+	if ( empty( $terms ) ) {
+			return false;
+	}
 
 	return $terms;
 }
@@ -1391,11 +1424,13 @@ 
 function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
 	$terms = get_the_terms( $id, $taxonomy );
 
-	if ( is_wp_error( $terms ) )
-		return $terms;
+	if ( is_wp_error( $terms ) ) {
+			return $terms;
+	}
 
-	if ( empty( $terms ) )
-		return false;
+	if ( empty( $terms ) ) {
+			return false;
+	}
 
 	$links = array();
 
@@ -1437,8 +1472,9 @@ 
 function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
 	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
 
-	if ( is_wp_error( $term_list ) )
-		return false;
+	if ( is_wp_error( $term_list ) ) {
+			return false;
+	}
 
 	/**
 	 * Filter the list of terms to display.
@@ -1505,12 +1541,14 @@ 
 function has_term( $term = '', $taxonomy = '', $post = null ) {
 	$post = get_post($post);
 
-	if ( !$post )
-		return false;
+	if ( !$post ) {
+			return false;
+	}
 
 	$r = is_object_in_term( $post->ID, $taxonomy, $term );
-	if ( is_wp_error( $r ) )
-		return false;
+	if ( is_wp_error( $r ) ) {
+			return false;
+	}
 
 	return $r;
 }

src/wp-includes/class-http.php

Doc Comments +3 added lines, -3 removed lines

@@ -452,7 +452,7 @@ 
 	 * @since 2.7.0
 	 *
 	 * @param string $strResponse The full response string
-	 * @return array Array with 'headers' and 'body' keys.
+	 * @return string Array with 'headers' and 'body' keys.
 	 */
 	public static function processResponse($strResponse) {
 		$res = explode("\r\n\r\n", $strResponse, 2);
@@ -472,7 +472,7 @@ 
 	 *
 	 * @param string|array $headers
 	 * @param string $url The URL that was requested
-	 * @return array Processed string headers. If duplicate headers are encountered,
+	 * @return string Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
 	public static function processHeaders( $headers, $url = '' ) {
@@ -2106,7 +2106,7 @@ 
 	 * @param string $raw String to compress.
 	 * @param int $level Optional, default is 9. Compression level, 9 is highest.
 	 * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports.
-	 * @return string|false False on failure.
+	 * @return string False on failure.
 	 */
 	public static function compress( $raw, $level = 9, $supports = null ) {
 		return gzdeflate( $raw, $level );

Indentation +23 added lines, -23 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Simple and uniform HTTP request API.
- *
- * Standardizes the HTTP requests for WordPress. Handles cookies, gzip encoding and decoding, chunk
- * decoding, if HTTP 1.1 and various other difficult HTTP protocol implementations.
- *
- * @link https://core.trac.wordpress.org/ticket/4779 HTTP API Proposal
- *
- * @package WordPress
- * @subpackage HTTP
- * @since 2.7.0
- */
+	 * Simple and uniform HTTP request API.
+	 *
+	 * Standardizes the HTTP requests for WordPress. Handles cookies, gzip encoding and decoding, chunk
+	 * decoding, if HTTP 1.1 and various other difficult HTTP protocol implementations.
+	 *
+	 * @link https://core.trac.wordpress.org/ticket/4779 HTTP API Proposal
+	 *
+	 * @package WordPress
+	 * @subpackage HTTP
+	 * @since 2.7.0
+	 */
 
 /**
  * WordPress HTTP Class for managing HTTP Transports and making HTTP requests.
@@ -1871,18 +1871,18 @@ 
 	}
 }
 /**
- * Internal representation of a single cookie.
- *
- * Returned cookies are represented using this class, and when cookies are set, if they are not
- * already a WP_Http_Cookie() object, then they are turned into one.
- *
- * @todo The WordPress convention is to use underscores instead of camelCase for function and method
- * names. Need to switch to use underscores instead for the methods.
- *
- * @package WordPress
- * @subpackage HTTP
- * @since 2.8.0
- */
+	 * Internal representation of a single cookie.
+	 *
+	 * Returned cookies are represented using this class, and when cookies are set, if they are not
+	 * already a WP_Http_Cookie() object, then they are turned into one.
+	 *
+	 * @todo The WordPress convention is to use underscores instead of camelCase for function and method
+	 * names. Need to switch to use underscores instead for the methods.
+	 *
+	 * @package WordPress
+	 * @subpackage HTTP
+	 * @since 2.8.0
+	 */
 class WP_Http_Cookie {
 
 	/**

Spacing +504 added lines, -504 removed lines

@@ -82,7 +82,7 @@ 
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'.
 	 *                        A WP_Error instance upon error.
 	 */
-	public function request( $url, $args = array() ) {
+	public function request($url, $args = array()) {
 		global $wp_version;
 
 		$defaults = array(
@@ -95,7 +95,7 @@ 
 			 * @param int $timeout_value Time in seconds until a request times out.
 			 *                           Default 5.
 			 */
-			'timeout' => apply_filters( 'http_request_timeout', 5 ),
+			'timeout' => apply_filters('http_request_timeout', 5),
 			/**
 			 * Filter the number of redirects allowed during an HTTP request.
 			 *
@@ -103,7 +103,7 @@ 
 			 *
 			 * @param int $redirect_count Number of redirects allowed. Default 5.
 			 */
-			'redirection' => apply_filters( 'http_request_redirection_count', 5 ),
+			'redirection' => apply_filters('http_request_redirection_count', 5),
 			/**
 			 * Filter the version of the HTTP protocol used in a request.
 			 *
@@ -112,7 +112,7 @@ 
 			 * @param string $version Version of HTTP used. Accepts '1.0' and '1.1'.
 			 *                        Default '1.0'.
 			 */
-			'httpversion' => apply_filters( 'http_request_version', '1.0' ),
+			'httpversion' => apply_filters('http_request_version', '1.0'),
 			/**
 			 * Filter the user agent value sent with an HTTP request.
 			 *
@@ -120,7 +120,7 @@ 
 			 *
 			 * @param string $user_agent WordPress user agent string.
 			 */
-			'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ),
+			'user-agent' => apply_filters('http_headers_useragent', 'WordPress/'.$wp_version.'; '.get_bloginfo('url')),
 			/**
 			 * Filter whether to pass URLs through wp_http_validate_url() in an HTTP request.
 			 *
@@ -129,7 +129,7 @@ 
 			 * @param bool $pass_url Whether to pass URLs through wp_http_validate_url().
 			 *                       Default false.
 			 */
-			'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ),
+			'reject_unsafe_urls' => apply_filters('http_request_reject_unsafe_urls', false),
 			'blocking' => true,
 			'headers' => array(),
 			'cookies' => array(),
@@ -137,20 +137,20 @@ 
 			'compress' => false,
 			'decompress' => true,
 			'sslverify' => true,
-			'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
+			'sslcertificates' => ABSPATH.WPINC.'/certificates/ca-bundle.crt',
 			'stream' => false,
 			'filename' => null,
 			'limit_response_size' => null,
 		);
 
 		// Pre-parse for the HEAD checks.
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
+		if (isset($args['method']) && 'HEAD' == $args['method'])
 			$defaults['redirection'] = 0;
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		/**
 		 * Filter the arguments used in an HTTP request.
 		 *
@@ -159,10 +159,10 @@ 
 		 * @param array  $r   An array of HTTP request arguments.
 		 * @param string $url The request URL.
 		 */
-		$r = apply_filters( 'http_request_args', $r, $url );
+		$r = apply_filters('http_request_args', $r, $url);
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
+		if ( ! isset($r['_redirection']))
 			$r['_redirection'] = $r['redirection'];
 
 		/**
@@ -177,25 +177,25 @@ 
 		 * @param array  $r       HTTP request arguments.
 		 * @param string $url     The request URL.
 		 */
-		$pre = apply_filters( 'pre_http_request', false, $r, $url );
-		if ( false !== $pre )
+		$pre = apply_filters('pre_http_request', false, $r, $url);
+		if (false !== $pre)
 			return $pre;
 
-		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] )
-				$url = wp_http_validate_url( $url );
-			if ( $url ) {
-				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+		if (function_exists('wp_kses_bad_protocol')) {
+			if ($r['reject_unsafe_urls'])
+				$url = wp_http_validate_url($url);
+			if ($url) {
+				$url = wp_kses_bad_protocol($url, array('http', 'https', 'ssl'));
 			}
 		}
 
-		$arrURL = @parse_url( $url );
+		$arrURL = @parse_url($url);
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) )
+		if (empty($url) || empty($arrURL['scheme']))
 			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
 
-		if ( $this->block_request( $url ) )
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ($this->block_request($url))
+			return new WP_Error('http_request_failed', __('User has blocked requests through HTTP.'));
 
 		/*
 		 * Determine if this is a https call and pass that on to the transport functions
@@ -204,88 +204,88 @@ 
 		$r['ssl'] = $arrURL['scheme'] == 'https' || $arrURL['scheme'] == 'ssl';
 
 		// Determine if this request is to OUR install of WordPress.
-		$homeURL = parse_url( get_bloginfo( 'url' ) );
-		$r['local'] = 'localhost' == $arrURL['host'] || ( isset( $homeURL['host'] ) && $homeURL['host'] == $arrURL['host'] );
-		unset( $homeURL );
+		$homeURL = parse_url(get_bloginfo('url'));
+		$r['local'] = 'localhost' == $arrURL['host'] || (isset($homeURL['host']) && $homeURL['host'] == $arrURL['host']);
+		unset($homeURL);
 
 		/*
 		 * If we are streaming to a file but no filename was given drop it in the WP temp dir
 		 * and pick its name using the basename of the $url.
 		 */
-		if ( $r['stream']  && empty( $r['filename'] ) ) {
-			$r['filename'] = get_temp_dir() . wp_unique_filename( get_temp_dir(), basename( $url ) );
+		if ($r['stream'] && empty($r['filename'])) {
+			$r['filename'] = get_temp_dir().wp_unique_filename(get_temp_dir(), basename($url));
 		}
 
 		/*
 		 * Force some settings if we are streaming to a file and check for existence and perms
 		 * of destination directory.
 		 */
-		if ( $r['stream'] ) {
+		if ($r['stream']) {
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) )
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable(dirname($r['filename'])))
+				return new WP_Error('http_request_failed', __('Destination directory for file streaming does not exist or is not writable.'));
 		}
 
-		if ( is_null( $r['headers'] ) )
+		if (is_null($r['headers']))
 			$r['headers'] = array();
 
-		if ( ! is_array( $r['headers'] ) ) {
-			$processedHeaders = self::processHeaders( $r['headers'], $url );
+		if ( ! is_array($r['headers'])) {
+			$processedHeaders = self::processHeaders($r['headers'], $url);
 			$r['headers'] = $processedHeaders['headers'];
 		}
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
+			unset($r['headers']['User-Agent']);
 		}
 
-		if ( isset( $r['headers']['user-agent'] ) ) {
+		if (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
-		if ( '1.1' == $r['httpversion'] && !isset( $r['headers']['connection'] ) ) {
+		if ('1.1' == $r['httpversion'] && ! isset($r['headers']['connection'])) {
 			$r['headers']['connection'] = 'close';
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		self::buildCookieHeader( $r );
+		self::buildCookieHeader($r);
 
 		// Avoid issues where mbstring.func_overload is enabled.
 		mbstring_binary_safe_encoding();
 
-		if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
-			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
+		if ( ! isset($r['headers']['Accept-Encoding'])) {
+			if ($encoding = WP_Http_Encoding::accept_encoding($url, $r))
 				$r['headers']['Accept-Encoding'] = $encoding;
 		}
 
-		if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
-			if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
-				$r['body'] = http_build_query( $r['body'], null, '&' );
+		if (( ! is_null($r['body']) && '' != $r['body']) || 'POST' == $r['method'] || 'PUT' == $r['method']) {
+			if (is_array($r['body']) || is_object($r['body'])) {
+				$r['body'] = http_build_query($r['body'], null, '&');
 
-				if ( ! isset( $r['headers']['Content-Type'] ) )
-					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				if ( ! isset($r['headers']['Content-Type']))
+					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset='.get_option('blog_charset');
 			}
 
-			if ( '' === $r['body'] )
+			if ('' === $r['body'])
 				$r['body'] = null;
 
-			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
-				$r['headers']['Content-Length'] = strlen( $r['body'] );
+			if ( ! isset($r['headers']['Content-Length']) && ! isset($r['headers']['content-length']))
+				$r['headers']['Content-Length'] = strlen($r['body']);
 		}
 
-		$response = $this->_dispatch_request( $url, $r );
+		$response = $this->_dispatch_request($url, $r);
 
 		reset_mbstring_encoding();
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		// Append cookies that were used in this request to the response
-		if ( ! empty( $r['cookies'] ) ) {
-			$cookies_set = wp_list_pluck( $response['cookies'], 'name' );
-			foreach ( $r['cookies'] as $cookie ) {
-				if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+		if ( ! empty($r['cookies'])) {
+			$cookies_set = wp_list_pluck($response['cookies'], 'name');
+			foreach ($r['cookies'] as $cookie) {
+				if ( ! in_array($cookie->name, $cookies_set) && $cookie->test($url)) {
 					$response['cookies'][] = $cookie;
 				}
 			}
@@ -305,7 +305,7 @@ 
 	 *
 	 * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
 	 */
-	public function _get_first_available_transport( $args, $url = null ) {
+	public function _get_first_available_transport($args, $url = null) {
 		/**
 		 * Filter which HTTP transports are available and in what order.
 		 *
@@ -316,14 +316,14 @@ 
 		 * @param array  $args  HTTP request arguments.
 		 * @param string $url   The URL to request.
 		 */
-		$request_order = apply_filters( 'http_api_transports', array( 'curl', 'streams' ), $args, $url );
+		$request_order = apply_filters('http_api_transports', array('curl', 'streams'), $args, $url);
 
 		// Loop over each transport on each HTTP request looking for one which will serve this request's needs.
-		foreach ( $request_order as $transport ) {
-			$class = 'WP_HTTP_' . $transport;
+		foreach ($request_order as $transport) {
+			$class = 'WP_HTTP_'.$transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+			if ( ! call_user_func(array($class, 'test'), $args, $url))
 				continue;
 
 			return $class;
@@ -349,18 +349,18 @@ 
 	 * @param array $args Request arguments
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	private function _dispatch_request( $url, $args ) {
+	private function _dispatch_request($url, $args) {
 		static $transports = array();
 
-		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		$class = $this->_get_first_available_transport($args, $url);
+		if ( ! $class)
+			return new WP_Error('http_failure', __('There are no HTTP transports available which can complete the requested request.'));
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
+		if (empty($transports[$class]))
 			$transports[$class] = new $class;
 
-		$response = $transports[$class]->request( $url, $args );
+		$response = $transports[$class]->request($url, $args);
 
 		/**
 		 * Fires after an HTTP API response is received and before the response is returned.
@@ -373,9 +373,9 @@ 
 		 * @param array          $args     HTTP request arguments.
 		 * @param string         $url      The request URL.
 		 */
-		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+		do_action('http_api_debug', $response, 'response', $class, $args, $url);
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		/**
@@ -387,7 +387,7 @@ 
 		 * @param array  $args     HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $args, $url );
+		return apply_filters('http_response', $response, $args, $url);
 	}
 
 	/**
@@ -404,7 +404,7 @@ 
 	 */
 	public function post($url, $args = array()) {
 		$defaults = array('method' => 'POST');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -422,7 +422,7 @@ 
 	 */
 	public function get($url, $args = array()) {
 		$defaults = array('method' => 'GET');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -440,7 +440,7 @@ 
 	 */
 	public function head($url, $args = array()) {
 		$defaults = array('method' => 'HEAD');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -475,9 +475,9 @@ 
 	 * @return array Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
-	public static function processHeaders( $headers, $url = '' ) {
+	public static function processHeaders($headers, $url = '') {
 		// Split headers, one per array element.
-		if ( is_string($headers) ) {
+		if (is_string($headers)) {
 			// Tolerate line terminator: CRLF = LF (RFC 2616 19.3).
 			$headers = str_replace("\r\n", "\n", $headers);
 			/*
@@ -495,8 +495,8 @@ 
 		 * If a redirection has taken place, The headers for each page request may have been passed.
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
-		for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-			if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
+		for ($i = count($headers) - 1; $i >= 0; $i--) {
+			if ( ! empty($headers[$i]) && false === strpos($headers[$i], ':')) {
 				$headers = array_splice($headers, $i);
 				break;
 			}
@@ -504,35 +504,35 @@ 
 
 		$cookies = array();
 		$newheaders = array();
-		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
+		foreach ((array) $headers as $tempheader) {
+			if (empty($tempheader))
 				continue;
 
-			if ( false === strpos($tempheader, ':') ) {
+			if (false === strpos($tempheader, ':')) {
 				$stack = explode(' ', $tempheader, 3);
 				$stack[] = '';
-				list( , $response['code'], $response['message']) = $stack;
+				list(, $response['code'], $response['message']) = $stack;
 				continue;
 			}
 
 			list($key, $value) = explode(':', $tempheader, 2);
 
-			$key = strtolower( $key );
-			$value = trim( $value );
+			$key = strtolower($key);
+			$value = trim($value);
 
-			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
-				$newheaders[ $key ][] = $value;
+			if (isset($newheaders[$key])) {
+				if ( ! is_array($newheaders[$key]))
+					$newheaders[$key] = array($newheaders[$key]);
+				$newheaders[$key][] = $value;
 			} else {
-				$newheaders[ $key ] = $value;
+				$newheaders[$key] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ('set-cookie' == $key)
+				$cookies[] = new WP_Http_Cookie($value, $url);
 		}
 
 		// Cast the Response Code to an int
-		$response['code'] = intval( $response['code'] );
+		$response['code'] = intval($response['code']);
 
 		return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
 	}
@@ -550,20 +550,20 @@ 
 	 *
 	 * @param array $r Full array of args passed into ::request()
 	 */
-	public static function buildCookieHeader( &$r ) {
-		if ( ! empty($r['cookies']) ) {
+	public static function buildCookieHeader(&$r) {
+		if ( ! empty($r['cookies'])) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
-			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+			foreach ($r['cookies'] as $name => $value) {
+				if ( ! is_object($value))
+					$r['cookies'][$name] = new WP_HTTP_Cookie(array('name' => $name, 'value' => $value));
 			}
 
 			$cookies_header = '';
-			foreach ( (array) $r['cookies'] as $cookie ) {
-				$cookies_header .= $cookie->getHeaderValue() . '; ';
+			foreach ((array) $r['cookies'] as $cookie) {
+				$cookies_header .= $cookie->getHeaderValue().'; ';
 			}
 
-			$cookies_header = substr( $cookies_header, 0, -2 );
+			$cookies_header = substr($cookies_header, 0, -2);
 			$r['headers']['cookie'] = $cookies_header;
 		}
 	}
@@ -582,9 +582,9 @@ 
 	 * @param string $body Body content
 	 * @return string Chunked decoded body on success or raw body on failure.
 	 */
-	public static function chunkTransferDecode( $body ) {
+	public static function chunkTransferDecode($body) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($body)))
 			return $body;
 
 		$parsed_body = '';
@@ -592,22 +592,22 @@ 
 		// We'll be altering $body, so need a backup in case of error.
 		$body_original = $body;
 
-		while ( true ) {
-			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
+		while (true) {
+			$has_chunk = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match);
+			if ( ! $has_chunk || empty($match[1]))
 				return $body_original;
 
-			$length = hexdec( $match[1] );
-			$chunk_length = strlen( $match[0] );
+			$length = hexdec($match[1]);
+			$chunk_length = strlen($match[0]);
 
 			// Parse out the chunk of data.
-			$parsed_body .= substr( $body, $chunk_length, $length );
+			$parsed_body .= substr($body, $chunk_length, $length);
 
 			// Remove the chunk from the raw data.
-			$body = substr( $body, $length + $chunk_length );
+			$body = substr($body, $length + $chunk_length);
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
+			if ('0' === trim($body))
 				return $parsed_body;
 		}
 	}
@@ -636,17 +636,17 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
+		if ( ! defined('WP_HTTP_BLOCK_EXTERNAL') || ! WP_HTTP_BLOCK_EXTERNAL)
 			return false;
 
 		$check = parse_url($uri);
-		if ( ! $check )
+		if ( ! $check)
 			return true;
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url(get_option('siteurl'));
 
 		// Don't block requests back to ourselves by default.
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+		if ('localhost' == $check['host'] || (isset($home['host']) && $home['host'] == $check['host'])) {
 			/**
 			 * Filter whether to block local requests through the proxy.
 			 *
@@ -655,29 +655,29 @@ 
 			 * @param bool $block Whether to block local requests through proxy.
 			 *                    Default false.
 			 */
-			return apply_filters( 'block_local_requests', false );
+			return apply_filters('block_local_requests', false);
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
+		if ( ! defined('WP_ACCESSIBLE_HOSTS'))
 			return true;
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
-		if ( null === $accessible_hosts ) {
+		if (null === $accessible_hosts) {
 			$accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
 
-			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
+			if (false !== strpos(WP_ACCESSIBLE_HOSTS, '*')) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				foreach ($accessible_hosts as $host)
+					$wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+				$wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
+		if ( ! empty($wildcard_regex))
+			return ! preg_match($wildcard_regex, $check['host']);
 		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+			return ! in_array($check['host'], $accessible_hosts); //Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -700,25 +700,25 @@ 
 	 * @return bool|array False on failure; Array of URL components on success;
 	 *                    See parse_url()'s return values.
 	 */
-	protected static function parse_url( $url ) {
-		$parts = @parse_url( $url );
-		if ( ! $parts ) {
+	protected static function parse_url($url) {
+		$parts = @parse_url($url);
+		if ( ! $parts) {
 			// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path
-			if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
+			if ('/' == $url[0] && false !== strpos($url, '://')) {
 				// Since we know it's a relative path, prefix with a scheme/host placeholder and try again
-				if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url ) ) {
+				if ( ! $parts = @parse_url('placeholder://placeholder'.$url)) {
 					return $parts;
 				}
 				// Remove the placeholder values
-				unset( $parts['scheme'], $parts['host'] );
+				unset($parts['scheme'], $parts['host']);
 			} else {
 				return $parts;
 			}
 		}
 
 		// < PHP 5.4.7 compat, doesn't detect schemeless URL's host field
-		if ( '//' == substr( $url, 0, 2 ) && ! isset( $parts['host'] ) ) {
-			list( $parts['host'], $slashless_path ) = explode( '/', substr( $parts['path'], 2 ), 2 );
+		if ('//' == substr($url, 0, 2) && ! isset($parts['host'])) {
+			list($parts['host'], $slashless_path) = explode('/', substr($parts['path'], 2), 2);
 			$parts['path'] = "/{$slashless_path}";
 		}
 
@@ -739,65 +739,65 @@ 
 	 * @param string $url                 The URL which $maybe_relative_path is relative to
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
-	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
+	public static function make_absolute_url($maybe_relative_path, $url) {
+		if (empty($url))
 			return $maybe_relative_path;
 
-		if ( ! $url_parts = WP_HTTP::parse_url( $url ) ) {
+		if ( ! $url_parts = WP_HTTP::parse_url($url)) {
 			return $maybe_relative_path;
 		}
 
-		if ( ! $relative_url_parts = WP_HTTP::parse_url( $maybe_relative_path ) ) {
+		if ( ! $relative_url_parts = WP_HTTP::parse_url($maybe_relative_path)) {
 			return $maybe_relative_path;
 		}
 
 		// Check for a scheme on the 'relative' url
-		if ( ! empty( $relative_url_parts['scheme'] ) ) {
+		if ( ! empty($relative_url_parts['scheme'])) {
 			return $maybe_relative_path;
 		}
 
-		$absolute_path = $url_parts['scheme'] . '://';
+		$absolute_path = $url_parts['scheme'].'://';
 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
-		if ( isset( $relative_url_parts['host'] ) ) {
+		if (isset($relative_url_parts['host'])) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if (isset($relative_url_parts['port']))
+				$absolute_path .= ':'.$relative_url_parts['port'];
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if (isset($url_parts['port']))
+				$absolute_path .= ':'.$url_parts['port'];
 		}
 
 		// Start off with the Absolute URL path.
-		$path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
+		$path = ! empty($url_parts['path']) ? $url_parts['path'] : '/';
 
 		// If it's a root-relative path, then great.
-		if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
+		if ( ! empty($relative_url_parts['path']) && '/' == $relative_url_parts['path'][0]) {
 			$path = $relative_url_parts['path'];
 
 		// Else it's a relative path.
-		} elseif ( ! empty( $relative_url_parts['path'] ) ) {
+		} elseif ( ! empty($relative_url_parts['path'])) {
 			// Strip off any file components from the absolute path.
-			$path = substr( $path, 0, strrpos( $path, '/' ) + 1 );
+			$path = substr($path, 0, strrpos($path, '/') + 1);
 
 			// Build the new path.
 			$path .= $relative_url_parts['path'];
 
 			// Strip all /path/../ out of the path.
-			while ( strpos( $path, '../' ) > 1 ) {
-				$path = preg_replace( '![^/]+/\.\./!', '', $path );
+			while (strpos($path, '../') > 1) {
+				$path = preg_replace('![^/]+/\.\./!', '', $path);
 			}
 
 			// Strip any final leading ../ from the path.
-			$path = preg_replace( '!^/(\.\./)+!', '', $path );
+			$path = preg_replace('!^/(\.\./)+!', '', $path);
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty($relative_url_parts['query']))
+			$path .= '?'.$relative_url_parts['query'];
 
-		return $absolute_path . '/' . ltrim( $path, '/' );
+		return $absolute_path.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -812,42 +812,42 @@ 
 	 * @param array $response The Response of the HTTP request.
 	 * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
 	 */
-	public static function handle_redirects( $url, $args, $response ) {
+	public static function handle_redirects($url, $args, $response) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+		if ( ! isset($response['headers']['location']) || 0 === $args['_redirection'])
 			return false;
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+		if ($response['response']['code'] > 399 || $response['response']['code'] < 300)
 			return false;
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ($args['redirection']-- <= 0)
+			return new WP_Error('http_request_failed', __('Too many redirects.'));
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if (is_array($redirect_location))
+			$redirect_location = array_pop($redirect_location);
 
-		$redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url );
+		$redirect_location = WP_HTTP::make_absolute_url($redirect_location, $url);
 
 		// POST requests should not POST to a redirected location.
-		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+		if ('POST' == $args['method']) {
+			if (in_array($response['response']['code'], array(302, 303)))
 				$args['method'] = 'GET';
 		}
 
 		// Include valid cookies in the redirect process.
-		if ( ! empty( $response['cookies'] ) ) {
-			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
+		if ( ! empty($response['cookies'])) {
+			foreach ($response['cookies'] as $cookie) {
+				if ($cookie->test($redirect_location))
 					$args['cookies'][] = $cookie;
 			}
 		}
 
-		return wp_remote_request( $redirect_location, $args );
+		return wp_remote_request($redirect_location, $args);
 	}
 
 	/**
@@ -866,11 +866,11 @@ 
 	 * @param string $maybe_ip A suspected IP address
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
-	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+	public static function is_ip_address($maybe_ip) {
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip))
 			return 4;
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+		if (false !== strpos($maybe_ip, ':') && preg_match('/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim($maybe_ip, ' []')))
 			return 6;
 
 		return false;
@@ -906,26 +906,26 @@ 
 			'headers' => array(), 'body' => null, 'cookies' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
-		} elseif ( isset( $r['headers']['user-agent'] ) ) {
+			unset($r['headers']['User-Agent']);
+		} elseif (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		WP_Http::buildCookieHeader( $r );
+		WP_Http::buildCookieHeader($r);
 
 		$arrURL = parse_url($url);
 
 		$connect_host = $arrURL['host'];
 
-		$secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' );
-		if ( ! isset( $arrURL['port'] ) ) {
-			if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) {
+		$secure_transport = ($arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https');
+		if ( ! isset($arrURL['port'])) {
+			if ($arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https') {
 				$arrURL['port'] = 443;
 				$secure_transport = true;
 			} else {
@@ -934,16 +934,16 @@ 
 		}
 
 		// Always pass a Path, defaulting to the root in cases such as http://example.com
-		if ( ! isset( $arrURL['path'] ) ) {
+		if ( ! isset($arrURL['path'])) {
 			$arrURL['path'] = '/';
 		}
 
-		if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-			if ( isset( $r['headers']['Host'] ) )
+		if (isset($r['headers']['Host']) || isset($r['headers']['host'])) {
+			if (isset($r['headers']['Host']))
 				$arrURL['host'] = $r['headers']['Host'];
 			else
 				$arrURL['host'] = $r['headers']['host'];
-			unset( $r['headers']['Host'], $r['headers']['host'] );
+			unset($r['headers']['Host'], $r['headers']['host']);
 		}
 
 		/*
@@ -951,14 +951,14 @@ 
 		 * to ::1, which fails when the server is not set up for it. For compatibility, always
 		 * connect to the IPv4 address.
 		 */
-		if ( 'localhost' == strtolower( $connect_host ) )
+		if ('localhost' == strtolower($connect_host))
 			$connect_host = '127.0.0.1';
 
-		$connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
+		$connect_host = $secure_transport ? 'ssl://'.$connect_host : 'tcp://'.$connect_host;
 
-		$is_local = isset( $r['local'] ) && $r['local'];
-		$ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
-		if ( $is_local ) {
+		$is_local = isset($r['local']) && $r['local'];
+		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
+		if ($is_local) {
 			/**
 			 * Filter whether SSL should be verified for local requests.
 			 *
@@ -966,8 +966,8 @@ 
 			 *
 			 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 			 */
-			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
-		} elseif ( ! $is_local ) {
+			$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
+		} elseif ( ! $is_local) {
 			/**
 			 * Filter whether SSL should be verified for non-local requests.
 			 *
@@ -975,12 +975,12 @@ 
 			 *
 			 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 			 */
-			$ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
+			$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 		}
 
 		$proxy = new WP_HTTP_Proxy();
 
-		$context = stream_context_create( array(
+		$context = stream_context_create(array(
 			'ssl' => array(
 				'verify_peer' => $ssl_verify,
 				//'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()
@@ -989,11 +989,11 @@ 
 				'cafile' => $r['sslcertificates'],
 				'allow_self_signed' => ! $ssl_verify,
 			)
-		) );
+		));
 
-		$timeout = (int) floor( $r['timeout'] );
+		$timeout = (int) floor($r['timeout']);
 		$utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
-		$connect_timeout = max( $timeout, 1 );
+		$connect_timeout = max($timeout, 1);
 
 		// Store error number.
 		$connection_error = null;
@@ -1001,159 +1001,159 @@ 
 		// Store error string.
 		$connection_error_str = null;
 
-		if ( !WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			// In the event that the SSL connection fails, silence the many PHP Warnings.
-			if ( $secure_transport )
+			if ($secure_transport)
 				$error_reporting = error_reporting(0);
 
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ($proxy->is_enabled() && $proxy->send_through_proxy($url))
+				$handle = @stream_socket_client('tcp://'.$proxy->host().':'.$proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 			else
-				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = @stream_socket_client($connect_host.':'.$arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 
-			if ( $secure_transport )
-				error_reporting( $error_reporting );
+			if ($secure_transport)
+				error_reporting($error_reporting);
 
 		} else {
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ($proxy->is_enabled() && $proxy->send_through_proxy($url))
+				$handle = stream_socket_client('tcp://'.$proxy->host().':'.$proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 			else
-				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+				$handle = stream_socket_client($connect_host.':'.$arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context);
 		}
 
-		if ( false === $handle ) {
+		if (false === $handle) {
 			// SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken.
-			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ($secure_transport && 0 === $connection_error && '' === $connection_error_str)
+				return new WP_Error('http_request_failed', __('The SSL certificate for the host could not be verified.'));
 
-			return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
+			return new WP_Error('http_request_failed', $connection_error.': '.$connection_error_str);
 		}
 
 		// Verify that the SSL certificate is valid for this request.
-		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+		if ($secure_transport && $ssl_verify && ! $proxy->is_enabled()) {
+			if ( ! self::verify_ssl_certificate($handle, $arrURL['host']))
+				return new WP_Error('http_request_failed', __('The SSL certificate for the host could not be verified.'));
 		}
 
-		stream_set_timeout( $handle, $timeout, $utimeout );
+		stream_set_timeout($handle, $timeout, $utimeout);
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) //Some proxies require full URL in this field.
 			$requestPath = $url;
 		else
-			$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+			$requestPath = $arrURL['path'].(isset($arrURL['query']) ? '?'.$arrURL['query'] : '');
 
-		$strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
+		$strHeaders = strtoupper($r['method']).' '.$requestPath.' HTTP/'.$r['httpversion']."\r\n";
 
 		$include_port_in_host_header = (
-			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-			( 'http'  == $arrURL['scheme'] && 80  != $arrURL['port'] ) ||
-			( 'https' == $arrURL['scheme'] && 443 != $arrURL['port'] )
+			($proxy->is_enabled() && $proxy->send_through_proxy($url)) ||
+			('http' == $arrURL['scheme'] && 80 != $arrURL['port']) ||
+			('https' == $arrURL['scheme'] && 443 != $arrURL['port'])
 		);
 
-		if ( $include_port_in_host_header ) {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n";
+		if ($include_port_in_host_header) {
+			$strHeaders .= 'Host: '.$arrURL['host'].':'.$arrURL['port']."\r\n";
 		} else {
-			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
+			$strHeaders .= 'Host: '.$arrURL['host']."\r\n";
 		}
 
-		if ( isset($r['user-agent']) )
-			$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		if (isset($r['user-agent']))
+			$strHeaders .= 'User-agent: '.$r['user-agent']."\r\n";
 
-		if ( is_array($r['headers']) ) {
-			foreach ( (array) $r['headers'] as $header => $headerValue )
-				$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+		if (is_array($r['headers'])) {
+			foreach ((array) $r['headers'] as $header => $headerValue)
+				$strHeaders .= $header.': '.$headerValue."\r\n";
 		} else {
 			$strHeaders .= $r['headers'];
 		}
 
-		if ( $proxy->use_authentication() )
-			$strHeaders .= $proxy->authentication_header() . "\r\n";
+		if ($proxy->use_authentication())
+			$strHeaders .= $proxy->authentication_header()."\r\n";
 
 		$strHeaders .= "\r\n";
 
-		if ( ! is_null($r['body']) )
+		if ( ! is_null($r['body']))
 			$strHeaders .= $r['body'];
 
 		fwrite($handle, $strHeaders);
 
-		if ( ! $r['blocking'] ) {
-			stream_set_blocking( $handle, 0 );
-			fclose( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+		if ( ! $r['blocking']) {
+			stream_set_blocking($handle, 0);
+			fclose($handle);
+			return array('headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array());
 		}
 
 		$strResponse = '';
 		$bodyStarted = false;
 		$keep_reading = true;
 		$block_size = 4096;
-		if ( isset( $r['limit_response_size'] ) )
-			$block_size = min( $block_size, $r['limit_response_size'] );
+		if (isset($r['limit_response_size']))
+			$block_size = min($block_size, $r['limit_response_size']);
 
 		// If streaming to a file setup the file handle.
-		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$stream_handle = @fopen( $r['filename'], 'w+' );
+		if ($r['stream']) {
+			if ( ! WP_DEBUG)
+				$stream_handle = @fopen($r['filename'], 'w+');
 			else
-				$stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+				$stream_handle = fopen($r['filename'], 'w+');
+			if ( ! $stream_handle)
+				return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $r['filename']));
 
 			$bytes_written = 0;
-			while ( ! feof($handle) && $keep_reading ) {
-				$block = fread( $handle, $block_size );
-				if ( ! $bodyStarted ) {
+			while ( ! feof($handle) && $keep_reading) {
+				$block = fread($handle, $block_size);
+				if ( ! $bodyStarted) {
 					$strResponse .= $block;
-					if ( strpos( $strResponse, "\r\n\r\n" ) ) {
-						$process = WP_Http::processResponse( $strResponse );
+					if (strpos($strResponse, "\r\n\r\n")) {
+						$process = WP_Http::processResponse($strResponse);
 						$bodyStarted = true;
 						$block = $process['body'];
-						unset( $strResponse );
+						unset($strResponse);
 						$process['body'] = '';
 					}
 				}
 
-				$this_block_size = strlen( $block );
+				$this_block_size = strlen($block);
 
-				if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] ) {
-					$this_block_size = ( $r['limit_response_size'] - $bytes_written );
-					$block = substr( $block, 0, $this_block_size );
+				if (isset($r['limit_response_size']) && ($bytes_written + $this_block_size) > $r['limit_response_size']) {
+					$this_block_size = ($r['limit_response_size'] - $bytes_written);
+					$block = substr($block, 0, $this_block_size);
 				}
 
-				$bytes_written_to_file = fwrite( $stream_handle, $block );
+				$bytes_written_to_file = fwrite($stream_handle, $block);
 
-				if ( $bytes_written_to_file != $this_block_size ) {
-					fclose( $handle );
-					fclose( $stream_handle );
-					return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+				if ($bytes_written_to_file != $this_block_size) {
+					fclose($handle);
+					fclose($stream_handle);
+					return new WP_Error('http_request_failed', __('Failed to write request to temporary file.'));
 				}
 
 				$bytes_written += $bytes_written_to_file;
 
-				$keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
+				$keep_reading = ! isset($r['limit_response_size']) || $bytes_written < $r['limit_response_size'];
 			}
 
-			fclose( $stream_handle );
+			fclose($stream_handle);
 
 		} else {
 			$header_length = 0;
-			while ( ! feof( $handle ) && $keep_reading ) {
-				$block = fread( $handle, $block_size );
+			while ( ! feof($handle) && $keep_reading) {
+				$block = fread($handle, $block_size);
 				$strResponse .= $block;
-				if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) {
-					$header_length = strpos( $strResponse, "\r\n\r\n" ) + 4;
+				if ( ! $bodyStarted && strpos($strResponse, "\r\n\r\n")) {
+					$header_length = strpos($strResponse, "\r\n\r\n") + 4;
 					$bodyStarted = true;
 				}
-				$keep_reading = ( ! $bodyStarted || !isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
+				$keep_reading = ( ! $bodyStarted || ! isset($r['limit_response_size']) || strlen($strResponse) < ($header_length + $r['limit_response_size']));
 			}
 
-			$process = WP_Http::processResponse( $strResponse );
-			unset( $strResponse );
+			$process = WP_Http::processResponse($strResponse);
+			unset($strResponse);
 
 		}
 
-		fclose( $handle );
+		fclose($handle);
 
-		$arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
+		$arrHeaders = WP_Http::processHeaders($process['headers'], $url);
 
 		$response = array(
 			'headers' => $arrHeaders['headers'],
@@ -1165,18 +1165,18 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+		if (false !== ($redirect_response = WP_HTTP::handle_redirects($url, $r, $response)))
 			return $redirect_response;
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
+		if ( ! empty($process['body']) && isset($arrHeaders['headers']['transfer-encoding']) && 'chunked' == $arrHeaders['headers']['transfer-encoding'])
 			$process['body'] = WP_Http::chunkTransferDecode($process['body']);
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) )
-			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		if (true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']))
+			$process['body'] = WP_Http_Encoding::decompress($process['body']);
 
-		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
-			$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		if (isset($r['limit_response_size']) && strlen($process['body']) > $r['limit_response_size'])
+			$process['body'] = substr($process['body'], 0, $r['limit_response_size']);
 
 		$response['body'] = $process['body'];
 
@@ -1200,51 +1200,51 @@ 
 	 * @param string $host The hostname being requested
 	 * @return bool If the cerficiate presented in $stream is valid for $host
 	 */
-	public static function verify_ssl_certificate( $stream, $host ) {
-		$context_options = stream_context_get_options( $stream );
+	public static function verify_ssl_certificate($stream, $host) {
+		$context_options = stream_context_get_options($stream);
 
-		if ( empty( $context_options['ssl']['peer_certificate'] ) )
+		if (empty($context_options['ssl']['peer_certificate']))
 			return false;
 
-		$cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
-		if ( ! $cert )
+		$cert = openssl_x509_parse($context_options['ssl']['peer_certificate']);
+		if ( ! $cert)
 			return false;
 
 		/*
 		 * If the request is being made to an IP address, we'll validate against IP fields
 		 * in the cert (if they exist)
 		 */
-		$host_type = ( WP_HTTP::is_ip_address( $host ) ? 'ip' : 'dns' );
+		$host_type = (WP_HTTP::is_ip_address($host) ? 'ip' : 'dns');
 
 		$certificate_hostnames = array();
-		if ( ! empty( $cert['extensions']['subjectAltName'] ) ) {
-			$match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
-			foreach ( $match_against as $match ) {
-				list( $match_type, $match_host ) = explode( ':', $match );
-				if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
-					$certificate_hostnames[] = strtolower( trim( $match_host ) );
+		if ( ! empty($cert['extensions']['subjectAltName'])) {
+			$match_against = preg_split('/,\s*/', $cert['extensions']['subjectAltName']);
+			foreach ($match_against as $match) {
+				list($match_type, $match_host) = explode(':', $match);
+				if ($host_type == strtolower(trim($match_type))) // IP: or DNS:
+					$certificate_hostnames[] = strtolower(trim($match_host));
 			}
-		} elseif ( !empty( $cert['subject']['CN'] ) ) {
+		} elseif ( ! empty($cert['subject']['CN'])) {
 			// Only use the CN when the certificate includes no subjectAltName extension.
-			$certificate_hostnames[] = strtolower( $cert['subject']['CN'] );
+			$certificate_hostnames[] = strtolower($cert['subject']['CN']);
 		}
 
 		// Exact hostname/IP matches.
-		if ( in_array( strtolower( $host ), $certificate_hostnames ) )
+		if (in_array(strtolower($host), $certificate_hostnames))
 			return true;
 
 		// IP's can't be wildcards, Stop processing.
-		if ( 'ip' == $host_type )
+		if ('ip' == $host_type)
 			return false;
 
 		// Test to see if the domain is at least 2 deep for wildcard support.
-		if ( substr_count( $host, '.' ) < 2 )
+		if (substr_count($host, '.') < 2)
 			return false;
 
 		// Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
-		$wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
+		$wildcard_host = preg_replace('/^[^.]+\./', '*.', $host);
 
-		return in_array( strtolower( $wildcard_host ), $certificate_hostnames );
+		return in_array(strtolower($wildcard_host), $certificate_hostnames);
 	}
 
 	/**
@@ -1257,16 +1257,16 @@ 
 	 *
 	 * @return bool False means this class can not be used, true means it can.
 	 */
-	public static function test( $args = array() ) {
-		if ( ! function_exists( 'stream_socket_client' ) )
+	public static function test($args = array()) {
+		if ( ! function_exists('stream_socket_client'))
 			return false;
 
-		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+		$is_ssl = isset($args['ssl']) && $args['ssl'];
 
-		if ( $is_ssl ) {
-			if ( ! extension_loaded( 'openssl' ) )
+		if ($is_ssl) {
+			if ( ! extension_loaded('openssl'))
 				return false;
-			if ( ! function_exists( 'openssl_x509_parse' ) )
+			if ( ! function_exists('openssl_x509_parse'))
 				return false;
 		}
 
@@ -1278,7 +1278,7 @@ 
 		 * @param bool  $use_class Whether the class can be used. Default true.
 		 * @param array $args      Request arguments.
 		 */
-		return apply_filters( 'use_streams_transport', true, $args );
+		return apply_filters('use_streams_transport', true, $args);
 	}
 }
 
@@ -1371,125 +1371,125 @@ 
 			'headers' => array(), 'body' => null, 'cookies' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
-		} elseif ( isset( $r['headers']['user-agent'] ) ) {
+			unset($r['headers']['User-Agent']);
+		} elseif (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		WP_Http::buildCookieHeader( $r );
+		WP_Http::buildCookieHeader($r);
 
 		$handle = curl_init();
 
 		// cURL offers really easy proxy support.
 		$proxy = new WP_HTTP_Proxy();
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) {
 
-			curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
-			curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
-			curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
+			curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+			curl_setopt($handle, CURLOPT_PROXY, $proxy->host());
+			curl_setopt($handle, CURLOPT_PROXYPORT, $proxy->port());
 
-			if ( $proxy->use_authentication() ) {
-				curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-				curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
+			if ($proxy->use_authentication()) {
+				curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+				curl_setopt($handle, CURLOPT_PROXYUSERPWD, $proxy->authentication());
 			}
 		}
 
 		$is_local = isset($r['local']) && $r['local'];
 		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
-		if ( $is_local ) {
+		if ($is_local) {
 			/** This filter is documented in wp-includes/class-http.php */
-			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
-		} elseif ( ! $is_local ) {
+			$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
+		} elseif ( ! $is_local) {
 			/** This filter is documented in wp-includes/class-http.php */
-			$ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
+			$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 		}
 
 		/*
 		 * CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since.
 		 * a value of 0 will allow an unlimited timeout.
 		 */
-		$timeout = (int) ceil( $r['timeout'] );
-		curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
-		curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
+		$timeout = (int) ceil($r['timeout']);
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, $timeout);
+		curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
 
-		curl_setopt( $handle, CURLOPT_URL, $url);
-		curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
-		curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
-		curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
+		curl_setopt($handle, CURLOPT_URL, $url);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, ($ssl_verify === true) ? 2 : false);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify);
+		curl_setopt($handle, CURLOPT_CAINFO, $r['sslcertificates']);
+		curl_setopt($handle, CURLOPT_USERAGENT, $r['user-agent']);
 
 		/*
 		 * The option doesn't work with safe mode or when open_basedir is set, and there's
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
-		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
-			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		curl_setopt($handle, CURLOPT_FOLLOWLOCATION, false);
+		if (defined('CURLOPT_PROTOCOLS')) // PHP 5.2.10 / cURL 7.19.4
+			curl_setopt($handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 
-		switch ( $r['method'] ) {
+		switch ($r['method']) {
 			case 'HEAD':
-				curl_setopt( $handle, CURLOPT_NOBODY, true );
+				curl_setopt($handle, CURLOPT_NOBODY, true);
 				break;
 			case 'POST':
-				curl_setopt( $handle, CURLOPT_POST, true );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_POST, true);
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			case 'PUT':
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, 'PUT' );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, 'PUT');
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			default:
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, $r['method']);
+				if ( ! is_null($r['body']))
+					curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 		}
 
-		if ( true === $r['blocking'] ) {
-			curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
-			curl_setopt( $handle, CURLOPT_WRITEFUNCTION, array( $this, 'stream_body' ) );
+		if (true === $r['blocking']) {
+			curl_setopt($handle, CURLOPT_HEADERFUNCTION, array($this, 'stream_headers'));
+			curl_setopt($handle, CURLOPT_WRITEFUNCTION, array($this, 'stream_body'));
 		}
 
-		curl_setopt( $handle, CURLOPT_HEADER, false );
+		curl_setopt($handle, CURLOPT_HEADER, false);
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
+		if (isset($r['limit_response_size']))
+			$this->max_body_length = intval($r['limit_response_size']);
 		else
 			$this->max_body_length = false;
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
-		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
+		if ($r['stream']) {
+			if ( ! WP_DEBUG)
+				$this->stream_handle = @fopen($r['filename'], 'w+');
 			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+				$this->stream_handle = fopen($r['filename'], 'w+');
+			if ( ! $this->stream_handle)
+				return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $r['filename']));
 		} else {
 			$this->stream_handle = false;
 		}
 
-		if ( !empty( $r['headers'] ) ) {
+		if ( ! empty($r['headers'])) {
 			// cURL expects full header strings in each element.
 			$headers = array();
-			foreach ( $r['headers'] as $name => $value ) {
+			foreach ($r['headers'] as $name => $value) {
 				$headers[] = "{$name}: $value";
 			}
-			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
+			curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		if ($r['httpversion'] == '1.0')
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -1503,27 +1503,27 @@ 
 		 * @param array    $r       The HTTP request arguments.
 		 * @param string   $url     The request URL.
 		 */
-		do_action_ref_array( 'http_api_curl', array( &$handle, $r, $url ) );
+		do_action_ref_array('http_api_curl', array(&$handle, $r, $url));
 
 		// We don't need to return the body, so don't. Just execute request and return.
-		if ( ! $r['blocking'] ) {
-			curl_exec( $handle );
+		if ( ! $r['blocking']) {
+			curl_exec($handle);
 
-			if ( $curl_error = curl_error( $handle ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', $curl_error );
+			if ($curl_error = curl_error($handle)) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', $curl_error);
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 
-			curl_close( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+			curl_close($handle);
+			return array('headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array());
 		}
 
-		curl_exec( $handle );
-		$theHeaders = WP_Http::processHeaders( $this->headers, $url );
+		curl_exec($handle);
+		$theHeaders = WP_Http::processHeaders($this->headers, $url);
 		$theBody = $this->body;
 		$bytes_written_total = $this->bytes_written_total;
 
@@ -1531,37 +1531,37 @@ 
 		$this->body = '';
 		$this->bytes_written_total = 0;
 
-		$curl_error = curl_errno( $handle );
+		$curl_error = curl_errno($handle);
 
 		// If an error occurred, or, no response.
-		if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
-			if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
-				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
-					if ( $r['stream'] ) {
-						curl_close( $handle );
-						fclose( $this->stream_handle );
-						return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+		if ($curl_error || (0 == strlen($theBody) && empty($theHeaders['headers']))) {
+			if (CURLE_WRITE_ERROR /* 23 */ == $curl_error) {
+				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total) {
+					if ($r['stream']) {
+						curl_close($handle);
+						fclose($this->stream_handle);
+						return new WP_Error('http_request_failed', __('Failed to write request to temporary file.'));
 					} else {
-						curl_close( $handle );
-						return new WP_Error( 'http_request_failed', curl_error( $handle ) );
+						curl_close($handle);
+						return new WP_Error('http_request_failed', curl_error($handle));
 					}
 				}
 			} else {
-				if ( $curl_error = curl_error( $handle ) ) {
-					curl_close( $handle );
-					return new WP_Error( 'http_request_failed', $curl_error );
+				if ($curl_error = curl_error($handle)) {
+					curl_close($handle);
+					return new WP_Error('http_request_failed', $curl_error);
 				}
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 		}
 
-		curl_close( $handle );
+		curl_close($handle);
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ($r['stream'])
+			fclose($this->stream_handle);
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -1572,11 +1572,11 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+		if (false !== ($redirect_response = WP_HTTP::handle_redirects($url, $r, $response)))
 			return $redirect_response;
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if (true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']))
+			$theBody = WP_Http_Encoding::decompress($theBody);
 
 		$response['body'] = $theBody;
 
@@ -1592,9 +1592,9 @@ 
 	 * @access private
 	 * @return int
 	 */
-	private function stream_headers( $handle, $headers ) {
+	private function stream_headers($handle, $headers) {
 		$this->headers .= $headers;
-		return strlen( $headers );
+		return strlen($headers);
 	}
 
 	/**
@@ -1607,16 +1607,16 @@ 
 	 * @access private
 	 * @return int
 	 */
-	private function stream_body( $handle, $data ) {
-		$data_length = strlen( $data );
+	private function stream_body($handle, $data) {
+		$data_length = strlen($data);
 
-		if ( $this->max_body_length && ( $this->bytes_written_total + $data_length ) > $this->max_body_length ) {
-			$data_length = ( $this->max_body_length - $this->bytes_written_total );
-			$data = substr( $data, 0, $data_length );
+		if ($this->max_body_length && ($this->bytes_written_total + $data_length) > $this->max_body_length) {
+			$data_length = ($this->max_body_length - $this->bytes_written_total);
+			$data = substr($data, 0, $data_length);
 		}
 
-		if ( $this->stream_handle ) {
-			$bytes_written = fwrite( $this->stream_handle, $data );
+		if ($this->stream_handle) {
+			$bytes_written = fwrite($this->stream_handle, $data);
 		} else {
 			$this->body .= $data;
 			$bytes_written = $data_length;
@@ -1636,16 +1636,16 @@ 
 	 *
 	 * @return bool False means this class can not be used, true means it can.
 	 */
-	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+	public static function test($args = array()) {
+		if ( ! function_exists('curl_init') || ! function_exists('curl_exec'))
 			return false;
 
-		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+		$is_ssl = isset($args['ssl']) && $args['ssl'];
 
-		if ( $is_ssl ) {
+		if ($is_ssl) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']))
 				return false;
 		}
 
@@ -1657,7 +1657,7 @@ 
 		 * @param bool  $use_class Whether the class can be used. Default true.
 		 * @param array $args      An array of request arguments.
 		 */
-		return apply_filters( 'use_curl_transport', true, $args );
+		return apply_filters('use_curl_transport', true, $args);
 	}
 }
 
@@ -1730,7 +1730,7 @@ 
 	 * @return string
 	 */
 	public function host() {
-		if ( defined('WP_PROXY_HOST') )
+		if (defined('WP_PROXY_HOST'))
 			return WP_PROXY_HOST;
 
 		return '';
@@ -1744,7 +1744,7 @@ 
 	 * @return string
 	 */
 	public function port() {
-		if ( defined('WP_PROXY_PORT') )
+		if (defined('WP_PROXY_PORT'))
 			return WP_PROXY_PORT;
 
 		return '';
@@ -1758,7 +1758,7 @@ 
 	 * @return string
 	 */
 	public function username() {
-		if ( defined('WP_PROXY_USERNAME') )
+		if (defined('WP_PROXY_USERNAME'))
 			return WP_PROXY_USERNAME;
 
 		return '';
@@ -1772,7 +1772,7 @@ 
 	 * @return string
 	 */
 	public function password() {
-		if ( defined('WP_PROXY_PASSWORD') )
+		if (defined('WP_PROXY_PASSWORD'))
 			return WP_PROXY_PASSWORD;
 
 		return '';
@@ -1786,7 +1786,7 @@ 
 	 * @return string
 	 */
 	public function authentication() {
-		return $this->username() . ':' . $this->password();
+		return $this->username().':'.$this->password();
 	}
 
 	/**
@@ -1797,7 +1797,7 @@ 
 	 * @return string
 	 */
 	public function authentication_header() {
-		return 'Proxy-Authorization: Basic ' . base64_encode( $this->authentication() );
+		return 'Proxy-Authorization: Basic '.base64_encode($this->authentication());
 	}
 
 	/**
@@ -1815,7 +1815,7 @@ 
 	 * @param string $uri URI to check.
 	 * @return bool True, to send through the proxy and false if, the proxy should not be used.
 	 */
-	public function send_through_proxy( $uri ) {
+	public function send_through_proxy($uri) {
 		/*
 		 * parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
 		 * This will be displayed on blogs, which is not reasonable.
@@ -1823,10 +1823,10 @@ 
 		$check = @parse_url($uri);
 
 		// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-		if ( $check === false )
+		if ($check === false)
 			return true;
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url(get_option('siteurl'));
 
 		/**
 		 * Filter whether to preempt sending the request through the proxy server.
@@ -1841,33 +1841,33 @@ 
 		 * @param array  $check    Associative array result of parsing the URI.
 		 * @param array  $home     Associative array result of parsing the site URL.
 		 */
-		$result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home );
-		if ( ! is_null( $result ) )
+		$result = apply_filters('pre_http_send_through_proxy', null, $uri, $check, $home);
+		if ( ! is_null($result))
 			return $result;
 
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) )
+		if ('localhost' == $check['host'] || (isset($home['host']) && $home['host'] == $check['host']))
 			return false;
 
-		if ( !defined('WP_PROXY_BYPASS_HOSTS') )
+		if ( ! defined('WP_PROXY_BYPASS_HOSTS'))
 			return true;
 
 		static $bypass_hosts = null;
 		static $wildcard_regex = array();
-		if ( null === $bypass_hosts ) {
+		if (null === $bypass_hosts) {
 			$bypass_hosts = preg_split('|,\s*|', WP_PROXY_BYPASS_HOSTS);
 
-			if ( false !== strpos(WP_PROXY_BYPASS_HOSTS, '*') ) {
+			if (false !== strpos(WP_PROXY_BYPASS_HOSTS, '*')) {
 				$wildcard_regex = array();
-				foreach ( $bypass_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				foreach ($bypass_hosts as $host)
+					$wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+				$wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
+		if ( ! empty($wildcard_regex))
+			return ! preg_match($wildcard_regex, $check['host']);
 		else
-			return !in_array( $check['host'], $bypass_hosts );
+			return ! in_array($check['host'], $bypass_hosts);
 	}
 }
 /**
@@ -1947,54 +1947,54 @@ 
 	 * @param string       $requested_url The URL which the cookie was set on, used for default $domain
 	 *                                    and $port values.
 	 */
-	public function __construct( $data, $requested_url = '' ) {
-		if ( $requested_url )
-			$arrURL = @parse_url( $requested_url );
-		if ( isset( $arrURL['host'] ) )
+	public function __construct($data, $requested_url = '') {
+		if ($requested_url)
+			$arrURL = @parse_url($requested_url);
+		if (isset($arrURL['host']))
 			$this->domain = $arrURL['host'];
-		$this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
-		if (  '/' != substr( $this->path, -1 ) )
-			$this->path = dirname( $this->path ) . '/';
+		$this->path = isset($arrURL['path']) ? $arrURL['path'] : '/';
+		if ('/' != substr($this->path, -1))
+			$this->path = dirname($this->path).'/';
 
-		if ( is_string( $data ) ) {
+		if (is_string($data)) {
 			// Assume it's a header string direct from a previous request.
-			$pairs = explode( ';', $data );
+			$pairs = explode(';', $data);
 
 			// Special handling for first pair; name=value. Also be careful of "=" in value.
-			$name  = trim( substr( $pairs[0], 0, strpos( $pairs[0], '=' ) ) );
-			$value = substr( $pairs[0], strpos( $pairs[0], '=' ) + 1 );
+			$name  = trim(substr($pairs[0], 0, strpos($pairs[0], '=')));
+			$value = substr($pairs[0], strpos($pairs[0], '=') + 1);
 			$this->name  = $name;
-			$this->value = urldecode( $value );
+			$this->value = urldecode($value);
 
 			// Removes name=value from items.
-			array_shift( $pairs );
+			array_shift($pairs);
 
 			// Set everything else as a property.
-			foreach ( $pairs as $pair ) {
+			foreach ($pairs as $pair) {
 				$pair = rtrim($pair);
 
 				// Handle the cookie ending in ; which results in a empty final pair.
-				if ( empty($pair) )
+				if (empty($pair))
 					continue;
 
-				list( $key, $val ) = strpos( $pair, '=' ) ? explode( '=', $pair ) : array( $pair, '' );
-				$key = strtolower( trim( $key ) );
-				if ( 'expires' == $key )
-					$val = strtotime( $val );
+				list($key, $val) = strpos($pair, '=') ? explode('=', $pair) : array($pair, '');
+				$key = strtolower(trim($key));
+				if ('expires' == $key)
+					$val = strtotime($val);
 				$this->$key = $val;
 			}
 		} else {
-			if ( !isset( $data['name'] ) )
+			if ( ! isset($data['name']))
 				return;
 
 			// Set properties based directly on parameters.
-			foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
-				if ( isset( $data[ $field ] ) )
-					$this->$field = $data[ $field ];
+			foreach (array('name', 'value', 'path', 'domain', 'port') as $field) {
+				if (isset($data[$field]))
+					$this->$field = $data[$field];
 			}
 
-			if ( isset( $data['expires'] ) )
-				$this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] );
+			if (isset($data['expires']))
+				$this->expires = is_int($data['expires']) ? $data['expires'] : strtotime($data['expires']);
 			else
 				$this->expires = null;
 		}
@@ -2011,37 +2011,37 @@ 
 	 * @param string $url URL you intend to send this cookie to
 	 * @return bool true if allowed, false otherwise.
 	 */
-	public function test( $url ) {
-		if ( is_null( $this->name ) )
+	public function test($url) {
+		if (is_null($this->name))
 			return false;
 
 		// Expires - if expired then nothing else matters.
-		if ( isset( $this->expires ) && time() > $this->expires )
+		if (isset($this->expires) && time() > $this->expires)
 			return false;
 
 		// Get details on the URL we're thinking about sending to.
-		$url = parse_url( $url );
-		$url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 );
-		$url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
+		$url = parse_url($url);
+		$url['port'] = isset($url['port']) ? $url['port'] : ('https' == $url['scheme'] ? 443 : 80);
+		$url['path'] = isset($url['path']) ? $url['path'] : '/';
 
 		// Values to use for comparison against the URL.
-		$path   = isset( $this->path )   ? $this->path   : '/';
-		$port   = isset( $this->port )   ? $this->port   : null;
-		$domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
-		if ( false === stripos( $domain, '.' ) )
+		$path   = isset($this->path) ? $this->path : '/';
+		$port   = isset($this->port) ? $this->port : null;
+		$domain = isset($this->domain) ? strtolower($this->domain) : strtolower($url['host']);
+		if (false === stripos($domain, '.'))
 			$domain .= '.local';
 
 		// Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
-		$domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain;
-		if ( substr( $url['host'], -strlen( $domain ) ) != $domain )
+		$domain = substr($domain, 0, 1) == '.' ? substr($domain, 1) : $domain;
+		if (substr($url['host'], -strlen($domain)) != $domain)
 			return false;
 
 		// Port - supports "port-lists" in the format: "80,8000,8080".
-		if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) )
+		if ( ! empty($port) && ! in_array($url['port'], explode(',', $port)))
 			return false;
 
 		// Path - request path must start with path restriction.
-		if ( substr( $url['path'], 0, strlen( $path ) ) != $path )
+		if (substr($url['path'], 0, strlen($path)) != $path)
 			return false;
 
 		return true;
@@ -2056,7 +2056,7 @@ 
 	 * @return string Header encoded cookie name and value.
 	 */
 	public function getHeaderValue() {
-		if ( ! isset( $this->name ) || ! isset( $this->value ) )
+		if ( ! isset($this->name) || ! isset($this->value))
 			return '';
 
 		/**
@@ -2067,7 +2067,7 @@ 
 		 * @param string $value The cookie value.
 		 * @param string $name  The cookie name.
 		 */
-		return $this->name . '=' . apply_filters( 'wp_http_cookie_value', $this->value, $this->name );
+		return $this->name.'='.apply_filters('wp_http_cookie_value', $this->value, $this->name);
 	}
 
 	/**
@@ -2079,7 +2079,7 @@ 
 	 * @return string
 	 */
 	public function getFullHeader() {
-		return 'Cookie: ' . $this->getHeaderValue();
+		return 'Cookie: '.$this->getHeaderValue();
 	}
 }
 
@@ -2108,8 +2108,8 @@ 
 	 * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports.
 	 * @return string|false False on failure.
 	 */
-	public static function compress( $raw, $level = 9, $supports = null ) {
-		return gzdeflate( $raw, $level );
+	public static function compress($raw, $level = 9, $supports = null) {
+		return gzdeflate($raw, $level);
 	}
 
 	/**
@@ -2128,24 +2128,24 @@ 
 	 * @param int $length The optional length of the compressed data.
 	 * @return string|bool False on failure.
 	 */
-	public static function decompress( $compressed, $length = null ) {
+	public static function decompress($compressed, $length = null) {
 
-		if ( empty($compressed) )
+		if (empty($compressed))
 			return $compressed;
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = @gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = self::compatible_gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
+		if (false !== ($decompressed = @gzuncompress($compressed)))
 			return $decompressed;
 
-		if ( function_exists('gzdecode') ) {
-			$decompressed = @gzdecode( $compressed );
+		if (function_exists('gzdecode')) {
+			$decompressed = @gzdecode($compressed);
 
-			if ( false !== $decompressed )
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
@@ -2177,29 +2177,29 @@ 
 	public static function compatible_gzinflate($gzData) {
 
 		// Compressed data might contain a full header, if so strip it for gzinflate().
-		if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
+		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
-			$flg = ord( substr($gzData, 3, 1) );
-			if ( $flg > 0 ) {
-				if ( $flg & 4 ) {
-					list($xlen) = unpack('v', substr($gzData, $i, 2) );
+			$flg = ord(substr($gzData, 3, 1));
+			if ($flg > 0) {
+				if ($flg & 4) {
+					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
+				if ($flg & 8)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
+				if ($flg & 16)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
+				if ($flg & 2)
 					$i = $i + 2;
 			}
-			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
+			$decompressed = @gzinflate(substr($gzData, $i, -8));
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
-		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
+		$decompressed = @gzinflate(substr($gzData, 2));
+		if (false !== $decompressed)
 			return $decompressed;
 
 		return false;
@@ -2216,25 +2216,25 @@ 
 	 * @param array  $args
 	 * @return string Types of encoding to accept.
 	 */
-	public static function accept_encoding( $url, $args ) {
+	public static function accept_encoding($url, $args) {
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress']) // Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		elseif ($args['stream']) // Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		elseif (isset($args['limit_response_size'])) // If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
 
-		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
+		if ($compression_enabled) {
+			if (function_exists('gzinflate'))
 				$type[] = 'deflate;q=1.0';
 
-			if ( function_exists( 'gzuncompress' ) )
+			if (function_exists('gzuncompress'))
 				$type[] = 'compress;q=0.5';
 
-			if ( function_exists( 'gzdecode' ) )
+			if (function_exists('gzdecode'))
 				$type[] = 'gzip;q=0.5';
 		}
 
@@ -2248,7 +2248,7 @@ 
 		 * @param string $url  URL of the HTTP request.
 		 * @param array  $args HTTP request arguments.
 		 */
-		$type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
+		$type = apply_filters('wp_http_accept_encoding', $type, $url, $args);
 
 		return implode(', ', $type);
 	}
@@ -2277,11 +2277,11 @@ 
 	 * @return bool
 	 */
 	public static function should_decode($headers) {
-		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
+		if (is_array($headers)) {
+			if (array_key_exists('content-encoding', $headers) && ! empty($headers['content-encoding']))
 				return true;
-		} elseif ( is_string( $headers ) ) {
-			return ( stripos($headers, 'content-encoding:') !== false );
+		} elseif (is_string($headers)) {
+			return (stripos($headers, 'content-encoding:') !== false);
 		}
 
 		return false;
@@ -2301,6 +2301,6 @@ 
 	 * @return bool
 	 */
 	public static function is_available() {
-		return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
+		return (function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate'));
 	}
 }

Braces +390 added lines, -262 removed lines

@@ -147,8 +147,9 @@ 
 		$args = wp_parse_args( $args );
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
-			$defaults['redirection'] = 0;
+		if ( isset($args['method']) && 'HEAD' == $args['method'] ) {
+					$defaults['redirection'] = 0;
+		}
 
 		$r = wp_parse_args( $args, $defaults );
 		/**
@@ -162,8 +163,9 @@ 
 		$r = apply_filters( 'http_request_args', $r, $url );
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
-			$r['_redirection'] = $r['redirection'];
+		if ( ! isset( $r['_redirection'] ) ) {
+					$r['_redirection'] = $r['redirection'];
+		}
 
 		/**
 		 * Filter whether to preempt an HTTP request's return.
@@ -178,12 +180,14 @@ 
 		 * @param string $url     The request URL.
 		 */
 		$pre = apply_filters( 'pre_http_request', false, $r, $url );
-		if ( false !== $pre )
-			return $pre;
+		if ( false !== $pre ) {
+					return $pre;
+		}
 
 		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] )
-				$url = wp_http_validate_url( $url );
+			if ( $r['reject_unsafe_urls'] ) {
+							$url = wp_http_validate_url( $url );
+			}
 			if ( $url ) {
 				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
 			}
@@ -191,11 +195,13 @@ 
 
 		$arrURL = @parse_url( $url );
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) )
-			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+					return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+		}
 
-		if ( $this->block_request( $url ) )
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ( $this->block_request( $url ) ) {
+					return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		}
 
 		/*
 		 * Determine if this is a https call and pass that on to the transport functions
@@ -222,12 +228,14 @@ 
 		 */
 		if ( $r['stream'] ) {
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) )
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
+							return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			}
 		}
 
-		if ( is_null( $r['headers'] ) )
-			$r['headers'] = array();
+		if ( is_null( $r['headers'] ) ) {
+					$r['headers'] = array();
+		}
 
 		if ( ! is_array( $r['headers'] ) ) {
 			$processedHeaders = self::processHeaders( $r['headers'], $url );
@@ -255,31 +263,36 @@ 
 		mbstring_binary_safe_encoding();
 
 		if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
-			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
-				$r['headers']['Accept-Encoding'] = $encoding;
+			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) ) {
+							$r['headers']['Accept-Encoding'] = $encoding;
+			}
 		}
 
 		if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
 			if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
 				$r['body'] = http_build_query( $r['body'], null, '&' );
 
-				if ( ! isset( $r['headers']['Content-Type'] ) )
-					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				if ( ! isset( $r['headers']['Content-Type'] ) ) {
+									$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				}
 			}
 
-			if ( '' === $r['body'] )
-				$r['body'] = null;
+			if ( '' === $r['body'] ) {
+							$r['body'] = null;
+			}
 
-			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
-				$r['headers']['Content-Length'] = strlen( $r['body'] );
+			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) ) {
+							$r['headers']['Content-Length'] = strlen( $r['body'] );
+			}
 		}
 
 		$response = $this->_dispatch_request( $url, $r );
 
 		reset_mbstring_encoding();
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		// Append cookies that were used in this request to the response
 		if ( ! empty( $r['cookies'] ) ) {
@@ -323,8 +336,9 @@ 
 			$class = 'WP_HTTP_' . $transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
-				continue;
+			if ( !call_user_func( array( $class, 'test' ), $args, $url ) ) {
+							continue;
+			}
 
 			return $class;
 		}
@@ -353,12 +367,14 @@ 
 		static $transports = array();
 
 		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		if ( !$class ) {
+					return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		}
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
-			$transports[$class] = new $class;
+		if ( empty( $transports[$class] ) ) {
+					$transports[$class] = new $class;
+		}
 
 		$response = $transports[$class]->request( $url, $args );
 
@@ -375,8 +391,9 @@ 
 		 */
 		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		/**
 		 * Filter the HTTP API response immediately before the response is returned.
@@ -505,8 +522,9 @@ 
 		$cookies = array();
 		$newheaders = array();
 		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
-				continue;
+			if ( empty($tempheader) ) {
+							continue;
+			}
 
 			if ( false === strpos($tempheader, ':') ) {
 				$stack = explode(' ', $tempheader, 3);
@@ -521,14 +539,16 @@ 
 			$value = trim( $value );
 
 			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
+				if ( ! is_array( $newheaders[ $key ] ) ) {
+									$newheaders[$key] = array( $newheaders[ $key ] );
+				}
 				$newheaders[ $key ][] = $value;
 			} else {
 				$newheaders[ $key ] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ( 'set-cookie' == $key ) {
+							$cookies[] = new WP_Http_Cookie( $value, $url );
+			}
 		}
 
 		// Cast the Response Code to an int
@@ -554,8 +574,9 @@ 
 		if ( ! empty($r['cookies']) ) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
 			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+				if ( ! is_object( $value ) ) {
+									$r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+				}
 			}
 
 			$cookies_header = '';
@@ -584,8 +605,9 @@ 
 	 */
 	public static function chunkTransferDecode( $body ) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
-			return $body;
+		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) ) {
+					return $body;
+		}
 
 		$parsed_body = '';
 
@@ -594,8 +616,9 @@ 
 
 		while ( true ) {
 			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
-				return $body_original;
+			if ( ! $has_chunk || empty( $match[1] ) ) {
+							return $body_original;
+			}
 
 			$length = hexdec( $match[1] );
 			$chunk_length = strlen( $match[0] );
@@ -607,8 +630,9 @@ 
 			$body = substr( $body, $length + $chunk_length );
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
-				return $parsed_body;
+			if ( '0' === trim( $body ) ) {
+							return $parsed_body;
+			}
 		}
 	}
 
@@ -636,12 +660,14 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
-			return false;
+		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) {
+					return false;
+		}
 
 		$check = parse_url($uri);
-		if ( ! $check )
-			return true;
+		if ( ! $check ) {
+					return true;
+		}
 
 		$home = parse_url( get_option('siteurl') );
 
@@ -658,8 +684,9 @@ 
 			return apply_filters( 'block_local_requests', false );
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
-			return true;
+		if ( !defined('WP_ACCESSIBLE_HOSTS') ) {
+					return true;
+		}
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
@@ -668,16 +695,19 @@ 
 
 			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				foreach ( $accessible_hosts as $host ) {
+									$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				}
 				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		if ( !empty($wildcard_regex) ) {
+					return !preg_match($wildcard_regex, $check['host']);
+		} else {
+					return !in_array( $check['host'], $accessible_hosts );
+		}
+		//Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -740,8 +770,9 @@ 
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
 	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
-			return $maybe_relative_path;
+		if ( empty( $url ) ) {
+					return $maybe_relative_path;
+		}
 
 		if ( ! $url_parts = WP_HTTP::parse_url( $url ) ) {
 			return $maybe_relative_path;
@@ -761,12 +792,14 @@ 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
 		if ( isset( $relative_url_parts['host'] ) ) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if ( isset( $relative_url_parts['port'] ) ) {
+							$absolute_path .= ':' . $relative_url_parts['port'];
+			}
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if ( isset( $url_parts['port'] ) ) {
+							$absolute_path .= ':' . $url_parts['port'];
+			}
 		}
 
 		// Start off with the Absolute URL path.
@@ -794,8 +827,9 @@ 
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty( $relative_url_parts['query'] ) ) {
+					$path .= '?' . $relative_url_parts['query'];
+		}
 
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
@@ -814,36 +848,42 @@ 
 	 */
 	public static function handle_redirects( $url, $args, $response ) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
-			return false;
+		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) {
+					return false;
+		}
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
-			return false;
+		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) {
+					return false;
+		}
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ( $args['redirection']-- <= 0 ) {
+					return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		}
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if ( is_array( $redirect_location ) ) {
+					$redirect_location = array_pop( $redirect_location );
+		}
 
 		$redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url );
 
 		// POST requests should not POST to a redirected location.
 		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
-				$args['method'] = 'GET';
+			if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
+							$args['method'] = 'GET';
+			}
 		}
 
 		// Include valid cookies in the redirect process.
 		if ( ! empty( $response['cookies'] ) ) {
 			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
-					$args['cookies'][] = $cookie;
+				if ( $cookie->test( $redirect_location ) ) {
+									$args['cookies'][] = $cookie;
+				}
 			}
 		}
 
@@ -867,11 +907,13 @@ 
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
 	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
-			return 4;
+		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
+					return 4;
+		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
-			return 6;
+		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+					return 6;
+		}
 
 		return false;
 	}
@@ -939,10 +981,11 @@ 
 		}
 
 		if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-			if ( isset( $r['headers']['Host'] ) )
-				$arrURL['host'] = $r['headers']['Host'];
-			else
-				$arrURL['host'] = $r['headers']['host'];
+			if ( isset( $r['headers']['Host'] ) ) {
+							$arrURL['host'] = $r['headers']['Host'];
+			} else {
+							$arrURL['host'] = $r['headers']['host'];
+			}
 			unset( $r['headers']['Host'], $r['headers']['host'] );
 		}
 
@@ -951,8 +994,9 @@ 
 		 * to ::1, which fails when the server is not set up for it. For compatibility, always
 		 * connect to the IPv4 address.
 		 */
-		if ( 'localhost' == strtolower( $connect_host ) )
-			$connect_host = '127.0.0.1';
+		if ( 'localhost' == strtolower( $connect_host ) ) {
+					$connect_host = '127.0.0.1';
+		}
 
 		$connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
 
@@ -1003,44 +1047,52 @@ 
 
 		if ( !WP_DEBUG ) {
 			// In the event that the SSL connection fails, silence the many PHP Warnings.
-			if ( $secure_transport )
-				$error_reporting = error_reporting(0);
+			if ( $secure_transport ) {
+							$error_reporting = error_reporting(0);
+			}
 
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
-				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+							$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			} else {
+							$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 
-			if ( $secure_transport )
-				error_reporting( $error_reporting );
+			if ( $secure_transport ) {
+							error_reporting( $error_reporting );
+			}
 
 		} else {
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
-				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+							$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			} else {
+							$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 		}
 
 		if ( false === $handle ) {
 			// SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken.
-			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str ) {
+							return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 
 			return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
 		}
 
 		// Verify that the SSL certificate is valid for this request.
 		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
-				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) {
+							return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 		}
 
 		stream_set_timeout( $handle, $timeout, $utimeout );
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
+		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+			//Some proxies require full URL in this field.
 			$requestPath = $url;
-		else
-			$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+		} else {
+					$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+		}
 
 		$strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
 
@@ -1056,23 +1108,27 @@ 
 			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
 		}
 
-		if ( isset($r['user-agent']) )
-			$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		if ( isset($r['user-agent']) ) {
+					$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		}
 
 		if ( is_array($r['headers']) ) {
-			foreach ( (array) $r['headers'] as $header => $headerValue )
-				$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+			foreach ( (array) $r['headers'] as $header => $headerValue ) {
+							$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+			}
 		} else {
 			$strHeaders .= $r['headers'];
 		}
 
-		if ( $proxy->use_authentication() )
-			$strHeaders .= $proxy->authentication_header() . "\r\n";
+		if ( $proxy->use_authentication() ) {
+					$strHeaders .= $proxy->authentication_header() . "\r\n";
+		}
 
 		$strHeaders .= "\r\n";
 
-		if ( ! is_null($r['body']) )
-			$strHeaders .= $r['body'];
+		if ( ! is_null($r['body']) ) {
+					$strHeaders .= $r['body'];
+		}
 
 		fwrite($handle, $strHeaders);
 
@@ -1086,17 +1142,20 @@ 
 		$bodyStarted = false;
 		$keep_reading = true;
 		$block_size = 4096;
-		if ( isset( $r['limit_response_size'] ) )
-			$block_size = min( $block_size, $r['limit_response_size'] );
+		if ( isset( $r['limit_response_size'] ) ) {
+					$block_size = min( $block_size, $r['limit_response_size'] );
+		}
 
 		// If streaming to a file setup the file handle.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$stream_handle = @fopen( $r['filename'], 'w+' );
-			else
-				$stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			if ( ! WP_DEBUG ) {
+							$stream_handle = @fopen( $r['filename'], 'w+' );
+			} else {
+							$stream_handle = fopen( $r['filename'], 'w+' );
+			}
+			if ( ! $stream_handle ) {
+							return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			}
 
 			$bytes_written = 0;
 			while ( ! feof($handle) && $keep_reading ) {
@@ -1165,18 +1224,22 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
-			return $redirect_response;
+		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) {
+					return $redirect_response;
+		}
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
-			$process['body'] = WP_Http::chunkTransferDecode($process['body']);
+		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) {
+					$process['body'] = WP_Http::chunkTransferDecode($process['body']);
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) )
-			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) ) {
+					$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		}
 
-		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
-			$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] ) {
+					$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		}
 
 		$response['body'] = $process['body'];
 
@@ -1203,12 +1266,14 @@ 
 	public static function verify_ssl_certificate( $stream, $host ) {
 		$context_options = stream_context_get_options( $stream );
 
-		if ( empty( $context_options['ssl']['peer_certificate'] ) )
-			return false;
+		if ( empty( $context_options['ssl']['peer_certificate'] ) ) {
+					return false;
+		}
 
 		$cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
-		if ( ! $cert )
-			return false;
+		if ( ! $cert ) {
+					return false;
+		}
 
 		/*
 		 * If the request is being made to an IP address, we'll validate against IP fields
@@ -1221,8 +1286,10 @@ 
 			$match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
 			foreach ( $match_against as $match ) {
 				list( $match_type, $match_host ) = explode( ':', $match );
-				if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
+				if ( $host_type == strtolower( trim( $match_type ) ) ) {
+					// IP: or DNS:
 					$certificate_hostnames[] = strtolower( trim( $match_host ) );
+				}
 			}
 		} elseif ( !empty( $cert['subject']['CN'] ) ) {
 			// Only use the CN when the certificate includes no subjectAltName extension.
@@ -1230,16 +1297,19 @@ 
 		}
 
 		// Exact hostname/IP matches.
-		if ( in_array( strtolower( $host ), $certificate_hostnames ) )
-			return true;
+		if ( in_array( strtolower( $host ), $certificate_hostnames ) ) {
+					return true;
+		}
 
 		// IP's can't be wildcards, Stop processing.
-		if ( 'ip' == $host_type )
-			return false;
+		if ( 'ip' == $host_type ) {
+					return false;
+		}
 
 		// Test to see if the domain is at least 2 deep for wildcard support.
-		if ( substr_count( $host, '.' ) < 2 )
-			return false;
+		if ( substr_count( $host, '.' ) < 2 ) {
+					return false;
+		}
 
 		// Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
 		$wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
@@ -1258,16 +1328,19 @@ 
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'stream_socket_client' ) )
-			return false;
+		if ( ! function_exists( 'stream_socket_client' ) ) {
+					return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
-			if ( ! extension_loaded( 'openssl' ) )
-				return false;
-			if ( ! function_exists( 'openssl_x509_parse' ) )
-				return false;
+			if ( ! extension_loaded( 'openssl' ) ) {
+							return false;
+			}
+			if ( ! function_exists( 'openssl_x509_parse' ) ) {
+							return false;
+			}
 		}
 
 		/**
@@ -1431,8 +1504,10 @@ 
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
 		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
+		if ( defined( 'CURLOPT_PROTOCOLS' ) ) {
+			// PHP 5.2.10 / cURL 7.19.4
 			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		}
 
 		switch ( $r['method'] ) {
 			case 'HEAD':
@@ -1448,8 +1523,9 @@ 
 				break;
 			default:
 				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				if ( ! is_null( $r['body'] ) ) {
+									curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				}
 				break;
 		}
 
@@ -1460,19 +1536,22 @@ 
 
 		curl_setopt( $handle, CURLOPT_HEADER, false );
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
-		else
-			$this->max_body_length = false;
+		if ( isset( $r['limit_response_size'] ) ) {
+					$this->max_body_length = intval( $r['limit_response_size'] );
+		} else {
+					$this->max_body_length = false;
+		}
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
-			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			if ( ! WP_DEBUG ) {
+							$this->stream_handle = @fopen( $r['filename'], 'w+' );
+			} else {
+							$this->stream_handle = fopen( $r['filename'], 'w+' );
+			}
+			if ( ! $this->stream_handle ) {
+							return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			}
 		} else {
 			$this->stream_handle = false;
 		}
@@ -1486,10 +1565,11 @@ 
 			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
-		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		if ( $r['httpversion'] == '1.0' ) {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		} else {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		}
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -1560,8 +1640,9 @@ 
 
 		curl_close( $handle );
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ( $r['stream'] ) {
+					fclose( $this->stream_handle );
+		}
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -1572,11 +1653,13 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
-			return $redirect_response;
+		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) {
+					return $redirect_response;
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) {
+					$theBody = WP_Http_Encoding::decompress( $theBody );
+		}
 
 		$response['body'] = $theBody;
 
@@ -1637,16 +1720,18 @@ 
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
-			return false;
+		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) ) {
+					return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
-				return false;
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) {
+							return false;
+			}
 		}
 
 		/**
@@ -1730,8 +1815,9 @@ 
 	 * @return string
 	 */
 	public function host() {
-		if ( defined('WP_PROXY_HOST') )
-			return WP_PROXY_HOST;
+		if ( defined('WP_PROXY_HOST') ) {
+					return WP_PROXY_HOST;
+		}
 
 		return '';
 	}
@@ -1744,8 +1830,9 @@ 
 	 * @return string
 	 */
 	public function port() {
-		if ( defined('WP_PROXY_PORT') )
-			return WP_PROXY_PORT;
+		if ( defined('WP_PROXY_PORT') ) {
+					return WP_PROXY_PORT;
+		}
 
 		return '';
 	}
@@ -1758,8 +1845,9 @@ 
 	 * @return string
 	 */
 	public function username() {
-		if ( defined('WP_PROXY_USERNAME') )
-			return WP_PROXY_USERNAME;
+		if ( defined('WP_PROXY_USERNAME') ) {
+					return WP_PROXY_USERNAME;
+		}
 
 		return '';
 	}
@@ -1772,8 +1860,9 @@ 
 	 * @return string
 	 */
 	public function password() {
-		if ( defined('WP_PROXY_PASSWORD') )
-			return WP_PROXY_PASSWORD;
+		if ( defined('WP_PROXY_PASSWORD') ) {
+					return WP_PROXY_PASSWORD;
+		}
 
 		return '';
 	}
@@ -1823,8 +1912,9 @@ 
 		$check = @parse_url($uri);
 
 		// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-		if ( $check === false )
-			return true;
+		if ( $check === false ) {
+					return true;
+		}
 
 		$home = parse_url( get_option('siteurl') );
 
@@ -1842,14 +1932,17 @@ 
 		 * @param array  $home     Associative array result of parsing the site URL.
 		 */
 		$result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home );
-		if ( ! is_null( $result ) )
-			return $result;
+		if ( ! is_null( $result ) ) {
+					return $result;
+		}
 
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) )
-			return false;
+		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+					return false;
+		}
 
-		if ( !defined('WP_PROXY_BYPASS_HOSTS') )
-			return true;
+		if ( !defined('WP_PROXY_BYPASS_HOSTS') ) {
+					return true;
+		}
 
 		static $bypass_hosts = null;
 		static $wildcard_regex = array();
@@ -1858,16 +1951,18 @@ 
 
 			if ( false !== strpos(WP_PROXY_BYPASS_HOSTS, '*') ) {
 				$wildcard_regex = array();
-				foreach ( $bypass_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				foreach ( $bypass_hosts as $host ) {
+									$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				}
 				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $bypass_hosts );
+		if ( !empty($wildcard_regex) ) {
+					return !preg_match($wildcard_regex, $check['host']);
+		} else {
+					return !in_array( $check['host'], $bypass_hosts );
+		}
 	}
 }
 /**
@@ -1948,13 +2043,16 @@ 
 	 *                                    and $port values.
 	 */
 	public function __construct( $data, $requested_url = '' ) {
-		if ( $requested_url )
-			$arrURL = @parse_url( $requested_url );
-		if ( isset( $arrURL['host'] ) )
-			$this->domain = $arrURL['host'];
+		if ( $requested_url ) {
+					$arrURL = @parse_url( $requested_url );
+		}
+		if ( isset( $arrURL['host'] ) ) {
+					$this->domain = $arrURL['host'];
+		}
 		$this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
-		if (  '/' != substr( $this->path, -1 ) )
-			$this->path = dirname( $this->path ) . '/';
+		if (  '/' != substr( $this->path, -1 ) ) {
+					$this->path = dirname( $this->path ) . '/';
+		}
 
 		if ( is_string( $data ) ) {
 			// Assume it's a header string direct from a previous request.
@@ -1974,29 +2072,34 @@ 
 				$pair = rtrim($pair);
 
 				// Handle the cookie ending in ; which results in a empty final pair.
-				if ( empty($pair) )
-					continue;
+				if ( empty($pair) ) {
+									continue;
+				}
 
 				list( $key, $val ) = strpos( $pair, '=' ) ? explode( '=', $pair ) : array( $pair, '' );
 				$key = strtolower( trim( $key ) );
-				if ( 'expires' == $key )
-					$val = strtotime( $val );
+				if ( 'expires' == $key ) {
+									$val = strtotime( $val );
+				}
 				$this->$key = $val;
 			}
 		} else {
-			if ( !isset( $data['name'] ) )
-				return;
+			if ( !isset( $data['name'] ) ) {
+							return;
+			}
 
 			// Set properties based directly on parameters.
 			foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
-				if ( isset( $data[ $field ] ) )
-					$this->$field = $data[ $field ];
+				if ( isset( $data[ $field ] ) ) {
+									$this->$field = $data[ $field ];
+				}
 			}
 
-			if ( isset( $data['expires'] ) )
-				$this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] );
-			else
-				$this->expires = null;
+			if ( isset( $data['expires'] ) ) {
+							$this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] );
+			} else {
+							$this->expires = null;
+			}
 		}
 	}
 
@@ -2012,12 +2115,14 @@ 
 	 * @return bool true if allowed, false otherwise.
 	 */
 	public function test( $url ) {
-		if ( is_null( $this->name ) )
-			return false;
+		if ( is_null( $this->name ) ) {
+					return false;
+		}
 
 		// Expires - if expired then nothing else matters.
-		if ( isset( $this->expires ) && time() > $this->expires )
-			return false;
+		if ( isset( $this->expires ) && time() > $this->expires ) {
+					return false;
+		}
 
 		// Get details on the URL we're thinking about sending to.
 		$url = parse_url( $url );
@@ -2028,21 +2133,25 @@ 
 		$path   = isset( $this->path )   ? $this->path   : '/';
 		$port   = isset( $this->port )   ? $this->port   : null;
 		$domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
-		if ( false === stripos( $domain, '.' ) )
-			$domain .= '.local';
+		if ( false === stripos( $domain, '.' ) ) {
+					$domain .= '.local';
+		}
 
 		// Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
 		$domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain;
-		if ( substr( $url['host'], -strlen( $domain ) ) != $domain )
-			return false;
+		if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) {
+					return false;
+		}
 
 		// Port - supports "port-lists" in the format: "80,8000,8080".
-		if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) )
-			return false;
+		if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) ) {
+					return false;
+		}
 
 		// Path - request path must start with path restriction.
-		if ( substr( $url['path'], 0, strlen( $path ) ) != $path )
-			return false;
+		if ( substr( $url['path'], 0, strlen( $path ) ) != $path ) {
+					return false;
+		}
 
 		return true;
 	}
@@ -2056,8 +2165,9 @@ 
 	 * @return string Header encoded cookie name and value.
 	 */
 	public function getHeaderValue() {
-		if ( ! isset( $this->name ) || ! isset( $this->value ) )
-			return '';
+		if ( ! isset( $this->name ) || ! isset( $this->value ) ) {
+					return '';
+		}
 
 		/**
 		 * Filter the header-encoded cookie value.
@@ -2130,23 +2240,28 @@ 
 	 */
 	public static function decompress( $compressed, $length = null ) {
 
-		if ( empty($compressed) )
-			return $compressed;
+		if ( empty($compressed) ) {
+					return $compressed;
+		}
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) {
+					return $decompressed;
+		}
 
 		if ( function_exists('gzdecode') ) {
 			$decompressed = @gzdecode( $compressed );
 
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		return $compressed;
@@ -2185,22 +2300,27 @@ 
 					list($xlen) = unpack('v', substr($gzData, $i, 2) );
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
-					$i = $i + 2;
+				if ( $flg & 8 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 16 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 2 ) {
+									$i = $i + 2;
+				}
 			}
 			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
 		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
-			return $decompressed;
+		if ( false !== $decompressed ) {
+					return $decompressed;
+		}
 
 		return false;
 	}
@@ -2220,22 +2340,29 @@ 
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress'] ) {
+			// Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		} elseif ( $args['stream'] ) {
+			// Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		} elseif ( isset( $args['limit_response_size'] ) ) {
+			// If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
+		}
 
 		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
-				$type[] = 'deflate;q=1.0';
+			if ( function_exists( 'gzinflate' ) ) {
+							$type[] = 'deflate;q=1.0';
+			}
 
-			if ( function_exists( 'gzuncompress' ) )
-				$type[] = 'compress;q=0.5';
+			if ( function_exists( 'gzuncompress' ) ) {
+							$type[] = 'compress;q=0.5';
+			}
 
-			if ( function_exists( 'gzdecode' ) )
-				$type[] = 'gzip;q=0.5';
+			if ( function_exists( 'gzdecode' ) ) {
+							$type[] = 'gzip;q=0.5';
+			}
 		}
 
 		/**
@@ -2278,8 +2405,9 @@ 
 	 */
 	public static function should_decode($headers) {
 		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
-				return true;
+			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) ) {
+							return true;
+			}
 		} elseif ( is_string( $headers ) ) {
 			return ( stripos($headers, 'content-encoding:') !== false );
 		}

src/wp-includes/class-IXR.php

Doc Comments +6 added lines

@@ -1048,6 +1048,12 @@
 		self::__construct();
 	}
 
+    /**
+     * @param string $method
+     * @param string $callback
+     * @param string[] $args
+     * @param string $help
+     */
     function addCallback($method, $callback, $args, $help)
     {
         $this->callbacks[$method] = $callback;

Indentation +950 added lines, -950 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 /**
- * IXR - The Incutio XML-RPC Library
- *
- * Copyright (c) 2010, Incutio Ltd.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  - Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *  - Neither the name of Incutio Ltd. nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @package IXR
- * @since 1.5.0
- *
- * @copyright  Incutio Ltd 2010 (http://www.incutio.com)
- * @version    1.7.4 7th September 2010
- * @author     Simon Willison
- * @link       http://scripts.incutio.com/xmlrpc/ Site/manual
- * @license    http://www.opensource.org/licenses/bsd-license.php BSD
- */
+	 * IXR - The Incutio XML-RPC Library
+	 *
+	 * Copyright (c) 2010, Incutio Ltd.
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions are met:
+	 *
+	 *  - Redistributions of source code must retain the above copyright notice,
+	 *    this list of conditions and the following disclaimer.
+	 *  - Redistributions in binary form must reproduce the above copyright
+	 *    notice, this list of conditions and the following disclaimer in the
+	 *    documentation and/or other materials provided with the distribution.
+	 *  - Neither the name of Incutio Ltd. nor the names of its contributors
+	 *    may be used to endorse or promote products derived from this software
+	 *    without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+	 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package IXR
+	 * @since 1.5.0
+	 *
+	 * @copyright  Incutio Ltd 2010 (http://www.incutio.com)
+	 * @version    1.7.4 7th September 2010
+	 * @author     Simon Willison
+	 * @link       http://scripts.incutio.com/xmlrpc/ Site/manual
+	 * @license    http://www.opensource.org/licenses/bsd-license.php BSD
+	 */
 
 /**
  * IXR_Value
@@ -46,31 +46,31 @@ 
  * @since 1.5.0
  */
 class IXR_Value {
-    var $data;
-    var $type;
+	var $data;
+	var $type;
 
 	/**
 	 * PHP5 constructor.
 	 */
 	function __construct( $data, $type = false )
-    {
-        $this->data = $data;
-        if (!$type) {
-            $type = $this->calculateType();
-        }
-        $this->type = $type;
-        if ($type == 'struct') {
-            // Turn all the values in the array in to new IXR_Value objects
-            foreach ($this->data as $key => $value) {
-                $this->data[$key] = new IXR_Value($value);
-            }
-        }
-        if ($type == 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
-                $this->data[$i] = new IXR_Value($this->data[$i]);
-            }
-        }
-    }
+	{
+		$this->data = $data;
+		if (!$type) {
+			$type = $this->calculateType();
+		}
+		$this->type = $type;
+		if ($type == 'struct') {
+			// Turn all the values in the array in to new IXR_Value objects
+			foreach ($this->data as $key => $value) {
+				$this->data[$key] = new IXR_Value($value);
+			}
+		}
+		if ($type == 'array') {
+			for ($i = 0, $j = count($this->data); $i < $j; $i++) {
+				$this->data[$i] = new IXR_Value($this->data[$i]);
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -79,102 +79,102 @@ 
 		self::__construct( $data, $type );
 	}
 
-    function calculateType()
-    {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_integer($this->data)) {
-            return 'int';
-        }
-        if (is_double($this->data)) {
-            return 'double';
-        }
-
-        // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
-            return 'date';
-        }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
-            return 'base64';
-        }
-
-        // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
-            $this->data = get_object_vars($this->data);
-            return 'struct';
-        }
-        if (!is_array($this->data)) {
-            return 'string';
-        }
-
-        // We have an array - is it an array or a struct?
-        if ($this->isStruct($this->data)) {
-            return 'struct';
-        } else {
-            return 'array';
-        }
-    }
-
-    function getXml()
-    {
-        // Return XML for this value
-        switch ($this->type) {
-            case 'boolean':
-                return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
-                break;
-            case 'int':
-                return '<int>'.$this->data.'</int>';
-                break;
-            case 'double':
-                return '<double>'.$this->data.'</double>';
-                break;
-            case 'string':
-                return '<string>'.htmlspecialchars($this->data).'</string>';
-                break;
-            case 'array':
-                $return = '<array><data>'."\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>'.$item->getXml()."</value>\n";
-                }
-                $return .= '</data></array>';
-                return $return;
-                break;
-            case 'struct':
-                $return = '<struct>'."\n";
-                foreach ($this->data as $name => $value) {
+	function calculateType()
+	{
+		if ($this->data === true || $this->data === false) {
+			return 'boolean';
+		}
+		if (is_integer($this->data)) {
+			return 'int';
+		}
+		if (is_double($this->data)) {
+			return 'double';
+		}
+
+		// Deal with IXR object types base64 and date
+		if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+			return 'date';
+		}
+		if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+			return 'base64';
+		}
+
+		// If it is a normal PHP object convert it in to a struct
+		if (is_object($this->data)) {
+			$this->data = get_object_vars($this->data);
+			return 'struct';
+		}
+		if (!is_array($this->data)) {
+			return 'string';
+		}
+
+		// We have an array - is it an array or a struct?
+		if ($this->isStruct($this->data)) {
+			return 'struct';
+		} else {
+			return 'array';
+		}
+	}
+
+	function getXml()
+	{
+		// Return XML for this value
+		switch ($this->type) {
+			case 'boolean':
+				return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
+				break;
+			case 'int':
+				return '<int>'.$this->data.'</int>';
+				break;
+			case 'double':
+				return '<double>'.$this->data.'</double>';
+				break;
+			case 'string':
+				return '<string>'.htmlspecialchars($this->data).'</string>';
+				break;
+			case 'array':
+				$return = '<array><data>'."\n";
+				foreach ($this->data as $item) {
+					$return .= '  <value>'.$item->getXml()."</value>\n";
+				}
+				$return .= '</data></array>';
+				return $return;
+				break;
+			case 'struct':
+				$return = '<struct>'."\n";
+				foreach ($this->data as $name => $value) {
 					$name = htmlspecialchars($name);
-                    $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml()."</value></member>\n";
-                }
-                $return .= '</struct>';
-                return $return;
-                break;
-            case 'date':
-            case 'base64':
-                return $this->data->getXml();
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether or not the supplied array is a struct or not
-     *
-     * @param array $array
-     * @return bool
-     */
-    function isStruct($array)
-    {
-        $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
-                return true;
-            }
-            $expected++;
-        }
-        return false;
-    }
+					$return .= "  <member><name>$name</name><value>";
+					$return .= $value->getXml()."</value></member>\n";
+				}
+				$return .= '</struct>';
+				return $return;
+				break;
+			case 'date':
+			case 'base64':
+				return $this->data->getXml();
+				break;
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether or not the supplied array is a struct or not
+	 *
+	 * @param array $array
+	 * @return bool
+	 */
+	function isStruct($array)
+	{
+		$expected = 0;
+		foreach ($array as $key => $value) {
+			if ((string)$key != (string)$expected) {
+				return true;
+			}
+			$expected++;
+		}
+		return false;
+	}
 }
 
 /**
@@ -186,31 +186,31 @@ 
  */
 class IXR_Message
 {
-    var $message;
-    var $messageType;  // methodCall / methodResponse / fault
-    var $faultCode;
-    var $faultString;
-    var $methodName;
-    var $params;
-
-    // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
-    var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
-    var $_param;
-    var $_value;
-    var $_currentTag;
-    var $_currentTagContents;
-    // The XML parser
-    var $_parser;
+	var $message;
+	var $messageType;  // methodCall / methodResponse / fault
+	var $faultCode;
+	var $faultString;
+	var $methodName;
+	var $params;
+
+	// Current variable stacks
+	var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+	var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
+	var $_currentStructName = array();  // A stack as well
+	var $_param;
+	var $_value;
+	var $_currentTag;
+	var $_currentTagContents;
+	// The XML parser
+	var $_parser;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $message )
-    {
-        $this->message =& $message;
-    }
+	function __construct( $message )
+	{
+		$this->message =& $message;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -219,178 +219,178 @@ 
 		self::__construct( $message );
 	}
 
-    function parse()
-    {
-        // first remove the XML declaration
-        // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
-        $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Then remove the DOCTYPE
-        $header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Check that the root tag is valid
-        $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
-        if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
-            return false;
-        }
-        if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
-            return false;
-        }
-
-        // Bail if there are too many elements to parse
-        $element_limit = 30000;
-        if ( function_exists( 'apply_filters' ) ) {
-            /**
-             * Filter the number of elements to parse in an XML-RPC response.
-             *
-             * @since 4.0.0
-             *
-             * @param int $element_limit Default elements limit.
-             */
-            $element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
-        }
-        if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
-            return false;
-        }
-
-        $this->_parser = xml_parser_create();
-        // Set XML parser to take the case of tags in to account
-        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
-        // Set XML parser callback functions
-        xml_set_object($this->_parser, $this);
-        xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
-        xml_set_character_data_handler($this->_parser, 'cdata');
-        $chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages
-        $final = false;
-        do {
-            if (strlen($this->message) <= $chunk_size) {
-                $final = true;
-            }
-            $part = substr($this->message, 0, $chunk_size);
-            $this->message = substr($this->message, $chunk_size);
-            if (!xml_parse($this->_parser, $part, $final)) {
-                return false;
-            }
-            if ($final) {
-                break;
-            }
-        } while (true);
-        xml_parser_free($this->_parser);
-
-        // Grab the error messages, if any
-        if ($this->messageType == 'fault') {
-            $this->faultCode = $this->params[0]['faultCode'];
-            $this->faultString = $this->params[0]['faultString'];
-        }
-        return true;
-    }
-
-    function tag_open($parser, $tag, $attr)
-    {
-        $this->_currentTagContents = '';
-        $this->currentTag = $tag;
-        switch($tag) {
-            case 'methodCall':
-            case 'methodResponse':
-            case 'fault':
-                $this->messageType = $tag;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
-                $this->_arraystructstypes[] = 'array';
-                $this->_arraystructs[] = array();
-                break;
-            case 'struct':
-                $this->_arraystructstypes[] = 'struct';
-                $this->_arraystructs[] = array();
-                break;
-        }
-    }
-
-    function cdata($parser, $cdata)
-    {
-        $this->_currentTagContents .= $cdata;
-    }
-
-    function tag_close($parser, $tag)
-    {
-        $valueFlag = false;
-        switch($tag) {
-            case 'int':
-            case 'i4':
-                $value = (int)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'double':
-                $value = (double)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'string':
-                $value = (string)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'dateTime.iso8601':
-                $value = new IXR_Date(trim($this->_currentTagContents));
-                $valueFlag = true;
-                break;
-            case 'value':
-                // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
-                    $valueFlag = true;
-                }
-                break;
-            case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'base64':
-                $value = base64_decode($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':
-            case 'struct':
-                $value = array_pop($this->_arraystructs);
-                array_pop($this->_arraystructstypes);
-                $valueFlag = true;
-                break;
-            case 'member':
-                array_pop($this->_currentStructName);
-                break;
-            case 'name':
-                $this->_currentStructName[] = trim($this->_currentTagContents);
-                break;
-            case 'methodName':
-                $this->methodName = trim($this->_currentTagContents);
-                break;
-        }
-
-        if ($valueFlag) {
-            if (count($this->_arraystructs) > 0) {
-                // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
-                    // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
-                } else {
-                    // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
-                }
-            } else {
-                // Just add as a parameter
-                $this->params[] = $value;
-            }
-        }
-        $this->_currentTagContents = '';
-    }
+	function parse()
+	{
+		// first remove the XML declaration
+		// merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
+		$header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
+		$this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
+		if ( '' == $this->message ) {
+			return false;
+		}
+
+		// Then remove the DOCTYPE
+		$header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
+		$this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
+		if ( '' == $this->message ) {
+			return false;
+		}
+
+		// Check that the root tag is valid
+		$root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
+		if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
+			return false;
+		}
+		if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
+			return false;
+		}
+
+		// Bail if there are too many elements to parse
+		$element_limit = 30000;
+		if ( function_exists( 'apply_filters' ) ) {
+			/**
+			 * Filter the number of elements to parse in an XML-RPC response.
+			 *
+			 * @since 4.0.0
+			 *
+			 * @param int $element_limit Default elements limit.
+			 */
+			$element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
+		}
+		if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
+			return false;
+		}
+
+		$this->_parser = xml_parser_create();
+		// Set XML parser to take the case of tags in to account
+		xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
+		// Set XML parser callback functions
+		xml_set_object($this->_parser, $this);
+		xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
+		xml_set_character_data_handler($this->_parser, 'cdata');
+		$chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages
+		$final = false;
+		do {
+			if (strlen($this->message) <= $chunk_size) {
+				$final = true;
+			}
+			$part = substr($this->message, 0, $chunk_size);
+			$this->message = substr($this->message, $chunk_size);
+			if (!xml_parse($this->_parser, $part, $final)) {
+				return false;
+			}
+			if ($final) {
+				break;
+			}
+		} while (true);
+		xml_parser_free($this->_parser);
+
+		// Grab the error messages, if any
+		if ($this->messageType == 'fault') {
+			$this->faultCode = $this->params[0]['faultCode'];
+			$this->faultString = $this->params[0]['faultString'];
+		}
+		return true;
+	}
+
+	function tag_open($parser, $tag, $attr)
+	{
+		$this->_currentTagContents = '';
+		$this->currentTag = $tag;
+		switch($tag) {
+			case 'methodCall':
+			case 'methodResponse':
+			case 'fault':
+				$this->messageType = $tag;
+				break;
+				/* Deal with stacks of arrays and structs */
+			case 'data':    // data is to all intents and puposes more interesting than array
+				$this->_arraystructstypes[] = 'array';
+				$this->_arraystructs[] = array();
+				break;
+			case 'struct':
+				$this->_arraystructstypes[] = 'struct';
+				$this->_arraystructs[] = array();
+				break;
+		}
+	}
+
+	function cdata($parser, $cdata)
+	{
+		$this->_currentTagContents .= $cdata;
+	}
+
+	function tag_close($parser, $tag)
+	{
+		$valueFlag = false;
+		switch($tag) {
+			case 'int':
+			case 'i4':
+				$value = (int)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'double':
+				$value = (double)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'string':
+				$value = (string)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'dateTime.iso8601':
+				$value = new IXR_Date(trim($this->_currentTagContents));
+				$valueFlag = true;
+				break;
+			case 'value':
+				// "If no type is indicated, the type is string."
+				if (trim($this->_currentTagContents) != '') {
+					$value = (string)$this->_currentTagContents;
+					$valueFlag = true;
+				}
+				break;
+			case 'boolean':
+				$value = (boolean)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'base64':
+				$value = base64_decode($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+				/* Deal with stacks of arrays and structs */
+			case 'data':
+			case 'struct':
+				$value = array_pop($this->_arraystructs);
+				array_pop($this->_arraystructstypes);
+				$valueFlag = true;
+				break;
+			case 'member':
+				array_pop($this->_currentStructName);
+				break;
+			case 'name':
+				$this->_currentStructName[] = trim($this->_currentTagContents);
+				break;
+			case 'methodName':
+				$this->methodName = trim($this->_currentTagContents);
+				break;
+		}
+
+		if ($valueFlag) {
+			if (count($this->_arraystructs) > 0) {
+				// Add value to struct or array
+				if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+					// Add to struct
+					$this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+				} else {
+					// Add to array
+					$this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+				}
+			} else {
+				// Just add as a parameter
+				$this->params[] = $value;
+			}
+		}
+		$this->_currentTagContents = '';
+	}
 }
 
 /**
@@ -401,25 +401,25 @@ 
  */
 class IXR_Server
 {
-    var $data;
-    var $callbacks = array();
-    var $message;
-    var $capabilities;
+	var $data;
+	var $callbacks = array();
+	var $message;
+	var $capabilities;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $callbacks = false, $data = false, $wait = false )
-    {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        if (!$wait) {
-            $this->serve($data);
-        }
-    }
+	function __construct( $callbacks = false, $data = false, $wait = false )
+	{
+		$this->setCapabilities();
+		if ($callbacks) {
+			$this->callbacks = $callbacks;
+		}
+		$this->setCallbacks();
+		if (!$wait) {
+			$this->serve($data);
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -428,46 +428,46 @@ 
 		self::__construct( $callbacks, $data, $wait );
 	}
 
-    function serve($data = false)
-    {
-        if (!$data) {
-            if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
-                if ( function_exists( 'status_header' ) ) {
-                    status_header( 405 ); // WP #20986
-                    header( 'Allow: POST' );
-                }
-                header('Content-Type: text/plain'); // merged from WP #9093
-                die('XML-RPC server accepts POST requests only.');
-            }
-
-            global $HTTP_RAW_POST_DATA;
-            if (empty($HTTP_RAW_POST_DATA)) {
-                // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
-                $data = file_get_contents('php://input');
-            } else {
-                $data =& $HTTP_RAW_POST_DATA;
-            }
-        }
-        $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
-            $this->error(-32700, 'parse error. not well formed');
-        }
-        if ($this->message->messageType != 'methodCall') {
-            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
-        }
-        $result = $this->call($this->message->methodName, $this->message->params);
-
-        // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
-            $this->error($result);
-        }
-
-        // Encode the result
-        $r = new IXR_Value($result);
-        $resultxml = $r->getXml();
-
-        // Create the XML
-        $xml = <<<EOD
+	function serve($data = false)
+	{
+		if (!$data) {
+			if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
+				if ( function_exists( 'status_header' ) ) {
+					status_header( 405 ); // WP #20986
+					header( 'Allow: POST' );
+				}
+				header('Content-Type: text/plain'); // merged from WP #9093
+				die('XML-RPC server accepts POST requests only.');
+			}
+
+			global $HTTP_RAW_POST_DATA;
+			if (empty($HTTP_RAW_POST_DATA)) {
+				// workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
+				$data = file_get_contents('php://input');
+			} else {
+				$data =& $HTTP_RAW_POST_DATA;
+			}
+		}
+		$this->message = new IXR_Message($data);
+		if (!$this->message->parse()) {
+			$this->error(-32700, 'parse error. not well formed');
+		}
+		if ($this->message->messageType != 'methodCall') {
+			$this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
+		}
+		$result = $this->call($this->message->methodName, $this->message->params);
+
+		// Is the result an error?
+		if (is_a($result, 'IXR_Error')) {
+			$this->error($result);
+		}
+
+		// Encode the result
+		$r = new IXR_Value($result);
+		$resultxml = $r->getXml();
+
+		// Create the XML
+		$xml = <<<EOD
 <methodResponse>
   <params>
     <param>
@@ -479,143 +479,143 @@ 
 </methodResponse>
 
 EOD;
-      // Send it
-      $this->output($xml);
-    }
-
-    function call($methodname, $args)
-    {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
-        }
-        $method = $this->callbacks[$methodname];
-
-        // Perform the callback and send the response
-        if (count($args) == 1) {
-            // If only one parameter just send that instead of the whole array
-            $args = $args[0];
-        }
-
-        // Are we dealing with a function or a method?
-        if (is_string($method) && substr($method, 0, 5) == 'this:') {
-            // It's a class method - check it exists
-            $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
-            }
-
-            //Call the method
-            $result = $this->$method($args);
-        } else {
-            // It's a function - does it exist?
-            if (is_array($method)) {
-                if (!is_callable(array($method[0], $method[1]))) {
-                    return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
-                }
-            } else if (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
-            }
-
-            // Call the function
-            $result = call_user_func($method, $args);
-        }
-        return $result;
-    }
-
-    function error($error, $message = false)
-    {
-        // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
-            $error = new IXR_Error($error, $message);
-        }
-        $this->output($error->getXml());
-    }
-
-    function output($xml)
-    {
-        $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
-        $length = strlen($xml);
-        header('Connection: close');
-        header('Content-Length: '.$length);
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
-        header('Date: '.date('r'));
-        echo $xml;
-        exit;
-    }
-
-    function hasMethod($method)
-    {
-        return in_array($method, array_keys($this->callbacks));
-    }
-
-    function setCapabilities()
-    {
-        // Initialises capabilities array
-        $this->capabilities = array(
-            'xmlrpc' => array(
-                'specUrl' => 'http://www.xmlrpc.com/spec',
-                'specVersion' => 1
-        ),
-            'faults_interop' => array(
-                'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-                'specVersion' => 20010516
-        ),
-            'system.multicall' => array(
-                'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-                'specVersion' => 1
-        ),
-        );
-    }
-
-    function getCapabilities($args)
-    {
-        return $this->capabilities;
-    }
-
-    function setCallbacks()
-    {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods'] = 'this:listMethods';
-        $this->callbacks['system.multicall'] = 'this:multiCall';
-    }
-
-    function listMethods($args)
-    {
-        // Returns a list of methods - uses array_reverse to ensure user defined
-        // methods are listed before server defined methods
-        return array_reverse(array_keys($this->callbacks));
-    }
-
-    function multiCall($methodcalls)
-    {
-        // See http://www.xmlrpc.com/discuss/msgReader$1208
-        $return = array();
-        foreach ($methodcalls as $call) {
-            $method = $call['methodName'];
-            $params = $call['params'];
-            if ($method == 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
-                $result = $this->call($method, $params);
-            }
-            if (is_a($result, 'IXR_Error')) {
-                $return[] = array(
-                    'faultCode' => $result->code,
-                    'faultString' => $result->message
-                );
-            } else {
-                $return[] = array($result);
-            }
-        }
-        return $return;
-    }
+	  // Send it
+	  $this->output($xml);
+	}
+
+	function call($methodname, $args)
+	{
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
+		}
+		$method = $this->callbacks[$methodname];
+
+		// Perform the callback and send the response
+		if (count($args) == 1) {
+			// If only one parameter just send that instead of the whole array
+			$args = $args[0];
+		}
+
+		// Are we dealing with a function or a method?
+		if (is_string($method) && substr($method, 0, 5) == 'this:') {
+			// It's a class method - check it exists
+			$method = substr($method, 5);
+			if (!method_exists($this, $method)) {
+				return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
+			}
+
+			//Call the method
+			$result = $this->$method($args);
+		} else {
+			// It's a function - does it exist?
+			if (is_array($method)) {
+				if (!is_callable(array($method[0], $method[1]))) {
+					return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
+				}
+			} else if (!function_exists($method)) {
+				return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
+			}
+
+			// Call the function
+			$result = call_user_func($method, $args);
+		}
+		return $result;
+	}
+
+	function error($error, $message = false)
+	{
+		// Accepts either an error object or an error code and message
+		if ($message && !is_object($error)) {
+			$error = new IXR_Error($error, $message);
+		}
+		$this->output($error->getXml());
+	}
+
+	function output($xml)
+	{
+		$charset = function_exists('get_option') ? get_option('blog_charset') : '';
+		if ($charset)
+			$xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+		else
+			$xml = '<?xml version="1.0"?>'."\n".$xml;
+		$length = strlen($xml);
+		header('Connection: close');
+		header('Content-Length: '.$length);
+		if ($charset)
+			header('Content-Type: text/xml; charset='.$charset);
+		else
+			header('Content-Type: text/xml');
+		header('Date: '.date('r'));
+		echo $xml;
+		exit;
+	}
+
+	function hasMethod($method)
+	{
+		return in_array($method, array_keys($this->callbacks));
+	}
+
+	function setCapabilities()
+	{
+		// Initialises capabilities array
+		$this->capabilities = array(
+			'xmlrpc' => array(
+				'specUrl' => 'http://www.xmlrpc.com/spec',
+				'specVersion' => 1
+		),
+			'faults_interop' => array(
+				'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
+				'specVersion' => 20010516
+		),
+			'system.multicall' => array(
+				'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+				'specVersion' => 1
+		),
+		);
+	}
+
+	function getCapabilities($args)
+	{
+		return $this->capabilities;
+	}
+
+	function setCallbacks()
+	{
+		$this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+		$this->callbacks['system.listMethods'] = 'this:listMethods';
+		$this->callbacks['system.multicall'] = 'this:multiCall';
+	}
+
+	function listMethods($args)
+	{
+		// Returns a list of methods - uses array_reverse to ensure user defined
+		// methods are listed before server defined methods
+		return array_reverse(array_keys($this->callbacks));
+	}
+
+	function multiCall($methodcalls)
+	{
+		// See http://www.xmlrpc.com/discuss/msgReader$1208
+		$return = array();
+		foreach ($methodcalls as $call) {
+			$method = $call['methodName'];
+			$params = $call['params'];
+			if ($method == 'system.multicall') {
+				$result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+			} else {
+				$result = $this->call($method, $params);
+			}
+			if (is_a($result, 'IXR_Error')) {
+				$return[] = array(
+					'faultCode' => $result->code,
+					'faultString' => $result->message
+				);
+			} else {
+				$return[] = array($result);
+			}
+		}
+		return $return;
+	}
 }
 
 /**
@@ -626,32 +626,32 @@ 
  */
 class IXR_Request
 {
-    var $method;
-    var $args;
-    var $xml;
+	var $method;
+	var $args;
+	var $xml;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct($method, $args)
-    {
-        $this->method = $method;
-        $this->args = $args;
-        $this->xml = <<<EOD
+	function __construct($method, $args)
+	{
+		$this->method = $method;
+		$this->args = $args;
+		$this->xml = <<<EOD
 <?xml version="1.0"?>
 <methodCall>
 <methodName>{$this->method}</methodName>
 <params>
 
 EOD;
-        foreach ($this->args as $arg) {
-            $this->xml .= '<param><value>';
-            $v = new IXR_Value($arg);
-            $this->xml .= $v->getXml();
-            $this->xml .= "</value></param>\n";
-        }
-        $this->xml .= '</params></methodCall>';
-    }
+		foreach ($this->args as $arg) {
+			$this->xml .= '<param><value>';
+			$v = new IXR_Value($arg);
+			$this->xml .= $v->getXml();
+			$this->xml .= "</value></param>\n";
+		}
+		$this->xml .= '</params></methodCall>';
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -660,15 +660,15 @@ 
 		self::__construct( $method, $args );
 	}
 
-    function getLength()
-    {
-        return strlen($this->xml);
-    }
+	function getLength()
+	{
+		return strlen($this->xml);
+	}
 
-    function getXml()
-    {
-        return $this->xml;
-    }
+	function getXml()
+	{
+		return $this->xml;
+	}
 }
 
 /**
@@ -680,47 +680,47 @@ 
  */
 class IXR_Client
 {
-    var $server;
-    var $port;
-    var $path;
-    var $useragent;
-    var $response;
-    var $message = false;
-    var $debug = false;
-    var $timeout;
-    var $headers = array();
-
-    // Storage place for an error message
-    var $error = false;
+	var $server;
+	var $port;
+	var $path;
+	var $useragent;
+	var $response;
+	var $message = false;
+	var $debug = false;
+	var $timeout;
+	var $headers = array();
+
+	// Storage place for an error message
+	var $error = false;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
-    {
-        if (!$path) {
-            // Assume we have been given a URL instead
-            $bits = parse_url($server);
-            $this->server = $bits['host'];
-            $this->port = isset($bits['port']) ? $bits['port'] : 80;
-            $this->path = isset($bits['path']) ? $bits['path'] : '/';
-
-            // Make absolutely sure we have a path
-            if (!$this->path) {
-                $this->path = '/';
-            }
-
-            if ( ! empty( $bits['query'] ) ) {
-                $this->path .= '?' . $bits['query'];
-            }
-        } else {
-            $this->server = $server;
-            $this->path = $path;
-            $this->port = $port;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
-        $this->timeout = $timeout;
-    }
+	function __construct( $server, $path = false, $port = 80, $timeout = 15 )
+	{
+		if (!$path) {
+			// Assume we have been given a URL instead
+			$bits = parse_url($server);
+			$this->server = $bits['host'];
+			$this->port = isset($bits['port']) ? $bits['port'] : 80;
+			$this->path = isset($bits['path']) ? $bits['path'] : '/';
+
+			// Make absolutely sure we have a path
+			if (!$this->path) {
+				$this->path = '/';
+			}
+
+			if ( ! empty( $bits['query'] ) ) {
+				$this->path .= '?' . $bits['query'];
+			}
+		} else {
+			$this->server = $server;
+			$this->path = $path;
+			$this->port = $port;
+		}
+		$this->useragent = 'The Incutio XML-RPC PHP Library';
+		$this->timeout = $timeout;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -729,111 +729,111 @@ 
 		self::__construct( $server, $path, $port, $timeout );
 	}
 
-    function query()
-    {
-        $args = func_get_args();
-        $method = array_shift($args);
-        $request = new IXR_Request($method, $args);
-        $length = $request->getLength();
-        $xml = $request->getXml();
-        $r = "\r\n";
-        $request  = "POST {$this->path} HTTP/1.0$r";
-
-        // Merged from WP #8145 - allow custom headers
-        $this->headers['Host']          = $this->server;
-        $this->headers['Content-Type']  = 'text/xml';
-        $this->headers['User-Agent']    = $this->useragent;
-        $this->headers['Content-Length']= $length;
-
-        foreach( $this->headers as $header => $value ) {
-            $request .= "{$header}: {$value}{$r}";
-        }
-        $request .= $r;
-
-        $request .= $xml;
-
-        // Now send the request
-        if ($this->debug) {
-            echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
-        }
-
-        if ($this->timeout) {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
-        } else {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
-        }
-        if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
-            return false;
-        }
-        fputs($fp, $request);
-        $contents = '';
-        $debugContents = '';
-        $gotFirstLine = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (strstr($line, '200') === false) {
-                    $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
-                    return false;
-                }
-                $gotFirstLine = true;
-            }
-            if (trim($line) == '') {
-                $gettingHeaders = false;
-            }
-            if (!$gettingHeaders) {
-            	// merged from WP #12559 - remove trim
-                $contents .= $line;
-            }
-            if ($this->debug) {
-            	$debugContents .= $line;
-            }
-        }
-        if ($this->debug) {
-            echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
-        }
-
-        // Now parse what we've got back
-        $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
-            // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
-            return false;
-        }
-
-        // Is the message a fault?
-        if ($this->message->messageType == 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
-            return false;
-        }
-
-        // Message must be OK
-        return true;
-    }
-
-    function getResponse()
-    {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-
-    function isError()
-    {
-        return (is_object($this->error));
-    }
-
-    function getErrorCode()
-    {
-        return $this->error->code;
-    }
-
-    function getErrorMessage()
-    {
-        return $this->error->message;
-    }
+	function query()
+	{
+		$args = func_get_args();
+		$method = array_shift($args);
+		$request = new IXR_Request($method, $args);
+		$length = $request->getLength();
+		$xml = $request->getXml();
+		$r = "\r\n";
+		$request  = "POST {$this->path} HTTP/1.0$r";
+
+		// Merged from WP #8145 - allow custom headers
+		$this->headers['Host']          = $this->server;
+		$this->headers['Content-Type']  = 'text/xml';
+		$this->headers['User-Agent']    = $this->useragent;
+		$this->headers['Content-Length']= $length;
+
+		foreach( $this->headers as $header => $value ) {
+			$request .= "{$header}: {$value}{$r}";
+		}
+		$request .= $r;
+
+		$request .= $xml;
+
+		// Now send the request
+		if ($this->debug) {
+			echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
+		}
+
+		if ($this->timeout) {
+			$fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+		} else {
+			$fp = @fsockopen($this->server, $this->port, $errno, $errstr);
+		}
+		if (!$fp) {
+			$this->error = new IXR_Error(-32300, 'transport error - could not open socket');
+			return false;
+		}
+		fputs($fp, $request);
+		$contents = '';
+		$debugContents = '';
+		$gotFirstLine = false;
+		$gettingHeaders = true;
+		while (!feof($fp)) {
+			$line = fgets($fp, 4096);
+			if (!$gotFirstLine) {
+				// Check line for '200'
+				if (strstr($line, '200') === false) {
+					$this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
+					return false;
+				}
+				$gotFirstLine = true;
+			}
+			if (trim($line) == '') {
+				$gettingHeaders = false;
+			}
+			if (!$gettingHeaders) {
+				// merged from WP #12559 - remove trim
+				$contents .= $line;
+			}
+			if ($this->debug) {
+				$debugContents .= $line;
+			}
+		}
+		if ($this->debug) {
+			echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
+		}
+
+		// Now parse what we've got back
+		$this->message = new IXR_Message($contents);
+		if (!$this->message->parse()) {
+			// XML error
+			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
+			return false;
+		}
+
+		// Is the message a fault?
+		if ($this->message->messageType == 'fault') {
+			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+			return false;
+		}
+
+		// Message must be OK
+		return true;
+	}
+
+	function getResponse()
+	{
+		// methodResponses can only have one param - return that
+		return $this->message->params[0];
+	}
+
+	function isError()
+	{
+		return (is_object($this->error));
+	}
+
+	function getErrorCode()
+	{
+		return $this->error->code;
+	}
+
+	function getErrorMessage()
+	{
+		return $this->error->message;
+	}
 }
 
 
@@ -845,17 +845,17 @@ 
  */
 class IXR_Error
 {
-    var $code;
-    var $message;
+	var $code;
+	var $message;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $code, $message )
-    {
-        $this->code = $code;
-        $this->message = htmlspecialchars($message);
-    }
+	function __construct( $code, $message )
+	{
+		$this->code = $code;
+		$this->message = htmlspecialchars($message);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -864,9 +864,9 @@ 
 		self::__construct( $code, $message );
 	}
 
-    function getXml()
-    {
-        $xml = <<<EOD
+	function getXml()
+	{
+		$xml = <<<EOD
 <methodResponse>
   <fault>
     <value>
@@ -885,8 +885,8 @@ 
 </methodResponse>
 
 EOD;
-        return $xml;
-    }
+		return $xml;
+	}
 }
 
 /**
@@ -896,26 +896,26 @@ 
  * @since 1.5.0
  */
 class IXR_Date {
-    var $year;
-    var $month;
-    var $day;
-    var $hour;
-    var $minute;
-    var $second;
-    var $timezone;
+	var $year;
+	var $month;
+	var $day;
+	var $hour;
+	var $minute;
+	var $second;
+	var $timezone;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $time )
-    {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
+	function __construct( $time )
+	{
+		// $time can be a PHP timestamp or an ISO one
+		if (is_numeric($time)) {
+			$this->parseTimestamp($time);
+		} else {
+			$this->parseIso($time);
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -924,42 +924,42 @@ 
 		self::__construct( $time );
 	}
 
-    function parseTimestamp($timestamp)
-    {
-        $this->year = date('Y', $timestamp);
-        $this->month = date('m', $timestamp);
-        $this->day = date('d', $timestamp);
-        $this->hour = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
-        $this->timezone = '';
-    }
-
-    function parseIso($iso)
-    {
-        $this->year = substr($iso, 0, 4);
-        $this->month = substr($iso, 4, 2);
-        $this->day = substr($iso, 6, 2);
-        $this->hour = substr($iso, 9, 2);
-        $this->minute = substr($iso, 12, 2);
-        $this->second = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
-    }
-
-    function getIso()
-    {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
-    }
-
-    function getXml()
-    {
-        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
-    }
-
-    function getTimestamp()
-    {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
+	function parseTimestamp($timestamp)
+	{
+		$this->year = date('Y', $timestamp);
+		$this->month = date('m', $timestamp);
+		$this->day = date('d', $timestamp);
+		$this->hour = date('H', $timestamp);
+		$this->minute = date('i', $timestamp);
+		$this->second = date('s', $timestamp);
+		$this->timezone = '';
+	}
+
+	function parseIso($iso)
+	{
+		$this->year = substr($iso, 0, 4);
+		$this->month = substr($iso, 4, 2);
+		$this->day = substr($iso, 6, 2);
+		$this->hour = substr($iso, 9, 2);
+		$this->minute = substr($iso, 12, 2);
+		$this->second = substr($iso, 15, 2);
+		$this->timezone = substr($iso, 17);
+	}
+
+	function getIso()
+	{
+		return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+	}
+
+	function getXml()
+	{
+		return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
+	}
+
+	function getTimestamp()
+	{
+		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+	}
 }
 
 /**
@@ -970,15 +970,15 @@ 
  */
 class IXR_Base64
 {
-    var $data;
+	var $data;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $data )
-    {
-        $this->data = $data;
-    }
+	function __construct( $data )
+	{
+		$this->data = $data;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -987,10 +987,10 @@ 
 		self::__construct( $data );
 	}
 
-    function getXml()
-    {
-        return '<base64>'.base64_encode($this->data).'</base64>';
-    }
+	function getXml()
+	{
+		return '<base64>'.base64_encode($this->data).'</base64>';
+	}
 }
 
 /**
@@ -1001,45 +1001,45 @@ 
  */
 class IXR_IntrospectionServer extends IXR_Server
 {
-    var $signatures;
-    var $help;
+	var $signatures;
+	var $help;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct()
-    {
-        $this->setCallbacks();
-        $this->setCapabilities();
-        $this->capabilities['introspection'] = array(
-            'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-            'specVersion' => 1
-        );
-        $this->addCallback(
-            'system.methodSignature',
-            'this:methodSignature',
-            array('array', 'string'),
-            'Returns an array describing the return type and required parameters of a method'
-        );
-        $this->addCallback(
-            'system.getCapabilities',
-            'this:getCapabilities',
-            array('struct'),
-            'Returns a struct describing the XML-RPC specifications supported by this server'
-        );
-        $this->addCallback(
-            'system.listMethods',
-            'this:listMethods',
-            array('array'),
-            'Returns an array of available methods on this server'
-        );
-        $this->addCallback(
-            'system.methodHelp',
-            'this:methodHelp',
-            array('string', 'string'),
-            'Returns a documentation string for the specified method'
-        );
-    }
+	function __construct()
+	{
+		$this->setCallbacks();
+		$this->setCapabilities();
+		$this->capabilities['introspection'] = array(
+			'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+			'specVersion' => 1
+		);
+		$this->addCallback(
+			'system.methodSignature',
+			'this:methodSignature',
+			array('array', 'string'),
+			'Returns an array describing the return type and required parameters of a method'
+		);
+		$this->addCallback(
+			'system.getCapabilities',
+			'this:getCapabilities',
+			array('struct'),
+			'Returns a struct describing the XML-RPC specifications supported by this server'
+		);
+		$this->addCallback(
+			'system.listMethods',
+			'this:listMethods',
+			array('array'),
+			'Returns an array of available methods on this server'
+		);
+		$this->addCallback(
+			'system.methodHelp',
+			'this:methodHelp',
+			array('string', 'string'),
+			'Returns a documentation string for the specified method'
+		);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -1048,122 +1048,122 @@ 
 		self::__construct();
 	}
 
-    function addCallback($method, $callback, $args, $help)
-    {
-        $this->callbacks[$method] = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method] = $help;
-    }
-
-    function call($methodname, $args)
-    {
-        // Make sure it's in an array
-        if ($args && !is_array($args)) {
-            $args = array($args);
-        }
-
-        // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
-        }
-        $method = $this->callbacks[$methodname];
-        $signature = $this->signatures[$methodname];
-        $returnType = array_shift($signature);
-
-        // Check the number of arguments
-        if (count($args) != count($signature)) {
-            return new IXR_Error(-32602, 'server error. wrong number of method parameters');
-        }
-
-        // Check the argument types
-        $ok = true;
-        $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; $i++) {
-            $arg = array_shift($args);
-            $type = array_shift($signature);
-            switch ($type) {
-                case 'int':
-                case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'base64':
-                case 'string':
-                    if (!is_string($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'boolean':
-                    if ($arg !== false && $arg !== true) {
-                        $ok = false;
-                    }
-                    break;
-                case 'float':
-                case 'double':
-                    if (!is_float($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'date':
-                case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
-                        $ok = false;
-                    }
-                    break;
-            }
-            if (!$ok) {
-                return new IXR_Error(-32602, 'server error. invalid method parameters');
-            }
-        }
-        // It passed the test - run the "real" method call
-        return parent::call($methodname, $argsbackup);
-    }
-
-    function methodSignature($method)
-    {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
-        }
-        // We should be returning an array of types
-        $types = $this->signatures[$method];
-        $return = array();
-        foreach ($types as $type) {
-            switch ($type) {
-                case 'string':
-                    $return[] = 'string';
-                    break;
-                case 'int':
-                case 'i4':
-                    $return[] = 42;
-                    break;
-                case 'double':
-                    $return[] = 3.1415;
-                    break;
-                case 'dateTime.iso8601':
-                    $return[] = new IXR_Date(time());
-                    break;
-                case 'boolean':
-                    $return[] = true;
-                    break;
-                case 'base64':
-                    $return[] = new IXR_Base64('base64');
-                    break;
-                case 'array':
-                    $return[] = array('array');
-                    break;
-                case 'struct':
-                    $return[] = array('struct' => 'struct');
-                    break;
-            }
-        }
-        return $return;
-    }
-
-    function methodHelp($method)
-    {
-        return $this->help[$method];
-    }
+	function addCallback($method, $callback, $args, $help)
+	{
+		$this->callbacks[$method] = $callback;
+		$this->signatures[$method] = $args;
+		$this->help[$method] = $help;
+	}
+
+	function call($methodname, $args)
+	{
+		// Make sure it's in an array
+		if ($args && !is_array($args)) {
+			$args = array($args);
+		}
+
+		// Over-rides default call method, adds signature check
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
+		}
+		$method = $this->callbacks[$methodname];
+		$signature = $this->signatures[$methodname];
+		$returnType = array_shift($signature);
+
+		// Check the number of arguments
+		if (count($args) != count($signature)) {
+			return new IXR_Error(-32602, 'server error. wrong number of method parameters');
+		}
+
+		// Check the argument types
+		$ok = true;
+		$argsbackup = $args;
+		for ($i = 0, $j = count($args); $i < $j; $i++) {
+			$arg = array_shift($args);
+			$type = array_shift($signature);
+			switch ($type) {
+				case 'int':
+				case 'i4':
+					if (is_array($arg) || !is_int($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'base64':
+				case 'string':
+					if (!is_string($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'boolean':
+					if ($arg !== false && $arg !== true) {
+						$ok = false;
+					}
+					break;
+				case 'float':
+				case 'double':
+					if (!is_float($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'date':
+				case 'dateTime.iso8601':
+					if (!is_a($arg, 'IXR_Date')) {
+						$ok = false;
+					}
+					break;
+			}
+			if (!$ok) {
+				return new IXR_Error(-32602, 'server error. invalid method parameters');
+			}
+		}
+		// It passed the test - run the "real" method call
+		return parent::call($methodname, $argsbackup);
+	}
+
+	function methodSignature($method)
+	{
+		if (!$this->hasMethod($method)) {
+			return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
+		}
+		// We should be returning an array of types
+		$types = $this->signatures[$method];
+		$return = array();
+		foreach ($types as $type) {
+			switch ($type) {
+				case 'string':
+					$return[] = 'string';
+					break;
+				case 'int':
+				case 'i4':
+					$return[] = 42;
+					break;
+				case 'double':
+					$return[] = 3.1415;
+					break;
+				case 'dateTime.iso8601':
+					$return[] = new IXR_Date(time());
+					break;
+				case 'boolean':
+					$return[] = true;
+					break;
+				case 'base64':
+					$return[] = new IXR_Base64('base64');
+					break;
+				case 'array':
+					$return[] = array('array');
+					break;
+				case 'struct':
+					$return[] = array('struct' => 'struct');
+					break;
+			}
+		}
+		return $return;
+	}
+
+	function methodHelp($method)
+	{
+		return $this->help[$method];
+	}
 }
 
 /**
@@ -1174,16 +1174,16 @@ 
  */
 class IXR_ClientMulticall extends IXR_Client
 {
-    var $calls = array();
+	var $calls = array();
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80 )
-    {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
+	function __construct( $server, $path = false, $port = 80 )
+	{
+		parent::IXR_Client($server, $path, $port);
+		$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -1192,20 +1192,20 @@ 
 		self::__construct( $server, $path, $port );
 	}
 
-    function addCall()
-    {
-        $args = func_get_args();
-        $methodName = array_shift($args);
-        $struct = array(
-            'methodName' => $methodName,
-            'params' => $args
-        );
-        $this->calls[] = $struct;
-    }
-
-    function query()
-    {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
+	function addCall()
+	{
+		$args = func_get_args();
+		$methodName = array_shift($args);
+		$struct = array(
+			'methodName' => $methodName,
+			'params' => $args
+		);
+		$this->calls[] = $struct;
+	}
+
+	function query()
+	{
+		// Prepare multicall, then call the parent::query() method
+		return parent::query('system.multicall', $this->calls);
+	}
 }

Spacing +88 added lines, -88 removed lines

@@ -52,10 +52,10 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $data, $type = false )
+	function __construct($data, $type = false)
     {
         $this->data = $data;
-        if (!$type) {
+        if ( ! $type) {
             $type = $this->calculateType();
         }
         $this->type = $type;
@@ -75,8 +75,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Value( $data, $type = false ) {
-		self::__construct( $data, $type );
+	public function IXR_Value($data, $type = false) {
+		self::__construct($data, $type);
 	}
 
     function calculateType()
@@ -104,7 +104,7 @@ 
             $this->data = get_object_vars($this->data);
             return 'struct';
         }
-        if (!is_array($this->data)) {
+        if ( ! is_array($this->data)) {
             return 'string';
         }
 
@@ -168,7 +168,7 @@ 
     {
         $expected = 0;
         foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
+            if ((string) $key != (string) $expected) {
                 return true;
             }
             $expected++;
@@ -187,16 +187,16 @@ 
 class IXR_Message
 {
     var $message;
-    var $messageType;  // methodCall / methodResponse / fault
+    var $messageType; // methodCall / methodResponse / fault
     var $faultCode;
     var $faultString;
     var $methodName;
     var $params;
 
     // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+    var $_arraystructs = array(); // The stack used to keep track of the current array/struct
     var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
+    var $_currentStructName = array(); // A stack as well
     var $_param;
     var $_value;
     var $_currentTag;
@@ -207,47 +207,47 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $message )
+    function __construct($message)
     {
-        $this->message =& $message;
+        $this->message = & $message;
     }
 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Message( $message ) {
-		self::__construct( $message );
+	public function IXR_Message($message) {
+		self::__construct($message);
 	}
 
     function parse()
     {
         // first remove the XML declaration
         // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
-        $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
-        if ( '' == $this->message ) {
+        $header = preg_replace('/<\?xml.*?\?'.'>/s', '', substr($this->message, 0, 100), 1);
+        $this->message = trim(substr_replace($this->message, $header, 0, 100));
+        if ('' == $this->message) {
             return false;
         }
 
         // Then remove the DOCTYPE
-        $header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
-        if ( '' == $this->message ) {
+        $header = preg_replace('/^<!DOCTYPE[^>]*+>/i', '', substr($this->message, 0, 200), 1);
+        $this->message = trim(substr_replace($this->message, $header, 0, 200));
+        if ('' == $this->message) {
             return false;
         }
 
         // Check that the root tag is valid
-        $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
-        if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
+        $root_tag = substr($this->message, 0, strcspn(substr($this->message, 0, 20), "> \t\r\n"));
+        if ('<!DOCTYPE' === strtoupper($root_tag)) {
             return false;
         }
-        if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
+        if ( ! in_array($root_tag, array('<methodCall', '<methodResponse', '<fault'))) {
             return false;
         }
 
         // Bail if there are too many elements to parse
         $element_limit = 30000;
-        if ( function_exists( 'apply_filters' ) ) {
+        if (function_exists('apply_filters')) {
             /**
              * Filter the number of elements to parse in an XML-RPC response.
              *
@@ -255,9 +255,9 @@ 
              *
              * @param int $element_limit Default elements limit.
              */
-            $element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
+            $element_limit = apply_filters('xmlrpc_element_limit', $element_limit);
         }
-        if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
+        if ($element_limit && 2 * $element_limit < substr_count($this->message, '<')) {
             return false;
         }
 
@@ -276,7 +276,7 @@ 
             }
             $part = substr($this->message, 0, $chunk_size);
             $this->message = substr($this->message, $chunk_size);
-            if (!xml_parse($this->_parser, $part, $final)) {
+            if ( ! xml_parse($this->_parser, $part, $final)) {
                 return false;
             }
             if ($final) {
@@ -297,7 +297,7 @@ 
     {
         $this->_currentTagContents = '';
         $this->currentTag = $tag;
-        switch($tag) {
+        switch ($tag) {
             case 'methodCall':
             case 'methodResponse':
             case 'fault':
@@ -323,18 +323,18 @@ 
     function tag_close($parser, $tag)
     {
         $valueFlag = false;
-        switch($tag) {
+        switch ($tag) {
             case 'int':
             case 'i4':
-                $value = (int)trim($this->_currentTagContents);
+                $value = (int) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'double':
-                $value = (double)trim($this->_currentTagContents);
+                $value = (double) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'string':
-                $value = (string)trim($this->_currentTagContents);
+                $value = (string) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'dateTime.iso8601':
@@ -344,12 +344,12 @@ 
             case 'value':
                 // "If no type is indicated, the type is string."
                 if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
+                    $value = (string) $this->_currentTagContents;
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
+                $value = (boolean) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'base64':
@@ -377,12 +377,12 @@ 
         if ($valueFlag) {
             if (count($this->_arraystructs) > 0) {
                 // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+                if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] == 'struct') {
                     // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
                 } else {
                     // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
                 }
             } else {
                 // Just add as a parameter
@@ -409,14 +409,14 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $callbacks = false, $data = false, $wait = false )
+    function __construct($callbacks = false, $data = false, $wait = false)
     {
         $this->setCapabilities();
         if ($callbacks) {
             $this->callbacks = $callbacks;
         }
         $this->setCallbacks();
-        if (!$wait) {
+        if ( ! $wait) {
             $this->serve($data);
         }
     }
@@ -424,17 +424,17 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Server( $callbacks = false, $data = false, $wait = false ) {
-		self::__construct( $callbacks, $data, $wait );
+	public function IXR_Server($callbacks = false, $data = false, $wait = false) {
+		self::__construct($callbacks, $data, $wait);
 	}
 
     function serve($data = false)
     {
-        if (!$data) {
+        if ( ! $data) {
             if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
-                if ( function_exists( 'status_header' ) ) {
-                    status_header( 405 ); // WP #20986
-                    header( 'Allow: POST' );
+                if (function_exists('status_header')) {
+                    status_header(405); // WP #20986
+                    header('Allow: POST');
                 }
                 header('Content-Type: text/plain'); // merged from WP #9093
                 die('XML-RPC server accepts POST requests only.');
@@ -445,11 +445,11 @@ 
                 // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
                 $data = file_get_contents('php://input');
             } else {
-                $data =& $HTTP_RAW_POST_DATA;
+                $data = & $HTTP_RAW_POST_DATA;
             }
         }
         $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
+        if ( ! $this->message->parse()) {
             $this->error(-32700, 'parse error. not well formed');
         }
         if ($this->message->messageType != 'methodCall') {
@@ -485,7 +485,7 @@ 
 
     function call($methodname, $args)
     {
-        if (!$this->hasMethod($methodname)) {
+        if ( ! $this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
         }
         $method = $this->callbacks[$methodname];
@@ -500,7 +500,7 @@ 
         if (is_string($method) && substr($method, 0, 5) == 'this:') {
             // It's a class method - check it exists
             $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
+            if ( ! method_exists($this, $method)) {
                 return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
             }
 
@@ -509,10 +509,10 @@ 
         } else {
             // It's a function - does it exist?
             if (is_array($method)) {
-                if (!is_callable(array($method[0], $method[1]))) {
+                if ( ! is_callable(array($method[0], $method[1]))) {
                     return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
                 }
-            } else if (!function_exists($method)) {
+            } else if ( ! function_exists($method)) {
                 return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
             }
 
@@ -525,7 +525,7 @@ 
     function error($error, $message = false)
     {
         // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
+        if ($message && ! is_object($error)) {
             $error = new IXR_Error($error, $message);
         }
         $this->output($error->getXml());
@@ -656,8 +656,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Request( $method, $args ) {
-		self::__construct( $method, $args );
+	public function IXR_Request($method, $args) {
+		self::__construct($method, $args);
 	}
 
     function getLength()
@@ -696,9 +696,9 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
+    function __construct($server, $path = false, $port = 80, $timeout = 15)
     {
-        if (!$path) {
+        if ( ! $path) {
             // Assume we have been given a URL instead
             $bits = parse_url($server);
             $this->server = $bits['host'];
@@ -706,12 +706,12 @@ 
             $this->path = isset($bits['path']) ? $bits['path'] : '/';
 
             // Make absolutely sure we have a path
-            if (!$this->path) {
+            if ( ! $this->path) {
                 $this->path = '/';
             }
 
-            if ( ! empty( $bits['query'] ) ) {
-                $this->path .= '?' . $bits['query'];
+            if ( ! empty($bits['query'])) {
+                $this->path .= '?'.$bits['query'];
             }
         } else {
             $this->server = $server;
@@ -725,8 +725,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Client( $server, $path = false, $port = 80, $timeout = 15 ) {
-		self::__construct( $server, $path, $port, $timeout );
+	public function IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
+		self::__construct($server, $path, $port, $timeout);
 	}
 
     function query()
@@ -737,15 +737,15 @@ 
         $length = $request->getLength();
         $xml = $request->getXml();
         $r = "\r\n";
-        $request  = "POST {$this->path} HTTP/1.0$r";
+        $request = "POST {$this->path} HTTP/1.0$r";
 
         // Merged from WP #8145 - allow custom headers
         $this->headers['Host']          = $this->server;
         $this->headers['Content-Type']  = 'text/xml';
         $this->headers['User-Agent']    = $this->useragent;
-        $this->headers['Content-Length']= $length;
+        $this->headers['Content-Length'] = $length;
 
-        foreach( $this->headers as $header => $value ) {
+        foreach ($this->headers as $header => $value) {
             $request .= "{$header}: {$value}{$r}";
         }
         $request .= $r;
@@ -762,7 +762,7 @@ 
         } else {
             $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
         }
-        if (!$fp) {
+        if ( ! $fp) {
             $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
             return false;
         }
@@ -771,9 +771,9 @@ 
         $debugContents = '';
         $gotFirstLine = false;
         $gettingHeaders = true;
-        while (!feof($fp)) {
+        while ( ! feof($fp)) {
             $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
+            if ( ! $gotFirstLine) {
                 // Check line for '200'
                 if (strstr($line, '200') === false) {
                     $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
@@ -784,7 +784,7 @@ 
             if (trim($line) == '') {
                 $gettingHeaders = false;
             }
-            if (!$gettingHeaders) {
+            if ( ! $gettingHeaders) {
             	// merged from WP #12559 - remove trim
                 $contents .= $line;
             }
@@ -798,7 +798,7 @@ 
 
         // Now parse what we've got back
         $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
+        if ( ! $this->message->parse()) {
             // XML error
             $this->error = new IXR_Error(-32700, 'parse error. not well formed');
             return false;
@@ -851,7 +851,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $code, $message )
+    function __construct($code, $message)
     {
         $this->code = $code;
         $this->message = htmlspecialchars($message);
@@ -860,8 +860,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Error( $code, $message ) {
-		self::__construct( $code, $message );
+	public function IXR_Error($code, $message) {
+		self::__construct($code, $message);
 	}
 
     function getXml()
@@ -907,7 +907,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $time )
+    function __construct($time)
     {
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
@@ -920,8 +920,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Date( $time ) {
-		self::__construct( $time );
+	public function IXR_Date($time) {
+		self::__construct($time);
 	}
 
     function parseTimestamp($timestamp)
@@ -975,7 +975,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $data )
+    function __construct($data)
     {
         $this->data = $data;
     }
@@ -983,8 +983,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Base64( $data ) {
-		self::__construct( $data );
+	public function IXR_Base64($data) {
+		self::__construct($data);
 	}
 
     function getXml()
@@ -1058,12 +1058,12 @@ 
     function call($methodname, $args)
     {
         // Make sure it's in an array
-        if ($args && !is_array($args)) {
+        if ($args && ! is_array($args)) {
             $args = array($args);
         }
 
         // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
+        if ( ! $this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
         }
         $method = $this->callbacks[$methodname];
@@ -1084,13 +1084,13 @@ 
             switch ($type) {
                 case 'int':
                 case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
+                    if (is_array($arg) || ! is_int($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'base64':
                 case 'string':
-                    if (!is_string($arg)) {
+                    if ( ! is_string($arg)) {
                         $ok = false;
                     }
                     break;
@@ -1101,18 +1101,18 @@ 
                     break;
                 case 'float':
                 case 'double':
-                    if (!is_float($arg)) {
+                    if ( ! is_float($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'date':
                 case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
+                    if ( ! is_a($arg, 'IXR_Date')) {
                         $ok = false;
                     }
                     break;
             }
-            if (!$ok) {
+            if ( ! $ok) {
                 return new IXR_Error(-32602, 'server error. invalid method parameters');
             }
         }
@@ -1122,7 +1122,7 @@ 
 
     function methodSignature($method)
     {
-        if (!$this->hasMethod($method)) {
+        if ( ! $this->hasMethod($method)) {
             return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
         }
         // We should be returning an array of types
@@ -1179,7 +1179,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80 )
+    function __construct($server, $path = false, $port = 80)
     {
         parent::IXR_Client($server, $path, $port);
         $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
@@ -1188,8 +1188,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_ClientMulticall( $server, $path = false, $port = 80 ) {
-		self::__construct( $server, $path, $port );
+	public function IXR_ClientMulticall($server, $path = false, $port = 80) {
+		self::__construct($server, $path, $port);
 	}
 
     function addCall()

Braces +10 added lines, -8 removed lines

@@ -534,17 +534,19 @@
     function output($xml)
     {
         $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
+        if ($charset) {
+                    $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+        } else {
+                    $xml = '<?xml version="1.0"?>'."\n".$xml;
+        }
         $length = strlen($xml);
         header('Connection: close');
         header('Content-Length: '.$length);
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
+        if ($charset) {
+                    header('Content-Type: text/xml; charset='.$charset);
+        } else {
+                    header('Content-Type: text/xml');
+        }
         header('Date: '.date('r'));
         echo $xml;
         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 ) {

Indentation +13 added lines, -13 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Portable PHP password hashing framework.
- * @package phpass
- * @since 2.5.0
- * @version 0.3 / WordPress
- * @link http://www.openwall.com/phpass/
- */
+	 * Portable PHP password hashing framework.
+	 * @package phpass
+	 * @since 2.5.0
+	 * @version 0.3 / WordPress
+	 * @link http://www.openwall.com/phpass/
+	 */
 
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
@@ -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;
 

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;
 	}

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 = "";

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 it's 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 truely
-            //  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 it's 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 truely
+			//  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 ));
+	}
 }

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;
         }

src/wp-includes/class-simplepie.php

Doc Comments +6 added lines, -6 removed lines

@@ -1614,7 +1614,7 @@ 
 	/**
 	 * Get the error message for the occurred error.
 	 *
-	 * @return string|array Error message, or array of messages for multifeeds
+	 * @return string Error message, or array of messages for multifeeds
 	 */
 	public function error()
 	{
@@ -1627,7 +1627,7 @@ 
 	 * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
 	 * the data instead of printing it.
 	 *
-	 * @return string|boolean Raw XML data, false if the cache is used
+	 * @return string Raw XML data, false if the cache is used
 	 */
 	public function get_raw_data()
 	{
@@ -2607,7 +2607,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -2636,7 +2636,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{
@@ -2778,7 +2778,7 @@ 
 	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_width()
 	{
@@ -2804,7 +2804,7 @@ 
 	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_height()
 	{

Spacing +83 added lines, -83 removed lines

@@ -1,35 +1,35 @@ 
 <?php
-if ( ! class_exists( 'SimplePie' ) ) :
+if ( ! class_exists('SimplePie')) :
 
 // Load classes we will need.
-require ABSPATH . WPINC . '/SimplePie/Misc.php';
-require ABSPATH . WPINC . '/SimplePie/Cache.php';
-require ABSPATH . WPINC . '/SimplePie/File.php';
-require ABSPATH . WPINC . '/SimplePie/Sanitize.php';
-require ABSPATH . WPINC . '/SimplePie/Registry.php';
-require ABSPATH . WPINC . '/SimplePie/IRI.php';
-require ABSPATH . WPINC . '/SimplePie/Locator.php';
-require ABSPATH . WPINC . '/SimplePie/Content/Type/Sniffer.php';
-require ABSPATH . WPINC . '/SimplePie/XML/Declaration/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Item.php';
-require ABSPATH . WPINC . '/SimplePie/Parse/Date.php';
-require ABSPATH . WPINC . '/SimplePie/Author.php';
+require ABSPATH.WPINC.'/SimplePie/Misc.php';
+require ABSPATH.WPINC.'/SimplePie/Cache.php';
+require ABSPATH.WPINC.'/SimplePie/File.php';
+require ABSPATH.WPINC.'/SimplePie/Sanitize.php';
+require ABSPATH.WPINC.'/SimplePie/Registry.php';
+require ABSPATH.WPINC.'/SimplePie/IRI.php';
+require ABSPATH.WPINC.'/SimplePie/Locator.php';
+require ABSPATH.WPINC.'/SimplePie/Content/Type/Sniffer.php';
+require ABSPATH.WPINC.'/SimplePie/XML/Declaration/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Item.php';
+require ABSPATH.WPINC.'/SimplePie/Parse/Date.php';
+require ABSPATH.WPINC.'/SimplePie/Author.php';
 
 /**
  * WordPress autoloader for SimplePie.
  *
  * @since 3.5.0
  */
-function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
+function wp_simplepie_autoload($class) {
+	if (0 !== strpos($class, 'SimplePie_'))
 		return;
 
-	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
-	include( $file );
+	$file = ABSPATH.WPINC.'/'.str_replace('_', '/', $class).'.php';
+	include($file);
 }
 
-if ( function_exists( 'spl_autoload_register' ) ) {
+if (function_exists('spl_autoload_register')) {
 	/**
 	 * We autoload classes we may not need.
 	 *
@@ -38,25 +38,25 @@ 
 	 * Core.php is not loaded manually, because SimplePie_Core (a deprecated class)
 	 * was never included in WordPress core.
 	 */
-	spl_autoload_register( 'wp_simplepie_autoload' );
+	spl_autoload_register('wp_simplepie_autoload');
 } else {
-	require ABSPATH . WPINC . '/SimplePie/Cache/Base.php';
-	require ABSPATH . WPINC . '/SimplePie/Cache/DB.php';
-	require ABSPATH . WPINC . '/SimplePie/Cache/File.php';
-	require ABSPATH . WPINC . '/SimplePie/Cache/Memcache.php';
-	require ABSPATH . WPINC . '/SimplePie/Cache/MySQL.php';
-	require ABSPATH . WPINC . '/SimplePie/Caption.php';
-	require ABSPATH . WPINC . '/SimplePie/Category.php';
-	require ABSPATH . WPINC . '/SimplePie/Copyright.php';
-	require ABSPATH . WPINC . '/SimplePie/Credit.php';
-	require ABSPATH . WPINC . '/SimplePie/Decode/HTML/Entities.php';
-	require ABSPATH . WPINC . '/SimplePie/Enclosure.php';
-	require ABSPATH . WPINC . '/SimplePie/gzdecode.php';
-	require ABSPATH . WPINC . '/SimplePie/HTTP/Parser.php';
-	require ABSPATH . WPINC . '/SimplePie/Net/IPv6.php';
-	require ABSPATH . WPINC . '/SimplePie/Rating.php';
-	require ABSPATH . WPINC . '/SimplePie/Restriction.php';
-	require ABSPATH . WPINC . '/SimplePie/Source.php';
+	require ABSPATH.WPINC.'/SimplePie/Cache/Base.php';
+	require ABSPATH.WPINC.'/SimplePie/Cache/DB.php';
+	require ABSPATH.WPINC.'/SimplePie/Cache/File.php';
+	require ABSPATH.WPINC.'/SimplePie/Cache/Memcache.php';
+	require ABSPATH.WPINC.'/SimplePie/Cache/MySQL.php';
+	require ABSPATH.WPINC.'/SimplePie/Caption.php';
+	require ABSPATH.WPINC.'/SimplePie/Category.php';
+	require ABSPATH.WPINC.'/SimplePie/Copyright.php';
+	require ABSPATH.WPINC.'/SimplePie/Credit.php';
+	require ABSPATH.WPINC.'/SimplePie/Decode/HTML/Entities.php';
+	require ABSPATH.WPINC.'/SimplePie/Enclosure.php';
+	require ABSPATH.WPINC.'/SimplePie/gzdecode.php';
+	require ABSPATH.WPINC.'/SimplePie/HTTP/Parser.php';
+	require ABSPATH.WPINC.'/SimplePie/Net/IPv6.php';
+	require ABSPATH.WPINC.'/SimplePie/Rating.php';
+	require ABSPATH.WPINC.'/SimplePie/Restriction.php';
+	require ABSPATH.WPINC.'/SimplePie/Source.php';
 }
 
 /**
@@ -127,12 +127,12 @@ 
  * SimplePie Useragent
  * @see SimplePie::set_useragent()
  */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
 
 /**
  * SimplePie Linkback
  */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 
 /**
  * No Autodiscovery
@@ -725,9 +725,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || ! gc_enabled()) && ! ini_get('zend.ze1_compatibility_mode'))
 		{
-			if (!empty($this->data['items']))
+			if ( ! empty($this->data['items']))
 			{
 				foreach ($this->data['items'] as $item)
 				{
@@ -735,7 +735,7 @@ 
 				}
 				unset($item, $this->data['items']);
 			}
-			if (!empty($this->data['ordered_items']))
+			if ( ! empty($this->data['ordered_items']))
 			{
 				foreach ($this->data['ordered_items'] as $item)
 				{
@@ -802,7 +802,7 @@ 
 		if ($file instanceof SimplePie_File)
 		{
 			$this->feed_url = $file->url;
-			$this->file =& $file;
+			$this->file = & $file;
 			return true;
 		}
 		return false;
@@ -1237,7 +1237,7 @@ 
 	{
 		if ($page !== false)
 		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
 		}
 		else
 		{
@@ -1267,12 +1267,12 @@ 
 	public function init()
 	{
 		// Check absolute bare minimum requirements.
-		if (!extension_loaded('xml') || !extension_loaded('pcre'))
+		if ( ! extension_loaded('xml') || ! extension_loaded('pcre'))
 		{
 			return false;
 		}
 		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-		elseif (!extension_loaded('xmlreader'))
+		elseif ( ! extension_loaded('xmlreader'))
 		{
 			static $xml_is_sane = null;
 			if ($xml_is_sane === null)
@@ -1282,7 +1282,7 @@ 
 				xml_parser_free($parser_check);
 				$xml_is_sane = isset($values[0]['value']);
 			}
-			if (!$xml_is_sane)
+			if ( ! $xml_is_sane)
 			{
 				return false;
 			}
@@ -1298,7 +1298,7 @@ 
 		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
 		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
 
-		if (!empty($this->multifeed_url))
+		if ( ! empty($this->multifeed_url))
 		{
 			$i = 0;
 			$success = 0;
@@ -1310,7 +1310,7 @@ 
 				$this->multifeed_objects[$i]->set_feed_url($url);
 				$single_success = $this->multifeed_objects[$i]->init();
 				$success |= $single_success;
-				if (!$single_success)
+				if ( ! $single_success)
 				{
 					$this->error[$i] = $this->multifeed_objects[$i]->error();
 				}
@@ -1410,7 +1410,7 @@ 
 				if ($parser->parse($utf8_data, 'UTF-8'))
 				{
 					$this->data = $parser->get_data();
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					if ( ! ($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
 					{
 						$this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
@@ -1424,7 +1424,7 @@ 
 					$this->data['build'] = SIMPLEPIE_BUILD;
 
 					// Cache the file if caching is enabled
-					if ($cache && !$cache->save($this))
+					if ($cache && ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1462,10 +1462,10 @@ 
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if (!empty($this->data))
+			if ( ! empty($this->data))
 			{
 				// If the cache is for an outdated build of SimplePie
-				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
+				if ( ! isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
 				{
 					$cache->unlink();
 					$this->data = array();
@@ -1511,7 +1511,7 @@ 
 							$headers['if-none-match'] = $this->data['headers']['etag'];
 						}
 
-						$file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+						$file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen));
 
 						if ($file->success)
 						{
@@ -1542,11 +1542,11 @@ 
 			}
 		}
 		// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
-		if (!isset($file))
+		if ( ! isset($file))
 		{
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
-				$file =& $this->file;
+				$file = & $this->file;
 			}
 			else
 			{
@@ -1557,26 +1557,26 @@ 
 			}
 		}
 		// If the file connection has an error, set SimplePie::error to that and quit
-		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		if ( ! $file->success && ! ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 		{
 			$this->error = $file->error;
-			return !empty($this->data);
+			return ! empty($this->data);
 		}
 
-		if (!$this->force_feed)
+		if ( ! $this->force_feed)
 		{
 			// Check if the supplied URL is a feed, if it isn't, look for it.
 			$locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds));
 
-			if (!$locate->is_feed($file))
+			if ( ! $locate->is_feed($file))
 			{
 				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 				unset($file);
 				try
 				{
-					if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+					if ( ! ($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
 					{
-						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or ".SIMPLEPIE_NAME." was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
@@ -1591,7 +1591,7 @@ 
 				if ($cache)
 				{
 					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-					if (!$cache->save($this))
+					if ( ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1666,12 +1666,12 @@ 
 	 */
 	public function handle_content_type($mime = 'text/html')
 	{
-		if (!headers_sent())
+		if ( ! headers_sent())
 		{
 			$header = "Content-type: $mime;";
 			if ($this->get_encoding())
 			{
-				$header .= ' charset=' . $this->get_encoding();
+				$header .= ' charset='.$this->get_encoding();
 			}
 			else
 			{
@@ -1709,7 +1709,7 @@ 
 	 */
 	public function get_type()
 	{
-		if (!isset($this->data['type']))
+		if ( ! isset($this->data['type']))
 		{
 			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
@@ -1997,7 +1997,7 @@ 
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if ( ! ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && ! empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -2145,7 +2145,7 @@ 
 			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($categories))
+		if ( ! empty($categories))
 		{
 			return array_unique($categories);
 		}
@@ -2243,7 +2243,7 @@ 
 			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($authors))
+		if ( ! empty($authors))
 		{
 			return array_unique($authors);
 		}
@@ -2329,7 +2329,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -2387,7 +2387,7 @@ 
 	 */
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
@@ -2431,19 +2431,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -2885,9 +2885,9 @@ 
 	 */
 	public function get_items($start = 0, $end = 0)
 	{
-		if (!isset($this->data['items']))
+		if ( ! isset($this->data['items']))
 		{
-			if (!empty($this->multifeed_objects))
+			if ( ! empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
 			}
@@ -2937,17 +2937,17 @@ 
 			}
 		}
 
-		if (!empty($this->data['items']))
+		if ( ! empty($this->data['items']))
 		{
 			// If we want to order it by date, check if all items have a date, and then sort it
 			if ($this->order_by_date && empty($this->multifeed_objects))
 			{
-				if (!isset($this->data['ordered_items']))
+				if ( ! isset($this->data['ordered_items']))
 				{
 					$do_sort = true;
 					foreach ($this->data['items'] as $item)
 					{
-						if (!$item->get_date('U'))
+						if ( ! $item->get_date('U'))
 						{
 							$do_sort = false;
 							break;
@@ -3007,7 +3007,7 @@ 
 
 		if (($url = $this->get_link()) !== null)
 		{
-			return 'http://g.etfv.co/' . urlencode($url);
+			return 'http://g.etfv.co/'.urlencode($url);
 		}
 
 		return false;
@@ -3088,7 +3088,7 @@ 
 			$do_sort = true;
 			foreach ($items as $item)
 			{
-				if (!$item->get_date('U'))
+				if ( ! $item->get_date('U'))
 				{
 					$do_sort = false;
 					break;

Braces +92 added lines, -180 removed lines

@@ -22,8 +22,9 @@ 
  * @since 3.5.0
  */
 function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
-		return;
+	if ( 0 !== strpos( $class, 'SimplePie_' ) ) {
+			return;
+	}
 
 	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
 	include( $file );
@@ -784,8 +785,7 @@ 
 			{
 				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
 			}
-		}
-		else
+		} else
 		{
 			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
 		}
@@ -920,8 +920,7 @@ 
 		if ($encoding)
 		{
 			$this->input_encoding = (string) $encoding;
-		}
-		else
+		} else
 		{
 			$this->input_encoding = false;
 		}
@@ -1238,8 +1237,7 @@ 
 		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
+		} else
 		{
 			$this->image_handler = '';
 		}
@@ -1317,8 +1315,7 @@ 
 				$i++;
 			}
 			return (bool) $success;
-		}
-		elseif ($this->feed_url === null && $this->raw_data === null)
+		} elseif ($this->feed_url === null && $this->raw_data === null)
 		{
 			return false;
 		}
@@ -1342,8 +1339,7 @@ 
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
 				return true;
-			}
-			elseif ($fetched === false) {
+			} elseif ($fetched === false) {
 				return false;
 			}
 
@@ -1373,8 +1369,7 @@ 
 				}
 				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
 				$encodings[] = 'UTF-8';
-			}
-			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+			} elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
 			{
 				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
 				{
@@ -1437,8 +1432,7 @@ 
 		{
 			// We have an error, just set SimplePie_Misc::error to it and quit
 			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-		}
-		else
+		} else
 		{
 			$this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
 		}
@@ -1520,8 +1514,7 @@ 
 								$cache->touch();
 								return true;
 							}
-						}
-						else
+						} else
 						{
 							unset($file);
 						}
@@ -1547,8 +1540,7 @@ 
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
 				$file =& $this->file;
-			}
-			else
+			} else
 			{
 				$headers = array(
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
@@ -1580,8 +1572,7 @@ 
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
-				}
-				catch (SimplePie_Exception $e)
+				} catch (SimplePie_Exception $e)
 				{
 					// This is usually because DOMDocument doesn't exist
 					$this->error = $e->getMessage();
@@ -1672,8 +1663,7 @@ 
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
+			} else
 			{
 				$header .= ' charset=UTF-8';
 			}
@@ -1715,12 +1705,10 @@ 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
 			{
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
 				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
@@ -1736,8 +1724,7 @@ 
 				{
 					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
 				}
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
@@ -1778,8 +1765,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
 			}
@@ -1804,8 +1790,7 @@ 
 		if ($this->feed_url !== null)
 		{
 			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2000,12 +1985,10 @@ 
 		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
-		}
-		elseif ($this->get_link() !== null)
+		} elseif ($this->get_link() !== null)
 		{
 			return $this->get_link();
-		}
-		else
+		} else
 		{
 			return $this->subscribe_url();
 		}
@@ -2039,32 +2022,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2083,8 +2059,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2129,8 +2104,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -2148,8 +2122,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2168,8 +2141,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2246,8 +2218,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2266,8 +2237,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2332,8 +2302,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2353,8 +2322,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2435,13 +2403,11 @@ 
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
+					} else
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
-				}
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -2452,8 +2418,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2478,40 +2443,31 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2530,24 +2486,19 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2566,32 +2517,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['headers']['content-language']))
+		} elseif (isset($this->data['headers']['content-language']))
 		{
 			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2615,12 +2559,10 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2643,16 +2585,13 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2672,24 +2611,19 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2711,28 +2645,22 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2755,16 +2683,13 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2785,12 +2710,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2811,12 +2734,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2838,8 +2759,7 @@ 
 		if ($max === 0)
 		{
 			return $qty;
-		}
-		else
+		} else
 		{
 			return ($qty > $max) ? $max : $qty;
 		}
@@ -2863,8 +2783,7 @@ 
 		if (isset($items[$key]))
 		{
 			return $items[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2890,8 +2809,7 @@ 
 			if (!empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-			}
-			else
+			} else
 			{
 				$this->data['items'] = array();
 				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
@@ -2961,8 +2879,7 @@ 
 					}
 				}
 				$items = $this->data['ordered_items'];
-			}
-			else
+			} else
 			{
 				$items = $this->data['items'];
 			}
@@ -2971,13 +2888,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3078,8 +2993,7 @@ 
 				if ($arg instanceof SimplePie)
 				{
 					$items = array_merge($items, $arg->get_items(0, $limit));
-				}
-				else
+				} else
 				{
 					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
 				}
@@ -3103,13 +3017,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
 			return array();

src/wp-includes/class-smtp.php

Doc Comments +1 added lines, -1 removed lines

@@ -879,7 +879,7 @@
      * Send raw data to the server.
      * @param string $data The data to send
      * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
+     * @return integer The number of bytes sent to the server or false on error
      */
     public function client_send($data)
     {

Indentation +1061 added lines, -1061 removed lines

@@ -26,535 +26,535 @@ 
  */
 class SMTP
 {
-    /**
-     * The PHPMailer SMTP version number.
-     * @type string
-     */
-    const VERSION = '5.2.10';
-
-    /**
-     * SMTP line break constant.
-     * @type string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @type integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
-    /**
-     * The PHPMailer SMTP Version number.
-     * @type string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.10';
-
-    /**
-     * SMTP server port number.
-     * @type integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @type string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug output level.
-     * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
-     * * self::DEBUG_CLIENT (`1`) Client commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
-     * @type integer
-     */
-    public $do_debug = self::DEBUG_OFF;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to use VERP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * The timeout value for connection, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
-     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * How long to wait for commands to complete, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @type resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error information, if any, for the last SMTP command.
-     * @type array
-     */
-    protected $error = array(
-        'error' => '',
-        'detail' => '',
-        'smtp_code' => '',
-        'smtp_code_ex' => ''
-    );
-
-    /**
-     * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
-     * @type string|null
-     */
-    protected $helo_rply = null;
-
-    /**
-     * The set of SMTP extensions sent in reply to EHLO command.
-     * Indexes of the array are extension names.
-     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
-     * represents the server name. In case of HELO it is the only element of the array.
-     * Other values can be boolean TRUE or an array containing extension options.
-     * If null, no HELO/EHLO string has yet been received.
-     * @type array|null
-     */
-    protected $server_caps = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @type string
-     */
-    protected $last_reply = '';
-
-    /**
-     * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
-     * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
-     * @return void
-     */
-    protected function edebug($str, $level = 0)
-    {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
-        }
-    }
-
-    /**
-     * Connect to an SMTP server.
-     * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
-     * @param array $options An array of options for stream_context_create()
-     * @access public
-     * @return boolean
-     */
-    public function connect($host, $port = null, $timeout = 30, $options = array())
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
-        $this->setError('');
-        // Make sure we are __not__ connected
-        if ($this->connected()) {
-            // Already connected, generate error
-            $this->setError('Already connected to a server');
-            return false;
-        }
-        if (empty($port)) {
-            $port = self::DEFAULT_SMTP_PORT;
-        }
-        // Connect to the SMTP server
-        $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
-            self::DEBUG_CONNECTION
-        );
-        $errno = 0;
-        $errstr = '';
-        if ($streamok) {
-            $socket_context = stream_context_create($options);
-            //Suppress errors; connection failures are handled at a higher level
-            $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
-                $errno,
-                $errstr,
-                $timeout,
-                STREAM_CLIENT_CONNECT,
-                $socket_context
-            );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
-            $this->setError(
-                'Failed to connect to server',
-                $errno,
-                $errstr
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $max = ini_get('max_execution_time');
-            // Don't bother if unlimited
-            if ($max != 0 && $timeout > $max) {
-                @set_time_limit($timeout);
-            }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
-        }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
-        return true;
-    }
-
-    /**
-     * Initiate a TLS (encrypted) session.
-     * @access public
-     * @return boolean
-     */
-    public function startTLS()
-    {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
-            return false;
-        }
-        // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
-            $this->smtp_conn,
-            true,
-            STREAM_CRYPTO_METHOD_TLS_CLIENT
-        )) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Perform SMTP authentication.
-     * Must be run after hello().
-     * @see hello()
-     * @param string $username    The user name
-     * @param string $password    The password
-     * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
-     * @param string $realm       The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @access public
-     * @return boolean True if successfully authenticated.
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = null,
-        $realm = '',
-        $workstation = ''
-    ) {
-        if (!$this->server_caps) {
-            $this->setError('Authentication is not allowed before HELO/EHLO');
-            return false;
-        }
-
-        if (array_key_exists('EHLO', $this->server_caps)) {
-        // SMTP extensions are available. Let's try to find a proper authentication method
-
-            if (!array_key_exists('AUTH', $this->server_caps)) {
-                $this->setError('Authentication is not allowed at this stage');
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
-                return false;
-            }
-
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
-            self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
-                self::DEBUG_LOWLEVEL
-            );
-
-            if (empty($authtype)) {
-                foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) {
-                    if (in_array($method, $this->server_caps['AUTH'])) {
-                        $authtype = $method;
-                        break;
-                    }
-                }
-                if (empty($authtype)) {
-                    $this->setError('No supported authentication methods found');
-                    return false;
-                }
-                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
-            }
-
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
-                return false;
-            }
-        } elseif (empty($authtype)) {
-            $authtype = 'LOGIN';
-        }
-        switch ($authtype) {
-            case 'PLAIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
-                    return false;
-                }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
-                ) {
-                    return false;
-                }
-                break;
-            case 'LOGIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
-                    return false;
-                }
-                break;
-            case 'CRAM-MD5':
-                // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
-                    return false;
-                }
-                // Get the challenge
-                $challenge = base64_decode(substr($this->last_reply, 4));
-
-                // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
-
-                // send encoded credentials
-                return $this->sendCommand('Username', base64_encode($response), 235);
-            default:
-                $this->setError("Authentication method \"$authtype\" is not supported");
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * Calculate an MD5 HMAC hash.
-     * Works like hash_hmac('md5', $data, $key)
-     * in case that function is not available
-     * @param string $data The data to hash
-     * @param string $key  The key to hash with
-     * @access protected
-     * @return string
-     */
-    protected function hmac($data, $key)
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('md5', $data, $key);
-        }
-
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
-
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
-
-        $bytelen = 64; // byte length for md5
-        if (strlen($key) > $bytelen) {
-            $key = pack('H*', md5($key));
-        }
-        $key = str_pad($key, $bytelen, chr(0x00));
-        $ipad = str_pad('', $bytelen, chr(0x36));
-        $opad = str_pad('', $bytelen, chr(0x5c));
-        $k_ipad = $key ^ $ipad;
-        $k_opad = $key ^ $opad;
-
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
-    }
-
-    /**
-     * Check connection state.
-     * @access public
-     * @return boolean True if connected.
-     */
-    public function connected()
-    {
-        if (is_resource($this->smtp_conn)) {
-            $sock_status = stream_get_meta_data($this->smtp_conn);
-            if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
-                $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
-                    self::DEBUG_CLIENT
-                );
-                $this->close();
-                return false;
-            }
-            return true; // everything looks good
-        }
-        return false;
-    }
-
-    /**
-     * Close the socket and clean up the state of the class.
-     * Don't use this function without first trying to use QUIT.
-     * @see quit()
-     * @access public
-     * @return void
-     */
-    public function close()
-    {
-        $this->setError('');
-        $this->server_caps = null;
-        $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
-            fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
-        }
-    }
-
-    /**
-     * Send an SMTP DATA command.
-     * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
-     * and the message body being separated by and additional <CRLF>.
-     * Implements rfc 821: DATA <CRLF>
-     * @param string $msg_data Message data to send
-     * @access public
-     * @return boolean
-     */
-    public function data($msg_data)
-    {
-        //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
-            return false;
-        }
-
-        /* The server is ready to accept data!
+	/**
+	 * The PHPMailer SMTP version number.
+	 * @type string
+	 */
+	const VERSION = '5.2.10';
+
+	/**
+	 * SMTP line break constant.
+	 * @type string
+	 */
+	const CRLF = "\r\n";
+
+	/**
+	 * The SMTP port to use if one is not specified.
+	 * @type integer
+	 */
+	const DEFAULT_SMTP_PORT = 25;
+
+	/**
+	 * The maximum line length allowed by RFC 2822 section 2.1.1
+	 * @type integer
+	 */
+	const MAX_LINE_LENGTH = 998;
+
+	/**
+	 * Debug level for no output
+	 */
+	const DEBUG_OFF = 0;
+
+	/**
+	 * Debug level to show client -> server messages
+	 */
+	const DEBUG_CLIENT = 1;
+
+	/**
+	 * Debug level to show client -> server and server -> client messages
+	 */
+	const DEBUG_SERVER = 2;
+
+	/**
+	 * Debug level to show connection status, client -> server and server -> client messages
+	 */
+	const DEBUG_CONNECTION = 3;
+
+	/**
+	 * Debug level to show all messages
+	 */
+	const DEBUG_LOWLEVEL = 4;
+
+	/**
+	 * The PHPMailer SMTP Version number.
+	 * @type string
+	 * @deprecated Use the `VERSION` constant instead
+	 * @see SMTP::VERSION
+	 */
+	public $Version = '5.2.10';
+
+	/**
+	 * SMTP server port number.
+	 * @type integer
+	 * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+	 * @see SMTP::DEFAULT_SMTP_PORT
+	 */
+	public $SMTP_PORT = 25;
+
+	/**
+	 * SMTP reply line ending.
+	 * @type string
+	 * @deprecated Use the `CRLF` constant instead
+	 * @see SMTP::CRLF
+	 */
+	public $CRLF = "\r\n";
+
+	/**
+	 * Debug output level.
+	 * Options:
+	 * * self::DEBUG_OFF (`0`) No debug output, default
+	 * * self::DEBUG_CLIENT (`1`) Client commands
+	 * * self::DEBUG_SERVER (`2`) Client commands and server responses
+	 * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+	 * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+	 * @type integer
+	 */
+	public $do_debug = self::DEBUG_OFF;
+
+	/**
+	 * How to handle debug output.
+	 * Options:
+	 * * `echo` Output plain-text as-is, appropriate for CLI
+	 * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+	 * * `error_log` Output to error log as configured in php.ini
+	 *
+	 * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+	 * <code>
+	 * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+	 * </code>
+	 * @type string|callable
+	 */
+	public $Debugoutput = 'echo';
+
+	/**
+	 * Whether to use VERP.
+	 * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+	 * @link http://www.postfix.org/VERP_README.html Info on VERP
+	 * @type boolean
+	 */
+	public $do_verp = false;
+
+	/**
+	 * The timeout value for connection, in seconds.
+	 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+	 * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+	 * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+	 * @type integer
+	 */
+	public $Timeout = 300;
+
+	/**
+	 * How long to wait for commands to complete, in seconds.
+	 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+	 * @type integer
+	 */
+	public $Timelimit = 300;
+
+	/**
+	 * The socket for the server connection.
+	 * @type resource
+	 */
+	protected $smtp_conn;
+
+	/**
+	 * Error information, if any, for the last SMTP command.
+	 * @type array
+	 */
+	protected $error = array(
+		'error' => '',
+		'detail' => '',
+		'smtp_code' => '',
+		'smtp_code_ex' => ''
+	);
+
+	/**
+	 * The reply the server sent to us for HELO.
+	 * If null, no HELO string has yet been received.
+	 * @type string|null
+	 */
+	protected $helo_rply = null;
+
+	/**
+	 * The set of SMTP extensions sent in reply to EHLO command.
+	 * Indexes of the array are extension names.
+	 * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+	 * represents the server name. In case of HELO it is the only element of the array.
+	 * Other values can be boolean TRUE or an array containing extension options.
+	 * If null, no HELO/EHLO string has yet been received.
+	 * @type array|null
+	 */
+	protected $server_caps = null;
+
+	/**
+	 * The most recent reply received from the server.
+	 * @type string
+	 */
+	protected $last_reply = '';
+
+	/**
+	 * Output debugging info via a user-selected method.
+	 * @see SMTP::$Debugoutput
+	 * @see SMTP::$do_debug
+	 * @param string $str Debug string to output
+	 * @param integer $level The debug level of this message; see DEBUG_* constants
+	 * @return void
+	 */
+	protected function edebug($str, $level = 0)
+	{
+		if ($level > $this->do_debug) {
+			return;
+		}
+		//Avoid clash with built-in function names
+		if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+			call_user_func($this->Debugoutput, $str, $this->do_debug);
+			return;
+		}
+		switch ($this->Debugoutput) {
+			case 'error_log':
+				//Don't output, just log
+				error_log($str);
+				break;
+			case 'html':
+				//Cleans up output a bit for a better looking, HTML-safe output
+				echo htmlentities(
+					preg_replace('/[\r\n]+/', '', $str),
+					ENT_QUOTES,
+					'UTF-8'
+				)
+				. "<br>\n";
+				break;
+			case 'echo':
+			default:
+				//Normalize line breaks
+				$str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+				echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+					"\n",
+					"\n                   \t                  ",
+					trim($str)
+				)."\n";
+		}
+	}
+
+	/**
+	 * Connect to an SMTP server.
+	 * @param string $host SMTP server IP or host name
+	 * @param integer $port The port number to connect to
+	 * @param integer $timeout How long to wait for the connection to open
+	 * @param array $options An array of options for stream_context_create()
+	 * @access public
+	 * @return boolean
+	 */
+	public function connect($host, $port = null, $timeout = 30, $options = array())
+	{
+		static $streamok;
+		//This is enabled by default since 5.0.0 but some providers disable it
+		//Check this once and cache the result
+		if (is_null($streamok)) {
+			$streamok = function_exists('stream_socket_client');
+		}
+		// Clear errors to avoid confusion
+		$this->setError('');
+		// Make sure we are __not__ connected
+		if ($this->connected()) {
+			// Already connected, generate error
+			$this->setError('Already connected to a server');
+			return false;
+		}
+		if (empty($port)) {
+			$port = self::DEFAULT_SMTP_PORT;
+		}
+		// Connect to the SMTP server
+		$this->edebug(
+			"Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
+			self::DEBUG_CONNECTION
+		);
+		$errno = 0;
+		$errstr = '';
+		if ($streamok) {
+			$socket_context = stream_context_create($options);
+			//Suppress errors; connection failures are handled at a higher level
+			$this->smtp_conn = @stream_socket_client(
+				$host . ":" . $port,
+				$errno,
+				$errstr,
+				$timeout,
+				STREAM_CLIENT_CONNECT,
+				$socket_context
+			);
+		} else {
+			//Fall back to fsockopen which should work in more places, but is missing some features
+			$this->edebug(
+				"Connection: stream_socket_client not available, falling back to fsockopen",
+				self::DEBUG_CONNECTION
+			);
+			$this->smtp_conn = fsockopen(
+				$host,
+				$port,
+				$errno,
+				$errstr,
+				$timeout
+			);
+		}
+		// Verify we connected properly
+		if (!is_resource($this->smtp_conn)) {
+			$this->setError(
+				'Failed to connect to server',
+				$errno,
+				$errstr
+			);
+			$this->edebug(
+				'SMTP ERROR: ' . $this->error['error']
+				. ": $errstr ($errno)",
+				self::DEBUG_CLIENT
+			);
+			return false;
+		}
+		$this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+		// SMTP server can take longer to respond, give longer timeout for first read
+		// Windows does not have support for this timeout function
+		if (substr(PHP_OS, 0, 3) != 'WIN') {
+			$max = ini_get('max_execution_time');
+			// Don't bother if unlimited
+			if ($max != 0 && $timeout > $max) {
+				@set_time_limit($timeout);
+			}
+			stream_set_timeout($this->smtp_conn, $timeout, 0);
+		}
+		// Get any announcement
+		$announce = $this->get_lines();
+		$this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+		return true;
+	}
+
+	/**
+	 * Initiate a TLS (encrypted) session.
+	 * @access public
+	 * @return boolean
+	 */
+	public function startTLS()
+	{
+		if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+			return false;
+		}
+		// Begin encrypted connection
+		if (!stream_socket_enable_crypto(
+			$this->smtp_conn,
+			true,
+			STREAM_CRYPTO_METHOD_TLS_CLIENT
+		)) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Perform SMTP authentication.
+	 * Must be run after hello().
+	 * @see hello()
+	 * @param string $username    The user name
+	 * @param string $password    The password
+	 * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
+	 * @param string $realm       The auth realm for NTLM
+	 * @param string $workstation The auth workstation for NTLM
+	 * @access public
+	 * @return boolean True if successfully authenticated.
+	 */
+	public function authenticate(
+		$username,
+		$password,
+		$authtype = null,
+		$realm = '',
+		$workstation = ''
+	) {
+		if (!$this->server_caps) {
+			$this->setError('Authentication is not allowed before HELO/EHLO');
+			return false;
+		}
+
+		if (array_key_exists('EHLO', $this->server_caps)) {
+		// SMTP extensions are available. Let's try to find a proper authentication method
+
+			if (!array_key_exists('AUTH', $this->server_caps)) {
+				$this->setError('Authentication is not allowed at this stage');
+				// 'at this stage' means that auth may be allowed after the stage changes
+				// e.g. after STARTTLS
+				return false;
+			}
+
+			self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+			self::edebug(
+				'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+				self::DEBUG_LOWLEVEL
+			);
+
+			if (empty($authtype)) {
+				foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) {
+					if (in_array($method, $this->server_caps['AUTH'])) {
+						$authtype = $method;
+						break;
+					}
+				}
+				if (empty($authtype)) {
+					$this->setError('No supported authentication methods found');
+					return false;
+				}
+				self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
+			}
+
+			if (!in_array($authtype, $this->server_caps['AUTH'])) {
+				$this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+				return false;
+			}
+		} elseif (empty($authtype)) {
+			$authtype = 'LOGIN';
+		}
+		switch ($authtype) {
+			case 'PLAIN':
+				// Start authentication
+				if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+					return false;
+				}
+				// Send encoded username and password
+				if (!$this->sendCommand(
+					'User & Password',
+					base64_encode("\0" . $username . "\0" . $password),
+					235
+				)
+				) {
+					return false;
+				}
+				break;
+			case 'LOGIN':
+				// Start authentication
+				if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+					return false;
+				}
+				if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+					return false;
+				}
+				if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+					return false;
+				}
+				break;
+			case 'CRAM-MD5':
+				// Start authentication
+				if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+					return false;
+				}
+				// Get the challenge
+				$challenge = base64_decode(substr($this->last_reply, 4));
+
+				// Build the response
+				$response = $username . ' ' . $this->hmac($challenge, $password);
+
+				// send encoded credentials
+				return $this->sendCommand('Username', base64_encode($response), 235);
+			default:
+				$this->setError("Authentication method \"$authtype\" is not supported");
+				return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Calculate an MD5 HMAC hash.
+	 * Works like hash_hmac('md5', $data, $key)
+	 * in case that function is not available
+	 * @param string $data The data to hash
+	 * @param string $key  The key to hash with
+	 * @access protected
+	 * @return string
+	 */
+	protected function hmac($data, $key)
+	{
+		if (function_exists('hash_hmac')) {
+			return hash_hmac('md5', $data, $key);
+		}
+
+		// The following borrowed from
+		// http://php.net/manual/en/function.mhash.php#27225
+
+		// RFC 2104 HMAC implementation for php.
+		// Creates an md5 HMAC.
+		// Eliminates the need to install mhash to compute a HMAC
+		// by Lance Rushing
+
+		$bytelen = 64; // byte length for md5
+		if (strlen($key) > $bytelen) {
+			$key = pack('H*', md5($key));
+		}
+		$key = str_pad($key, $bytelen, chr(0x00));
+		$ipad = str_pad('', $bytelen, chr(0x36));
+		$opad = str_pad('', $bytelen, chr(0x5c));
+		$k_ipad = $key ^ $ipad;
+		$k_opad = $key ^ $opad;
+
+		return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+	}
+
+	/**
+	 * Check connection state.
+	 * @access public
+	 * @return boolean True if connected.
+	 */
+	public function connected()
+	{
+		if (is_resource($this->smtp_conn)) {
+			$sock_status = stream_get_meta_data($this->smtp_conn);
+			if ($sock_status['eof']) {
+				// The socket is valid but we are not connected
+				$this->edebug(
+					'SMTP NOTICE: EOF caught while checking if connected',
+					self::DEBUG_CLIENT
+				);
+				$this->close();
+				return false;
+			}
+			return true; // everything looks good
+		}
+		return false;
+	}
+
+	/**
+	 * Close the socket and clean up the state of the class.
+	 * Don't use this function without first trying to use QUIT.
+	 * @see quit()
+	 * @access public
+	 * @return void
+	 */
+	public function close()
+	{
+		$this->setError('');
+		$this->server_caps = null;
+		$this->helo_rply = null;
+		if (is_resource($this->smtp_conn)) {
+			// close the connection and cleanup
+			fclose($this->smtp_conn);
+			$this->smtp_conn = null; //Makes for cleaner serialization
+			$this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+		}
+	}
+
+	/**
+	 * Send an SMTP DATA command.
+	 * Issues a data command and sends the msg_data to the server,
+	 * finializing the mail transaction. $msg_data is the message
+	 * that is to be send with the headers. Each header needs to be
+	 * on a single line followed by a <CRLF> with the message headers
+	 * and the message body being separated by and additional <CRLF>.
+	 * Implements rfc 821: DATA <CRLF>
+	 * @param string $msg_data Message data to send
+	 * @access public
+	 * @return boolean
+	 */
+	public function data($msg_data)
+	{
+		//This will use the standard timelimit
+		if (!$this->sendCommand('DATA', 'DATA', 354)) {
+			return false;
+		}
+
+		/* The server is ready to accept data!
          * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
          * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
          * smaller lines to fit within the limit.
@@ -562,541 +562,541 @@ 
          * NOTE: this does not count towards line-length limit.
          */
 
-        // Normalize line breaks before exploding
-        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+		// Normalize line breaks before exploding
+		$lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
 
-        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+		/* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
          * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
          * process all lines before a blank line as headers.
          */
 
-        $field = substr($lines[0], 0, strpos($lines[0], ':'));
-        $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
-            $in_headers = true;
-        }
-
-        foreach ($lines as $line) {
-            $lines_out = array();
-            if ($in_headers and $line == '') {
-                $in_headers = false;
-            }
-            //Break this line up into several smaller lines if it's too long
-            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
-            while (isset($line[self::MAX_LINE_LENGTH])) {
-                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
-                //so as to avoid breaking in the middle of a word
-                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
-                //Deliberately matches both false and 0
-                if (!$pos) {
-                    //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
-                    $lines_out[] = substr($line, 0, $pos);
-                    $line = substr($line, $pos);
-                } else {
-                    //Break at the found point
-                    $lines_out[] = substr($line, 0, $pos);
-                    //Move along by the amount we dealt with
-                    $line = substr($line, $pos + 1);
-                }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
-                if ($in_headers) {
-                    $line = "\t" . $line;
-                }
-            }
-            $lines_out[] = $line;
-
-            //Send the lines to the server
-            foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
-                }
-                $this->client_send($line_out . self::CRLF);
-            }
-        }
-
-        //Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Used to identify the sending server to the receiving server.
-     * This makes sure that client and server are in a known state.
-     * Implements RFC 821: HELO <SP> <domain> <CRLF>
-     * and RFC 2821 EHLO.
-     * @param string $host The host name or IP to connect to
-     * @access public
-     * @return boolean
-     */
-    public function hello($host = '')
-    {
-        //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Low-level implementation used by hello()
-     * @see hello()
-     * @param string $hello The HELO string
-     * @param string $host The hostname to say we are
-     * @access protected
-     * @return boolean
-     */
-    protected function sendHello($hello, $host)
-    {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
-        $this->helo_rply = $this->last_reply;
-        if ($noerror) {
-            $this->parseHelloFields($hello);
-        } else {
-            $this->server_caps = null;
-        }
-        return $noerror;
-    }
-
-    /**
-     * Parse a reply to HELO/EHLO command to discover server extensions.
-     * In case of HELO, the only parameter that can be discovered is a server name.
-     * @access protected
-     * @param string $type - 'HELO' or 'EHLO'
-     */
-    protected function parseHelloFields($type)
-    {
-        $this->server_caps = array();
-        $lines = explode("\n", $this->last_reply);
-        foreach ($lines as $n => $s) {
-            $s = trim(substr($s, 4));
-            if (!$s) {
-                continue;
-            }
-            $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
-                    $name = $type;
-                    $fields = $fields[0];
-                } else {
-                    $name = array_shift($fields);
-                    if ($name == 'SIZE') {
-                        $fields = ($fields) ? $fields[0] : 0;
-                    }
-                }
-                $this->server_caps[$name] = ($fields ? $fields : true);
-            }
-        }
-    }
-
-    /**
-     * Send an SMTP MAIL command.
-     * Starts a mail transaction from the email address specified in
-     * $from. Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command.
-     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from Source address of this message
-     * @access public
-     * @return boolean
-     */
-    public function mail($from)
-    {
-        $useVerp = ($this->do_verp ? ' XVERP' : '');
-        return $this->sendCommand(
-            'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
-            250
-        );
-    }
-
-    /**
-     * Send an SMTP QUIT command.
-     * Closes the socket if there is no error or the $close_on_error argument is true.
-     * Implements from rfc 821: QUIT <CRLF>
-     * @param boolean $close_on_error Should the connection close if an error occurs?
-     * @access public
-     * @return boolean
-     */
-    public function quit($close_on_error = true)
-    {
-        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
-        $err = $this->error; //Save any error
-        if ($noerror or $close_on_error) {
-            $this->close();
-            $this->error = $err; //Restore any error from the quit command
-        }
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP RCPT command.
-     * Sets the TO argument to $toaddr.
-     * Returns true if the recipient was accepted false if it was rejected.
-     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-     * @param string $toaddr The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($toaddr)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
-            array(250, 251)
-        );
-    }
-
-    /**
-     * Send an SMTP RSET command.
-     * Abort any transaction that is currently in progress.
-     * Implements rfc 821: RSET <CRLF>
-     * @access public
-     * @return boolean True on success.
-     */
-    public function reset()
-    {
-        return $this->sendCommand('RSET', 'RSET', 250);
-    }
-
-    /**
-     * Send a command to an SMTP server and check its return code.
-     * @param string $command       The command name - not sent to the server
-     * @param string $commandstring The actual command to send
-     * @param integer|array $expect     One or more expected integer success codes
-     * @access protected
-     * @return boolean True on success.
-     */
-    protected function sendCommand($command, $commandstring, $expect)
-    {
-        if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
-            return false;
-        }
-        $this->client_send($commandstring . self::CRLF);
-
-        $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
-        $matches = array();
-        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
-            $code = $matches[1];
-            $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
-            $detail = preg_replace(
-                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
-                '',
-                $this->last_reply
-            );
-        } else {
-            // Fall back to simple parsing if regex fails
-            $code = substr($this->last_reply, 0, 3);
-            $code_ex = null;
-            $detail = substr($this->last_reply, 4);
-        }
-
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        if (!in_array($code, (array)$expect)) {
-            $this->setError(
-                "$command command failed",
-                $detail,
-                $code,
-                $code_ex
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-
-        $this->setError('');
-        return true;
-    }
-
-    /**
-     * Send an SMTP SAML command.
-     * Starts a mail transaction from the email address specified in $from.
-     * Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command. This command
-     * will send the message to the users terminal if they are logged
-     * in and send them an email.
-     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from The address the message is from
-     * @access public
-     * @return boolean
-     */
-    public function sendAndMail($from)
-    {
-        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
-    }
-
-    /**
-     * Send an SMTP VRFY command.
-     * @param string $name The name to verify
-     * @access public
-     * @return boolean
-     */
-    public function verify($name)
-    {
-        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
-    }
-
-    /**
-     * Send an SMTP NOOP command.
-     * Used to keep keep-alives alive, doesn't actually do anything
-     * @access public
-     * @return boolean
-     */
-    public function noop()
-    {
-        return $this->sendCommand('NOOP', 'NOOP', 250);
-    }
-
-    /**
-     * Send an SMTP TURN command.
-     * This is an optional command for SMTP that this class does not support.
-     * This method is here to make the RFC821 Definition complete for this class
-     * and _may_ be implemented in future
-     * Implements from rfc 821: TURN <CRLF>
-     * @access public
-     * @return boolean
-     */
-    public function turn()
-    {
-        $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
-        return false;
-    }
-
-    /**
-     * Send raw data to the server.
-     * @param string $data The data to send
-     * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
-     */
-    public function client_send($data)
-    {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
-    }
-
-    /**
-     * Get the latest error.
-     * @access public
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get SMTP extensions available on the server
-     * @access public
-     * @return array|null
-     */
-    public function getServerExtList()
-    {
-        return $this->server_caps;
-    }
-
-    /**
-     * A multipurpose method
-     * The method works in three ways, dependent on argument value and current state
-     *   1. HELO/EHLO was not sent - returns null and set up $this->error
-     *   2. HELO was sent
-     *     $name = 'HELO': returns server name
-     *     $name = 'EHLO': returns boolean false
-     *     $name = any string: returns null and set up $this->error
-     *   3. EHLO was sent
-     *     $name = 'HELO'|'EHLO': returns server name
-     *     $name = any string: if extension $name exists, returns boolean True
-     *       or its options. Otherwise returns boolean False
-     * In other words, one can use this method to detect 3 conditions:
-     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
-     *  - false returned: the requested feature exactly not exists
-     *  - positive value returned: the requested feature exists
-     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
-     * @return mixed
-     */
-    public function getServerExt($name)
-    {
-        if (!$this->server_caps) {
-            $this->setError('No HELO/EHLO was sent');
-            return null;
-        }
-
-        // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
-            if ($name == 'HELO') {
-                return $this->server_caps['EHLO'];
-            }
-            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
-                return false;
-            }
-            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
-            return null;
-        }
-
-        return $this->server_caps[$name];
-    }
-
-    /**
-     * Get the last reply from the server.
-     * @access public
-     * @return string
-     */
-    public function getLastReply()
-    {
-        return $this->last_reply;
-    }
-
-    /**
-     * Read the SMTP server's response.
-     * Either before eof or socket timeout occurs on the operation.
-     * With SMTP we can tell if we have more lines to read if the
-     * 4th character is '-' symbol. If it is a space then we don't
-     * need to read anything else.
-     * @access protected
-     * @return string
-     */
-    protected function get_lines()
-    {
-        // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
-            return '';
-        }
-        $data = '';
-        $endtime = 0;
-        stream_set_timeout($this->smtp_conn, $this->Timeout);
-        if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
-        }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-            $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
-                break;
-            }
-            // Timed-out? Log and break
-            $info = stream_get_meta_data($this->smtp_conn);
-            if ($info['timed_out']) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-            // Now check if reads took too long
-            if ($endtime and time() > $endtime) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enable or disable VERP address generation.
-     * @param boolean $enabled
-     */
-    public function setVerp($enabled = false)
-    {
-        $this->do_verp = $enabled;
-    }
-
-    /**
-     * Get VERP address generation mode.
-     * @return boolean
-     */
-    public function getVerp()
-    {
-        return $this->do_verp;
-    }
-
-    /**
-     * Set error messages and codes.
-     * @param string $message The error message
-     * @param string $detail Further detail on the error
-     * @param string $smtp_code An associated SMTP error code
-     * @param string $smtp_code_ex Extended SMTP code
-     */
-    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
-    {
-        $this->error = array(
-            'error' => $message,
-            'detail' => $detail,
-            'smtp_code' => $smtp_code,
-            'smtp_code_ex' => $smtp_code_ex
-        );
-    }
-
-    /**
-     * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
-     */
-    public function setDebugOutput($method = 'echo')
-    {
-        $this->Debugoutput = $method;
-    }
-
-    /**
-     * Get debug output method.
-     * @return string
-     */
-    public function getDebugOutput()
-    {
-        return $this->Debugoutput;
-    }
-
-    /**
-     * Set debug output level.
-     * @param integer $level
-     */
-    public function setDebugLevel($level = 0)
-    {
-        $this->do_debug = $level;
-    }
-
-    /**
-     * Get debug output level.
-     * @return integer
-     */
-    public function getDebugLevel()
-    {
-        return $this->do_debug;
-    }
-
-    /**
-     * Set SMTP timeout.
-     * @param integer $timeout
-     */
-    public function setTimeout($timeout = 0)
-    {
-        $this->Timeout = $timeout;
-    }
-
-    /**
-     * Get SMTP timeout.
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->Timeout;
-    }
+		$field = substr($lines[0], 0, strpos($lines[0], ':'));
+		$in_headers = false;
+		if (!empty($field) && strpos($field, ' ') === false) {
+			$in_headers = true;
+		}
+
+		foreach ($lines as $line) {
+			$lines_out = array();
+			if ($in_headers and $line == '') {
+				$in_headers = false;
+			}
+			//Break this line up into several smaller lines if it's too long
+			//Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+			while (isset($line[self::MAX_LINE_LENGTH])) {
+				//Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+				//so as to avoid breaking in the middle of a word
+				$pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+				//Deliberately matches both false and 0
+				if (!$pos) {
+					//No nice break found, add a hard break
+					$pos = self::MAX_LINE_LENGTH - 1;
+					$lines_out[] = substr($line, 0, $pos);
+					$line = substr($line, $pos);
+				} else {
+					//Break at the found point
+					$lines_out[] = substr($line, 0, $pos);
+					//Move along by the amount we dealt with
+					$line = substr($line, $pos + 1);
+				}
+				//If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+				if ($in_headers) {
+					$line = "\t" . $line;
+				}
+			}
+			$lines_out[] = $line;
+
+			//Send the lines to the server
+			foreach ($lines_out as $line_out) {
+				//RFC2821 section 4.5.2
+				if (!empty($line_out) and $line_out[0] == '.') {
+					$line_out = '.' . $line_out;
+				}
+				$this->client_send($line_out . self::CRLF);
+			}
+		}
+
+		//Message data has been sent, complete the command
+		//Increase timelimit for end of DATA command
+		$savetimelimit = $this->Timelimit;
+		$this->Timelimit = $this->Timelimit * 2;
+		$result = $this->sendCommand('DATA END', '.', 250);
+		//Restore timelimit
+		$this->Timelimit = $savetimelimit;
+		return $result;
+	}
+
+	/**
+	 * Send an SMTP HELO or EHLO command.
+	 * Used to identify the sending server to the receiving server.
+	 * This makes sure that client and server are in a known state.
+	 * Implements RFC 821: HELO <SP> <domain> <CRLF>
+	 * and RFC 2821 EHLO.
+	 * @param string $host The host name or IP to connect to
+	 * @access public
+	 * @return boolean
+	 */
+	public function hello($host = '')
+	{
+		//Try extended hello first (RFC 2821)
+		return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+	}
+
+	/**
+	 * Send an SMTP HELO or EHLO command.
+	 * Low-level implementation used by hello()
+	 * @see hello()
+	 * @param string $hello The HELO string
+	 * @param string $host The hostname to say we are
+	 * @access protected
+	 * @return boolean
+	 */
+	protected function sendHello($hello, $host)
+	{
+		$noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+		$this->helo_rply = $this->last_reply;
+		if ($noerror) {
+			$this->parseHelloFields($hello);
+		} else {
+			$this->server_caps = null;
+		}
+		return $noerror;
+	}
+
+	/**
+	 * Parse a reply to HELO/EHLO command to discover server extensions.
+	 * In case of HELO, the only parameter that can be discovered is a server name.
+	 * @access protected
+	 * @param string $type - 'HELO' or 'EHLO'
+	 */
+	protected function parseHelloFields($type)
+	{
+		$this->server_caps = array();
+		$lines = explode("\n", $this->last_reply);
+		foreach ($lines as $n => $s) {
+			$s = trim(substr($s, 4));
+			if (!$s) {
+				continue;
+			}
+			$fields = explode(' ', $s);
+			if (!empty($fields)) {
+				if (!$n) {
+					$name = $type;
+					$fields = $fields[0];
+				} else {
+					$name = array_shift($fields);
+					if ($name == 'SIZE') {
+						$fields = ($fields) ? $fields[0] : 0;
+					}
+				}
+				$this->server_caps[$name] = ($fields ? $fields : true);
+			}
+		}
+	}
+
+	/**
+	 * Send an SMTP MAIL command.
+	 * Starts a mail transaction from the email address specified in
+	 * $from. Returns true if successful or false otherwise. If True
+	 * the mail transaction is started and then one or more recipient
+	 * commands may be called followed by a data command.
+	 * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+	 * @param string $from Source address of this message
+	 * @access public
+	 * @return boolean
+	 */
+	public function mail($from)
+	{
+		$useVerp = ($this->do_verp ? ' XVERP' : '');
+		return $this->sendCommand(
+			'MAIL FROM',
+			'MAIL FROM:<' . $from . '>' . $useVerp,
+			250
+		);
+	}
+
+	/**
+	 * Send an SMTP QUIT command.
+	 * Closes the socket if there is no error or the $close_on_error argument is true.
+	 * Implements from rfc 821: QUIT <CRLF>
+	 * @param boolean $close_on_error Should the connection close if an error occurs?
+	 * @access public
+	 * @return boolean
+	 */
+	public function quit($close_on_error = true)
+	{
+		$noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+		$err = $this->error; //Save any error
+		if ($noerror or $close_on_error) {
+			$this->close();
+			$this->error = $err; //Restore any error from the quit command
+		}
+		return $noerror;
+	}
+
+	/**
+	 * Send an SMTP RCPT command.
+	 * Sets the TO argument to $toaddr.
+	 * Returns true if the recipient was accepted false if it was rejected.
+	 * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+	 * @param string $toaddr The address the message is being sent to
+	 * @access public
+	 * @return boolean
+	 */
+	public function recipient($toaddr)
+	{
+		return $this->sendCommand(
+			'RCPT TO',
+			'RCPT TO:<' . $toaddr . '>',
+			array(250, 251)
+		);
+	}
+
+	/**
+	 * Send an SMTP RSET command.
+	 * Abort any transaction that is currently in progress.
+	 * Implements rfc 821: RSET <CRLF>
+	 * @access public
+	 * @return boolean True on success.
+	 */
+	public function reset()
+	{
+		return $this->sendCommand('RSET', 'RSET', 250);
+	}
+
+	/**
+	 * Send a command to an SMTP server and check its return code.
+	 * @param string $command       The command name - not sent to the server
+	 * @param string $commandstring The actual command to send
+	 * @param integer|array $expect     One or more expected integer success codes
+	 * @access protected
+	 * @return boolean True on success.
+	 */
+	protected function sendCommand($command, $commandstring, $expect)
+	{
+		if (!$this->connected()) {
+			$this->setError("Called $command without being connected");
+			return false;
+		}
+		$this->client_send($commandstring . self::CRLF);
+
+		$this->last_reply = $this->get_lines();
+		// Fetch SMTP code and possible error code explanation
+		$matches = array();
+		if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+			$code = $matches[1];
+			$code_ex = (count($matches) > 2 ? $matches[2] : null);
+			// Cut off error code from each response line
+			$detail = preg_replace(
+				"/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
+				'',
+				$this->last_reply
+			);
+		} else {
+			// Fall back to simple parsing if regex fails
+			$code = substr($this->last_reply, 0, 3);
+			$code_ex = null;
+			$detail = substr($this->last_reply, 4);
+		}
+
+		$this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+		if (!in_array($code, (array)$expect)) {
+			$this->setError(
+				"$command command failed",
+				$detail,
+				$code,
+				$code_ex
+			);
+			$this->edebug(
+				'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+				self::DEBUG_CLIENT
+			);
+			return false;
+		}
+
+		$this->setError('');
+		return true;
+	}
+
+	/**
+	 * Send an SMTP SAML command.
+	 * Starts a mail transaction from the email address specified in $from.
+	 * Returns true if successful or false otherwise. If True
+	 * the mail transaction is started and then one or more recipient
+	 * commands may be called followed by a data command. This command
+	 * will send the message to the users terminal if they are logged
+	 * in and send them an email.
+	 * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+	 * @param string $from The address the message is from
+	 * @access public
+	 * @return boolean
+	 */
+	public function sendAndMail($from)
+	{
+		return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+	}
+
+	/**
+	 * Send an SMTP VRFY command.
+	 * @param string $name The name to verify
+	 * @access public
+	 * @return boolean
+	 */
+	public function verify($name)
+	{
+		return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+	}
+
+	/**
+	 * Send an SMTP NOOP command.
+	 * Used to keep keep-alives alive, doesn't actually do anything
+	 * @access public
+	 * @return boolean
+	 */
+	public function noop()
+	{
+		return $this->sendCommand('NOOP', 'NOOP', 250);
+	}
+
+	/**
+	 * Send an SMTP TURN command.
+	 * This is an optional command for SMTP that this class does not support.
+	 * This method is here to make the RFC821 Definition complete for this class
+	 * and _may_ be implemented in future
+	 * Implements from rfc 821: TURN <CRLF>
+	 * @access public
+	 * @return boolean
+	 */
+	public function turn()
+	{
+		$this->setError('The SMTP TURN command is not implemented');
+		$this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+		return false;
+	}
+
+	/**
+	 * Send raw data to the server.
+	 * @param string $data The data to send
+	 * @access public
+	 * @return integer|boolean The number of bytes sent to the server or false on error
+	 */
+	public function client_send($data)
+	{
+		$this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+		return fwrite($this->smtp_conn, $data);
+	}
+
+	/**
+	 * Get the latest error.
+	 * @access public
+	 * @return array
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+	/**
+	 * Get SMTP extensions available on the server
+	 * @access public
+	 * @return array|null
+	 */
+	public function getServerExtList()
+	{
+		return $this->server_caps;
+	}
+
+	/**
+	 * A multipurpose method
+	 * The method works in three ways, dependent on argument value and current state
+	 *   1. HELO/EHLO was not sent - returns null and set up $this->error
+	 *   2. HELO was sent
+	 *     $name = 'HELO': returns server name
+	 *     $name = 'EHLO': returns boolean false
+	 *     $name = any string: returns null and set up $this->error
+	 *   3. EHLO was sent
+	 *     $name = 'HELO'|'EHLO': returns server name
+	 *     $name = any string: if extension $name exists, returns boolean True
+	 *       or its options. Otherwise returns boolean False
+	 * In other words, one can use this method to detect 3 conditions:
+	 *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+	 *  - false returned: the requested feature exactly not exists
+	 *  - positive value returned: the requested feature exists
+	 * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+	 * @return mixed
+	 */
+	public function getServerExt($name)
+	{
+		if (!$this->server_caps) {
+			$this->setError('No HELO/EHLO was sent');
+			return null;
+		}
+
+		// the tight logic knot ;)
+		if (!array_key_exists($name, $this->server_caps)) {
+			if ($name == 'HELO') {
+				return $this->server_caps['EHLO'];
+			}
+			if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+				return false;
+			}
+			$this->setError('HELO handshake was used. Client knows nothing about server extensions');
+			return null;
+		}
+
+		return $this->server_caps[$name];
+	}
+
+	/**
+	 * Get the last reply from the server.
+	 * @access public
+	 * @return string
+	 */
+	public function getLastReply()
+	{
+		return $this->last_reply;
+	}
+
+	/**
+	 * Read the SMTP server's response.
+	 * Either before eof or socket timeout occurs on the operation.
+	 * With SMTP we can tell if we have more lines to read if the
+	 * 4th character is '-' symbol. If it is a space then we don't
+	 * need to read anything else.
+	 * @access protected
+	 * @return string
+	 */
+	protected function get_lines()
+	{
+		// If the connection is bad, give up straight away
+		if (!is_resource($this->smtp_conn)) {
+			return '';
+		}
+		$data = '';
+		$endtime = 0;
+		stream_set_timeout($this->smtp_conn, $this->Timeout);
+		if ($this->Timelimit > 0) {
+			$endtime = time() + $this->Timelimit;
+		}
+		while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+			$str = @fgets($this->smtp_conn, 515);
+			$this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
+			$this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
+			$data .= $str;
+			$this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+			// If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
+			if ((isset($str[3]) and $str[3] == ' ')) {
+				break;
+			}
+			// Timed-out? Log and break
+			$info = stream_get_meta_data($this->smtp_conn);
+			if ($info['timed_out']) {
+				$this->edebug(
+					'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+					self::DEBUG_LOWLEVEL
+				);
+				break;
+			}
+			// Now check if reads took too long
+			if ($endtime and time() > $endtime) {
+				$this->edebug(
+					'SMTP -> get_lines(): timelimit reached ('.
+					$this->Timelimit . ' sec)',
+					self::DEBUG_LOWLEVEL
+				);
+				break;
+			}
+		}
+		return $data;
+	}
+
+	/**
+	 * Enable or disable VERP address generation.
+	 * @param boolean $enabled
+	 */
+	public function setVerp($enabled = false)
+	{
+		$this->do_verp = $enabled;
+	}
+
+	/**
+	 * Get VERP address generation mode.
+	 * @return boolean
+	 */
+	public function getVerp()
+	{
+		return $this->do_verp;
+	}
+
+	/**
+	 * Set error messages and codes.
+	 * @param string $message The error message
+	 * @param string $detail Further detail on the error
+	 * @param string $smtp_code An associated SMTP error code
+	 * @param string $smtp_code_ex Extended SMTP code
+	 */
+	protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+	{
+		$this->error = array(
+			'error' => $message,
+			'detail' => $detail,
+			'smtp_code' => $smtp_code,
+			'smtp_code_ex' => $smtp_code_ex
+		);
+	}
+
+	/**
+	 * Set debug output method.
+	 * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+	 */
+	public function setDebugOutput($method = 'echo')
+	{
+		$this->Debugoutput = $method;
+	}
+
+	/**
+	 * Get debug output method.
+	 * @return string
+	 */
+	public function getDebugOutput()
+	{
+		return $this->Debugoutput;
+	}
+
+	/**
+	 * Set debug output level.
+	 * @param integer $level
+	 */
+	public function setDebugLevel($level = 0)
+	{
+		$this->do_debug = $level;
+	}
+
+	/**
+	 * Get debug output level.
+	 * @return integer
+	 */
+	public function getDebugLevel()
+	{
+		return $this->do_debug;
+	}
+
+	/**
+	 * Set SMTP timeout.
+	 * @param integer $timeout
+	 */
+	public function setTimeout($timeout = 0)
+	{
+		$this->Timeout = $timeout;
+	}
+
+	/**
+	 * Get SMTP timeout.
+	 * @return integer
+	 */
+	public function getTimeout()
+	{
+		return $this->Timeout;
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -205,7 +205,7 @@ 
             return;
         }
         //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+        if ( ! in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
             call_user_func($this->Debugoutput, $str, $this->do_debug);
             return;
         }
@@ -227,7 +227,7 @@ 
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
@@ -274,7 +274,7 @@ 
             $socket_context = stream_context_create($options);
             //Suppress errors; connection failures are handled at a higher level
             $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
+                $host.":".$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -296,14 +296,14 @@ 
             );
         }
         // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
+        if ( ! is_resource($this->smtp_conn)) {
             $this->setError(
                 'Failed to connect to server',
                 $errno,
                 $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -322,7 +322,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
         return true;
     }
 
@@ -333,11 +333,11 @@ 
      */
     public function startTLS()
     {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+        if ( ! $this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
             return false;
         }
         // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
+        if ( ! stream_socket_enable_crypto(
             $this->smtp_conn,
             true,
             STREAM_CRYPTO_METHOD_TLS_CLIENT
@@ -366,7 +366,7 @@ 
         $realm = '',
         $workstation = ''
     ) {
-        if (!$this->server_caps) {
+        if ( ! $this->server_caps) {
             $this->setError('Authentication is not allowed before HELO/EHLO');
             return false;
         }
@@ -374,16 +374,16 @@ 
         if (array_key_exists('EHLO', $this->server_caps)) {
         // SMTP extensions are available. Let's try to find a proper authentication method
 
-            if (!array_key_exists('AUTH', $this->server_caps)) {
+            if ( ! array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
                 // 'at this stage' means that auth may be allowed after the stage changes
                 // e.g. after STARTTLS
                 return false;
             }
 
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
@@ -401,7 +401,7 @@ 
                 self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+            if ( ! in_array($authtype, $this->server_caps['AUTH'])) {
                 $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
                 return false;
             }
@@ -411,13 +411,13 @@ 
         switch ($authtype) {
             case 'PLAIN':
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                if ( ! $this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                     return false;
                 }
                 // Send encoded username and password
-                if (!$this->sendCommand(
+                if ( ! $this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -426,26 +426,26 @@ 
                 break;
             case 'LOGIN':
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                if ( ! $this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                     return false;
                 }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                if ( ! $this->sendCommand("Username", base64_encode($username), 334)) {
                     return false;
                 }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                if ( ! $this->sendCommand("Password", base64_encode($password), 235)) {
                     return false;
                 }
                 break;
             case 'CRAM-MD5':
                 // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                if ( ! $this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                     return false;
                 }
                 // Get the challenge
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -489,7 +489,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -550,7 +550,7 @@ 
     public function data($msg_data)
     {
         //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+        if ( ! $this->sendCommand('DATA', 'DATA', 354)) {
             return false;
         }
 
@@ -572,7 +572,7 @@ 
 
         $field = substr($lines[0], 0, strpos($lines[0], ':'));
         $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
+        if ( ! empty($field) && strpos($field, ' ') === false) {
             $in_headers = true;
         }
 
@@ -588,7 +588,7 @@ 
                 //so as to avoid breaking in the middle of a word
                 $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
                 //Deliberately matches both false and 0
-                if (!$pos) {
+                if ( ! $pos) {
                     //No nice break found, add a hard break
                     $pos = self::MAX_LINE_LENGTH - 1;
                     $lines_out[] = substr($line, 0, $pos);
@@ -601,7 +601,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -609,10 +609,10 @@ 
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                if ( ! empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . self::CRLF);
+                $this->client_send($line_out.self::CRLF);
             }
         }
 
@@ -639,7 +639,7 @@ 
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+        return (boolean) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -653,7 +653,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -675,12 +675,12 @@ 
         $lines = explode("\n", $this->last_reply);
         foreach ($lines as $n => $s) {
             $s = trim(substr($s, 4));
-            if (!$s) {
+            if ( ! $s) {
                 continue;
             }
             $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
+            if ( ! empty($fields)) {
+                if ( ! $n) {
                     $name = $type;
                     $fields = $fields[0];
                 } else {
@@ -710,7 +710,7 @@ 
         $useVerp = ($this->do_verp ? ' XVERP' : '');
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -747,7 +747,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
+            'RCPT TO:<'.$toaddr.'>',
             array(250, 251)
         );
     }
@@ -774,11 +774,11 @@ 
      */
     protected function sendCommand($command, $commandstring, $expect)
     {
-        if (!$this->connected()) {
+        if ( ! $this->connected()) {
             $this->setError("Called $command without being connected");
             return false;
         }
-        $this->client_send($commandstring . self::CRLF);
+        $this->client_send($commandstring.self::CRLF);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -799,9 +799,9 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
-        if (!in_array($code, (array)$expect)) {
+        if ( ! in_array($code, (array) $expect)) {
             $this->setError(
                 "$command command failed",
                 $detail,
@@ -809,7 +809,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
             return false;
@@ -871,7 +871,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
         return false;
     }
 
@@ -928,13 +928,13 @@ 
      */
     public function getServerExt($name)
     {
-        if (!$this->server_caps) {
+        if ( ! $this->server_caps) {
             $this->setError('No HELO/EHLO was sent');
             return null;
         }
 
         // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
+        if ( ! array_key_exists($name, $this->server_caps)) {
             if ($name == 'HELO') {
                 return $this->server_caps['EHLO'];
             }
@@ -970,7 +970,7 @@ 
     protected function get_lines()
     {
         // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
+        if ( ! is_resource($this->smtp_conn)) {
             return '';
         }
         $data = '';
@@ -979,7 +979,7 @@ 
         if ($this->Timelimit > 0) {
             $endtime = time() + $this->Timelimit;
         }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+        while (is_resource($this->smtp_conn) && ! feof($this->smtp_conn)) {
             $str = @fgets($this->smtp_conn, 515);
             $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
             $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
@@ -993,7 +993,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1002,7 +1002,7 @@ 
             if ($endtime and time() > $endtime) {
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

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))

Spacing +250 added lines, -250 removed lines

@@ -3,9 +3,9 @@ 
 /**
  * Deprecated. Use WP_HTTP (http.php, class-http.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/http.php' );
+_deprecated_file(basename(__FILE__), '3.0', WPINC.'/http.php');
 
-if ( !class_exists( 'Snoopy' ) ) :
+if ( ! class_exists('Snoopy')) :
 /*************************************************
 
 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,105 +944,105 @@ 
 	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);
 
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
-			$safer_header = strtr( $headers[$curr_header], "\"", " " );
+		for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+			$safer_header = strtr($headers[$curr_header], "\"", " ");
 			$cmdline_params .= " -H \"".$safer_header."\"";
 		}
 
-		if(!empty($body))
+		if ( ! empty($body))
 			$cmdline_params .= " -d \"$body\"";
 
-		if($this->read_timeout > 0)
+		if ($this->read_timeout > 0)
 			$cmdline_params .= " -m ".$this->read_timeout;
 
 		$headerfile = tempnam($this->temp_dir, "sno");
 
-		exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." \"".escapeshellcmd($URI)."\"",$results,$return);
+		exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." \"".escapeshellcmd($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];
@@ -1051,7 +1051,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];
@@ -1059,20 +1059,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
@@ -1090,9 +1090,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]);
 		}
 	}
@@ -1124,7 +1124,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;
 
@@ -1139,7 +1139,7 @@ 
 
 		$this->status = 0;
 
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -1155,16 +1155,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;
 		}
@@ -1201,7 +1201,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)."&";
@@ -1215,7 +1215,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";
@@ -1233,7 +1233,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));

Braces +279 added lines, -209 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,32 +1038,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;
+			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);
 
 		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$safer_header = strtr( $headers[$curr_header], "\"", " " );
 			$cmdline_params .= " -H \"".$safer_header."\"";
 		}
 
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+		if(!empty($body)) {
+					$cmdline_params .= " -d \"$body\"";
+		}
 
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+		if($this->read_timeout > 0) {
+					$cmdline_params .= " -m ".$this->read_timeout;
+		}
 
 		$headerfile = tempnam($this->temp_dir, "sno");
 
@@ -1042,17 +1104,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];
 		}
@@ -1068,15 +1132,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");
 
@@ -1092,8 +1159,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]);
+		}
 		}
 	}
 
@@ -1130,8 +1198,7 @@ 
 
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -1150,8 +1217,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -1195,8 +1261,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":
@@ -1206,8 +1273,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;
 
@@ -1233,7 +1301,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));