iqltechnologies / brighty

wp/wp-includes/SimplePie/Net/IPv6.php

Braces +17 added lines, -14 removed lines

@@ -85,16 +85,14 @@ 
 			if ($ip1 === '')
 			{
 				$c1 = -1;
-			}
-			else
+			} else
 			{
 				$c1 = substr_count($ip1, ':');
 			}
 			if ($ip2 === '')
 			{
 				$c2 = -1;
-			}
-			else
+			} else
 			{
 				$c2 = substr_count($ip2, ':');
 			}
@@ -221,30 +219,35 @@ 
 			foreach ($ipv6 as $ipv6_part)
 			{
 				// The section can't be empty
-				if ($ipv6_part === '')
-					return false;
+				if ($ipv6_part === '') {
+									return false;
+				}
 
 				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4)
-					return false;
+				if (strlen($ipv6_part) > 4) {
+									return false;
+				}
 
 				// Remove leading zeros (this is safe because of the above)
 				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '')
-					$ipv6_part = '0';
+				if ($ipv6_part === '') {
+									$ipv6_part = '0';
+				}
 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
-					return false;
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+									return false;
+				}
 			}
 			if (count($ipv4) === 4)
 			{
 				foreach ($ipv4 as $ipv4_part)
 				{
 					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
-						return false;
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+											return false;
+					}
 				}
 			}
 			return true;

wp/wp-includes/SimplePie/File.php

Braces +11 added lines, -22 removed lines

@@ -124,8 +124,7 @@ 
 				{
 					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
 					$this->success = false;
-				}
-				else
+				} else
 				{
 					// Use the updated url provided by curl_getinfo after any redirects.
 					if ($info = curl_getinfo($fp)) {
@@ -150,8 +149,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
@@ -170,8 +168,7 @@ 
 				{
 					$this->error = 'fsockopen error: ' . $errstr;
 					$this->success = false;
-				}
-				else
+				} else
 				{
 					stream_set_timeout($fp, $timeout);
 					if (isset($url_parts['path']))
@@ -179,13 +176,11 @@ 
 						if (isset($url_parts['query']))
 						{
 							$get = "$url_parts[path]?$url_parts[query]";
-						}
-						else
+						} else
 						{
 							$get = $url_parts['path'];
 						}
-					}
-					else
+					} else
 					{
 						$get = '/';
 					}
@@ -245,8 +240,7 @@ 
 										{
 											$this->error = 'Unable to decode HTTP "gzip" stream';
 											$this->success = false;
-										}
-										else
+										} else
 										{
 											$this->body = trim($decoder->data);
 										}
@@ -256,16 +250,13 @@ 
 										if (($decompressed = gzinflate($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else if (($decompressed = gzuncompress($this->body)) !== false)
+										} else if (($decompressed = gzuncompress($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
+										} else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
 										{
 											$this->body = $decompressed;
-										}
-										else
+										} else
 										{
 											$this->error = 'Unable to decode HTTP "deflate" stream';
 											$this->success = false;
@@ -278,8 +269,7 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						$this->error = 'fsocket timed out';
 						$this->success = false;
@@ -287,8 +277,7 @@ 
 					fclose($fp);
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
 			if (empty($url) || !($this->body = trim(file_get_contents($url))))

wp/wp-includes/SimplePie/Parser.php

Braces +41 added lines, -47 removed lines

@@ -94,8 +94,7 @@ 
 		if (strtoupper($encoding) === 'US-ASCII')
 		{
 			$this->encoding = 'UTF-8';
-		}
-		else
+		} else
 		{
 			$this->encoding = $encoding;
 		}
@@ -134,8 +133,7 @@ 
 			{
 				$data = substr($data, $pos + 2);
 				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
-			}
-			else
+			} else
 			{
 				$this->error_string = 'SimplePie bug! Please report this!';
 				return false;
@@ -182,8 +180,7 @@ 
 					}
 				} while (!feof($stream));
 				fclose($stream);
-			}
-			else
+			} else
 			{
 				$return = false;
 			}
@@ -207,8 +204,7 @@ 
 					if ($xml->namespaceURI !== '')
 					{
 						$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-					}
-					else
+					} else
 					{
 						$tagName = $xml->localName;
 					}
@@ -219,8 +215,7 @@ 
 					if ($xml->namespaceURI !== '')
 					{
 						$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-					}
-					else
+					} else
 					{
 						$tagName = $xml->localName;
 					}
@@ -230,8 +225,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$attrName = $xml->localName;
 						}
@@ -311,8 +305,7 @@ 
 				$this->xml_base[] = $base;
 				$this->xml_base_explicit[] = true;
 			}
-		}
-		else
+		} else
 		{
 			$this->xml_base[] = end($this->xml_base);
 			$this->xml_base_explicit[] = end($this->xml_base_explicit);
@@ -321,8 +314,7 @@ 
 		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
 		{
 			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-		}
-		else
+		} else
 		{
 			$this->xml_lang[] = end($this->xml_lang);
 		}
@@ -342,8 +334,7 @@ 
 				}
 				$this->data['data'] .= '>';
 			}
-		}
-		else
+		} else
 		{
 			$this->datas[] =& $this->data;
 			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
@@ -364,8 +355,7 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-		}
-		else
+		} else
 		{
 			$this->data['data'] .= $cdata;
 		}
@@ -423,8 +413,7 @@ 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
 				$cache[$string] = array($namespace, $local_name);
-			}
-			else
+			} else
 			{
 				$cache[$string] = array('', $string);
 			}
@@ -444,8 +433,7 @@ 
 				$link = $data['properties']['url'][0];
 				if ($name === '') {
 					$name = $link;
-				}
-				else {
+				} else {
 					// can't have commas in categories.
 					$name = str_replace(',', '', $name);
 				}
@@ -471,19 +459,24 @@ 
 				break;
 			}
 			// Also look for h-feed or h-entry in the children of each top level item.
-			if (!isset($mf_item['children'][0]['type'])) continue;
+			if (!isset($mf_item['children'][0]['type'])) {
+			    continue;
+			}
 			if (in_array('h-feed', $mf_item['children'][0]['type'])) {
 				$h_feed = $mf_item['children'][0];
 				// In this case the parent of the h-feed may be an h-card, so use it as
 				// the feed_author.
-				if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
+				if (in_array('h-card', $mf_item['type'])) {
+				    $feed_author = $mf_item;
+				}
 				break;
-			}
-			else if (in_array('h-entry', $mf_item['children'][0]['type'])) {
+			} else if (in_array('h-entry', $mf_item['children'][0]['type'])) {
 				$entries = $mf_item['children'];
 				// In this case the parent of the h-entry list may be an h-card, so use
 				// it as the feed_author.
-				if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
+				if (in_array('h-card', $mf_item['type'])) {
+				    $feed_author = $mf_item;
+				}
 				break;
 			}
 		}
@@ -496,8 +489,7 @@ 
 			if (isset($mf['items'][0]['properties']['author'][0])) {
 				$feed_author = $mf['items'][0]['properties']['author'][0];
 			}
-		}
-		else if (count($entries) === 0) {
+		} else if (count($entries) === 0) {
 			$entries = $mf['items'];
 		}
 		for ($i = 0; $i < count($entries); $i++) {
@@ -508,17 +500,23 @@ 
 				$description = '';
 				if (isset($entry['properties']['url'][0])) {
 					$link = $entry['properties']['url'][0];
-					if (isset($link['value'])) $link = $link['value'];
+					if (isset($link['value'])) {
+					    $link = $link['value'];
+					}
 					$item['link'] = array(array('data' => $link));
 				}
 				if (isset($entry['properties']['uid'][0])) {
 					$guid = $entry['properties']['uid'][0];
-					if (isset($guid['value'])) $guid = $guid['value'];
+					if (isset($guid['value'])) {
+					    $guid = $guid['value'];
+					}
 					$item['guid'] = array(array('data' => $guid));
 				}
 				if (isset($entry['properties']['name'][0])) {
 					$title = $entry['properties']['name'][0];
-					if (isset($title['value'])) $title = $title['value'];
+					if (isset($title['value'])) {
+					    $title = $title['value'];
+					}
 					$item['title'] = array(array('data' => $title));
 				}
 				if (isset($entry['properties']['author'][0]) || isset($feed_author)) {
@@ -529,12 +527,10 @@ 
 						$entry['properties']['author'][0] : $feed_author;
 					if (!is_string($author)) {
 						$author = $this->parse_hcard($author);
-					}
-					else if (strpos($author, 'http') === 0) {
+					} else if (strpos($author, 'http') === 0) {
 						if (isset($author_cache[$author])) {
 							$author = $author_cache[$author];
-						}
-						else {
+						} else {
 							$mf = Mf2\fetch($author);
 							foreach ($mf['items'] as $hcard) {
 								// Only interested in an h-card by itself in this case.
@@ -584,8 +580,7 @@ 
 								'<img src="'.$photo_list[$j].'"></a>';
 						}
 						$description .= '<br><b>'.$count.' photos</b></p>';
-					}
-					else if ($count == 1) {
+					} else if ($count == 1) {
 						$description = '<p><img src="'.$photo_list[0].'"></p>';
 					}
 				}
@@ -602,8 +597,7 @@ 
 						$in_reply_to = '';
 						if (is_string($entry['properties']['in-reply-to'][0])) {
 							$in_reply_to = $entry['properties']['in-reply-to'][0];
-						}
-						else if (isset($entry['properties']['in-reply-to'][0]['value'])) {
+						} else if (isset($entry['properties']['in-reply-to'][0]['value'])) {
 							$in_reply_to = $entry['properties']['in-reply-to'][0]['value'];
 						}
 						if ($in_reply_to !== '') {
@@ -617,12 +611,13 @@ 
 					$category_csv = '';
 					// Categories can also contain h-cards.
 					foreach ($entry['properties']['category'] as $category) {
-						if ($category_csv !== '') $category_csv .= ', ';
+						if ($category_csv !== '') {
+						    $category_csv .= ', ';
+						}
 						if (is_string($category)) {
 							// Can't have commas in categories.
 							$category_csv .= str_replace(',', '', $category);
-						}
-						else {
+						} else {
 							$category_csv .= $this->parse_hcard($category, true);
 						}
 					}
@@ -653,8 +648,7 @@ 
 		// Use the name given for the h-feed, or get the title from the html.
 		if ($feed_title !== '') {
 			$feed_title = array(array('data' => htmlspecialchars($feed_title)));
-		}
-		else if ($position = strpos($data, '<title>')) {
+		} else if ($position = strpos($data, '<title>')) {
 			$start = $position < 200 ? 0 : $position - 200;
 			$check = substr($data, $start, 400);
 			$matches = array();

wp/wp-includes/SimplePie/Source.php

Braces +29 added lines, -58 removed lines

@@ -103,28 +103,22 @@ 
 		if ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -174,8 +168,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -413,13 +406,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];
 				}
@@ -440,36 +431,28 @@ 
 		if ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
 		}
@@ -482,20 +465,16 @@ 
 		if ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_source_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_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -508,16 +487,13 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['xml_lang']))
+		} elseif (isset($this->data['xml_lang']))
 		{
 			return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -530,8 +506,7 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
 		}
@@ -544,12 +519,10 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
 		}
@@ -562,12 +535,10 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
 		}

wp/wp-includes/SimplePie/HTTP/Parser.php

Braces +12 added lines, -24 removed lines

@@ -203,13 +203,11 @@ 
 				$this->http_version = (float) $this->http_version;
 				$this->position += strspn($this->data, "\x09\x20", $this->position);
 				$this->state = 'status';
-			}
-			else
+			} else
 			{
 				$this->state = false;
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -225,8 +223,7 @@ 
 			$this->status_code = (int) substr($this->data, $this->position, $len);
 			$this->position += $len;
 			$this->state = 'reason';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -256,8 +253,7 @@ 
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
 			{
 				$this->headers[$this->name] .= ', ' . $this->value;
-			}
-			else
+			} else
 			{
 				$this->headers[$this->name] = $this->value;
 			}
@@ -268,13 +264,11 @@ 
 		{
 			$this->position += 2;
 			$this->state = 'body';
-		}
-		elseif ($this->data[$this->position] === "\x0A")
+		} elseif ($this->data[$this->position] === "\x0A")
 		{
 			$this->position++;
 			$this->state = 'body';
-		}
-		else
+		} else
 		{
 			$this->state = 'name';
 		}
@@ -292,15 +286,13 @@ 
 			{
 				$this->position += $len;
 				$this->state = 'new_line';
-			}
-			else
+			} else
 			{
 				$this->name = substr($this->data, $this->position, $len);
 				$this->position += $len + 1;
 				$this->state = 'value';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -316,8 +308,7 @@ 
 			if (substr($this->data, $this->position, 2) === "\x0D\x0A")
 			{
 				$this->position += 2;
-			}
-			elseif ($this->data[$this->position] === "\x0A")
+			} elseif ($this->data[$this->position] === "\x0A")
 			{
 				$this->position++;
 			}
@@ -334,8 +325,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -384,8 +374,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -442,8 +431,7 @@ 
 		{
 			unset($this->headers['transfer-encoding']);
 			$this->state = 'chunked';
-		}
-		else
+		} else
 		{
 			$this->state = 'emit';
 		}

wp/wp-includes/SimplePie/IRI.php

Braces +55 added lines, -78 removed lines

@@ -150,8 +150,7 @@ 
 		if (method_exists($this, 'set_' . $name))
 		{
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -184,8 +183,7 @@ 
 		)
 		{
 			$return = $this->{"get_$name"}();
-		}
-		elseif (array_key_exists($name, $props))
+		} elseif (array_key_exists($name, $props))
 		{
 			$return = $this->$name;
 		}
@@ -200,8 +198,7 @@ 
 		{
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else
+		} else
 		{
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
@@ -276,12 +273,10 @@ 
 		if (!$relative->is_valid())
 		{
 			return false;
-		}
-		elseif ($relative->scheme !== null)
+		} elseif ($relative->scheme !== null)
 		{
 			return clone $relative;
-		}
-		else
+		} else
 		{
 			if (!($base instanceof SimplePie_IRI))
 			{
@@ -295,8 +290,7 @@ 
 					{
 						$target = clone $relative;
 						$target->scheme = $base->scheme;
-					}
-					else
+					} else
 					{
 						$target = new SimplePie_IRI;
 						$target->scheme = $base->scheme;
@@ -308,38 +302,32 @@ 
 							if ($relative->ipath[0] === '/')
 							{
 								$target->ipath = $relative->ipath;
-							}
-							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+							} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
 								$target->ipath = '/' . $relative->ipath;
-							}
-							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+							} elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
 								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-							}
-							else
+							} else
 							{
 								$target->ipath = $relative->ipath;
 							}
 							$target->ipath = $target->remove_dot_segments($target->ipath);
 							$target->iquery = $relative->iquery;
-						}
-						else
+						} else
 						{
 							$target->ipath = $base->ipath;
 							if ($relative->iquery !== null)
 							{
 								$target->iquery = $relative->iquery;
-							}
-							elseif ($base->iquery !== null)
+							} elseif ($base->iquery !== null)
 							{
 								$target->iquery = $base->iquery;
 							}
 						}
 						$target->ifragment = $relative->ifragment;
 					}
-				}
-				else
+				} else
 				{
 					$target = clone $base;
 					$target->ifragment = null;
@@ -405,8 +393,7 @@ 
 			if (strpos($input, '../') === 0)
 			{
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0)
+			} elseif (strpos($input, './') === 0)
 			{
 				$input = substr($input, 2);
 			}
@@ -414,8 +401,7 @@ 
 			elseif (strpos($input, '/./') === 0)
 			{
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.')
+			} elseif ($input === '/.')
 			{
 				$input = '/';
 			}
@@ -424,8 +410,7 @@ 
 			{
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..')
+			} elseif ($input === '/..')
 			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
@@ -440,8 +425,7 @@ 
 			{
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else
+			} else
 			{
 				$output .= $input;
 				$input = '';
@@ -535,8 +519,7 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					$position = $strlen - 1;
 					$valid = false;
@@ -570,8 +553,9 @@ 
 			)
 			{
 				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid)
-					$position--;
+				if ($valid) {
+									$position--;
+				}
 
 				for ($j = $start; $j <= $position; $j++)
 				{
@@ -703,8 +687,7 @@ 
 					{
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else
+				} else
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
@@ -763,20 +746,28 @@ 
 	 */
 	public function is_valid()
 	{
-		if ($this->ipath === '') return true;
+		if ($this->ipath === '') {
+		    return true;
+		}
 
 		$isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
 			$this->port !== null;
-		if ($isauthority && $this->ipath[0] === '/') return true;
+		if ($isauthority && $this->ipath[0] === '/') {
+		    return true;
+		}
 
-		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;
+		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) {
+		    return false;
+		}
 
 		// Relative urls cannot have a colon in the first path segment (and the
 		// slashes themselves are not included so skip the first character).
 		if (!$this->scheme && !$isauthority &&
 		    strpos($this->ipath, ':') !== false &&
 		    strpos($this->ipath, '/', 1) !== false &&
-		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
+		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) {
+		    return false;
+		}
 
 		return true;
 	}
@@ -804,8 +795,7 @@ 
 		if ($iri === null)
 		{
 			return true;
-		}
-		elseif (isset($cache[$iri]))
+		} elseif (isset($cache[$iri]))
 		{
 			list($this->scheme,
 				 $this->iuserinfo,
@@ -853,13 +843,11 @@ 
 		if ($scheme === null)
 		{
 			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
 		{
 			$this->scheme = null;
 			return false;
-		}
-		else
+		} else
 		{
 			$this->scheme = strtolower($scheme);
 		}
@@ -881,8 +869,9 @@ 
 			$cache = null;
 			return;
 		}
-		if (!$cache)
-			$cache = array();
+		if (!$cache) {
+					$cache = array();
+		}
 
 		if ($authority === null)
 		{
@@ -890,8 +879,7 @@ 
 			$this->ihost = null;
 			$this->port = null;
 			return true;
-		}
-		elseif (isset($cache[$authority]))
+		} elseif (isset($cache[$authority]))
 		{
 			list($this->iuserinfo,
 				 $this->ihost,
@@ -906,8 +894,7 @@ 
 		{
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else
+		} else
 		{
 			$iuserinfo = null;
 		}
@@ -918,8 +905,7 @@ 
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
-		}
-		else
+		} else
 		{
 			$port = null;
 		}
@@ -947,8 +933,7 @@ 
 		if ($iuserinfo === null)
 		{
 			$this->iuserinfo = null;
-		}
-		else
+		} else
 		{
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
@@ -970,20 +955,17 @@ 
 		{
 			$this->ihost = null;
 			return true;
-		}
-		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		} elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
 				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else
+			} else
 			{
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
@@ -997,8 +979,7 @@ 
 				if ($ihost[$position] === '%')
 				{
 					$position += 3;
-				}
-				else
+				} else
 				{
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
@@ -1026,8 +1007,7 @@ 
 		{
 			$this->port = null;
 			return true;
-		}
-		elseif (strspn($port, '0123456789') === strlen($port))
+		} elseif (strspn($port, '0123456789') === strlen($port))
 		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
@@ -1062,8 +1042,7 @@ 
 		if (isset($cache[$ipath]))
 		{
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else
+		} else
 		{
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
@@ -1087,8 +1066,7 @@ 
 		if ($iquery === null)
 		{
 			$this->iquery = null;
-		}
-		else
+		} else
 		{
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
@@ -1107,8 +1085,7 @@ 
 		if ($ifragment === null)
 		{
 			$this->ifragment = null;
-		}
-		else
+		} else
 		{
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
@@ -1165,8 +1142,7 @@ 
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
-		}
-        elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		} elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
@@ -1228,8 +1204,9 @@ 
 	protected function get_authority()
 	{
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority))
-			return $this->to_uri($iauthority);
+		if (is_string($iauthority)) {
+					return $this->to_uri($iauthority);
+		}
 
 		return $iauthority;
 	}

wp/wp-includes/SimplePie/Cache/MySQL.php

Braces +12 added lines, -24 removed lines

@@ -105,8 +105,7 @@ 
 		try
 		{
 			$this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-		}
-		catch (PDOException $e)
+		} catch (PDOException $e)
 		{
 			$this->mysql = null;
 			return;
@@ -191,8 +190,7 @@ 
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 						$query->bindValue(':items', $items);
-					}
-					else
+					} else
 					{
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
@@ -205,8 +203,7 @@ 
 					{
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
 					$query->bindValue(':feed', $this->id);
@@ -259,14 +256,12 @@ 
 						}
 						return true;
 					}
-				}
-				else
+				} else
 				{
 					return true;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
@@ -282,8 +277,7 @@ 
 					{
 						return true;
 					}
-				}
-				else
+				} else
 				{
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
 					$query->bindValue(':id', $this->id);
@@ -320,8 +314,7 @@ 
 			if (isset($this->options['items'][0]))
 			{
 				$items = (int) $this->options['items'][0];
-			}
-			else
+			} else
 			{
 				$items = (int) $row[0];
 			}
@@ -331,20 +324,16 @@ 
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-				}
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
 				{
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
-				}
-				else
+				} else
 				{
 					$feed = null;
 				}
@@ -365,8 +354,7 @@ 
 						{
 							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
 						}
-					}
-					else
+					} else
 					{
 						return false;
 					}

wp/wp-includes/SimplePie/Cache/DB.php

Braces +4 added lines, -8 removed lines

@@ -81,20 +81,16 @@
 			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 			{
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-			}
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
 			{
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-			}
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
 			{
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-			}
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
 			{
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
-			}
-			else
+			} else
 			{
 				$channel = null;
 			}

wp/wp-includes/SimplePie/Misc.php

Braces +23 added lines, -46 removed lines

@@ -108,8 +108,7 @@ 
 				if (strlen($matches[$i][3][0]) <= 2)
 				{
 					$return[$i]['self_closing'] = true;
-				}
-				else
+				} else
 				{
 					$return[$i]['self_closing'] = false;
 					$return[$i]['content'] = $matches[$i][4][0];
@@ -142,8 +141,7 @@ 
 		if ($element['self_closing'])
 		{
 			$full .= ' />';
-		}
-		else
+		} else
 		{
 			$full .= ">$element[content]</$element[tag]>";
 		}
@@ -208,12 +206,10 @@ 
 		if ($http === 2 && $parsed['scheme'] !== '')
 		{
 			return "feed:$url";
-		}
-		elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
+		} elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
 		{
 			return substr_replace($url, 'podcast', 0, 4);
-		}
-		elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
+		} elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
 		{
 			return substr_replace($url, 'itpc', 0, 4);
 		}
@@ -228,8 +224,7 @@ 
 			if (is_array($value))
 			{
 				$array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
-			}
-			else
+			} else
 			{
 				$array1[$key] = $value;
 			}
@@ -1728,16 +1723,13 @@ 
 		if (is_array($curl = curl_version()))
 		{
 			$curl = $curl['version'];
-		}
-		elseif (substr($curl, 0, 5) === 'curl/')
+		} elseif (substr($curl, 0, 5) === 'curl/')
 		{
 			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
-		}
-		elseif (substr($curl, 0, 8) === 'libcurl/')
+		} elseif (substr($curl, 0, 8) === 'libcurl/')
 		{
 			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
-		}
-		else
+		} else
 		{
 			$curl = 0;
 		}
@@ -1759,8 +1751,7 @@ 
 			if (($end = strpos($data, '-->', $start)) !== false)
 			{
 				$data = substr_replace($data, '', 0, $end + 3);
-			}
-			else
+			} else
 			{
 				$data = '';
 			}
@@ -1816,8 +1807,7 @@ 
 					{
 						$position++;
 						continue;
-					}
-					elseif (isset($string[$position]))
+					} elseif (isset($string[$position]))
 					{
 						switch ($string[$position])
 						{
@@ -1830,14 +1820,12 @@ 
 								break;
 						}
 						$position++;
-					}
-					else
+					} else
 					{
 						break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$output .= '(';
 			}
@@ -1862,8 +1850,7 @@ 
 		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
 		{
 			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
-		}
-		else
+		} else
 		{
 			$mode = SIMPLEPIE_CONSTRUCT_NONE;
 		}
@@ -1932,8 +1919,7 @@ 
 			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
 			{
 				return SIMPLEPIE_CONSTRUCT_NONE;
-			}
-			else
+			} else
 			{
 				return SIMPLEPIE_CONSTRUCT_BASE64;
 			}
@@ -1979,20 +1965,16 @@ 
 		if ($codepoint < 0)
 		{
 			return false;
-		}
-		else if ($codepoint <= 0x7f)
+		} else if ($codepoint <= 0x7f)
 		{
 			return chr($codepoint);
-		}
-		else if ($codepoint <= 0x7ff)
+		} else if ($codepoint <= 0x7ff)
 		{
 			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
-		}
-		else if ($codepoint <= 0xffff)
+		} else if ($codepoint <= 0xffff)
 		{
 			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-		}
-		else if ($codepoint <= 0x10ffff)
+		} else if ($codepoint <= 0x10ffff)
 		{
 			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
 		}
@@ -2022,8 +2004,7 @@ 
 			{
 				list($name, $value) = explode('=', $section, 2);
 				$return[urldecode($name)][] = urldecode($value);
-			}
-			else
+			} else
 			{
 				$return[urldecode($section)][] = null;
 			}
@@ -2185,8 +2166,7 @@ 
 		if (file_exists($root . '/.git/index'))
 		{
 			return filemtime($root . '/.git/index');
-		}
-		elseif (file_exists($root . '/SimplePie'))
+		} elseif (file_exists($root . '/SimplePie'))
 		{
 			$time = 0;
 			foreach (glob($root . '/SimplePie/*.php') as $file)
@@ -2197,8 +2177,7 @@ 
 				}
 			}
 			return $time;
-		}
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		} elseif (file_exists(dirname(__FILE__) . '/Core.php'))
 		{
 			return filemtime(dirname(__FILE__) . '/Core.php');
 		}
@@ -2216,8 +2195,7 @@ 
 		if ($sp->error() !== null)
 		{
 			$info .= 'Error occurred: ' . $sp->error() . "\n";
-		}
-		else
+		} else
 		{
 			$info .= "No error found.\n";
 		}
@@ -2247,8 +2225,7 @@ 
 						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
 						break;
 				}
-			}
-			else
+			} else
 			{
 				$info .= "    $ext not loaded\n";
 			}