Ysurac / FlightAirMap

airline-statistics-registration.php

Braces +7 added lines, -4 removed lines

@@ -43,7 +43,9 @@ 
 	}
 	$Stats = new Stats($Spotter->db);
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -66,8 +68,7 @@ 
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}
@@ -131,7 +132,9 @@ 
 				$images = $Image->getSpotterImage($aircraft_item['registration']);
 				if (isset($images['image_thumbnail'])) {
 					$aircraft_item['image_thumbnail'] = $images['image_thumbnail'];
-				} else $aircraft_item['image_thumbnail'] = '';
+				} else {
+					$aircraft_item['image_thumbnail'] = '';
+				}
 			}
 			if ($aircraft_item['image_thumbnail'] != "")
 			{

marine-type-detailed.php

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];

statistics-type.php

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
 $title = _("Statistics").' - '._("Most common Vessel Type");
 
 $type = 'marine';
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 

require/libs/SimplePie.compiled.php

Braces +661 added lines, -1229 removed lines

@@ -765,8 +765,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;
@@ -931,8 +930,7 @@ 
 		if ($encoding)
 		{
 			$this->input_encoding = (string) $encoding;
-		}
-		else
+		} else
 		{
 			$this->input_encoding = false;
 		}
@@ -1259,8 +1257,7 @@ 
 		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
+		} else
 		{
 			$this->image_handler = '';
 		}
@@ -1354,8 +1351,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;
 		}
@@ -1380,8 +1376,7 @@ 
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
 				return true;
-			}
-			elseif ($fetched === false) {
+			} elseif ($fetched === false) {
 				return false;
 			}
 
@@ -1418,8 +1413,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))
 				{
@@ -1483,8 +1477,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')) {
@@ -1587,8 +1580,7 @@ 
 								$cache->touch();
 								return true;
 							}
-						}
-						else
+						} else
 						{
 							$this->check_modified = false;
 							if($this->force_cache_fallback)
@@ -1621,8 +1613,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',
@@ -1676,14 +1667,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
@@ -1693,8 +1682,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);
@@ -1787,8 +1775,7 @@ 
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
+			} else
 			{
 				$header .= ' charset=UTF-8';
 			}
@@ -1830,12 +1817,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'])
@@ -1851,8 +1836,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']))
@@ -1893,8 +1877,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
 			}
@@ -1931,8 +1914,7 @@ 
 				                   $this->sanitize($this->permanent_url,
 				                                   SIMPLEPIE_CONSTRUCT_IRI));
 			}
-		}
-		else
+		} else
 		{
 			if ($this->feed_url !== null)
 			{
@@ -2133,12 +2115,10 @@ 
 		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
-		}
-		elseif ($this->get_link() !== null)
+		} elseif ($this->get_link() !== null)
 		{
 			return $this->get_link();
-		}
-		else
+		} else
 		{
 			return $this->subscribe_url();
 		}
@@ -2159,8 +2139,7 @@ 
 		try
 		{
 			return $this->sanitize->sanitize($data, $type, $base);
-		}
-		catch (SimplePie_Exception $e)
+		} catch (SimplePie_Exception $e)
 		{
 			if (!$this->enable_exceptions)
 			{
@@ -2186,32 +2165,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2230,8 +2202,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2276,8 +2247,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -2295,8 +2265,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2315,8 +2284,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2393,8 +2361,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2413,8 +2380,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2479,8 +2445,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2500,8 +2465,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2582,13 +2546,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];
 				}
@@ -2601,12 +2563,10 @@ 
 		               $this->data['headers']['link'], $match))
 		{
 			return array($match[1]);
-		}
-		else if (isset($this->data['links'][$rel]))
+		} else if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2631,40 +2591,31 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2683,24 +2634,19 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2719,32 +2665,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['headers']['content-language']))
+		} elseif (isset($this->data['headers']['content-language']))
 		{
 			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2768,12 +2707,10 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2796,16 +2733,13 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2825,24 +2759,19 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2864,28 +2793,22 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2907,16 +2830,13 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2937,12 +2857,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2963,12 +2881,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2990,8 +2906,7 @@ 
 		if ($max === 0)
 		{
 			return $qty;
-		}
-		else
+		} else
 		{
 			return ($qty > $max) ? $max : $qty;
 		}
@@ -3015,8 +2930,7 @@ 
 		if (isset($items[$key]))
 		{
 			return $items[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -3104,8 +3018,7 @@ 
 				usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
 		 	}
 			$items = $this->data['ordered_items'];
-		}
-		else
+		} else
 		{
 			$items = $this->data['items'];
 		}
@@ -3113,8 +3026,7 @@ 
 		if ($end === 0)
 		{
 			return array_slice($items, $start);
-		}
-		else
+		} else
 		{
 			return array_slice($items, $start, $end);
 		}
@@ -3227,8 +3139,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);
 				}
@@ -3239,13 +3150,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
 			return array();
@@ -3277,8 +3186,7 @@ 
 				{
 					$file->headers['link'] = ', ';
 				}
-			}
-			else
+			} else
 			{
 				$file->headers['link'] = '';
 			}
@@ -3362,8 +3270,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -3379,8 +3286,7 @@ 
 		if ($this->link !== null)
 		{
 			return $this->link;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -3396,8 +3302,7 @@ 
 		if ($this->email !== null)
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -3607,20 +3512,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;
 			}
@@ -4109,8 +4010,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;
@@ -4195,8 +4095,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);
@@ -4209,8 +4108,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);
@@ -4263,14 +4161,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);
@@ -4286,8 +4182,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);
@@ -4324,8 +4219,7 @@ 
 			if (isset($this->options['items'][0]))
 			{
 				$items = (int) $this->options['items'][0];
-			}
-			else
+			} else
 			{
 				$items = (int) $row[0];
 			}
@@ -4335,20 +4229,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;
 				}
@@ -4369,8 +4259,7 @@ 
 						{
 							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
 						}
-					}
-					else
+					} else
 					{
 						return false;
 					}
@@ -4398,8 +4287,7 @@ 
 		if ($query->execute() && ($time = $query->fetchColumn()))
 		{
 			return $time;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -4423,8 +4311,7 @@ 
 		if ($query->execute() && $query->rowCount() > 0)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -4449,8 +4336,7 @@ 
 		if ($query->execute() && $query2->execute())
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -4699,8 +4585,7 @@ 
 		if ($this->endTime !== null)
 		{
 			return $this->endTime;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -4717,8 +4602,7 @@ 
 		if ($this->lang !== null)
 		{
 			return $this->lang;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -4734,8 +4618,7 @@ 
 		if ($this->startTime !== null)
 		{
 			return $this->startTime;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -4751,8 +4634,7 @@ 
 		if ($this->text !== null)
 		{
 			return $this->text;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -4768,8 +4650,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -4950,8 +4831,7 @@ 
 			if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
 			{
 				$official = substr($this->file->headers['content-type'], 0, $pos);
-			}
-			else
+			} else
 			{
 				$official = $this->file->headers['content-type'];
 			}
@@ -4961,34 +4841,28 @@ 
 				|| $official === 'application/unknown')
 			{
 				return $this->unknown();
-			}
-			elseif (substr($official, -4) === '+xml'
+			} elseif (substr($official, -4) === '+xml'
 				|| $official === 'text/xml'
 				|| $official === 'application/xml')
 			{
 				return $official;
-			}
-			elseif (substr($official, 0, 6) === 'image/')
+			} elseif (substr($official, 0, 6) === 'image/')
 			{
 				if ($return = $this->image())
 				{
 					return $return;
-				}
-				else
+				} else
 				{
 					return $official;
 				}
-			}
-			elseif ($official === 'text/html')
+			} elseif ($official === 'text/html')
 			{
 				return $this->feed_or_html();
-			}
-			else
+			} else
 			{
 				return $official;
 			}
-		}
-		else
+		} else
 		{
 			return $this->unknown();
 		}
@@ -5007,12 +4881,10 @@ 
 			|| substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
 		{
 			return 'text/plain';
-		}
-		elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
+		} elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
 		{
 			return 'application/octect-stream';
-		}
-		else
+		} else
 		{
 			return 'text/plain';
 		}
@@ -5031,37 +4903,29 @@ 
 			|| strtolower(substr($this->file->body, $ws, 7)) === '<script')
 		{
 			return 'text/html';
-		}
-		elseif (substr($this->file->body, 0, 5) === '%PDF-')
+		} elseif (substr($this->file->body, 0, 5) === '%PDF-')
 		{
 			return 'application/pdf';
-		}
-		elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
+		} elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
 		{
 			return 'application/postscript';
-		}
-		elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+		} elseif (substr($this->file->body, 0, 6) === 'GIF87a'
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
 		{
 			return 'image/gif';
-		}
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
 		{
 			return 'image/png';
-		}
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
 		{
 			return 'image/jpeg';
-		}
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
 		{
 			return 'image/bmp';
-		}
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
 		{
 			return 'image/vnd.microsoft.icon';
-		}
-		else
+		} else
 		{
 			return $this->text_or_binary();
 		}
@@ -5078,24 +4942,19 @@ 
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
 		{
 			return 'image/gif';
-		}
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
 		{
 			return 'image/png';
-		}
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
 		{
 			return 'image/jpeg';
-		}
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
 		{
 			return 'image/bmp';
-		}
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
 		{
 			return 'image/vnd.microsoft.icon';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -5136,44 +4995,36 @@ 
 				if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
 				{
 					$pos += 3;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 1) === '!')
+			} elseif (substr($this->file->body, $pos, 1) === '!')
 			{
 				if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
 				{
 					$pos++;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 1) === '?')
+			} elseif (substr($this->file->body, $pos, 1) === '?')
 			{
 				if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
 				{
 					$pos += 2;
-				}
-				else
+				} else
 				{
 					return 'text/html';
 				}
-			}
-			elseif (substr($this->file->body, $pos, 3) === 'rss'
+			} elseif (substr($this->file->body, $pos, 3) === 'rss'
 				|| substr($this->file->body, $pos, 7) === 'rdf:RDF')
 			{
 				return 'application/rss+xml';
-			}
-			elseif (substr($this->file->body, $pos, 4) === 'feed')
+			} elseif (substr($this->file->body, $pos, 4) === 'feed')
 			{
 				return 'application/atom+xml';
-			}
-			else
+			} else
 			{
 				return 'text/html';
 			}
@@ -5244,8 +5095,7 @@ 
 		if ($this->url !== null)
 		{
 			return $this->url;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -5261,8 +5111,7 @@ 
 		if ($this->label !== null)
 		{
 			return $this->label;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -5353,8 +5202,7 @@ 
 		if ($this->role !== null)
 		{
 			return $this->role;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -5370,8 +5218,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -5387,8 +5234,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -5469,8 +5315,7 @@ 
 		{
 			$this->consumed .= $this->data[$this->position];
 			return $this->data[$this->position++];
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -5491,8 +5336,7 @@ 
 			$this->consumed .= $data;
 			$this->position += $len;
 			return $data;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -5551,8 +5395,7 @@ 
 					if ($hex)
 					{
 						$codepoint = hexdec($codepoint);
-					}
-					else
+					} else
 					{
 						$codepoint = intval($codepoint);
 					}
@@ -5560,8 +5403,7 @@ 
 					if (isset($windows_1252_specials[$codepoint]))
 					{
 						$replacement = $windows_1252_specials[$codepoint];
-					}
-					else
+					} else
 					{
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}
@@ -6206,8 +6048,7 @@ 
 		if ($this->bitrate !== null)
 		{
 			return $this->bitrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6225,8 +6066,7 @@ 
 		if (isset($captions[$key]))
 		{
 			return $captions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6242,8 +6082,7 @@ 
 		if ($this->captions !== null)
 		{
 			return $this->captions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6261,8 +6100,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6278,8 +6116,7 @@ 
 		if ($this->categories !== null)
 		{
 			return $this->categories;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6295,8 +6132,7 @@ 
 		if ($this->channels !== null)
 		{
 			return $this->channels;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6312,8 +6148,7 @@ 
 		if ($this->copyright !== null)
 		{
 			return $this->copyright;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6331,8 +6166,7 @@ 
 		if (isset($credits[$key]))
 		{
 			return $credits[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6348,8 +6182,7 @@ 
 		if ($this->credits !== null)
 		{
 			return $this->credits;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6365,8 +6198,7 @@ 
 		if ($this->description !== null)
 		{
 			return $this->description;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6386,13 +6218,11 @@ 
 			{
 				$time = SimplePie_Misc::time_hms($this->duration);
 				return $time;
-			}
-			else
+			} else
 			{
 				return $this->duration;
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6408,8 +6238,7 @@ 
 		if ($this->expression !== null)
 		{
 			return $this->expression;
-		}
-		else
+		} else
 		{
 			return 'full';
 		}
@@ -6443,8 +6272,7 @@ 
 		if ($this->framerate !== null)
 		{
 			return $this->framerate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6473,8 +6301,7 @@ 
 		if (isset($hashes[$key]))
 		{
 			return $hashes[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6490,8 +6317,7 @@ 
 		if ($this->hashes !== null)
 		{
 			return $this->hashes;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6507,8 +6333,7 @@ 
 		if ($this->height !== null)
 		{
 			return $this->height;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6525,8 +6350,7 @@ 
 		if ($this->lang !== null)
 		{
 			return $this->lang;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6544,8 +6368,7 @@ 
 		if (isset($keywords[$key]))
 		{
 			return $keywords[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6561,8 +6384,7 @@ 
 		if ($this->keywords !== null)
 		{
 			return $this->keywords;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6578,8 +6400,7 @@ 
 		if ($this->length !== null)
 		{
 			return $this->length;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6595,8 +6416,7 @@ 
 		if ($this->link !== null)
 		{
 			return urldecode($this->link);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6613,8 +6433,7 @@ 
 		if ($this->medium !== null)
 		{
 			return $this->medium;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6631,8 +6450,7 @@ 
 		if ($this->player !== null)
 		{
 			return $this->player;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6650,8 +6468,7 @@ 
 		if (isset($ratings[$key]))
 		{
 			return $ratings[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6667,8 +6484,7 @@ 
 		if ($this->ratings !== null)
 		{
 			return $this->ratings;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6686,8 +6502,7 @@ 
 		if (isset($restrictions[$key]))
 		{
 			return $restrictions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6703,8 +6518,7 @@ 
 		if ($this->restrictions !== null)
 		{
 			return $this->restrictions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6720,8 +6534,7 @@ 
 		if ($this->samplingrate !== null)
 		{
 			return $this->samplingrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6738,8 +6551,7 @@ 
 		if ($length !== null)
 		{
 			return round($length/1048576, 2);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6757,8 +6569,7 @@ 
 		if (isset($thumbnails[$key]))
 		{
 			return $thumbnails[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6774,8 +6585,7 @@ 
 		if ($this->thumbnails !== null)
 		{
 			return $this->thumbnails;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6791,8 +6601,7 @@ 
 		if ($this->title !== null)
 		{
 			return $this->title;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6809,8 +6618,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6826,8 +6634,7 @@ 
 		if ($this->width !== null)
 		{
 			return $this->width;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -6911,8 +6718,7 @@ 
 		if (is_array($options))
 		{
 			extract($options);
-		}
-		else
+		} else
 		{
 			$options = explode(',', $options);
 			foreach($options as $option)
@@ -6979,17 +6785,14 @@ 
 				if ($height === 'auto')
 				{
 					$width = 480;
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$width = round((intval($height)/9)*16);
-				}
-				else
+				} else
 				{
 					$width = round((intval($height)/3)*4);
 				}
-			}
-			else
+			} else
 			{
 				$width = '100%';
 			}
@@ -7000,35 +6803,29 @@ 
 			if ($mime === 'audio')
 			{
 				$height = 0;
-			}
-			elseif ($mime === 'video')
+			} elseif ($mime === 'video')
 			{
 				if ($width === 'auto')
 				{
 					if ($widescreen)
 					{
 						$height = 270;
-					}
-					else
+					} else
 					{
 						$height = 360;
 					}
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$height = round((intval($width)/16)*9);
-				}
-				else
+				} else
 				{
 					$height = round((intval($width)/4)*3);
 				}
-			}
-			else
+			} else
 			{
 				$height = 376;
 			}
-		}
-		elseif ($mime === 'audio')
+		} elseif ($mime === 'audio')
 		{
 			$height = 0;
 		}
@@ -7037,8 +6834,7 @@ 
 		if ($mime === 'audio')
 		{
 			$placeholder = $audio;
-		}
-		elseif ($mime === 'video')
+		} elseif ($mime === 'video')
 		{
 			$placeholder = $video;
 		}
@@ -7051,8 +6847,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
 			}
@@ -7066,8 +6861,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
@@ -7083,13 +6877,11 @@ 
 				if ($placeholder !== '')
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-				}
-				else
+				} else
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
 			}
@@ -7102,15 +6894,16 @@ 
 			if ($native)
 			{
 				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else {
+			$embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		}
 
 		return $embed;
 	}
@@ -7138,8 +6931,7 @@ 
 		if ($this->get_type() !== null)
 		{
 			$type = strtolower($this->type);
-		}
-		else
+		} else
 		{
 			$type = null;
 		}
@@ -7273,29 +7065,23 @@ 
 			if (in_array($type, $types_flash))
 			{
 				return 'flash';
-			}
-			elseif (in_array($type, $types_fmedia))
+			} elseif (in_array($type, $types_fmedia))
 			{
 				return 'fmedia';
-			}
-			elseif (in_array($type, $types_quicktime))
+			} elseif (in_array($type, $types_quicktime))
 			{
 				return 'quicktime';
-			}
-			elseif (in_array($type, $types_wmedia))
+			} elseif (in_array($type, $types_wmedia))
 			{
 				return 'wmedia';
-			}
-			elseif (in_array($type, $types_mp3))
+			} elseif (in_array($type, $types_mp3))
 			{
 				return 'mp3';
-			}
-			else
+			} else
 			{
 				return null;
 			}
-		}
-		else
+		} else
 		{
 			return $type;
 		}
@@ -7398,8 +7184,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)) {
@@ -7424,8 +7209,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
@@ -7444,8 +7228,7 @@ 
 				{
 					$this->error = 'fsockopen error: ' . $errstr;
 					$this->success = false;
-				}
-				else
+				} else
 				{
 					stream_set_timeout($fp, $timeout);
 					if (isset($url_parts['path']))
@@ -7453,13 +7236,11 @@ 
 						if (isset($url_parts['query']))
 						{
 							$get = "$url_parts[path]?$url_parts[query]";
-						}
-						else
+						} else
 						{
 							$get = $url_parts['path'];
 						}
-					}
-					else
+					} else
 					{
 						$get = '/';
 					}
@@ -7519,8 +7300,7 @@ 
 										{
 											$this->error = 'Unable to decode HTTP "gzip" stream';
 											$this->success = false;
-										}
-										else
+										} else
 										{
 											$this->body = trim($decoder->data);
 										}
@@ -7530,16 +7310,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;
@@ -7552,8 +7329,7 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						$this->error = 'fsocket timed out';
 						$this->success = false;
@@ -7561,8 +7337,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))))
@@ -7686,8 +7461,7 @@ 
 		if ($this->state === 'emit' || $this->state === 'body')
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$this->http_version = '';
 			$this->status_code = '';
@@ -7737,13 +7511,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;
 		}
@@ -7759,8 +7531,7 @@ 
 			$this->status_code = (int) substr($this->data, $this->position, $len);
 			$this->position += $len;
 			$this->state = 'reason';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -7790,8 +7561,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;
 			}
@@ -7802,13 +7572,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';
 		}
@@ -7826,15 +7594,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;
 		}
@@ -7850,8 +7616,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++;
 			}
@@ -7868,8 +7633,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -7918,8 +7682,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -7976,8 +7739,7 @@ 
 		{
 			unset($this->headers['transfer-encoding']);
 			$this->state = 'chunked';
-		}
-		else
+		} else
 		{
 			$this->state = 'emit';
 		}
@@ -8157,8 +7919,7 @@ 
 		if (method_exists($this, 'set_' . $name))
 		{
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -8191,8 +7952,7 @@ 
 		)
 		{
 			$return = $this->{"get_$name"}();
-		}
-		elseif (array_key_exists($name, $props))
+		} elseif (array_key_exists($name, $props))
 		{
 			$return = $this->$name;
 		}
@@ -8207,8 +7967,7 @@ 
 		{
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else
+		} else
 		{
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
@@ -8217,8 +7976,7 @@ 
 		if ($return === null && isset($this->normalization[$this->scheme][$name]))
 		{
 			return $this->normalization[$this->scheme][$name];
-		}
-		else
+		} else
 		{
 			return $return;
 		}
@@ -8235,8 +7993,7 @@ 
 		if (method_exists($this, 'get_' . $name) || isset($this->$name))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -8292,12 +8049,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))
 			{
@@ -8311,8 +8066,7 @@ 
 					{
 						$target = clone $relative;
 						$target->scheme = $base->scheme;
-					}
-					else
+					} else
 					{
 						$target = new SimplePie_IRI;
 						$target->scheme = $base->scheme;
@@ -8324,46 +8078,39 @@ 
 							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;
 				}
 				$target->scheme_normalization();
 				return $target;
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -8402,8 +8149,7 @@ 
 				$match['fragment'] = null;
 			}
 			return $match;
-		}
-		else
+		} else
 		{
 			// This can occur when a paragraph is accidentally parsed as a URI
 			return false;
@@ -8425,8 +8171,7 @@ 
 			if (strpos($input, '../') === 0)
 			{
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0)
+			} elseif (strpos($input, './') === 0)
 			{
 				$input = substr($input, 2);
 			}
@@ -8434,8 +8179,7 @@ 
 			elseif (strpos($input, '/./') === 0)
 			{
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.')
+			} elseif ($input === '/.')
 			{
 				$input = '/';
 			}
@@ -8444,8 +8188,7 @@ 
 			{
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..')
+			} elseif ($input === '/..')
 			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
@@ -8460,8 +8203,7 @@ 
 			{
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else
+			} else
 			{
 				$output .= $input;
 				$input = '';
@@ -8555,8 +8297,7 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					$position = $strlen - 1;
 					$valid = false;
@@ -8590,8 +8331,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++)
 				{
@@ -8723,8 +8465,7 @@ 
 					{
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else
+				} else
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
@@ -8783,20 +8524,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;
 	}
@@ -8824,8 +8573,7 @@ 
 		if ($iri === null)
 		{
 			return true;
-		}
-		elseif (isset($cache[$iri]))
+		} elseif (isset($cache[$iri]))
 		{
 			list($this->scheme,
 				 $this->iuserinfo,
@@ -8836,8 +8584,7 @@ 
 				 $this->ifragment,
 				 $return) = $cache[$iri];
 			return $return;
-		}
-		else
+		} else
 		{
 			$parsed = $this->parse_iri((string) $iri);
 			if (!$parsed)
@@ -8875,13 +8622,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);
 		}
@@ -8903,8 +8648,9 @@ 
 			$cache = null;
 			return;
 		}
-		if (!$cache)
-			$cache = array();
+		if (!$cache) {
+					$cache = array();
+		}
 
 		if ($authority === null)
 		{
@@ -8912,8 +8658,7 @@ 
 			$this->ihost = null;
 			$this->port = null;
 			return true;
-		}
-		elseif (isset($cache[$authority]))
+		} elseif (isset($cache[$authority]))
 		{
 			list($this->iuserinfo,
 				 $this->ihost,
@@ -8921,16 +8666,14 @@ 
 				 $return) = $cache[$authority];
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$remaining = $authority;
 			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
 			{
 				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 				$remaining = substr($remaining, $iuserinfo_end + 1);
-			}
-			else
+			} else
 			{
 				$iuserinfo = null;
 			}
@@ -8941,8 +8684,7 @@ 
 					$port = null;
 				}
 				$remaining = substr($remaining, 0, $port_start);
-			}
-			else
+			} else
 			{
 				$port = null;
 			}
@@ -8971,8 +8713,7 @@ 
 		if ($iuserinfo === null)
 		{
 			$this->iuserinfo = null;
-		}
-		else
+		} else
 		{
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
@@ -8994,20 +8735,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, '!$&\'()*+,;=');
 
@@ -9021,8 +8759,7 @@ 
 				if ($ihost[$position] === '%')
 				{
 					$position += 3;
-				}
-				else
+				} else
 				{
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
@@ -9050,14 +8787,12 @@ 
 		{
 			$this->port = null;
 			return true;
-		}
-		elseif (strspn($port, '0123456789') === strlen($port))
+		} elseif (strspn($port, '0123456789') === strlen($port))
 		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
 			return true;
-		}
-		else
+		} else
 		{
 			$this->port = null;
 			return false;
@@ -9088,8 +8823,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);
@@ -9113,8 +8847,7 @@ 
 		if ($iquery === null)
 		{
 			$this->iquery = null;
-		}
-		else
+		} else
 		{
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
@@ -9133,8 +8866,7 @@ 
 		if ($ifragment === null)
 		{
 			$this->ifragment = null;
-		}
-		else
+		} else
 		{
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
@@ -9191,8 +8923,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'];
 		}
@@ -9241,8 +8972,7 @@ 
 				$iauthority .= ':' . $this->port;
 			}
 			return $iauthority;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9256,10 +8986,11 @@ 
 	protected function get_authority()
 	{
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority))
-			return $this->to_uri($iauthority);
-		else
-			return $iauthority;
+		if (is_string($iauthority)) {
+					return $this->to_uri($iauthority);
+		} else {
+					return $iauthority;
+		}
 	}
 }
 
@@ -9367,8 +9098,7 @@ 
 		if (isset($this->data['child'][$namespace][$tag]))
 		{
 			return $this->data['child'][$namespace][$tag];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9437,24 +9167,19 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+			} elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
 			{
 				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
 			}
@@ -9462,8 +9187,7 @@ 
 		if ($fn === false)
 		{
 			return null;
-		}
-		elseif (!is_callable($fn))
+		} elseif (!is_callable($fn))
 		{
 			trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
 			$fn = 'md5';
@@ -9487,32 +9211,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 			{
 				$this->data['title'] = $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_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 			{
 				$this->data['title'] = $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_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$this->data['title'] = null;
 			}
@@ -9541,53 +9258,42 @@ 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
 		{
 			return $return;
-		}
-
-		elseif (!$description_only)
+		} elseif (!$description_only)
 		{
 			return $this->get_content(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9613,22 +9319,18 @@ 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (!$content_only)
+		} elseif (!$content_only)
 		{
 			return $this->get_description(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9649,8 +9351,7 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
 			{
 				$this->data['thumbnail'] = $return[0]['attribs'][''];
-			}
-			else
+			} else
 			{
 				$this->data['thumbnail'] = null;
 			}
@@ -9671,8 +9372,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9718,8 +9418,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -9739,8 +9438,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9759,8 +9457,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9779,8 +9476,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9845,8 +9541,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9927,16 +9622,13 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+		} elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
 		{
 			return $authors;
-		}
-		elseif ($authors = $this->feed->get_authors())
+		} elseif ($authors = $this->feed->get_authors())
 		{
 			return $authors;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9955,16 +9647,13 @@ 
 		if ($return = $this->get_item_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_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -9991,32 +9680,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
@@ -10025,8 +9707,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['date'] = null;
 			}
@@ -10045,8 +9726,7 @@ 
 				default:
 					return date($date_format, $this->data['date']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10076,8 +9756,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['updated'] = null;
 			}
@@ -10096,8 +9775,7 @@ 
 				default:
 					return date($date_format, $this->data['updated']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10121,12 +9799,10 @@ 
 		if (!$date_format)
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (($date = $this->get_date('U')) !== null && $date !== false)
+		} elseif (($date = $this->get_date('U')) !== null && $date !== false)
 		{
 			return strftime($date_format, $date);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10185,12 +9861,10 @@ 
 		if ($link !== null)
 		{
 			return $link;
-		}
-		elseif ($enclosure !== null)
+		} elseif ($enclosure !== null)
 		{
 			return $enclosure->get_link();
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10210,8 +9884,7 @@ 
 		if ($links[$key] !== null)
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10277,13 +9950,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];
 				}
@@ -10293,8 +9964,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10316,8 +9986,7 @@ 
 		if (isset($enclosures[$key]))
 		{
 			return $enclosures[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -10393,8 +10062,7 @@ 
 					}
 					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
 				}
-			}
-			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			} elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
 			{
 				foreach ($captions as $caption)
 				{
@@ -10444,8 +10112,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -10467,8 +10134,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -10520,8 +10186,7 @@ 
 					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
 				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-			}
-			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			} elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
 			{
 				$copyright_url = null;
 				$copyright_label = null;
@@ -10551,8 +10216,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -10562,8 +10226,7 @@ 
 					}
 					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
 				}
-			}
-			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			} elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
 			{
 				foreach ($credits as $credit)
 				{
@@ -10577,8 +10240,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -10601,8 +10263,7 @@ 
 				{
 					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			} elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
 			{
 				if (isset($description_parent[0]['data']))
 				{
@@ -10652,15 +10313,13 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
 					$hashes_parent[] = $algo.':'.$value;
 				}
-			}
-			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			} elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
 			{
 				foreach ($hashes_iterator as $hash)
 				{
@@ -10673,8 +10332,7 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
@@ -10698,8 +10356,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -10710,8 +10367,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -10722,8 +10378,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -10747,8 +10402,7 @@ 
 				{
 					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 				}
-			}
-			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			} elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
 			{
 				if (isset($player_parent[0]['attribs']['']['url']))
 				{
@@ -10766,8 +10420,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -10777,8 +10430,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -10790,8 +10442,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -10800,8 +10451,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -10811,8 +10461,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -10852,8 +10501,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -10866,8 +10514,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -10888,8 +10535,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -10906,8 +10552,7 @@ 
 			if (is_array($restrictions_parent))
 			{
 				$restrictions_parent = array_values(array_unique($restrictions_parent));
-			}
-			else
+			} else
 			{
 				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
 			}
@@ -10922,8 +10567,7 @@ 
 						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 					}
 				}
-			}
-			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			} elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
 			{
 				foreach ($thumbnails as $thumbnail)
 				{
@@ -10941,8 +10585,7 @@ 
 				{
 					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			} elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
 			{
 				if (isset($title_parent[0]['data']))
 				{
@@ -11035,8 +10678,7 @@ 
 							if (isset($content['attribs']['']['duration']))
 							{
 								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$duration = $duration_parent;
 							}
@@ -11116,8 +10758,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
 								{
@@ -11152,8 +10793,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							else
+							} else
 							{
 								$captions = $captions_parent;
 							}
@@ -11173,8 +10813,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -11199,8 +10838,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -11214,12 +10852,10 @@ 
 							if (is_array($categories) && is_array($categories_parent))
 							{
 								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-							}
-							elseif (is_array($categories))
+							} elseif (is_array($categories))
 							{
 								$categories = array_values(array_unique($categories));
-							}
-							elseif (is_array($categories_parent))
+							} elseif (is_array($categories_parent))
 							{
 								$categories = array_values(array_unique($categories_parent));
 							}
@@ -11238,8 +10874,7 @@ 
 									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
 							{
 								$copyright_url = null;
 								$copyright_label = null;
@@ -11252,8 +10887,7 @@ 
 									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							else
+							} else
 							{
 								$copyrights = $copyrights_parent;
 							}
@@ -11273,8 +10907,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -11288,8 +10921,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
 								{
@@ -11303,8 +10935,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -11318,8 +10949,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							else
+							} else
 							{
 								$credits = $credits_parent;
 							}
@@ -11328,12 +10958,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$description = $description_parent;
 							}
@@ -11352,8 +10980,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -11363,8 +10990,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
 								{
@@ -11377,8 +11003,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -11388,8 +11013,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							else
+							} else
 							{
 								$hashes = $hashes_parent;
 							}
@@ -11410,8 +11034,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
 							{
 								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
 								{
@@ -11426,8 +11049,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							else
+							} else
 							{
 								$keywords = $keywords_parent;
 							}
@@ -11436,12 +11058,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							else
+							} else
 							{
 								$player = $player_parent;
 							}
@@ -11456,8 +11076,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -11471,8 +11090,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
 								{
@@ -11481,8 +11099,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -11496,8 +11113,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							else
+							} else
 							{
 								$ratings = $ratings_parent;
 							}
@@ -11528,8 +11144,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
 								{
@@ -11554,8 +11169,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							else
+							} else
 							{
 								$restrictions = $restrictions_parent;
 							}
@@ -11571,8 +11185,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
 								{
@@ -11582,8 +11195,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							else
+							} else
 							{
 								$thumbnails = $thumbnails_parent;
 							}
@@ -11592,12 +11204,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$title = $title_parent;
 							}
@@ -11657,8 +11267,7 @@ 
 						if (isset($content['attribs']['']['duration']))
 						{
 							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$duration = $duration_parent;
 						}
@@ -11740,8 +11349,7 @@ 
 							{
 								$captions = array_values(array_unique($captions));
 							}
-						}
-						else
+						} else
 						{
 							$captions = $captions_parent;
 						}
@@ -11761,8 +11369,7 @@ 
 								if (isset($category['attribs']['']['scheme']))
 								{
 									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$scheme = 'http://search.yahoo.com/mrss/category_schema';
 								}
@@ -11776,16 +11383,13 @@ 
 						if (is_array($categories) && is_array($categories_parent))
 						{
 							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-						}
-						elseif (is_array($categories))
+						} elseif (is_array($categories))
 						{
 							$categories = array_values(array_unique($categories));
-						}
-						elseif (is_array($categories_parent))
+						} elseif (is_array($categories_parent))
 						{
 							$categories = array_values(array_unique($categories_parent));
-						}
-						else
+						} else
 						{
 							$categories = null;
 						}
@@ -11804,8 +11408,7 @@ 
 								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 							}
 							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-						}
-						else
+						} else
 						{
 							$copyrights = $copyrights_parent;
 						}
@@ -11825,8 +11428,7 @@ 
 								if (isset($credit['attribs']['']['scheme']))
 								{
 									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$credit_scheme = 'urn:ebu';
 								}
@@ -11840,8 +11442,7 @@ 
 							{
 								$credits = array_values(array_unique($credits));
 							}
-						}
-						else
+						} else
 						{
 							$credits = $credits_parent;
 						}
@@ -11850,8 +11451,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 						{
 							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$description = $description_parent;
 						}
@@ -11870,8 +11470,7 @@ 
 								if (isset($hash['attribs']['']['algo']))
 								{
 									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$algo = 'md5';
 								}
@@ -11881,8 +11480,7 @@ 
 							{
 								$hashes = array_values(array_unique($hashes));
 							}
-						}
-						else
+						} else
 						{
 							$hashes = $hashes_parent;
 						}
@@ -11903,8 +11501,7 @@ 
 							{
 								$keywords = array_values(array_unique($keywords));
 							}
-						}
-						else
+						} else
 						{
 							$keywords = $keywords_parent;
 						}
@@ -11915,8 +11512,7 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 							}
-						}
-						else
+						} else
 						{
 							$player = $player_parent;
 						}
@@ -11931,8 +11527,7 @@ 
 								if (isset($rating['attribs']['']['scheme']))
 								{
 									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$rating_scheme = 'urn:simple';
 								}
@@ -11946,8 +11541,7 @@ 
 							{
 								$ratings = array_values(array_unique($ratings));
 							}
-						}
-						else
+						} else
 						{
 							$ratings = $ratings_parent;
 						}
@@ -11978,8 +11572,7 @@ 
 							{
 								$restrictions = array_values(array_unique($restrictions));
 							}
-						}
-						else
+						} else
 						{
 							$restrictions = $restrictions_parent;
 						}
@@ -11997,8 +11590,7 @@ 
 							{
 								$thumbnails = array_values(array_unique($thumbnails));
 							}
-						}
-						else
+						} else
 						{
 							$thumbnails = $thumbnails_parent;
 						}
@@ -12007,8 +11599,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 						{
 							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$title = $title_parent;
 						}
@@ -12050,8 +11641,7 @@ 
 					if (isset($link['attribs']['']['title']))
 					{
 						$title = $this->sanitize($link['attribs']['']['title'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$title = $title_parent;
 					}
@@ -12142,8 +11732,7 @@ 
 		if (!empty($this->data['enclosures']))
 		{
 			return $this->data['enclosures'];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -12166,12 +11755,10 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -12194,16 +11781,13 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -12220,8 +11804,7 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
 		{
 			return $this->registry->create('Source', array($this, $return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -12265,8 +11848,7 @@ 
 			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
 			$this->dom->loadHTML($this->file->body);
 			restore_error_handler();
-		}
-		else
+		} else
 		{
 			$this->dom = null;
 		}
@@ -12344,17 +11926,14 @@ 
 			if (in_array($sniffed, $mime_types))
 			{
 				return true;
-			}
-			else
+			} else
 			{
 				return false;
 			}
-		}
-		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+		} elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -12396,8 +11975,7 @@ 
 		if (!empty($feeds))
 		{
 			return array_values($feeds);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -12425,8 +12003,7 @@ 
 				if ($this->base_location < $line)
 				{
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-				}
-				else
+				} else
 				{
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 				}
@@ -12473,8 +12050,7 @@ 
 					if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo())
 					{
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-					}
-					else
+					} else
 					{
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 					}
@@ -12488,8 +12064,7 @@ 
 					if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
 					{
 						$this->local[] = $href;
-					}
-					else
+					} else
 					{
 						$this->elsewhere[] = $href;
 					}
@@ -12534,8 +12109,7 @@ 
 						$this->registry->call('Misc', 'absolutize_url',
 						                      array(trim($link->getAttribute('href')),
 						                            $this->base));
-				}
-				else
+				} else
 				{
 					$href =
 						$this->registry->call('Misc', 'absolutize_url',
@@ -12575,8 +12149,7 @@ 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
 				{
 					return array($feed);
-				}
-				else
+				} else
 				{
 					unset($array[$key]);
 				}
@@ -12603,8 +12176,7 @@ 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
 				{
 					return array($feed);
-				}
-				else
+				} else
 				{
 					unset($array[$key]);
 				}
@@ -12681,8 +12253,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];
@@ -12715,8 +12286,7 @@ 
 		if ($element['self_closing'])
 		{
 			$full .= ' />';
-		}
-		else
+		} else
 		{
 			$full .= ">$element[content]</$element[tag]>";
 		}
@@ -12781,16 +12351,13 @@ 
 		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);
-		}
-		else
+		} else
 		{
 			return $url;
 		}
@@ -12803,8 +12370,7 @@ 
 			if (is_array($value))
 			{
 				$array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
-			}
-			else
+			} else
 			{
 				$array1[$key] = $value;
 			}            
@@ -12848,8 +12414,7 @@ 
 		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
 		{
 			return chr($integer);
-		}
-		else
+		} else
 		{
 			return strtoupper($match[0]);
 		}
@@ -14306,16 +13871,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;
 		}
@@ -14337,8 +13899,7 @@ 
 			if (($end = strpos($data, '-->', $start)) !== false)
 			{
 				$data = substr_replace($data, '', 0, $end + 3);
-			}
-			else
+			} else
 			{
 				$data = '';
 			}
@@ -14394,8 +13955,7 @@ 
 					{
 						$position++;
 						continue;
-					}
-					elseif (isset($string[$position]))
+					} elseif (isset($string[$position]))
 					{
 						switch ($string[$position])
 						{
@@ -14408,14 +13968,12 @@ 
 								break;
 						}
 						$position++;
-					}
-					else
+					} else
 					{
 						break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$output .= '(';
 			}
@@ -14430,8 +13988,7 @@ 
 		if (($pos = strpos($mime, ';')) === false)
 		{
 			return trim($mime);
-		}
-		else
+		} else
 		{
 			return trim(substr($mime, 0, $pos));
 		}
@@ -14442,8 +13999,7 @@ 
 		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
 		{
 			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
-		}
-		else
+		} else
 		{
 			$mode = SIMPLEPIE_CONSTRUCT_NONE;
 		}
@@ -14466,8 +14022,7 @@ 
 				default:
 					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
 			}
-		}
-		else
+		} else
 		{
 			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
 		}
@@ -14514,13 +14069,11 @@ 
 			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
 			{
 				return SIMPLEPIE_CONSTRUCT_NONE;
-			}
-			else
+			} else
 			{
 				return SIMPLEPIE_CONSTRUCT_BASE64;
 			}
-		}
-		else
+		} else
 		{
 			return SIMPLEPIE_CONSTRUCT_TEXT;
 		}
@@ -14563,24 +14116,19 @@ 
 		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));
-		}
-		else
+		} else
 		{
 			// U+FFFD REPLACEMENT CHARACTER
 			return "\xEF\xBF\xBD";
@@ -14608,8 +14156,7 @@ 
 			{
 				list($name, $value) = explode('=', $section, 2);
 				$return[urldecode($name)][] = urldecode($value);
-			}
-			else
+			} else
 			{
 				$return[urldecode($section)][] = null;
 			}
@@ -14771,8 +14318,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)
@@ -14783,12 +14329,10 @@ 
 				}
 			}
 			return $time;
-		}
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		} elseif (file_exists(dirname(__FILE__) . '/Core.php'))
 		{
 			return filemtime(dirname(__FILE__) . '/Core.php');
-		}
-		else
+		} else
 		{
 			return filemtime(__FILE__);
 		}
@@ -14804,8 +14348,7 @@ 
 		if ($sp->error() !== null)
 		{
 			$info .= 'Error occurred: ' . $sp->error() . "\n";
-		}
-		else
+		} else
 		{
 			$info .= "No error found.\n";
 		}
@@ -14835,8 +14378,7 @@ 
 						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
 						break;
 				}
-			}
-			else
+			} else
 			{
 				$info .= "    $ext not loaded\n";
 			}
@@ -14893,16 +14435,14 @@ 
 			if ($ip1 === '')
 			{
 				$c1 = -1;
-			}
-			else
+			} else
 			{
 				$c1 = substr_count($ip1, ':');
 			}
 			if ($ip2 === '')
 			{
 				$c2 = -1;
-			}
-			else
+			} else
 			{
 				$c2 = substr_count($ip2, ':');
 			}
@@ -14980,8 +14520,7 @@ 
 		if ($ip_parts[1] !== '')
 		{
 			return implode(':', $ip_parts);
-		}
-		else
+		} else
 		{
 			return $ip_parts[0];
 		}
@@ -15007,8 +14546,7 @@ 
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
-		}
-		else
+		} else
 		{
 			return array($ip, '');
 		}
@@ -15033,35 +14571,39 @@ 
 			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;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -15660,8 +15202,7 @@ 
 		if (is_callable($callback))
 		{
 			$this->user[] = $callback;
-		}
-		else
+		} else
 		{
 			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
 		}
@@ -15723,8 +15264,7 @@ 
 				{
 					$timezone = 0 - $timezone;
 				}
-			}
-			else
+			} else
 			{
 				$timezone = 0;
 			}
@@ -15733,8 +15273,7 @@ 
 			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7])));
 
 			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -15770,8 +15309,7 @@ 
 					{
 						$position++;
 						continue;
-					}
-					elseif (isset($string[$position]))
+					} elseif (isset($string[$position]))
 					{
 						switch ($string[$position])
 						{
@@ -15784,14 +15322,12 @@ 
 								break;
 						}
 						$position++;
-					}
-					else
+					} else
 					{
 						break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$output .= '(';
 			}
@@ -15870,8 +15406,7 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			elseif ($match[4] < 1000)
+			} elseif ($match[4] < 1000)
 			{
 				$match[4] += 1900;
 			}
@@ -15880,15 +15415,13 @@ 
 			if ($match[7] !== '')
 			{
 				$second = $match[7];
-			}
-			else
+			} else
 			{
 				$second = 0;
 			}
 
 			return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -15945,15 +15478,13 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			else
+			} else
 			{
 				$match[4] += 1900;
 			}
 
 			return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -15994,8 +15525,7 @@ 
 
 			$month = $this->month[strtolower($match[2])];
 			return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -16013,8 +15543,7 @@ 
 		if ($strtotime === -1 || $strtotime === false)
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return $strtotime;
 		}
@@ -16074,8 +15603,7 @@ 
 		if (strtoupper($encoding) === 'US-ASCII')
 		{
 			$this->encoding = 'UTF-8';
-		}
-		else
+		} else
 		{
 			$this->encoding = $encoding;
 		}
@@ -16114,8 +15642,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;
@@ -16155,8 +15682,7 @@ 
 			$this->current_byte = xml_get_current_byte_index($xml);
 			xml_parser_free($xml);
 			return $return;
-		}
-		else
+		} else
 		{
 			libxml_clear_errors();
 			$xml = new XMLReader();
@@ -16170,8 +15696,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -16182,8 +15707,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -16193,8 +15717,7 @@ 
 							if ($xml->namespaceURI !== '')
 							{
 								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-							}
-							else
+							} else
 							{
 								$attrName = $xml->localName;
 							}
@@ -16220,8 +15743,7 @@ 
 				$this->current_line = $error->line;
 				$this->current_column = $error->column;
 				return false;
-			}
-			else
+			} else
 			{
 				return true;
 			}
@@ -16277,8 +15799,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);
@@ -16287,8 +15808,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);
 		}
@@ -16308,8 +15828,7 @@ 
 				}
 				$this->data['data'] .= '>';
 			}
-		}
-		else
+		} else
 		{
 			$this->datas[] =& $this->data;
 			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
@@ -16330,8 +15849,7 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-		}
-		else
+		} else
 		{
 			$this->data['data'] .= $cdata;
 		}
@@ -16389,8 +15907,7 @@ 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
 				$cache[$string] = array($namespace, $local_name);
-			}
-			else
+			} else
 			{
 				$cache[$string] = array('', $string);
 			}
@@ -16410,8 +15927,7 @@ 
 				$link = $data['properties']['url'][0];
 				if ($name === '') {
 					$name = $link;
-				}
-				else {
+				} else {
 					// can't have commas in categories.
 					$name = str_replace(',', '', $name);
 				}
@@ -16437,19 +15953,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;
 			}
 		}
@@ -16462,8 +15983,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++) {
@@ -16474,17 +15994,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)) {
@@ -16495,12 +16021,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.
@@ -16550,8 +16074,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>';
 					}
 				}
@@ -16568,8 +16091,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 !== '') {
@@ -16583,12 +16105,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);
 						}
 					}
@@ -16619,8 +16142,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();
@@ -16705,8 +16227,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -16722,8 +16243,7 @@ 
 		if ($this->value !== null)
 		{
 			return $this->value;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -16865,8 +16385,7 @@ 
 		if (!method_exists($class, '__construct'))
 		{
 			$instance = new $class;
-		}
-		else
+		} else
 		{
 			$reflector = new ReflectionClass($class);
 			$instance = $reflector->newInstanceArgs($parameters);
@@ -16982,8 +16501,7 @@ 
 		if ($this->relationship !== null)
 		{
 			return $this->relationship;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -16999,8 +16517,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17016,8 +16533,7 @@ 
 		if ($this->value !== null)
 		{
 			return $this->value;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17071,8 +16587,7 @@ 
 		if ($page)
 		{
 			$this->image_handler = (string) $page;
-		}
-		else
+		} else
 		{
 			$this->image_handler = false;
 		}
@@ -17126,13 +16641,11 @@ 
 			if (is_array($tags))
 			{
 				$this->strip_htmltags = $tags;
-			}
-			else
+			} else
 			{
 				$this->strip_htmltags = explode(',', $tags);
 			}
-		}
-		else
+		} else
 		{
 			$this->strip_htmltags = false;
 		}
@@ -17150,13 +16663,11 @@ 
 			if (is_array($attribs))
 			{
 				$this->strip_attributes = $attribs;
-			}
-			else
+			} else
 			{
 				$this->strip_attributes = explode(',', $attribs);
 			}
-		}
-		else
+		} else
 		{
 			$this->strip_attributes = false;
 		}
@@ -17169,13 +16680,11 @@ 
 			if (is_array($attribs))
 			{
 				$this->add_attributes = $attribs;
-			}
-			else
+			} else
 			{
 				$this->add_attributes = explode(',', $attribs);
 			}
-		}
-		else
+		} else
 		{
 			$this->add_attributes = false;
 		}
@@ -17234,8 +16743,7 @@ 
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
-				}
-				else
+				} else
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 				}
@@ -17323,8 +16831,7 @@ 
 							if ($cache->load())
 							{
 								$img->setAttribute('src', $this->image_handler . $image_url);
-							}
-							else
+							} else
 							{
 								$file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
 								$headers = $file->headers;
@@ -17334,8 +16841,7 @@ 
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
 									{
 										$img->setAttribute('src', $this->image_handler . $image_url);
-									}
-									else
+									} else
 									{
 										trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 									}
@@ -17351,8 +16857,7 @@ 
 				if (version_compare(PHP_VERSION, '5.3.6', '>='))
 				{
 					$data = trim($document->saveHTML($div));
-				}
-				else
+				} else
 				{
 					$data = trim($document->saveXML($div));
 				}
@@ -17361,8 +16866,7 @@ 
 				{
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
 					$data = preg_replace('/<\/div>$/', '', $data);
-				}
-				else
+				} else
 				{
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
 				}
@@ -17401,8 +16905,7 @@ 
 			$html = '<div>' . $html . '</div>';
 			$ret .= '<!DOCTYPE html>';
 			$content_type = 'text/html';
-		}
-		else
+		} else
 		{
 			$ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
 			$content_type = 'application/xhtml+xml';
@@ -17450,17 +16953,14 @@ 
 				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
 				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
 				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
-			}
-			else
+			} else
 			{
 				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
 			}
-		}
-		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		} elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
 		{
 			return $match[4];
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -17523,8 +17023,7 @@ 
 			}
 
 			return;
-		}
-		elseif (in_array($tag, array('script', 'style')))
+		} elseif (in_array($tag, array('script', 'style')))
 		{
 			foreach ($elements as $element)
 			{
@@ -17532,8 +17031,7 @@ 
 			}
 
 			return;
-		}
-		else
+		} else
 		{
 			foreach ($elements as $element)
 			{
@@ -17610,8 +17108,7 @@ 
 		if (isset($this->data['child'][$namespace][$tag]))
 		{
 			return $this->data['child'][$namespace][$tag];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17637,32 +17134,25 @@ 
 		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);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17674,8 +17164,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17712,8 +17201,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -17731,8 +17219,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17744,8 +17231,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17814,8 +17300,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17827,8 +17312,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17885,8 +17369,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17898,8 +17381,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17963,13 +17445,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];
 				}
@@ -17980,8 +17460,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -17992,40 +17471,31 @@ 
 		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]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18036,24 +17506,19 @@ 
 		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);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18064,20 +17529,16 @@ 
 		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);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18088,12 +17549,10 @@ 
 		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];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18104,16 +17563,13 @@ 
 		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];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18124,16 +17580,13 @@ 
 		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]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -18233,8 +17686,7 @@ 
 		if ($this->state === 'emit')
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$this->version = '';
 			$this->encoding = '';
@@ -18291,8 +17743,7 @@ 
 		if ($this->skip_whitespace())
 		{
 			$this->state = 'version_name';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18305,8 +17756,7 @@ 
 			$this->position += 7;
 			$this->skip_whitespace();
 			$this->state = 'version_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18319,8 +17769,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'version_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18334,13 +17783,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'encoding_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18353,8 +17800,7 @@ 
 			$this->position += 8;
 			$this->skip_whitespace();
 			$this->state = 'encoding_equals';
-		}
-		else
+		} else
 		{
 			$this->state = 'standalone_name';
 		}
@@ -18367,8 +17813,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'encoding_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18382,13 +17827,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'standalone_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18401,8 +17844,7 @@ 
 			$this->position += 10;
 			$this->skip_whitespace();
 			$this->state = 'standalone_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18415,8 +17857,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'standalone_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18445,13 +17886,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = false;
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -18676,8 +18115,7 @@ 
 					// Set the extra field to the given data
 					$this->extra_field = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -18696,8 +18134,7 @@ 
 					// Set the original filename to the given string
 					$this->filename = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len + 1;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -18716,8 +18153,7 @@ 
 					// Set the original comment to the given string
 					$this->comment = substr($this->compressed_data, $this->position, $len);
 					$this->position += $len + 1;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -18737,13 +18173,11 @@ 
 					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
 					{
 						$this->position += 2;
-					}
-					else
+					} else
 					{
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -18753,8 +18187,7 @@ 
 			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
 			{
 				return false;
-			}
-			else
+			} else
 			{
 				$this->position = $this->compressed_size - 8;
 			}
@@ -18777,8 +18210,7 @@ 
 
 			// Wow, against all odds, we've actually got a valid gzip string
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

news.php

Braces +21 added lines, -10 removed lines

@@ -7,11 +7,17 @@ 
 $title = _("News");
 require_once('header.php');
 
-if (isset($_GET['tracker'])) $type = 'tracker';
-elseif (isset($_GET['marine'])) $type = 'marine';
-elseif (isset($_GET['aircraft'])) $type = 'aircraft';
-elseif (isset($_GET['satellite'])) $type = 'satellite';
-else $type = 'global';
+if (isset($_GET['tracker'])) {
+	$type = 'tracker';
+} elseif (isset($_GET['marine'])) {
+	$type = 'marine';
+} elseif (isset($_GET['aircraft'])) {
+	$type = 'aircraft';
+} elseif (isset($_GET['satellite'])) {
+	$type = 'satellite';
+} else {
+	$type = 'global';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -19,7 +25,7 @@ 
   $limit_start = 0;
   $limit_end = 25;
   $absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -46,9 +52,12 @@ 
 	$feeds = $globalNewsFeeds[$type];
 } else {
 	$lg = $lang[1];
-	if (isset($globalNewsFeeds[$type][$lg])) $feeds = $globalNewsFeeds[$type][$lg];
-	else $feeds = array_shift($globalNewsFeeds[$type]);
-}
+	if (isset($globalNewsFeeds[$type][$lg])) {
+		$feeds = $globalNewsFeeds[$type][$lg];
+	} else {
+		$feeds = array_shift($globalNewsFeeds[$type]);
+	}
+	}
 
 $SimplePie->set_feed_url($feeds);
 $SimplePie->set_cache_duration(3600);
@@ -60,7 +69,9 @@ 
 {
 	$j = 0;
 	foreach($anews as $news) {
-		if ($j > 10) break;
+		if ($j > 10) {
+			break;
+		}
 		$j++;
 		print '<div class="news">';
 		print '<h4><a href="'.$news->get_permalink().'">'.$news->get_title().'</a> <span>('.$news->get_date('j M Y, g:i a').')</span></h4>'."\n";

owner-sub-menu.php

Braces +77 added lines, -11 removed lines

@@ -3,7 +3,13 @@ 
 </span>
 <div class="stats_airline">
 	<form id="changedate" method="post">
-		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 	</form>
 </div>
 <?php
@@ -11,15 +17,39 @@ 
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-aircraft" || strtolower($current_page) == "owner-statistics-registration" || strtolower($current_page) == "owner-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Aircraft Type"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Registration"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Manufacturer"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Aircraft Type"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -27,14 +57,50 @@ 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
 <?php

install/class.settings.php

Braces +26 added lines, -10 removed lines

@@ -26,14 +26,20 @@ 
 								foreach ($data as $keya => $dataa) {
 									if (is_array($dataa) && !empty($dataa)) {
 										foreach ($dataa as $dataaa) {
-											if (!isset($dataarraya)) $dataarraya = $dataaa;
-											else $dataarraya .= "','".$dataaa;
+											if (!isset($dataarraya)) {
+												$dataarraya = $dataaa;
+											} else {
+												$dataarraya .= "','".$dataaa;
+											}
 										}
 										$dataarray = "array('".$keya."' => array('".$dataarraya."'))";
 										unset($dataarraya);
 									} else {
-										if (!isset($dataarray)) $dataarray = "'".$dataa."'";
-										else $dataarray .= ",'".$dataa."'";
+										if (!isset($dataarray)) {
+											$dataarray = "'".$dataa."'";
+										} else {
+											$dataarray .= ",'".$dataa."'";
+										}
 									}
 								}
 								$array_value = "'".$key."' => ".$dataarray;
@@ -50,14 +56,20 @@ 
 								foreach ($data as $keya => $dataa) {
 									if (is_array($dataa) && !empty($dataa)) {
 										foreach ($dataa as $dataaa) {
-											if (!isset($dataarraya)) $dataarraya = $dataaa;
-											else $dataarraya .= "','".$dataaa;
+											if (!isset($dataarraya)) {
+												$dataarraya = $dataaa;
+											} else {
+												$dataarraya .= "','".$dataaa;
+											}
 										}
 										$dataarray = "array('".$keya."' => array('".$dataarraya."'))";
 										unset($dataarraya);
 									} else {
-										if (!isset($dataarray)) $dataarray = "'".$dataa."'";
-										else $dataarray .= "','".$dataa."'";
+										if (!isset($dataarray)) {
+											$dataarray = "'".$dataa."'";
+										} else {
+											$dataarray .= "','".$dataa."'";
+										}
 									}
 								}
 								$array_value .= ",'".$key."' => ".$dataarray;
@@ -90,7 +102,9 @@ 
 								}
 							}
 							if (!isset($array_value)) {
-								if (!isset($arrayd_value)) $arrayd_value = '';
+								if (!isset($arrayd_value)) {
+									$arrayd_value = '';
+								}
 								//$array_value = "'".$key."' => array(".$arrayd_value.")";
 								$array_value = "array(".$arrayd_value.")";
 							} elseif (isset($arrayd_value)) {
@@ -107,7 +121,9 @@ 
 						}
 					}
 				}
-				if (!isset($array_value)) $array_value = '';
+				if (!isset($array_value)) {
+					$array_value = '';
+				}
 				$replace = "\n".'\$'.$settingname." = array(".$array_value.")";
 				unset($array_value);
 			} else {

manufacturer-detailed.php

Braces +4 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		if (isset($limit_explode[1])) {
 			$limit_start = $limit_explode[0];
@@ -52,7 +52,9 @@ 
 		print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 		$Stats = new Stats();
 		$all_manufacturers = $Stats->getAllManufacturers();
-		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
+		if (empty($all_manufacturers)) {
+			$all_manufacturers = $Spotter->getAllManufacturers();
+		}
 		foreach($all_manufacturers as $all_manufacturer)
 		{
 			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))

tsk-geojson.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$id = $spotter_item['Waypoint']['@attributes']['id'];
-		if ($id == 0 || !is_numeric($id)) $id = $j;
+		if ($id == 0 || !is_numeric($id)) {
+			$id = $j;
+		}
 		$output .= '{"type": "Feature",';
 		    $output .= '"id": '.$id.',';
 		    $output .= '"properties": {';
@@ -34,7 +36,9 @@ 
 				$output .= '"icon": "/images/tsk/tsk-start.png"';
 			} elseif ($spotter_item['@attributes']['type'] == 'Finish') {
 				$output .= '"icon": "/images/tsk/tsk-finish.png"';
-			} else $output .= '"icon": "/images/tsk/number_'.$id.'.png"';
+			} else {
+				$output .= '"icon": "/images/tsk/number_'.$id.'.png"';
+			}
 		    $output .= '},';
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';