Ysurac / FlightAirMap

getLatestData-tv.php

Spacing +2 added lines, -2 removed lines

@@ -5,14 +5,14 @@
 require_once('require/class.Language.php');
 
 header('Content-Type: text/javascript');
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 $SpotterLive = new SpotterLive();
 $spotter_array = $SpotterLive->getRealTimeData($q);
 
 $output = '{';
 $output .= '"flights": [';
 if (!empty($spotter_array)) {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$output .= '{';
 		$output .= '"flight_id": "'.$spotter_item['spotter_id'].'",';

tv.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 <?php
 if (isset($_GET['q']))
 {
-	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 	$spotter_array = $Spotter->searchSpotterData($q, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
 } else {
 	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
@@ -148,18 +148,18 @@ 
    
 <?php
 	if (isset($_GET['image']) && isset($_GET['q'])) {
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>&q=<?php print $q; ?>", function( data ) {
 <?php
 	} elseif (isset($_GET['image'])) {
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>", function( data ) {
 <?php
 	} elseif (isset($_GET['q'])) {
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
 ?>
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&q=<?php print $q; ?>", function( data ) {
 <?php

require/libs/SimplePie.compiled.php

Doc Comments +75 added lines, -21 removed lines

@@ -2760,7 +2760,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -2789,7 +2789,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{
@@ -2930,7 +2930,7 @@ 
 	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_width()
 	{
@@ -2956,7 +2956,7 @@ 
 	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_height()
 	{
@@ -3185,7 +3185,7 @@ 
 	 * @access private
 	 * @param SimplePie $a
 	 * @param SimplePie $b
-	 * @return boolean
+	 * @return integer
 	 */
 	public static function sort_items($a, $b)
 	{
@@ -4384,7 +4384,7 @@ 
 	/**
 	 * Retrieve the last modified time for the cache
 	 *
-	 * @return int Timestamp
+	 * @return false|string Timestamp
 	 */
 	public function mtime()
 	{
@@ -4504,7 +4504,6 @@ 
      *
      * @param string $location Location string (from SimplePie::$cache_location)
      * @param string $name Unique ID for the cache
-     * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
      */
     public function __construct($location, $name, $options = null) {
         //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance();
@@ -5461,7 +5460,7 @@ 
 	 * Consume the next byte
 	 *
 	 * @access private
-	 * @return mixed The next byte, or false, if there is no more data
+	 * @return string|false The next byte, or false, if there is no more data
 	 */
 	public function consume()
 	{
@@ -5481,7 +5480,7 @@ 
 	 *
 	 * @access private
 	 * @param string $chars Characters to consume
-	 * @return mixed A series of characters that match the range, or false
+	 * @return string|false A series of characters that match the range, or false
 	 */
 	public function consume_range($chars)
 	{
@@ -6571,7 +6570,7 @@ 
 	/**
 	 * Get length
 	 *
-	 * @return float Length in bytes
+	 * @return string|null Length in bytes
 	 */
 	public function get_length()
 	{
@@ -8279,7 +8278,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param SimplePie_IRI $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -9068,7 +9067,7 @@ 
 	 * Set the ipath.
 	 *
 	 * @param string $ipath
-	 * @return bool
+	 * @return null|boolean
 	 */
 	public function set_path($ipath, $clear_cache = false)
 	{
@@ -9145,6 +9144,7 @@ 
 	/**
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
+	 * @param false|string $string
 	 * @return string
 	 */
 	public function to_uri($string)
@@ -10114,7 +10114,7 @@ 
 	 * @since 1.0
 	 *
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
-	 * @return int|string|null
+	 * @return string|null
 	 */
 	public function get_local_date($date_format = '%c')
 	{
@@ -10137,7 +10137,7 @@ 
 	 *
 	 * @see get_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -10155,7 +10155,7 @@ 
 	 *
 	 * @see get_updated_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_updated_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -12159,7 +12159,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -12187,7 +12187,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{
@@ -12403,6 +12403,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function search_elements_by_tag($name, &$done, $feeds)
 	{
 		if ($this->dom === null)
@@ -12621,6 +12624,9 @@ 
  */
 class SimplePie_Misc
 {
+	/**
+	 * @param integer $seconds
+	 */
 	public static function time_hms($seconds)
 	{
 		$time = '';
@@ -12923,6 +12929,11 @@ 
 		}
 	}
 
+	/**
+	 * @param string $data
+	 * @param string $input
+	 * @param string $output
+	 */
 	protected static function change_encoding_mbstring($data, $input, $output)
 	{
 		if ($input === 'windows-949')
@@ -12961,6 +12972,11 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $data
+	 * @param string $input
+	 * @param string $output
+	 */
 	protected static function change_encoding_iconv($data, $input, $output)
 	{
 		return @iconv($input, $output, $data);
@@ -14301,6 +14317,9 @@ 
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function get_curl_version()
 	{
 		if (is_array($curl = curl_version()))
@@ -14368,7 +14387,6 @@ 
 	/**
 	 * Remove RFC822 comments
 	 *
-	 * @param string $data Data to strip comments from
 	 * @return string Comment stripped string
 	 */
 	public static function uncomment_rfc822($string)
@@ -14624,7 +14642,7 @@ 
 	 * @todo Add support for EBCDIC
 	 * @param string $data XML data
 	 * @param SimplePie_Registry $registry Class registry
-	 * @return array Possible encodings
+	 * @return string[] Possible encodings
 	 */
 	public static function xml_encoding($data, $registry)
 	{
@@ -14997,7 +15015,7 @@ 
 	 *           0:0:0:0:0:FFFF:129.144.52.38
 	 *
 	 * @param string $ip An IPv6 address
-	 * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
 	private static function split_v6_v4($ip)
 	{
@@ -15744,7 +15762,6 @@ 
 	 * Remove RFC822 comments
 	 *
 	 * @access protected
-	 * @param string $data Data to strip comments from
 	 * @return string Comment stripped string
 	 */
 	public function remove_rfc2822_comments($string)
@@ -16258,6 +16275,9 @@ 
 		return $this->data;
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_open($parser, $tag, $attributes)
 	{
 		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
@@ -16325,6 +16345,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $cdata
+	 */
 	public function cdata($parser, $cdata)
 	{
 		if ($this->current_xhtml_construct >= 0)
@@ -16337,6 +16360,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_close($parser, $tag)
 	{
 		if ($this->current_xhtml_construct >= 0)
@@ -16422,6 +16448,9 @@ 
 		return isset($data['value']) ? $data['value'] : '';
 	}
 
+	/**
+	 * @param string $url
+	 */
 	private function parse_microformats(&$data, $url) {
 		$feed_title = '';
 		$feed_author = NULL;
@@ -16953,6 +16982,8 @@ 
 	 *
 	 * For documentation on all the parameters, see the corresponding
 	 * properties and their accessors
+	 * @param string $relationship
+	 * @param string $value
 	 */
 	public function __construct($relationship = null, $type = null, $value = null)
 	{
@@ -17390,6 +17421,9 @@ 
 		return $data;
 	}
 
+	/**
+	 * @param string $html
+	 */
 	protected function preprocess($html, $type)
 	{
 		$ret = '';
@@ -17414,6 +17448,9 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 */
 	public function replace_urls($document, $tag, $attributes)
 	{
 		if (!is_array($attributes))
@@ -17466,6 +17503,10 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 * @param DOMXPath $xpath
+	 */
 	protected function strip_tag($tag, $document, $xpath, $type)
 	{
 		$elements = $xpath->query('body//' . $tag);
@@ -17550,6 +17591,9 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMXPath $xpath
+	 */
 	protected function strip_attr($attrib, $xpath)
 	{
 		$elements = $xpath->query('//*[@' . $attrib . ']');
@@ -17560,6 +17604,9 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 */
 	protected function add_attr($tag, $valuePairs, $document)
 	{
 		$elements = $document->getElementsByTagName($tag);
@@ -17605,6 +17652,10 @@ 
 		return md5(serialize($this->data));
 	}
 
+	/**
+	 * @param string $namespace
+	 * @param string $tag
+	 */
 	public function get_source_tags($namespace, $tag)
 	{
 		if (isset($this->data['child'][$namespace][$tag]))
@@ -17617,6 +17668,9 @@ 
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	public function get_base($element = array())
 	{
 		return $this->item->get_base($element);

Indentation +281 added lines, -282 removed lines

@@ -868,7 +868,6 @@ 
 	 * This tells SimplePie to ignore any file errors and fall back to cache
 	 * instead. This only works if caching is enabled and cached content
 	 * still exists.
-
 	 * @param bool $enable Force use of cache on fail.
 	 */
 	public function force_cache_fallback($enable = false)
@@ -1663,7 +1662,7 @@ 
 					// Now also do feed discovery, but if microformats were found don't
 					// overwrite the current value of file.
 					$discovered = $locate->find($this->autodiscovery,
-					                            $this->all_discovered_feeds);
+												$this->all_discovered_feeds);
 					if ($microformats)
 					{
 						if ($hub = $locate->get_rel_link('hub'))
@@ -1928,8 +1927,8 @@ 
 			{
 				// sanitize encodes ampersands which are required when used in a url.
 				return str_replace('&', '&',
-				                   $this->sanitize($this->permanent_url,
-				                                   SIMPLEPIE_CONSTRUCT_IRI));
+								   $this->sanitize($this->permanent_url,
+												   SIMPLEPIE_CONSTRUCT_IRI));
 			}
 		}
 		else
@@ -1937,8 +1936,8 @@ 
 			if ($this->feed_url !== null)
 			{
 				return str_replace('&', '&',
-				                   $this->sanitize($this->feed_url,
-				                                   SIMPLEPIE_CONSTRUCT_IRI));
+								   $this->sanitize($this->feed_url,
+												   SIMPLEPIE_CONSTRUCT_IRI));
 			}
 		}
 		return null;
@@ -2597,8 +2596,8 @@ 
 		}
 
 		if (isset($this->data['headers']['link']) &&
-		    preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
-		               $this->data['headers']['link'], $match))
+			preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
+					   $this->data['headers']['link'], $match))
 		{
 			return array($match[1]);
 		}
@@ -3937,112 +3936,112 @@ 
  */
 class SimplePie_Cache_Memcached implements SimplePie_Cache_Base
 {
-    /**
-     * Memcached instance
-     * @var Memcached
-     */
-    protected $cache;
-
-    /**
-     * Options
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * Cache name
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Create a new cache object
-     * @param string $location Location string (from SimplePie::$cache_location)
-     * @param string $name     Unique ID for the cache
-     * @param string $type     Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-     */
-    public function __construct($location, $name, $type) {
-        $this->options = array(
-            'host'   => '127.0.0.1',
-            'port'   => 11211,
-            'extras' => array(
-                'timeout' => 3600, // one hour
-                'prefix'  => 'simplepie_',
-            ),
-        );
-        $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
-
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
-
-        $this->cache = new Memcached();
-        $this->cache->addServer($this->options['host'], (int)$this->options['port']);
-    }
-
-    /**
-     * Save data to the cache
-     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-     * @return bool Successfulness
-     */
-    public function save($data) {
-        if ($data instanceof SimplePie) {
-            $data = $data->data;
-        }
-
-        return $this->setData(serialize($data));
-    }
-
-    /**
-     * Retrieve the data saved to the cache
-     * @return array Data for SimplePie::$data
-     */
-    public function load() {
-        $data = $this->cache->get($this->name);
-
-        if ($data !== false) {
-            return unserialize($data);
-        }
-        return false;
-    }
-
-    /**
-     * Retrieve the last modified time for the cache
-     * @return int Timestamp
-     */
-    public function mtime() {
-        $data = $this->cache->get($this->name . '_mtime');
-        return (int) $data;
-    }
-
-    /**
-     * Set the last modified time to the current time
-     * @return bool Success status
-     */
-    public function touch() {
-        $data = $this->cache->get($this->name);
-        return $this->setData($data);
-    }
-
-    /**
-     * Remove the cache
-     * @return bool Success status
-     */
-    public function unlink() {
-        return $this->cache->delete($this->name, 0);
-    }
-
-    /**
-     * Set the last modified time and data to Memcached
-     * @return bool Success status
-     */
-    private function setData($data) {
-
-        if ($data !== false) {
-            $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
-            return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
-        }
-
-        return false;
-    }
+	/**
+	 * Memcached instance
+	 * @var Memcached
+	 */
+	protected $cache;
+
+	/**
+	 * Options
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache name
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Create a new cache object
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name     Unique ID for the cache
+	 * @param string $type     Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type) {
+		$this->options = array(
+			'host'   => '127.0.0.1',
+			'port'   => 11211,
+			'extras' => array(
+				'timeout' => 3600, // one hour
+				'prefix'  => 'simplepie_',
+			),
+		);
+		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
+		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+
+		$this->cache = new Memcached();
+		$this->cache->addServer($this->options['host'], (int)$this->options['port']);
+	}
+
+	/**
+	 * Save data to the cache
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data) {
+		if ($data instanceof SimplePie) {
+			$data = $data->data;
+		}
+
+		return $this->setData(serialize($data));
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load() {
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false) {
+			return unserialize($data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 * @return int Timestamp
+	 */
+	public function mtime() {
+		$data = $this->cache->get($this->name . '_mtime');
+		return (int) $data;
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 * @return bool Success status
+	 */
+	public function touch() {
+		$data = $this->cache->get($this->name);
+		return $this->setData($data);
+	}
+
+	/**
+	 * Remove the cache
+	 * @return bool Success status
+	 */
+	public function unlink() {
+		return $this->cache->delete($this->name, 0);
+	}
+
+	/**
+	 * Set the last modified time and data to Memcached
+	 * @return bool Success status
+	 */
+	private function setData($data) {
+
+		if ($data !== false) {
+			$this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
+			return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -4471,143 +4470,143 @@ 
  * @uses Redis
  */
 class SimplePie_Cache_Redis implements SimplePie_Cache_Base {
-    /**
-     * Redis instance
-     *
-     * @var \Redis
-     */
-    protected $cache;
-
-    /**
-     * Options
-     *
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * Cache name
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Cache Data
-     *
-     * @var type
-     */
-    protected $data;
-
-    /**
-     * Create a new cache object
-     *
-     * @param string $location Location string (from SimplePie::$cache_location)
-     * @param string $name Unique ID for the cache
-     * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
-     */
-    public function __construct($location, $name, $options = null) {
-        //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance();
-        $parsed = SimplePie_Cache::parse_URL($location);
-        $redis = new Redis();
-        $redis->connect($parsed['host'], $parsed['port']);
-        $this->cache = $redis;
-
-        if (!is_null($options) && is_array($options)) {
-            $this->options = $options;
-        } else {
-            $this->options = array (
-                'prefix' => 'rss:simple_primary:',
-                'expire' => 0,
-            );
-        }
-
-        $this->name = $this->options['prefix'] . $name;
-    }
-
-    /**
-     * @param \Redis $cache
-     */
-    public function setRedisClient(\Redis $cache) {
-        $this->cache = $cache;
-    }
-
-    /**
-     * Save data to the cache
-     *
-     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
-     * @return bool Successfulness
-     */
-    public function save($data) {
-        if ($data instanceof SimplePie) {
-            $data = $data->data;
-        }
-        $response = $this->cache->set($this->name, serialize($data));
-        if ($this->options['expire']) {
-            $this->cache->expire($this->name, $this->options['expire']);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Retrieve the data saved to the cache
-     *
-     * @return array Data for SimplePie::$data
-     */
-    public function load() {
-        $data = $this->cache->get($this->name);
-
-        if ($data !== false) {
-            return unserialize($data);
-        }
-        return false;
-    }
-
-    /**
-     * Retrieve the last modified time for the cache
-     *
-     * @return int Timestamp
-     */
-    public function mtime() {
-
-        $data = $this->cache->get($this->name);
-
-        if ($data !== false) {
-            return time();
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the last modified time to the current time
-     *
-     * @return bool Success status
-     */
-    public function touch() {
-
-        $data = $this->cache->get($this->name);
-
-        if ($data !== false) {
-            $return = $this->cache->set($this->name, $data);
-            if ($this->options['expire']) {
-                return $this->cache->expire($this->name, $this->ttl);
-            }
-            return $return;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove the cache
-     *
-     * @return bool Success status
-     */
-    public function unlink() {
-        return $this->cache->set($this->name, null);
-    }
+	/**
+	 * Redis instance
+	 *
+	 * @var \Redis
+	 */
+	protected $cache;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache name
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Cache Data
+	 *
+	 * @var type
+	 */
+	protected $data;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $options = null) {
+		//$this->cache = \flow\simple\cache\Redis::getRedisClientInstance();
+		$parsed = SimplePie_Cache::parse_URL($location);
+		$redis = new Redis();
+		$redis->connect($parsed['host'], $parsed['port']);
+		$this->cache = $redis;
+
+		if (!is_null($options) && is_array($options)) {
+			$this->options = $options;
+		} else {
+			$this->options = array (
+				'prefix' => 'rss:simple_primary:',
+				'expire' => 0,
+			);
+		}
+
+		$this->name = $this->options['prefix'] . $name;
+	}
+
+	/**
+	 * @param \Redis $cache
+	 */
+	public function setRedisClient(\Redis $cache) {
+		$this->cache = $cache;
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data) {
+		if ($data instanceof SimplePie) {
+			$data = $data->data;
+		}
+		$response = $this->cache->set($this->name, serialize($data));
+		if ($this->options['expire']) {
+			$this->cache->expire($this->name, $this->options['expire']);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load() {
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false) {
+			return unserialize($data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime() {
+
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false) {
+			return time();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch() {
+
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false) {
+			$return = $this->cache->set($this->name, $data);
+			if ($this->options['expire']) {
+				return $this->cache->expire($this->name, $this->ttl);
+			}
+			return $return;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink() {
+		return $this->cache->set($this->name, null);
+	}
 
 }
 
@@ -8269,9 +8268,9 @@ 
 	 * Clean up
 	 */
 	public function __destruct() {
-	    $this->set_iri(null, true);
-	    $this->set_path(null, true);
-	    $this->set_authority(null, true);
+		$this->set_iri(null, true);
+		$this->set_path(null, true);
+		$this->set_authority(null, true);
 	}
 
 	/**
@@ -8794,9 +8793,9 @@ 
 		// 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, ':') !== false &&
+			strpos($this->ipath, '/', 1) !== false &&
+			strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
 
 		return true;
 	}
@@ -9469,7 +9468,7 @@ 
 			$fn = 'md5';
 		}
 		return call_user_func($fn,
-		       $this->get_permalink().$this->get_title().$this->get_content());
+			   $this->get_permalink().$this->get_title().$this->get_content());
 	}
 
 	/**
@@ -9538,47 +9537,47 @@ 
 	public function get_description($description_only = false)
 	{
 		if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary')) &&
-		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+			($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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+				($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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
+				($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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
+				($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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+				($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
 		}
 		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+				($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
 		}
 		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 = $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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+				($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
 		}
 		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
+				($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
 		{
 			return $return;
 		}
@@ -9610,17 +9609,17 @@ 
 	public function get_content($content_only = false)
 	{
 		if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content')) &&
-		    ($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 = $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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+				($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')) &&
-		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
+				($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
 		}
@@ -12335,8 +12334,8 @@ 
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
 			$sniffed = $sniffer->get_type();
 			$mime_types = array('application/rss+xml', 'application/rdf+xml',
-			                    'text/rdf', 'application/atom+xml', 'text/xml',
-			                    'application/xml', 'application/x-rss+xml');
+								'text/rdf', 'application/atom+xml', 'text/xml',
+								'application/xml', 'application/x-rss+xml');
 			if ($check_html)
 			{
 				$mime_types[] = 'text/html';
@@ -12510,12 +12509,12 @@ 
 		if ($this->dom === null)
 		{
 			throw new SimplePie_Exception('DOMDocument not found, unable to use '.
-			                              'locator');
+										  'locator');
 		}
 		if (!class_exists('DOMXpath'))
 		{
 			throw new SimplePie_Exception('DOMXpath not found, unable to use '.
-			                              'get_rel_link');
+										  'get_rel_link');
 		}
 
 		$xpath = new DOMXpath($this->dom);
@@ -12525,22 +12524,22 @@ 
 			$href = trim($link->getAttribute('href'));
 			$parsed = $this->registry->call('Misc', 'parse_url', array($href));
 			if ($parsed['scheme'] === '' ||
-			    preg_match('/^https?$/i', $parsed['scheme']))
+				preg_match('/^https?$/i', $parsed['scheme']))
 			{
 				if (method_exists($link, 'getLineNo') &&
-				    $this->base_location < $link->getLineNo())
+					$this->base_location < $link->getLineNo())
 				{
 					$href =
 						$this->registry->call('Misc', 'absolutize_url',
-						                      array(trim($link->getAttribute('href')),
-						                            $this->base));
+											  array(trim($link->getAttribute('href')),
+													$this->base));
 				}
 				else
 				{
 					$href =
 						$this->registry->call('Misc', 'absolutize_url',
-						                      array(trim($link->getAttribute('href')),
-						                            $this->http_base));
+											  array(trim($link->getAttribute('href')),
+													$this->http_base));
 				}
 				if ($href === false)
 				{
@@ -16630,9 +16629,9 @@ 
 		}
 		$channel = array('channel' => array(array('child' => array('' =>
 			array('link' => $link, 'image' => $image, 'title' => $feed_title,
-			      'item' => $items)))));
+				  'item' => $items)))));
 		$rss = array(array('attribs' => array('' => array('version' => '2.0')),
-		                   'child' => array('' => $channel)));
+						   'child' => array('' => $channel)));
 		$this->data = array('child' => array('' => array('rss' => $rss)));
 		return true;
 	}

Spacing +250 added lines, -250 removed lines

@@ -69,12 +69,12 @@ 
  * SimplePie Useragent
  * @see SimplePie::set_useragent()
  */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
 
 /**
  * SimplePie Linkback
  */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 
 /**
  * No Autodiscovery
@@ -785,7 +785,7 @@ 
 		{
 			$this->feed_url = $file->url;
 			$this->permanent_url = $this->feed_url;
-			$this->file =& $file;
+			$this->file = & $file;
 			return true;
 		}
 		return false;
@@ -873,7 +873,7 @@ 
 	 */
 	public function force_cache_fallback($enable = false)
 	{
-		$this->force_cache_fallback= (bool) $enable;
+		$this->force_cache_fallback = (bool) $enable;
 	}
 
 	/**
@@ -1258,7 +1258,7 @@ 
 	{
 		if ($page !== false)
 		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
 		}
 		else
 		{
@@ -1389,7 +1389,7 @@ 
 		}
 		
 		// Empty response check
-		if(empty($this->raw_data)){
+		if (empty($this->raw_data)) {
 			$this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
 			$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 			return false;
@@ -1455,7 +1455,7 @@ 
 				if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url))
 				{
 					$this->data = $parser->get_data();
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					if (!($this->get_type()&~SIMPLEPIE_TYPE_NONE))
 					{
 						$this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
@@ -1500,7 +1500,7 @@ 
 				if (!class_exists('\UConverter')) {
 					$missingExtensions[] = 'intl (PHP 5.5+)';
 				}
-				$this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
+				$this->error .= ' Try installing/enabling the '.implode(' or ', $missingExtensions).' extension.';
 			}
 		}
 
@@ -1591,7 +1591,7 @@ 
 						else
 						{
 							$this->check_modified = false;
-							if($this->force_cache_fallback)
+							if ($this->force_cache_fallback)
 							{
 								$cache->touch();
 								return true;
@@ -1620,7 +1620,7 @@ 
 		{
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
-				$file =& $this->file;
+				$file = & $this->file;
 			}
 			else
 			{
@@ -1631,7 +1631,7 @@ 
 			}
 		}
 		// If the file connection has an error, set SimplePie::error to that and quit
-		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		if (!$file->success && !($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 		{
 			$this->error = $file->error;
 			return !empty($this->data);
@@ -1786,7 +1786,7 @@ 
 			$header = "Content-type: $mime;";
 			if ($this->get_encoding())
 			{
-				$header .= ' charset=' . $this->get_encoding();
+				$header .= ' charset='.$this->get_encoding();
 			}
 			else
 			{
@@ -1978,28 +1978,28 @@ 
 	public function get_feed_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_10)
+		if ($type&SIMPLEPIE_TYPE_ATOM_10)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_ATOM_03)
+		if ($type&SIMPLEPIE_TYPE_ATOM_03)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
+		if ($type&SIMPLEPIE_TYPE_RSS_RDF)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
 			{
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
 			{
@@ -2026,14 +2026,14 @@ 
 	public function get_channel_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
+		if ($type&SIMPLEPIE_TYPE_ATOM_ALL)
 		{
 			if ($return = $this->get_feed_tags($namespace, $tag))
 			{
 				return $return;
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
 			{
@@ -2043,7 +2043,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
 			{
@@ -2053,7 +2053,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
 			{
@@ -2083,7 +2083,7 @@ 
 	public function get_image_tags($namespace, $tag)
 	{
 		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
 		{
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
 			{
@@ -2093,7 +2093,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
 		{
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
 			{
@@ -2103,7 +2103,7 @@ 
 				}
 			}
 		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
 			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
 			{
@@ -2130,7 +2130,7 @@ 
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if (!($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -2578,19 +2578,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -2938,7 +2938,7 @@ 
 		{
 			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;
 		}
@@ -2964,7 +2964,7 @@ 
 		{
 			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;
 		}
@@ -3144,7 +3144,7 @@ 
 
 		if (($url = $this->get_link()) !== null)
 		{
-			return 'https://www.google.com/s2/favicons?domain=' . urlencode($url);
+			return 'https://www.google.com/s2/favicons?domain='.urlencode($url);
 		}
 
 		return false;
@@ -3606,19 +3606,19 @@ 
 
 			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 			{
-				$channel =& $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]))
 			{
-				$channel =& $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]))
 			{
-				$channel =& $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]))
 			{
-				$channel =& $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
 			{
@@ -3838,7 +3838,7 @@ 
 		);
 		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
 
-		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+		$this->name = $this->options['extras']['prefix'].md5("$name:$type");
 
 		$this->cache = new Memcache();
 		$this->cache->addServer($this->options['host'], (int) $this->options['port']);
@@ -3972,10 +3972,10 @@ 
         );
         $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
 
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+        $this->name = $this->options['extras']['prefix'].md5("$name:$type");
 
         $this->cache = new Memcached();
-        $this->cache->addServer($this->options['host'], (int)$this->options['port']);
+        $this->cache->addServer($this->options['host'], (int) $this->options['port']);
     }
 
     /**
@@ -4009,7 +4009,7 @@ 
      * @return int Timestamp
      */
     public function mtime() {
-        $data = $this->cache->get($this->name . '_mtime');
+        $data = $this->cache->get($this->name.'_mtime');
         return (int) $data;
     }
 
@@ -4037,8 +4037,8 @@ 
     private function setData($data) {
 
         if ($data !== false) {
-            $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
-            return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
+            $this->cache->set($this->name.'_mtime', time(), (int) $this->options['extras']['timeout']);
+            return $this->cache->set($this->name, $data, (int) $this->options['extras']['timeout']);
         }
 
         return false;
@@ -4116,7 +4116,7 @@ 
 			return;
 		}
 
-		$this->id = $name . $type;
+		$this->id = $name.$type;
 
 		if (!$query = $this->mysql->query('SHOW TABLES'))
 		{
@@ -4130,23 +4130,23 @@ 
 			$db[] = $row;
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+		if (!in_array($this->options['extras']['prefix'].'cache_data', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
 			if ($query === false)
 			{
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", E_USER_WARNING);
+				trigger_error("Can't create ".$this->options['extras']['prefix']."cache_data table, check permissions", E_USER_WARNING);
 				$this->mysql = null;
 				return;
 			}
 		}
 
-		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+		if (!in_array($this->options['extras']['prefix'].'items', $db))
 		{
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
 			if ($query === false)
 			{
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", E_USER_WARNING);
+				trigger_error("Can't create ".$this->options['extras']['prefix']."items table, check permissions", E_USER_WARNING);
 				$this->mysql = null;
 				return;
 			}
@@ -4166,9 +4166,9 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
-			'`' . $this->options['extras']['prefix'] . 'items` i ' .
-			'WHERE cd.id = i.feed_id ' .
+		$query = $this->mysql->prepare('DELETE i, cd FROM `'.$this->options['extras']['prefix'].'cache_data` cd, '.
+			'`'.$this->options['extras']['prefix'].'items` i '.
+			'WHERE cd.id = i.feed_id '.
 			'AND cd.mtime < (unix_timestamp() - :purge_time)');
 		$query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
 
@@ -4183,7 +4183,7 @@ 
 
 			$prepared = self::prepare_simplepie_object_for_cache($data);
 
-			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
@@ -4192,13 +4192,13 @@ 
 					$items = count($prepared[1]);
 					if ($items)
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$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
 					{
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
 						$query = $this->mysql->prepare($sql);
 					}
 
@@ -4212,7 +4212,7 @@ 
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+					$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);
 					$query->bindValue(':count', count($prepared[1]));
 					$query->bindValue(':data', $prepared[0]);
@@ -4231,7 +4231,7 @@ 
 						$database_ids[] = $this->mysql->quote($id);
 					}
 
-					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+					$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
 					$query->bindValue(':feed', $this->id);
 
 					if ($query->execute())
@@ -4251,7 +4251,7 @@ 
 								$date = time();
 							}
 
-							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+							$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
 							$query->bindValue(':feed', $this->id);
 							$query->bindValue(':id', $new_id);
 							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
@@ -4272,13 +4272,13 @@ 
 		}
 		else
 		{
-			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
 			$query->bindValue(':feed', $this->id);
 			if ($query->execute())
 			{
 				if ($query->rowCount() > 0)
 				{
-					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+					$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
 					$query->bindValue(':feed', $this->id);
@@ -4289,7 +4289,7 @@ 
 				}
 				else
 				{
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+					$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);
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
@@ -4315,7 +4315,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($row = $query->fetch()))
 		{
@@ -4334,19 +4334,19 @@ 
 			{
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
 				{
-					$feed =& $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]))
 				{
-					$feed =& $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]))
 				{
-					$feed =& $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]))
 				{
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
 				}
 				else
 				{
@@ -4355,10 +4355,10 @@ 
 
 				if ($feed !== null)
 				{
-					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+					$sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
 					if ($items > 0)
 					{
-						$sql .= ' LIMIT ' . $items;
+						$sql .= ' LIMIT '.$items;
 					}
 
 					$query = $this->mysql->prepare($sql);
@@ -4393,7 +4393,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && ($time = $query->fetchColumn()))
 		{
@@ -4417,7 +4417,7 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+		$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
 		$query->bindValue(':time', time());
 		$query->bindValue(':id', $this->id);
 		if ($query->execute() && $query->rowCount() > 0)
@@ -4442,9 +4442,9 @@ 
 			return false;
 		}
 
-		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
 		$query->bindValue(':id', $this->id);
-		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+		$query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
 		$query2->bindValue(':id', $this->id);
 		if ($query->execute() && $query2->execute())
 		{
@@ -4516,13 +4516,13 @@ 
         if (!is_null($options) && is_array($options)) {
             $this->options = $options;
         } else {
-            $this->options = array (
+            $this->options = array(
                 'prefix' => 'rss:simple_primary:',
                 'expire' => 0,
             );
         }
 
-        $this->name = $this->options['prefix'] . $name;
+        $this->name = $this->options['prefix'].$name;
     }
 
     /**
@@ -6841,7 +6841,7 @@ 
 	 * @param array|string $options See first paramter to {@see embed}
 	 * @return string HTML string to output
 	 */
-	public function native_embed($options='')
+	public function native_embed($options = '')
 	{
 		return $this->embed($options, true);
 	}
@@ -6915,7 +6915,7 @@ 
 		else
 		{
 			$options = explode(',', $options);
-			foreach($options as $option)
+			foreach ($options as $option)
 			{
 				$opt = explode(':', $option, 2);
 				if (isset($opt[0], $opt[1]))
@@ -7050,11 +7050,11 @@ 
 		{
 			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>";
+				$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
 			{
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
 			}
 		}
 
@@ -7065,11 +7065,11 @@ 
 			$height += 20;
 			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>";
+				$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
 			{
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
 		}
 
@@ -7082,16 +7082,16 @@ 
 			{
 				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>";
+					$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
 				{
-					$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>";
+					$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
 			{
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
 			}
 		}
 
@@ -7101,16 +7101,16 @@ 
 			$height += 45;
 			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>";
+				$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
 			{
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+				$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;
 	}
@@ -7130,7 +7130,7 @@ 
 	{
 		// Mime-types by handler.
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
 		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
 		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
 		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
@@ -7359,7 +7359,7 @@ 
 			}
 			if (!$force_fsockopen && function_exists('curl_exec'))
 			{
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_CURL;
 				$fp = curl_init();
 				$headers2 = array();
 				foreach ($headers as $key => $value)
@@ -7396,7 +7396,7 @@ 
 				}
 				if (curl_errno($fp))
 				{
-					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
 					$this->success = false;
 				}
 				else
@@ -7427,7 +7427,7 @@ 
 			}
 			else
 			{
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
 				$socket_host = $url_parts['host'];
 				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
@@ -7442,7 +7442,7 @@ 
 				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
 				if (!$fp)
 				{
-					$this->error = 'fsockopen error: ' . $errstr;
+					$this->error = 'fsockopen error: '.$errstr;
 					$this->success = false;
 				}
 				else
@@ -7473,7 +7473,7 @@ 
 
 					if (isset($url_parts['user']) && isset($url_parts['pass']))
 					{
-						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+						$out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
 					}
 					foreach ($headers as $key => $value)
 					{
@@ -7564,7 +7564,7 @@ 
 		}
 		else
 		{
-			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
+			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL|SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
 			if (empty($url) || !($this->body = trim(file_get_contents($url))))
 			{
 				$this->error = 'file_get_contents could not read the file';
@@ -7789,7 +7789,7 @@ 
 			// We should only use the last Content-Type header. c.f. issue #1
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
 			{
-				$this->headers[$this->name] .= ', ' . $this->value;
+				$this->headers[$this->name] .= ', '.$this->value;
 			}
 			else
 			{
@@ -7999,7 +7999,7 @@ 
 
 		while (true)
 		{
-			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+			$is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
 			if (!$is_chunked)
 			{
 				// Looks like it's not chunked after all
@@ -8154,9 +8154,9 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), $value);
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -8167,7 +8167,7 @@ 
 			|| $name === 'ifragment'
 		)
 		{
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -8197,7 +8197,7 @@ 
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
 		{
 			$name = $prop;
 			$return = $this->$prop;
@@ -8210,7 +8210,7 @@ 
 		}
 		else
 		{
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -8232,7 +8232,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		if (method_exists($this, 'get_'.$name) || isset($this->$name))
 		{
 			return true;
 		}
@@ -8249,9 +8249,9 @@ 
 	 */
 	public function __unset($name)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), '');
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -8327,11 +8327,11 @@ 
 							}
 							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
-								$target->ipath = '/' . $relative->ipath;
+								$target->ipath = '/'.$relative->ipath;
 							}
 							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
-								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 							}
 							else
 							{
@@ -8467,7 +8467,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -8506,23 +8506,23 @@ 
 
 			// No one byte sequences are valid due to the while.
 			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0)
+			if (($value&0xE0) === 0xC0)
 			{
-				$character = ($value & 0x1F) << 6;
+				$character = ($value&0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0)
+			elseif (($value&0xF0) === 0xE0)
 			{
-				$character = ($value & 0x0F) << 12;
+				$character = ($value&0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0)
+			elseif (($value&0xF8) === 0xF0)
 			{
-				$character = ($value & 0x07) << 18;
+				$character = ($value&0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
@@ -8543,9 +8543,9 @@ 
 						$value = ord($string[$position]);
 
 						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80)
+						if (($value&0xC0) === 0x80)
 						{
-							$character |= ($value & 0x3F) << (--$remaining * 6);
+							$character |= ($value&0x3F) << (--$remaining*6);
 						}
 						// If it is invalid, count the sequence as invalid and reprocess the current byte:
 						else
@@ -8573,7 +8573,7 @@ 
 				|| $length > 3 && $character <= 0xFFFF
 				// Outside of range of ucschar codepoints
 				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
+				|| ($character&0xFFFE) === 0xFFFE
 				|| $character >= 0xFDD0 && $character <= 0xFDEF
 				|| (
 					// Everything else not in ucschar
@@ -8648,23 +8648,23 @@ 
 					$length = 1;
 				}
 				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0)
+				elseif (($value&0xE0) === 0xC0)
 				{
-					$character = ($value & 0x1F) << 6;
+					$character = ($value&0x1F) << 6;
 					$length = 2;
 					$remaining = 1;
 				}
 				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0)
+				elseif (($value&0xF0) === 0xE0)
 				{
-					$character = ($value & 0x0F) << 12;
+					$character = ($value&0x0F) << 12;
 					$length = 3;
 					$remaining = 2;
 				}
 				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0)
+				elseif (($value&0xF8) === 0xF0)
 				{
-					$character = ($value & 0x07) << 18;
+					$character = ($value&0x07) << 18;
 					$length = 4;
 					$remaining = 3;
 				}
@@ -8679,10 +8679,10 @@ 
 			else
 			{
 				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80)
+				if (($value&0xC0) === 0x80)
 				{
 					$remaining--;
-					$character |= ($value & 0x3F) << ($remaining * 6);
+					$character |= ($value&0x3F) << ($remaining*6);
 				}
 				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
 				else
@@ -8708,7 +8708,7 @@ 
 					|| $character < 0x2D
 					|| $character > 0xEFFFD
 					// Noncharacters
-					|| ($character & 0xFFFE) === 0xFFFE
+					|| ($character&0xFFFE) === 0xFFFE
 					|| $character >= 0xFDD0 && $character <= 0xFDEF
 					// Everything else not in iunreserved (this is all BMP)
 					|| $character === 0x2F
@@ -8721,7 +8721,7 @@ 
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else
@@ -8740,7 +8740,7 @@ 
 		{
 			for ($j = $start; $j < $len; $j++)
 			{
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -8999,7 +8999,7 @@ 
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
-				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+				$this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else
 			{
@@ -9095,7 +9095,7 @@ 
 			$removed = $this->remove_dot_segments($valid);
 
 			$cache[$ipath] = array($valid, $removed);
-			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
 		}
 
 		$this->scheme_normalization();
@@ -9182,11 +9182,11 @@ 
 		$iri = '';
 		if ($this->scheme !== null)
 		{
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null)
 		{
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		if ($this->ipath !== '')
 		{
@@ -9198,11 +9198,11 @@ 
 		}
 		if ($this->iquery !== null)
 		{
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null)
 		{
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -9230,7 +9230,7 @@ 
 			$iauthority = '';
 			if ($this->iuserinfo !== null)
 			{
-				$iauthority .= $this->iuserinfo . '@';
+				$iauthority .= $this->iuserinfo.'@';
 			}
 			if ($this->ihost !== null)
 			{
@@ -9238,7 +9238,7 @@ 
 			}
 			if ($this->port !== null)
 			{
-				$iauthority .= ':' . $this->port;
+				$iauthority .= ':'.$this->port;
 			}
 			return $iauthority;
 		}
@@ -10273,19 +10273,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -10626,12 +10626,12 @@ 
 					if (sizeof($temp) > 0)
 					{
 						$minutes = (int) array_pop($temp);
-						$seconds += $minutes * 60;
+						$seconds += $minutes*60;
 					}
 					if (sizeof($temp) > 0)
 					{
 						$hours = (int) array_pop($temp);
-						$seconds += $hours * 3600;
+						$seconds += $hours*3600;
 					}
 					unset($temp);
 					$duration_parent = $seconds;
@@ -10986,7 +10986,7 @@ 
 			// If we have media:group tags, loop through them.
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
 			{
-				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
 				{
 					// If we have media:content tags, loop through them.
 					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
@@ -12284,7 +12284,7 @@ 
 			return $this->file;
 		}
 
-		if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		if ($this->file->method&SIMPLEPIE_FILE_SOURCE_REMOTE)
 		{
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file));
 			if ($sniffer->get_type() !== 'text/html')
@@ -12293,34 +12293,34 @@ 
 			}
 		}
 
-		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
+		if ($type&~SIMPLEPIE_LOCATOR_NONE)
 		{
 			$this->get_base();
 		}
 
-		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
+		if ($type&SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
 		{
 			return $working[0];
 		}
 
-		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
+		if ($type&(SIMPLEPIE_LOCATOR_LOCAL_EXTENSION|SIMPLEPIE_LOCATOR_LOCAL_BODY|SIMPLEPIE_LOCATOR_REMOTE_EXTENSION|SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
 		{
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
 			{
 				return $working[0];
 			}
 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
 			{
 				return $working[0];
 			}
@@ -12330,7 +12330,7 @@ 
 
 	public function is_feed($file, $check_html = false)
 	{
-		if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		if ($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE)
 		{
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
 			$sniffed = $sniffer->get_type();
@@ -12350,7 +12350,7 @@ 
 				return false;
 			}
 		}
-		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+		elseif ($file->method&SIMPLEPIE_FILE_SOURCE_LOCAL)
 		{
 			return true;
 		}
@@ -12442,7 +12442,7 @@ 
 						'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',
 					);
 					$feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent));
-					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, true))
+					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, true))
 					{
 						$feeds[$href] = $feed;
 					}
@@ -12572,7 +12572,7 @@ 
 					'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',
 				);
 				$feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent));
-				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))
+				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);
 				}
@@ -12600,7 +12600,7 @@ 
 					'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',
 				);
 				$feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent));
-				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))
+				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);
 				}
@@ -12625,22 +12625,22 @@ 
 	{
 		$time = '';
 
-		$hours = floor($seconds / 3600);
-		$remainder = $seconds % 3600;
+		$hours = floor($seconds/3600);
+		$remainder = $seconds%3600;
 		if ($hours > 0)
 		{
 			$time .= $hours.':';
 		}
 
-		$minutes = floor($remainder / 60);
-		$seconds = $remainder % 60;
+		$minutes = floor($remainder/60);
+		$seconds = $remainder%60;
 		if ($minutes < 10 && $hours > 0)
 		{
-			$minutes = '0' . $minutes;
+			$minutes = '0'.$minutes;
 		}
 		if ($seconds < 10)
 		{
-			$seconds = '0' . $seconds;
+			$seconds = '0'.$seconds;
 		}
 
 		$time .= $minutes.':';
@@ -12671,7 +12671,7 @@ 
 	{
 		$return = array();
 		$name = preg_quote($realname, '/');
-		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
 		{
 			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
 			{
@@ -12688,7 +12688,7 @@ 
 					$return[$i]['content'] = $matches[$i][4][0];
 				}
 				$return[$i]['attribs'] = array();
-				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' '.$matches[$i][2][0].' ', $attribs, PREG_SET_ORDER))
 				{
 					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
 					{
@@ -12710,7 +12710,7 @@ 
 		foreach ($element['attribs'] as $key => $value)
 		{
 			$key = strtolower($key);
-			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
+			$full .= " $key=\"".htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8').'"';
 		}
 		if ($element['self_closing'])
 		{
@@ -12725,7 +12725,7 @@ 
 
 	public static function error($message, $level, $file, $line)
 	{
-		if ((ini_get('error_reporting') & $level) > 0)
+		if ((ini_get('error_reporting')&$level) > 0)
 		{
 			switch ($level)
 			{
@@ -14343,7 +14343,7 @@ 
 				$data = '';
 			}
 		}
-		return $output . $data;
+		return $output.$data;
 	}
 
 	public static function parse_date($dt)
@@ -14453,23 +14453,23 @@ 
 			{
 				case 'text':
 				case 'text/plain':
-					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+					return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
 
 				case 'html':
 				case 'text/html':
-					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
+					return SIMPLEPIE_CONSTRUCT_HTML|$mode;
 
 				case 'xhtml':
 				case 'application/xhtml+xml':
-					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
+					return SIMPLEPIE_CONSTRUCT_XHTML|$mode;
 
 				default:
-					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
+					return SIMPLEPIE_CONSTRUCT_NONE|$mode;
 			}
 		}
 		else
 		{
-			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+			return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
 		}
 	}
 
@@ -14570,15 +14570,15 @@ 
 		}
 		else if ($codepoint <= 0x7ff)
 		{
-			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xc0|($codepoint >> 6)).chr(0x80|($codepoint&0x3f));
 		}
 		else if ($codepoint <= 0xffff)
 		{
-			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xe0|($codepoint >> 12)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
 		}
 		else if ($codepoint <= 0x10ffff)
 		{
-			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+			return chr(0xf0|($codepoint >> 18)).chr(0x80|(($codepoint >> 12)&0x3f)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
 		}
 		else
 		{
@@ -14734,7 +14734,7 @@ 
 		}
 		header('Content-type: text/javascript; charset: UTF-8');
 		header('Cache-Control: must-revalidate');
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days
 		?>
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
 	if (placeholder != '') {
@@ -14768,14 +14768,14 @@ 
 	public static function get_build()
 	{
 		$root = dirname(dirname(__FILE__));
-		if (file_exists($root . '/.git/index'))
+		if (file_exists($root.'/.git/index'))
 		{
-			return filemtime($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)
+			foreach (glob($root.'/SimplePie/*.php') as $file)
 			{
 				if (($mtime = filemtime($file)) > $time)
 				{
@@ -14784,9 +14784,9 @@ 
 			}
 			return $time;
 		}
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		elseif (file_exists(dirname(__FILE__).'/Core.php'))
 		{
-			return filemtime(dirname(__FILE__) . '/Core.php');
+			return filemtime(dirname(__FILE__).'/Core.php');
 		}
 		else
 		{
@@ -14799,11 +14799,11 @@ 
 	 */
 	public static function debug(&$sp)
 	{
-		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
-		$info .= 'PHP ' . PHP_VERSION . "\n";
+		$info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n";
+		$info .= 'PHP '.PHP_VERSION."\n";
 		if ($sp->error() !== null)
 		{
-			$info .= 'Error occurred: ' . $sp->error() . "\n";
+			$info .= 'Error occurred: '.$sp->error()."\n";
 		}
 		else
 		{
@@ -14819,20 +14819,20 @@ 
 				switch ($ext)
 				{
 					case 'pcre':
-						$info .= '      Version ' . PCRE_VERSION . "\n";
+						$info .= '      Version '.PCRE_VERSION."\n";
 						break;
 					case 'curl':
 						$version = curl_version();
-						$info .= '      Version ' . $version['version'] . "\n";
+						$info .= '      Version '.$version['version']."\n";
 						break;
 					case 'mbstring':
-						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+						$info .= '      Overloading: '.mb_get_info('func_overload')."\n";
 						break;
 					case 'iconv':
-						$info .= '      Version ' . ICONV_VERSION . "\n";
+						$info .= '      Version '.ICONV_VERSION."\n";
 						break;
 					case 'xml':
-						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+						$info .= '      Version '.LIBXML_DOTTED_VERSION."\n";
 						break;
 				}
 			}
@@ -14930,7 +14930,7 @@ 
 			// xxx::xxx
 			else
 			{
-				$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+				$fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
 				$ip = str_replace('::', $fill, $ip);
 			}
 		}
@@ -15581,8 +15581,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+		$this->day_pcre = '('.implode(array_keys($this->day), '|').')';
+		$this->month_pcre = '('.implode(array_keys($this->month), '|').')';
 
 		static $cache;
 		if (!isset($cache[get_class($this)]))
@@ -15684,7 +15684,7 @@ 
 			$month = $day = $hour = $minute = $second = '([0-9]{2})';
 			$decimal = '([0-9]*)';
 			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+			$pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -15717,8 +15717,8 @@ 
 			// Numeric timezone
 			if (isset($match[9]) && $match[9] !== '')
 			{
-				$timezone = $match[10] * 3600;
-				$timezone += $match[11] * 60;
+				$timezone = $match[10]*3600;
+				$timezone += $match[11]*60;
 				if ($match[9] === '-')
 				{
 					$timezone = 0 - $timezone;
@@ -15730,7 +15730,7 @@ 
 			}
 
 			// Convert the number of seconds to an integer, taking decimals into account
-			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[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;
 		}
@@ -15813,8 +15813,8 @@ 
 		if (!$pcre)
 		{
 			$wsp = '[\x09\x20]';
-			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-			$optional_fws = $fws . '?';
+			$fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
+			$optional_fws = $fws.'?';
 			$day_name = $this->day_pcre;
 			$month = $this->month_pcre;
 			$day = '([0-9]{1,2})';
@@ -15822,8 +15822,8 @@ 
 			$year = '([0-9]{2,4})';
 			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
 			$character_zone = '([A-Z]{1,5})';
-			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+			$zone = '(?:'.$num_zone.'|'.$character_zone.')';
+			$pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
 		}
 		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
 		{
@@ -15848,8 +15848,8 @@ 
 			// Numeric timezone
 			if ($match[8] !== '')
 			{
-				$timezone = $match[9] * 3600;
-				$timezone += $match[10] * 60;
+				$timezone = $match[9]*3600;
+				$timezone += $match[10]*60;
 				if ($match[8] === '-')
 				{
 					$timezone = 0 - $timezone;
@@ -15911,7 +15911,7 @@ 
 			$day = '([0-9]{1,2})';
 			$year = $hour = $minute = $second = '([0-9]{2})';
 			$zone = '([A-Z]{1,5})';
-			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+			$pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -15977,7 +15977,7 @@ 
 			$hour = $sec = $min = '([0-9]{2})';
 			$year = '([0-9]{4})';
 			$terminator = '\x0A?\x00?';
-			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+			$pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -16113,7 +16113,7 @@ 
 			if ($declaration->parse())
 			{
 				$data = substr($data, $pos + 2);
-				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
+				$data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'."\n".$this->declare_html_entities().$data;
 			}
 			else
 			{
@@ -16169,7 +16169,7 @@ 
 					case constant('XMLReader::END_ELEMENT'):
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -16181,7 +16181,7 @@ 
 						$empty = $xml->isEmptyElement;
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -16192,7 +16192,7 @@ 
 						{
 							if ($xml->namespaceURI !== '')
 							{
-								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+								$attrName = $xml->namespaceURI.$this->separator.$xml->localName;
 							}
 							else
 							{
@@ -16298,12 +16298,12 @@ 
 			$this->current_xhtml_construct++;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
 			{
-				$this->data['data'] .= '<' . end($this->element);
+				$this->data['data'] .= '<'.end($this->element);
 				if (isset($attribs['']))
 				{
 					foreach ($attribs[''] as $name => $value)
 					{
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+						$this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
 					}
 				}
 				$this->data['data'] .= '>';
@@ -16311,8 +16311,8 @@ 
 		}
 		else
 		{
-			$this->datas[] =& $this->data;
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->datas[] = & $this->data;
+			$this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
 			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
 			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
 			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -16344,12 +16344,12 @@ 
 			$this->current_xhtml_construct--;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
 			{
-				$this->data['data'] .= '</' . end($this->element) . '>';
+				$this->data['data'] .= '</'.end($this->element).'>';
 			}
 		}
 		if ($this->current_xhtml_construct === -1)
 		{
-			$this->data =& $this->datas[count($this->datas) - 1];
+			$this->data = & $this->datas[count($this->datas) - 1];
 			array_pop($this->datas);
 		}
 
@@ -16384,7 +16384,7 @@ 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
 				{
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
@@ -17227,11 +17227,11 @@ 
 	public function sanitize($data, $type, $base = '')
 	{
 		$data = trim($data);
-		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
+		if ($data !== '' || $type&SIMPLEPIE_CONSTRUCT_IRI)
 		{
-			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
+			if ($type&SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
-				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))
+				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;
 				}
@@ -17241,12 +17241,12 @@ 
 				}
 			}
 
-			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
+			if ($type&SIMPLEPIE_CONSTRUCT_BASE64)
 			{
 				$data = base64_decode($data);
 			}
 
-			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
+			if ($type&(SIMPLEPIE_CONSTRUCT_HTML|SIMPLEPIE_CONSTRUCT_XHTML))
 			{
 
 				if (!class_exists('DOMDocument'))
@@ -17322,18 +17322,18 @@ 
 
 							if ($cache->load())
 							{
-								$img->setAttribute('src', $this->image_handler . $image_url);
+								$img->setAttribute('src', $this->image_handler.$image_url);
 							}
 							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;
 
-								if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+								if ($file->success && ($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 								{
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
 									{
-										$img->setAttribute('src', $this->image_handler . $image_url);
+										$img->setAttribute('src', $this->image_handler.$image_url);
 									}
 									else
 									{
@@ -17359,16 +17359,16 @@ 
 
 				if ($this->remove_div)
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
 					$data = preg_replace('/<\/div>$/', '', $data);
 				}
 				else
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
 				}
 			}
 
-			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
+			if ($type&SIMPLEPIE_CONSTRUCT_IRI)
 			{
 				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
 				if ($absolute !== false)
@@ -17377,7 +17377,7 @@ 
 				}
 			}
 
-			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
+			if ($type&(SIMPLEPIE_CONSTRUCT_TEXT|SIMPLEPIE_CONSTRUCT_IRI))
 			{
 				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
 			}
@@ -17394,11 +17394,11 @@ 
 	{
 		$ret = '';
 		$html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
-		if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
+		if ($type&~SIMPLEPIE_CONSTRUCT_XHTML)
 		{
 			// Atom XHTML constructs are wrapped with a div by default
 			// Note: No protection if $html contains a stray </div>!
-			$html = '<div>' . $html . '</div>';
+			$html = '<div>'.$html.'</div>';
 			$ret .= '<!DOCTYPE html>';
 			$content_type = 'text/html';
 		}
@@ -17409,8 +17409,8 @@ 
 		}
 
 		$ret .= '<html><head>';
-		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-		$ret .= '</head><body>' . $html . '</body></html>';
+		$ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
+		$ret .= '</head><body>'.$html.'</body></html>';
 		return $ret;
 	}
 
@@ -17468,7 +17468,7 @@ 
 
 	protected function strip_tag($tag, $document, $xpath, $type)
 	{
-		$elements = $xpath->query('body//' . $tag);
+		$elements = $xpath->query('body//'.$tag);
 		if ($this->encode_instead_of_strip)
 		{
 			foreach ($elements as $element)
@@ -17478,7 +17478,7 @@ 
 				// For elements which aren't script or style, include the tag itself
 				if (!in_array($tag, array('script', 'style')))
 				{
-					$text = '<' . $tag;
+					$text = '<'.$tag;
 					if ($element->hasAttributes())
 					{
 						$attrs = array();
@@ -17487,21 +17487,21 @@ 
 							$value = $attr->value;
 
 							// In XHTML, empty values should never exist, so we repeat the value
-							if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
+							if (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_XHTML))
 							{
 								$value = $name;
 							}
 							// For HTML, empty is fine
-							elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
+							elseif (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_HTML))
 							{
 								$attrs[] = $name;
 								continue;
 							}
 
 							// Standard attribute text
-							$attrs[] = $name . '="' . $attr->value . '"';
+							$attrs[] = $name.'="'.$attr->value.'"';
 						}
-						$text .= ' ' . implode(' ', $attrs);
+						$text .= ' '.implode(' ', $attrs);
 					}
 					$text .= '>';
 					$fragment->appendChild(new DOMText($text));
@@ -17516,7 +17516,7 @@ 
 
 				if (!in_array($tag, array('script', 'style')))
 				{
-					$fragment->appendChild(new DOMText('</' . $tag . '>'));
+					$fragment->appendChild(new DOMText('</'.$tag.'>'));
 				}
 
 				$element->parentNode->replaceChild($fragment, $element);
@@ -17552,7 +17552,7 @@ 
 
 	protected function strip_attr($attrib, $xpath)
 	{
-		$elements = $xpath->query('//*[@' . $attrib . ']');
+		$elements = $xpath->query('//*[@'.$attrib.']');
 
 		foreach ($elements as $element)
 		{
@@ -17959,19 +17959,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -18653,7 +18653,7 @@ 
 			$this->OS = ord($this->compressed_data[$this->position++]);
 
 			// Parse the FEXTRA
-			if ($this->flags & 4)
+			if ($this->flags&4)
 			{
 				// Read subfield IDs
 				$this->SI1 = $this->compressed_data[$this->position++];
@@ -18684,7 +18684,7 @@ 
 			}
 
 			// Parse the FNAME
-			if ($this->flags & 8)
+			if ($this->flags&8)
 			{
 				// Get the length of the filename
 				$len = strcspn($this->compressed_data, "\x00", $this->position);
@@ -18704,7 +18704,7 @@ 
 			}
 
 			// Parse the FCOMMENT
-			if ($this->flags & 16)
+			if ($this->flags&16)
 			{
 				// Get the length of the comment
 				$len = strcspn($this->compressed_data, "\x00", $this->position);
@@ -18724,7 +18724,7 @@ 
 			}
 
 			// Parse the FHCRC
-			if ($this->flags & 2)
+			if ($this->flags&2)
 			{
 				// Check the length of the string is still valid
 				$this->min_compressed_size += $len + 2;
@@ -18734,7 +18734,7 @@ 
 					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
 
 					// Check the CRC matches
-					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
+					if ((crc32(substr($this->compressed_data, 0, $this->position))&0xFFFF) === $crc)
 					{
 						$this->position += 2;
 					}
@@ -18770,7 +18770,7 @@ 
 			// Check ISIZE of data
 			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
 			$this->position += 4;
-			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
+			if (sprintf('%u', strlen($this->data)&0xFFFFFFFF) !== sprintf('%u', $isize))
 			{
 				return false;
 			}

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

Spacing +4 added lines, -4 removed lines

@@ -14,18 +14,18 @@ 
 else $type = 'global';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
   $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];
 }
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -59,7 +59,7 @@ 
 if (!empty($anews))
 {
 	$j = 0;
-	foreach($anews as $news) {
+	foreach ($anews as $news) {
 		if ($j > 10) break;
 		$j++;
 		print '<div class="news">';

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

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 	</form>
 </div>
 <?php
-    if (isset($owner)) {
+	if (isset($owner)) {
 ?>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
@@ -38,5 +38,5 @@ 
 	</ul>
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 <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="#">
+		    <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">
@@ -23,7 +23,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-departure-airport" || strtolower($current_page) == "owner-statistics-departure-airport-country" || strtolower($current_page) == "owner-statistics-arrival-airport" || strtolower($current_page) == "owner-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "owner-statistics-departure-airport" || strtolower($current_page) == "owner-statistics-departure-airport-country" || strtolower($current_page) == "owner-statistics-arrival-airport" || strtolower($current_page) == "owner-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -33,8 +33,8 @@ 
 			  <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

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

manufacturer-detailed.php

Spacing +11 added lines, -11 removed lines

@@ -4,16 +4,16 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-if (!isset($_GET['aircraft_manufacturer'])){
+if (!isset($_GET['aircraft_manufacturer'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$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];
@@ -32,19 +32,19 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))));
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))));
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/manufacturer/'.$manufacturer;
 	
 	if ($sort != '') {
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, $sort);
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, '');
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, '');
 	}
 	
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$manufacturer);
+		$title = sprintf(_("Detailed View for %s"), $manufacturer);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -53,9 +53,9 @@ 
 		$Stats = new Stats();
 		$all_manufacturers = $Stats->getAllManufacturers();
 		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
-		foreach($all_manufacturers as $all_manufacturer)
+		foreach ($all_manufacturers as $all_manufacturer)
 		{
-			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+			if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 			} else {
@@ -72,7 +72,7 @@ 
 		print '</div>';
 
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$manufacturer).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $manufacturer).'</p>';
 
 		include('manufacturer-sub-menu.php');
 		include('table-output.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

Indentation +11 added lines, -11 removed lines

@@ -23,8 +23,8 @@ 
 		$id = $spotter_item['Waypoint']['@attributes']['id'];
 		if ($id == 0 || !is_numeric($id)) $id = $j;
 		$output .= '{"type": "Feature",';
-		    $output .= '"id": '.$id.',';
-		    $output .= '"properties": {';
+			$output .= '"id": '.$id.',';
+			$output .= '"properties": {';
 			$output .= '"type": "'.$spotter_item['@attributes']['type'].'",';
 			//$output .= '"id": "'.$spotter_item['Waypoint']['@attributes']['id'].'",';
 			$output .= '"name": "'.$spotter_item['Waypoint']['@attributes']['name'].'",';
@@ -35,31 +35,31 @@ 
 			} elseif ($spotter_item['@attributes']['type'] == 'Finish') {
 				$output .= '"icon": "/images/tsk/tsk-finish.png"';
 			} else $output .= '"icon": "/images/tsk/number_'.$id.'.png"';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
+				$output .= $spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 		$j++;
 	}
 	// Lines
 	$output .= '{"type": "Feature",';
-	    $output .= '"properties": {';
+		$output .= '"properties": {';
 		$output .= '"type": "'.$spotter_array['@attributes']['type'].'"';
-	    $output .= '},';
-	    $output .= '"geometry": {';
+		$output .= '},';
+		$output .= '"geometry": {';
 		$output .= '"type": "LineString",';
 		$output .= '"coordinates": [';
 	foreach($spotter_array['Point'] as $spotter_item)
 	{
-			    $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
+				$output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
 	}
 	$output  = substr($output, 0, -1);
 		$output .= ']';
-	    $output .= '}';
+		$output .= '}';
 	$output .= '},';
 	$output  = substr($output, 0, -1);
 }

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 }
 header('Content-Type: text/javascript');
 
-$tskfile = filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL);
+$tskfile = filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL);
 
 $spotter_array = $TSK->parse_xml($tskfile);
 
@@ -16,7 +16,7 @@ 
 if (!empty($spotter_array))
 {	  
 	$j = 0;
-	foreach($spotter_array['Point'] as $spotter_item)
+	foreach ($spotter_array['Point'] as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -53,7 +53,7 @@ 
 	    $output .= '"geometry": {';
 		$output .= '"type": "LineString",';
 		$output .= '"coordinates": [';
-	foreach($spotter_array['Point'] as $spotter_item)
+	foreach ($spotter_array['Point'] as $spotter_item)
 	{
 			    $output .= '['.$spotter_item['Waypoint']['Location']['@attributes']['longitude'].', '.$spotter_item['Waypoint']['Location']['@attributes']['latitude'].'],';
 	}

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",';

js/map.2d.js.php

Spacing +15 added lines, -15 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
 // Compressed GeoJson is used if true
@@ -20,10 +20,10 @@ 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 	else $enddate = time();
-	setcookie("archive_begin",$begindate);
-	setcookie("archive_end",$enddate);
-	setcookie("archive_update",$lastupd);
-	setcookie("archive_speed",$archivespeed);
+	setcookie("archive_begin", $begindate);
+	setcookie("archive_end", $enddate);
+	setcookie("archive_update", $lastupd);
+	setcookie("archive_speed", $archivespeed);
 ?>
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -75,16 +75,16 @@ 
 <?php
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['flightaware_id'])) {
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -112,7 +112,7 @@ 
 	} else {
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
 			if (isset($_COOKIE['lastcentercoord'])) {
-				$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
+				$lastcentercoord = explode(',', $_COOKIE['lastcentercoord']);
 				$viewcenterlatitude = $lastcentercoord[0];
 				$viewcenterlongitude = $lastcentercoord[1];
 				$viewzoom = $lastcentercoord[2];
@@ -133,7 +133,7 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom - 1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
 	}
@@ -227,19 +227,19 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
@@ -357,7 +357,7 @@ 
 
 	function update_tsk() {
 		var bbox = map.getBounds().toBBoxString();
-		var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>",function (data) {
+		var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>",function (data) {
 		    tskLayer = L.geoJson(data,{
 			onEachFeature: function (feature, layer) {
 			    tskPopup(feature, layer);

Indentation +7 added lines, -7 removed lines

@@ -375,7 +375,7 @@ 
 	};
 
 <?php
-    if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
+	if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
 ?>
 	function tskPopup (feature, layer) {
 		var output = '';
@@ -410,7 +410,7 @@ 
 	};
 	update_tsk();
 <?php
-    }
+	}
 ?>
 	map.on('moveend', function() {
 		//if (map.getZoom() > 7) {
@@ -426,10 +426,10 @@ 
 setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
 
 <?php
-    // Add support for custom json via $globalMapJson
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
+	// Add support for custom json via $globalMapJson
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
 	foreach ($globalMapJson as $json) {
-	    if (isset($json['url'])) {
+		if (isset($json['url'])) {
 ?>
 update_genLayer('<?php print $json['url']; ?>');
 <?php
@@ -438,9 +438,9 @@ 
 setInterval(function(){if (noTimeout) update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
 <?php
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 //adds the bootstrap tooltip to the map icons

Braces +109 added lines, -27 removed lines

@@ -4,10 +4,15 @@ 
 
 setcookie("MapFormat",'2d');
 
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
+if (!isset($globalOpenWeatherMapKey)) {
+	$globalOpenWeatherMapKey = '';
+}
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 if (isset($_GET['archive'])) {
 	$archive = true;
 	//$archiveupdatetime = 50;
@@ -18,8 +23,11 @@ 
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 	//$lastupd = 20;
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-	else $enddate = time();
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+		$enddate = $_GET['enddate'];
+	} else {
+		$enddate = time();
+	}
 	setcookie("archive_begin",$begindate);
 	setcookie("archive_end",$enddate);
 	setcookie("archive_update",$lastupd);
@@ -107,7 +115,17 @@ 
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
@@ -133,9 +151,21 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) {
+	print $viewzoom-1;
+} elseif (isset($viewzoom)) {
+	print $viewzoom;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
+		var zoom = <?php if (isset($viewzoom)) {
+	print $viewzoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -161,16 +191,27 @@ 
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -193,7 +234,12 @@ 
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -239,20 +285,26 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -281,7 +333,12 @@ 
 	    maxZoom: 5,
 	    tms : true,
 	    zindex : 3,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Natural Earth'
 	}).addTo(map);
 <?php
@@ -289,9 +346,24 @@ 
 		$customid = $MapType;
 ?>
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
 	}).addTo(map);
 
@@ -331,7 +403,12 @@ 
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,
@@ -423,7 +500,12 @@ 
 		createCookie('lastcentercoord',map.getCenter().lat+','+map.getCenter().lng+','+map.getZoom(),2);
 	});
 update_locationsLayer();
-setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 
 <?php
     // Add support for custom json via $globalMapJson

require/class.Common.php

Doc Comments +15 added lines, -2 removed lines

@@ -97,6 +97,10 @@ 
 		return strlen($headerLine); // Needed by curl
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $file
+	 */
 	public static function download($url, $file, $referer = '') {
 		global $globalDebug, $globalProxy, $globalForceIPv4;
 		$fp = fopen($file, 'w');
@@ -121,6 +125,9 @@ 
 		fclose($fp);
 	}
 
+	/**
+	 * @param string $in_file
+	 */
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
@@ -272,7 +279,7 @@ 
 	* Check is distance realistic
 	* @param int $timeDifference the time between the reception of both messages
 	* @param float $distance distance covered
-	* @return whether distance is realistic
+	* @return boolean distance is realistic
 	*/
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
@@ -295,6 +302,9 @@ 
 	}
 
 
+	/**
+	 * @param string $latlong
+	 */
 	public function convertDec($dms,$latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
@@ -306,6 +316,9 @@ 
 		return $deg+(($min*60)/3600);
 	}
 	
+	/**
+	 * @param string $latlong
+	 */
 	public function convertDM($coord,$latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
@@ -443,7 +456,7 @@ 
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Indentation +156 added lines, -156 removed lines

@@ -7,13 +7,13 @@ 
 	//protected $cookies = array();
 	
 	/**
-	* Get data from form result
-	* @param String $url form URL
-	* @param String $type type of submit form method (get or post)
-	* @param String|Array $data values form post method
-	* @param Array $headers header to submit with the form
-	* @return String the result
-	*/
+	 * Get data from form result
+	 * @param String $url form URL
+	 * @param String $type type of submit form method (get or post)
+	 * @param String|Array $data values form post method
+	 * @param Array $headers header to submit with the form
+	 * @return String the result
+	 */
 	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '', $sizelimit = false, $async = false) {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
@@ -166,10 +166,10 @@ 
 	}
 
 	/**
-	* Convert a HTML table to an array
-	* @param String $data HTML page
-	* @return Array array of the tables in HTML page
-	*/
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
 	public function table2array($data) {
 		if (!is_string($data)) return array();
 		if ($data == '') return array();
@@ -203,10 +203,10 @@ 
 	}
 	
 	/**
-	* Convert <p> part of a HTML page to an array
-	* @param String $data HTML page
-	* @return Array array of the <p> in HTML page
-	*/
+	 * Convert <p> part of a HTML page to an array
+	 * @param String $data HTML page
+	 * @return Array array of the <p> in HTML page
+	 */
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
@@ -221,14 +221,14 @@ 
 	}
 
 	/**
-	* Give distance between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @param String $unit km else no unit used
-	* @return Float Distance in $unit
-	*/
+	 * Give distance between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @param String $unit km else no unit used
+	 * @return Float Distance in $unit
+	 */
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
@@ -246,25 +246,25 @@ 
 	}
 
 	/**
-	* Give plunge between 2 altitudes and distance
-	* @param Float $initial_altitude altitude of first point in m
-	* @param Float $final_altitude altitude of second point in m
-	* @param String $distance distance between two points in m
-	* @return Float plunge
-	*/
+	 * Give plunge between 2 altitudes and distance
+	 * @param Float $initial_altitude altitude of first point in m
+	 * @param Float $final_altitude altitude of second point in m
+	 * @param String $distance distance between two points in m
+	 * @return Float plunge
+	 */
 	public function plunge($initial_altitude,$final_altitude,$distance) {
 		$plunge = rad2deg(asin(($final_altitude-$initial_altitude)/$distance));
 		return $plunge;
 	}
 
 	/**
-	* Give azimuth between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @return Float Azimuth
-	*/
+	 * Give azimuth between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @return Float Azimuth
+	 */
 	public function azimuth($lat, $lon, $latc, $lonc) {
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
@@ -275,11 +275,11 @@ 
 	
 	
 	/**
-	* Check is distance realistic
-	* @param int $timeDifference the time between the reception of both messages
-	* @param float $distance distance covered
-	* @return whether distance is realistic
-	*/
+	 * Check is distance realistic
+	 * @param int $timeDifference the time between the reception of both messages
+	 * @param float $distance distance covered
+	 * @return whether distance is realistic
+	 */
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
@@ -297,7 +297,7 @@ 
 	}
 
 	public function isInteger($input){
-	    return(ctype_digit(strval($input)));
+		return(ctype_digit(strval($input)));
 	}
 
 
@@ -328,11 +328,11 @@ 
 	}
 	
 	/**
-	* Copy folder contents
-	* @param       string   $source    Source path
-	* @param       string   $dest      Destination path
-	* @return      bool     Returns true on success, false on failure
-	*/
+	 * Copy folder contents
+	 * @param       string   $source    Source path
+	 * @param       string   $dest      Destination path
+	 * @return      bool     Returns true on success, false on failure
+	 */
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
@@ -344,20 +344,20 @@ 
 	}
 	
 	/**
-	* Check if an url exist
-	* @param	String $url url to check
-	* @return	bool Return true on succes false on failure
-	*/
+	 * Check if an url exist
+	 * @param	String $url url to check
+	 * @return	bool Return true on succes false on failure
+	 */
 	public function urlexist($url){
 		$headers=get_headers($url);
 		return stripos($headers[0],"200 OK")?true:false;
 	}
 	
 	/**
-	* Convert hexa to string
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa to string
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
@@ -366,10 +366,10 @@ 
 	}
 	
 	/**
-	* Convert hexa color to rgb
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa color to rgb
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2rgb($hex) {
 		$hex = str_replace('#','',$hex);
 		return sscanf($hex, "%02x%02x%02x"); 
@@ -447,9 +447,9 @@ 
 	}
 	
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{
@@ -548,100 +548,100 @@ 
 	public function remove_accents($string) {
 		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
 		$chars = array(
-		    // Decompositions for Latin-1 Supplement
-		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
-		    chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
-		    chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
-		    chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
-		    chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
-		    chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
-		    chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
-		    chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
-		    chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
-		    chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
-		    chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
-		    chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
-		    chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
-		    chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
-		    chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
-		    chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
-		    chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
-		    chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
-		    chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
-		    chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
-		    chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
-		    chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
-		    chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
-		    chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
-		    chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
-		    chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
-		    chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
-		    chr(195).chr(191) => 'y',
-		    // Decompositions for Latin Extended-A
-		    chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
-		    chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
-		    chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
-		    chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
-		    chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
-		    chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
-		    chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
-		    chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
-		    chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
-		    chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
-		    chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
-		    chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
-		    chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
-		    chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
-		    chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
-		    chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
-		    chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
-		    chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
-		    chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
-		    chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
-		    chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
-		    chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
-		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
-		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
-		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
-		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
-		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
-		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
-		    chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
-		    chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
-		    chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
-		    chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
-		    chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
-		    chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
-		    chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
-		    chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
-		    chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
-		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
-		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
-		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
-		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
-		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
-		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
-		    chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
-		    chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
-		    chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
-		    chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
-		    chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
-		    chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
-		    chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
-		    chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
-		    chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
-		    chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
-		    chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
-		    chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
-		    chr(197).chr(190) => 'z', chr(197).chr(191) => 's'
+			// Decompositions for Latin-1 Supplement
+			chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
+			chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
+			chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
+			chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
+			chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
+			chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
+			chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
+			chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
+			chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
+			chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
+			chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
+			chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
+			chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
+			chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
+			chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
+			chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
+			chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
+			chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
+			chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
+			chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
+			chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
+			chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
+			chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
+			chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
+			chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
+			chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
+			chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
+			chr(195).chr(191) => 'y',
+			// Decompositions for Latin Extended-A
+			chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
+			chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
+			chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
+			chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
+			chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
+			chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
+			chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
+			chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
+			chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
+			chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
+			chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
+			chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
+			chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
+			chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
+			chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
+			chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
+			chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
+			chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
+			chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
+			chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
+			chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
+			chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
+			chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
+			chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
+			chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
+			chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+			chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
+			chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
+			chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
+			chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
+			chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
+			chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
+			chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
+			chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
+			chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
+			chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
+			chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
+			chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
+			chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
+			chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
+			chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
+			chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+			chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
+			chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
+			chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
+			chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
+			chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
+			chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+			chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
+			chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
+			chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
+			chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
+			chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
+			chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
+			chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
+			chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
+			chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
+			chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
+			chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
+			chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
+			chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
+			chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
+			chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
+			chr(197).chr(190) => 'z', chr(197).chr(191) => 's'
 		);
 		$string = strtr($string, $chars);
 		return $string;

Spacing +92 added lines, -92 removed lines

@@ -14,12 +14,12 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '', $sizelimit = false, $async = false) {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '', $sizelimit = false, $async = false) {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -29,7 +29,7 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -39,13 +39,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -57,7 +57,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -68,7 +68,7 @@ 
 		if ($sizelimit === true) {
 			curl_setopt($ch, CURLOPT_BUFFERSIZE, 128);
 			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr,$downloadsize, $downloaded, $uploadsize, $uploaded){
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr, $downloadsize, $downloaded, $uploadsize, $uploaded) {
 				return ($downloaded > (3*1024)) ? 1 : 0;
 			});
 		}
@@ -79,13 +79,13 @@ 
 		$result = curl_exec($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 			return $result;
@@ -109,7 +109,7 @@ 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -124,20 +124,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	public static function gunzip($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -145,19 +145,19 @@ 
 		}
 	}
 
-	public static function bunzip2($in_file,$out_file_name = '') {
+	public static function bunzip2($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
 			else {
 				echo 'bzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!feof($file)) {
+			while (!feof($file)) {
 				fwrite($out_file, bzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -175,27 +175,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('tr') as $element)
+		$tabledata = array();
+		foreach ($html->find('tr') as $element)
 		{
 			$td = array();
-			foreach( $element->find('th') as $row)
+			foreach ($element->find('th') as $row)
 			{
 				$td [] = trim($row->plaintext);
 			}
-			$td=array_filter($td);
+			$td = array_filter($td);
 			$tabledata[] = $td;
 
 			$td = array();
 			$tdi = array();
-			foreach( $element->find('td') as $row)
+			foreach ($element->find('td') as $row)
 			{
 				$td [] = trim($row->plaintext);
 				$tdi [] = trim($row->innertext);
 			}
-			$td=array_filter($td);
-			$tdi=array_filter($tdi);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -210,8 +210,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -231,11 +231,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -252,8 +252,8 @@ 
 	* @param String $distance distance between two points in m
 	* @return Float plunge
 	*/
-	public function plunge($initial_altitude,$final_altitude,$distance) {
-		$plunge = rad2deg(asin(($final_altitude-$initial_altitude)/$distance));
+	public function plunge($initial_altitude, $final_altitude, $distance) {
+		$plunge = rad2deg(asin(($final_altitude - $initial_altitude)/$distance));
 		return $plunge;
 	}
 
@@ -268,8 +268,8 @@ 
 	public function azimuth($lat, $lon, $latc, $lonc) {
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
-		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		$azimuth = rad2deg(atan2($dY, $dX));
+		if ($azimuth < 0) return $azimuth + 360;
 		return $azimuth;
 	}
 	
@@ -280,7 +280,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -296,12 +296,12 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 	    return(ctype_digit(strval($input)));
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -309,10 +309,10 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
-	public function convertDM($coord,$latlong) {
+	public function convertDM($coord, $latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
 			else $NSEW = 'N';
@@ -322,9 +322,9 @@ 
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
-		$coord = ($coord-$deg)*60;
+		$coord = ($coord - $deg)*60;
 		$min = $coord;
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
 	}
 	
 	/**
@@ -336,8 +336,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -348,9 +348,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ?true:false;
 	}
 	
 	/**
@@ -361,7 +361,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -371,7 +371,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -379,33 +379,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > pi()) {
-			if($dLon > 0) {
-				$dLon = (2 * pi() - $dLon) * -1;
+		if (abs($dLon) > pi()) {
+			if ($dLon > 0) {
+				$dLon = (2*pi() - $dLon)*-1;
 			} else {
-				$dLon = 2 * pi() + $dLon;
+				$dLon = 2*pi() + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -469,7 +469,7 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
 		global $globalMapRefresh;
 		if ($seconds == '') {
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
@@ -480,27 +480,27 @@ 
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -509,7 +509,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -523,14 +523,14 @@ 
 	 * @param integer $level GZIP compression level (default: 9)
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
 	 */
-	public function gzCompressFile($source, $level = 9){ 
-		$dest = $source . '.gz'; 
-		$mode = 'wb' . $level; 
+	public function gzCompressFile($source, $level = 9) { 
+		$dest = $source.'.gz'; 
+		$mode = 'wb'.$level; 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
-			if ($fp_in = fopen($source,'rb')) { 
+			if ($fp_in = fopen($source, 'rb')) { 
 				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+					gzwrite($fp_out, fread($fp_in, 1024*512)); 
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -546,7 +546,7 @@ 
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -603,7 +603,7 @@ 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -619,13 +619,13 @@ 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -659,7 +659,7 @@ 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
 			if (is_numeric($string[$i]) && $concat_flag) {
 				$int .= $string[$i];
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
 				$concat_flag = false;
 			}
 		}
@@ -705,7 +705,7 @@ 
 			$slice = array_slice($arr, $offset + 1, $length);
 			return implode("", $slice);
 		} else {
-			return mb_substr($string,$offset,$length,'UTF-8');
+			return mb_substr($string, $offset, $length, 'UTF-8');
 		}
 	}
 
@@ -715,14 +715,14 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
 		else if (is_dir($path))
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
+		if ($f === false)
 			return false;
 		fclose($f);
 		if (!$rm)

Braces +101 added lines, -45 removed lines

@@ -37,8 +37,11 @@ 
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -95,8 +98,9 @@ 
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		//global $cookies;
 		$cookies = array();
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 
@@ -107,7 +111,9 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
 			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
@@ -119,7 +125,9 @@ 
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
-		if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch);
+		if (curl_errno($ch) && $globalDebug) {
+			echo 'Download error: '.curl_error($ch);
+		}
 		curl_close($ch);
 		fclose($fp);
 	}
@@ -127,12 +135,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -148,11 +160,14 @@ 
 	public static function bunzip2($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.bz2', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
-			else {
+			if (function_exists('bzopen')) {
+				$file = bzopen($in_file,'rb');
+			} else {
 				echo 'bzopen not available';
 				die;
 			}
@@ -171,10 +186,16 @@ 
 	* @return Array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -209,7 +230,9 @@ 
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -230,7 +253,9 @@ 
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -269,7 +294,9 @@ 
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
 		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		if ($azimuth < 0) {
+			return $azimuth+360;
+		}
 		return $azimuth;
 	}
 	
@@ -283,10 +310,16 @@ 
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -314,11 +347,17 @@ 
 	
 	public function convertDM($coord,$latlong) {
 		if ($latlong == 'latitude') {
-			if ($coord < 0) $NSEW = 'S';
-			else $NSEW = 'N';
+			if ($coord < 0) {
+				$NSEW = 'S';
+			} else {
+				$NSEW = 'N';
+			}
 		} else {
-			if ($coord < 0) $NSEW = 'W';
-			else $NSEW = 'E';
+			if ($coord < 0) {
+				$NSEW = 'W';
+			} else {
+				$NSEW = 'E';
+			}
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
@@ -361,7 +400,9 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -398,8 +439,11 @@ 
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -458,7 +502,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -529,8 +575,9 @@ 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
 			if ($fp_in = fopen($source,'rb')) { 
-				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+				while (!feof($fp_in)) {
+									gzwrite($fp_out, fread($fp_in, 1024 * 512));
+				}
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -539,14 +586,17 @@ 
 		} else {
 			$error = true; 
 		}
-		if ($error)
-			return false; 
-		else
-			return $dest; 
+		if ($error) {
+					return false;
+		} else {
+					return $dest;
+		}
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+		}
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -670,7 +720,9 @@ 
 		$ip = gethostbyname($host);
 		$s = socket_create(AF_INET, SOCK_STREAM, 0);
 		$r = @socket_connect($s, $ip, $port);
-		if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+		if (!socket_set_nonblock($s)) {
+			echo "Unable to set nonblock on socket\n";
+		}
 		if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
 			return $s;
 		}
@@ -715,18 +767,22 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path)-1}=='/') {
+			// recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
-		else if (is_dir($path))
-			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		} else if (is_dir($path)) {
+					return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		}
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
-			return false;
+		if ($f===false) {
+					return false;
+		}
 		fclose($f);
-		if (!$rm)
-			unlink($path);
+		if (!$rm) {
+					unlink($path);
+		}
 		return true;
 	}
 }