iqltechnologies / brighty

wp/wp-includes/feed-atom-comments.php

Braces +13 added lines, -5 removed lines

@@ -53,8 +53,11 @@ 
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'atom' ); ?>" />
 	<id><?php echo get_search_comments_feed_link( '', 'atom' ); ?></id>
-<?php else : ?>
-	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />
+<?php else {
+    : ?>
+	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' );
+}
+?>" href="<?php bloginfo_rss( 'url' ); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php bloginfo_rss( 'comments_atom_url' ); ?>" />
 	<id><?php bloginfo_rss( 'comments_atom_url' ); ?></id>
 <?php endif; ?>
@@ -104,8 +107,11 @@ 
 
 		<?php if ( post_password_required( $comment_post ) ) : ?>
 			<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-		<?php else : ?>
-			<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
+		<?php else {
+    : ?>
+			<content type="html" xml:base="<?php comment_link();
+}
+?>"><![CDATA[<?php comment_text(); ?>]]></content>
 		<?php endif; // End if post_password_required(). ?>
 
 		<?php
@@ -114,8 +120,10 @@ 
 			?>
 			<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
 			<?php
-		else : // This comment is in reply to another comment.
+		else {
+		    : // This comment is in reply to another comment.
 			$parent_comment = get_comment( $comment->comment_parent );
+		}
 			/*
 			 * The rel attribute below and the id tag above should be GUIDs,
 			 * but WP doesn't create them for comments (unlike posts).

wp/wp-includes/feed-rss2-comments.php

Braces +5 added lines, -2 removed lines

@@ -99,8 +99,11 @@
 		<?php if ( post_password_required( $comment_post ) ) : ?>
 			<description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>
 			<content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>
-		<?php else : ?>
-			<description><![CDATA[<?php comment_text_rss(); ?>]]></description>
+		<?php else {
+    : ?>
+			<description><![CDATA[<?php comment_text_rss();
+}
+?>]]></description>
 			<content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
 		<?php endif; // End if post_password_required(). ?>
 

wp/wp-includes/class-simplepie.php

Braces +69 added lines, -134 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;
@@ -807,8 +808,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));
 			$this->permanent_url = $this->feed_url;
@@ -1006,8 +1006,7 @@ 
 		if ($encoding)
 		{
 			$this->input_encoding = (string) $encoding;
-		}
-		else
+		} else
 		{
 			$this->input_encoding = false;
 		}
@@ -1348,8 +1347,7 @@ 
 		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
+		} else
 		{
 			$this->image_handler = '';
 		}
@@ -1443,8 +1441,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;
 		}
@@ -1470,8 +1467,7 @@ 
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
 				return true;
-			}
-			elseif ($fetched === false) {
+			} elseif ($fetched === false) {
 				return false;
 			}
 
@@ -1508,8 +1504,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))
 				{
@@ -1573,8 +1568,7 @@ 
 			// We have an error, just set SimplePie_Misc::error to it and quit
 			$this->error = $this->feed_url;
 			$this->error .= sprintf(' is invalid XML, 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.';
 			if (!extension_loaded('mbstring') && !extension_loaded('iconv') && !class_exists('\UConverter')) {
@@ -1678,8 +1672,7 @@ 
 								$cache->touch();
 								return true;
 							}
-						}
-						else
+						} else
 						{
 							$this->check_modified = false;
 							if($this->force_cache_fallback)
@@ -1712,8 +1705,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',
@@ -1769,14 +1761,12 @@ 
 						if (isset($this->all_discovered_feeds)) {
 							$this->all_discovered_feeds[] = $file;
 						}
-					}
-					else
+					} else
 					{
 						if ($discovered)
 						{
 							$file = $discovered;
-						}
-						else
+						} else
 						{
 							// We need to unset this so that if SimplePie::set_file() has
 							// been called that object is untouched
@@ -1786,8 +1776,7 @@ 
 							return false;
 						}
 					}
-				}
-				catch (SimplePie_Exception $e)
+				} catch (SimplePie_Exception $e)
 				{
 					// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 					unset($file);
@@ -1890,8 +1879,7 @@ 
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
+			} else
 			{
 				$header .= ' charset=UTF-8';
 			}
@@ -1933,12 +1921,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'])
@@ -1954,8 +1940,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']))
@@ -1996,8 +1981,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
 			}
@@ -2035,8 +2019,7 @@ 
 				                   $this->sanitize($this->permanent_url,
 				                                   SIMPLEPIE_CONSTRUCT_IRI));
 			}
-		}
-		else
+		} else
 		{
 			if ($this->feed_url !== null)
 			{
@@ -2237,8 +2220,7 @@ 
 		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();
 		}
@@ -2261,8 +2243,7 @@ 
 		try
 		{
 			return $this->sanitize->sanitize($data, $type, $base);
-		}
-		catch (SimplePie_Exception $e)
+		} catch (SimplePie_Exception $e)
 		{
 			if (!$this->enable_exceptions)
 			{
@@ -2288,28 +2269,22 @@ 
 		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);
 		}
@@ -2374,8 +2349,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -2668,13 +2642,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];
 				}
@@ -2721,36 +2693,28 @@ 
 		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]));
 		}
@@ -2771,20 +2735,16 @@ 
 		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);
 		}
@@ -2805,28 +2765,22 @@ 
 		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);
 		}
@@ -2852,8 +2806,7 @@ 
 		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];
 		}
@@ -2878,12 +2831,10 @@ 
 		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];
 		}
@@ -2905,20 +2856,16 @@ 
 		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);
 		}
@@ -2942,24 +2889,19 @@ 
 		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]));
 		}
@@ -2984,12 +2926,10 @@ 
 		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]));
 		}
@@ -3012,8 +2952,7 @@ 
 		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;
 		}
@@ -3036,8 +2975,7 @@ 
 		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;
 		}
@@ -3171,8 +3109,7 @@ 
 				usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
 		 	}
 			$items = $this->data['ordered_items'];
-		}
-		else
+		} else
 		{
 			$items = $this->data['items'];
 		}
@@ -3292,8 +3229,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);
 				}
@@ -3338,8 +3274,7 @@ 
 				{
 					$file->headers['link'] = ', ';
 				}
-			}
-			else
+			} else
 			{
 				$file->headers['link'] = '';
 			}

wp/wp-includes/general-template.php

Braces +3 added lines, -1 removed lines

@@ -4321,9 +4321,11 @@
 			);
 
 			$dots = true;
-		else :
+		else {
+		    :
 			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
 				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+		}
 				$link = str_replace( '%#%', $n, $link );
 				if ( $add_args ) {
 					$link = add_query_arg( $add_args, $link );

wp/wp-includes/feed-rdf.php

Braces +5 added lines, -2 removed lines

@@ -81,8 +81,11 @@
 
 	<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
-	<?php else : ?>
-		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
+	<?php else {
+    : ?>
+		<description><![CDATA[<?php the_excerpt_rss();
+}
+?>]]></description>
 		<content:encoded><![CDATA[<?php the_content_feed( 'rdf' ); ?>]]></content:encoded>
 	<?php endif; ?>
 

wp/wp-includes/pluggable-deprecated.php

Braces +15 added lines, -10 removed lines

@@ -105,9 +105,10 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_set_auth_cookie()' );
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
-}
-else :
+} else {
+    :
 	_deprecated_function( 'wp_setcookie', '2.5.0', 'wp_set_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_clearcookie') ) :
@@ -121,9 +122,10 @@ 
 function wp_clearcookie() {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()' );
 	wp_clear_auth_cookie();
-}
-else :
+} else {
+    :
 	_deprecated_function( 'wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_get_cookie_login') ):
@@ -141,9 +143,10 @@ 
 function wp_get_cookie_login() {
 	_deprecated_function( __FUNCTION__, '2.5.0' );
 	return false;
-}
-else :
+} else {
+    :
 	_deprecated_function( 'wp_get_cookie_login', '2.5.0' );
+}
 endif;
 
 if ( !function_exists('wp_login') ) :
@@ -174,14 +177,16 @@ 
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
-		return true;
+	if ( ! is_wp_error($user) ) {
+			return true;
+	}
 
 	$error = $user->get_error_message();
 	return false;
-}
-else :
+} else {
+    :
 	_deprecated_function( 'wp_login', '2.5.0', 'wp_signon()' );
+}
 endif;
 
 /**

wp/wp-includes/deprecated.php

Braces +376 added lines, -264 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $display )
-		echo $cat;
+	if ( $display ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -404,8 +412,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -467,8 +476,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -521,8 +531,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -656,18 +667,24 @@ 
 	$parsed_args = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($parsed_args['optionall']) && isset($parsed_args['all']))
-		$parsed_args['show_option_all'] = $parsed_args['all'];
-	if ( isset($parsed_args['sort_column']) )
-		$parsed_args['orderby'] = $parsed_args['sort_column'];
-	if ( isset($parsed_args['sort_order']) )
-		$parsed_args['order'] = $parsed_args['sort_order'];
-	if ( isset($parsed_args['optiondates']) )
-		$parsed_args['show_last_update'] = $parsed_args['optiondates'];
-	if ( isset($parsed_args['optioncount']) )
-		$parsed_args['show_count'] = $parsed_args['optioncount'];
-	if ( isset($parsed_args['list']) )
-		$parsed_args['style'] = $parsed_args['list'] ? 'list' : 'break';
+	if ( isset($parsed_args['optionall']) && isset($parsed_args['all'])) {
+			$parsed_args['show_option_all'] = $parsed_args['all'];
+	}
+	if ( isset($parsed_args['sort_column']) ) {
+			$parsed_args['orderby'] = $parsed_args['sort_column'];
+	}
+	if ( isset($parsed_args['sort_order']) ) {
+			$parsed_args['order'] = $parsed_args['sort_order'];
+	}
+	if ( isset($parsed_args['optiondates']) ) {
+			$parsed_args['show_last_update'] = $parsed_args['optiondates'];
+	}
+	if ( isset($parsed_args['optioncount']) ) {
+			$parsed_args['show_count'] = $parsed_args['optioncount'];
+	}
+	if ( isset($parsed_args['list']) ) {
+			$parsed_args['style'] = $parsed_args['list'] ? 'list' : 'break';
+	}
 	$parsed_args['title_li'] = '';
 
 	return wp_list_categories($parsed_args);
@@ -698,12 +715,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -805,8 +824,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $display )
-		echo $link;
+	if ( $display ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -952,64 +972,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) // get_bookmarks() uses '' to signify all categories.
+	if ( $category == -1 ) {
+	    // get_bookmarks() uses '' to signify all categories.
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . gmdate(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path.
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+			    // If it's a relative path.
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -1018,8 +1052,9 @@ 
 		$output .= "$after\n";
 	} // End while.
 
-	if ( !$display )
-		return $output;
+	if ( !$display ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1047,8 +1082,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1114,13 +1150,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1158,8 +1196,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $display )
-		echo $link;
+	if ( $display ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1178,8 +1217,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5.0', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $display )
-		echo $link;
+	if ( $display ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1272,19 +1312,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: Consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1687,8 +1730,9 @@ 
 	 * @param string $content Content of the current post.
 	 */
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1708,8 +1752,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1868,11 +1913,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1894,8 +1941,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1916,8 +1964,9 @@ 
 		$src_file = $icon_dir . '/' . wp_basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1937,11 +1986,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1993,11 +2044,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2040,10 +2093,11 @@ 
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2225,29 +2279,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2273,35 +2332,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object.
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2324,13 +2387,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2339,23 +2404,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2399,10 +2467,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+.
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+.
 }
 
 /**
@@ -2473,10 +2543,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2534,8 +2605,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2607,8 +2679,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2639,21 +2712,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2681,14 +2758,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post, stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts() to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2759,11 +2838,13 @@ 
 function get_parent_post_rel_link( $title = '%title' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2806,12 +2887,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2863,9 +2945,10 @@ 
  */
 function debug_fwrite( $fp, $message ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $message );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $message );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2899,18 +2982,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2930,8 +3015,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2947,8 +3033,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2968,10 +3055,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2998,8 +3086,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -3031,12 +3120,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3083,8 +3175,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3153,9 +3246,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3187,16 +3281,18 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
 	if ( ! is_file( $file ) ) {
 		/* translators: %s: File name. */
 		return sprintf( __( 'File &#8220;%s&#8221; does not exist?' ), $file );
 	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory.
 	wp_raise_memory_limit( 'image' );
@@ -3239,19 +3335,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3289,8 +3388,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3400,8 +3500,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9.0' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3610,8 +3711,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3.0', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // Convert only '< > &'.
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// Convert only '< > &'.
 
 	/**
 	 * Filters the text before it is formatted for the HTML editor.
@@ -3661,21 +3764,24 @@ 
 
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -3685,13 +3791,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename.
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);
@@ -3846,13 +3954,14 @@ 
 function _usort_terms_by_ID( $a, $b ) {
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort()' );
 
-	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;
+	}
+	}
 
 /**
  * Sort categories by name.
@@ -3892,22 +4001,25 @@ 
 
 	_deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort()' );
 
-	if ( empty( $_menu_item_sort_prop ) )
-		return 0;
+	if ( empty( $_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
-	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-		return 0;
+	if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) ) {
+			return 0;
+	}
 
 	$_a = (int) $a->$_menu_item_sort_prop;
 	$_b = (int) $b->$_menu_item_sort_prop;
 
-	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-		return 0;
-	elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-		return $_a < $_b ? -1 : 1;
-	else
-		return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}
+	if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop ) {
+			return 0;
+	} elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop ) {
+			return $_a < $_b ? -1 : 1;
+	} else {
+			return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+	}
+	}
 
 /**
  * Retrieves the Press This bookmarklet link.

wp/wp-includes/class-pop3.php

Braces +25 added lines, -21 removed lines

@@ -53,8 +53,9 @@ 
             // 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");
@@ -83,8 +84,9 @@ 
         // If MAILSERVER is set, override $server with its 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");
@@ -104,8 +106,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);
@@ -130,8 +133,9 @@ 
             if(!$this->is_ok($reply)) {
                 $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
                 return false;
-            } else
-                return true;
+            } else {
+                            return true;
+            }
         }
     }
 
@@ -222,8 +226,9 @@ 
                 if( (!$count) || ($count == -1) ) {
                     //  Preserve the error generated by last() and pass()
                     return false;
-                } else
-                    return $count;
+                } else {
+                                    return $count;
+                }
             }
         }
     }
@@ -336,8 +341,7 @@ 
             if($thisMsg != $msgC)
             {
                 $MsgArray[$msgC] = "deleted";
-            }
-            else
+            } else
             {
                 $MsgArray[$msgC] = $msgSize;
             }
@@ -565,8 +569,7 @@ 
                 $msgUidl = $this->strip_clf($msgUidl);
                 if($count == $msg) {
                     $UIDLArray[$msg] = $msgUidl;
-                }
-                else
+                } else
                 {
                     $UIDLArray[$count] = 'deleted';
                 }
@@ -607,18 +610,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;
         }

wp/wp-includes/class-snoopy.php

Braces +273 added lines, -205 removed lines

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