Ysurac / FlightAirMap

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

install/index.php

Indentation +39 added lines, -39 removed lines

@@ -345,14 +345,14 @@ 
 				</tr>
 				<!--
 		<?php
-		    if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
-			    require_once(dirname(__FILE__).'/../require/class.Connection.php');
-			    $Connection = new Connection();
+			if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
+				require_once(dirname(__FILE__).'/../require/class.Connection.php');
+				$Connection = new Connection();
 		?>
 			-->
 		<?php
 			if ($Connection->db != NULL) {
-			    if ($Connection->tableExists('source_location')) {
+				if ($Connection->tableExists('source_location')) {
 				require_once(dirname(__FILE__).'/../require/class.Source.php');
 				$Source = new Source();
 				//$alllocations = $Source->getAllLocationInfo();
@@ -372,9 +372,9 @@ 
 		
 		<?php
 				}
-			    }
+				}
+			}
 			}
-		    }
 		?>
 
 				<tr>
@@ -484,12 +484,12 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
-								    } else {
+									} else {
 									$hostport = explode(':',$source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
@@ -502,7 +502,7 @@ 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td>
 								<?php
-								    }
+									}
 								?>
 								<td>
 									<select name="format[]" id="format">
@@ -639,9 +639,9 @@ 
 			    </thead>
 			    <tbody>
 				<?php
-				    if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
+					if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
 					foreach ($globalNewsFeeds as $type => $feedslng) {
-					    foreach ($feedslng as $lng => $feeds) {
+						foreach ($feedslng as $lng => $feeds) {
 						foreach ($feeds as $feed) {
 				?>
 				<tr>
@@ -666,9 +666,9 @@ 
 				
 				<?php
 						}
-					    }
+						}
+					}
 					}
-				    }
 				?>
 				<tr>
 				    <td><input type="url" name="newsurl[]" /></td>
@@ -1009,7 +1009,7 @@ 
 			<br />
 			<p>
 			<?php 
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
+				if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
@@ -1019,11 +1019,11 @@ 
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
 			<?php
 				}
-			    } else {
+				} else {
 			?>
 				<b>PHP GD is not installed, you can't change color of aircraft icon on map</b>
 			<?php
-			    }
+				}
 			?>
 			</p>
 			<br />
@@ -1047,7 +1047,7 @@ 
 	</p>
 <?php
 	require('../footer.php');
-        exit;
+		exit;
 }
 // '	
 $settings = array();
@@ -1138,8 +1138,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1149,13 +1149,13 @@ 
 	
 	$newsfeeds = array();
 	foreach($newsurl as $newskey => $url) {
-	    if ($url != '') {
+		if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+			$newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
-	    }
+		}
 	}
 	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
 
@@ -1567,14 +1567,14 @@ 
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
-    	}
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+		}
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
@@ -1622,21 +1622,21 @@ 
 	$popi = false;
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		if ($done == 'Create database') $pop = true;
+		if ($_SESSION['install'] == 'database_create') $pop = true;
+		if ($_SESSION['install'] == 'database_import') $popi = true;
+		if ($_SESSION['install'] == 'waypoints') $popw = true;
 	}
 	if ($pop) {
-	    sleep(5);
-	    print '<li>Create database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create database....<img src="../images/loading.gif" /></li>';
 	} else if ($popi) {
-	    sleep(5);
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
 	} else if ($popw) {
-	    sleep(5);
-	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
 	print '</div></ul>';
 	print '<div id="error"></div>';
@@ -1702,7 +1702,7 @@ 
 	unset($_COOKIE['install']);
 	print '<div class="info column"><ul>';
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
 	}
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
 	print '</ul></div>';

header.php

Indentation +80 added lines, -80 removed lines

@@ -33,7 +33,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -165,17 +165,17 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -187,7 +187,7 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <?php
 //		if (isset($globalBeta) && $globalBeta) {
@@ -218,13 +218,13 @@ 
 <script src="<?php print $globalURL; ?>/js/map-satellite.2d.js.php?<?php print time(); ?>"></script>
 <?php
 		}
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -401,34 +401,34 @@ 
 
       <ul class="nav navbar-nav">
 <?php
-    if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
+	if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
 ?>
     <li><a href="<?php print $globalURL; ?>/news"><?php echo _("News"); ?></a></li>
 <?php
-    }
+	}
 ?>
 
 <?php 
-    $sub = false;
-    if (
+	$sub = false;
+	if (
 	(
-	    (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		(!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
+		isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
 	)
-    ) {
+	) {
 	$sub = true;
-    }
+	}
 ?>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
     <li class="dropdown">
 <?php
@@ -439,7 +439,7 @@ 
 	<ul class="dropdown-menu multi-level">
       	<li class="dropdown-submenu">
 <?php
-        }
+		}
 ?>
 <?php
 	if (isset($globalNewsFeeds['aircraft']) && !empty($globalNewsFeeds['aircraft'])) {
@@ -454,25 +454,25 @@ 
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li>
 <?php
-    if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
+	if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
 <?php
-    if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
+	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
 <?php
-    } 
-    if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
+	} 
+	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 
 ?>
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -480,43 +480,43 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
     	    <?php
-    	        if (isset($globalAccidents) && $globalAccidents) {
-    	    ?>
+				if (isset($globalAccidents) && $globalAccidents) {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
             <?php
-        	}
-    	    ?>
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <?php
 		if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) {
-	    ?>
+		?>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
 	    <?php
 		}
-	    ?>
+		?>
           </ul>
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
@@ -543,14 +543,14 @@ 
     </ul>
 <?php
 	}
-    }
+	}
 ?>
 <?php
-    if (isset($globalMarine) && $globalMarine) {
+	if (isset($globalMarine) && $globalMarine) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Marines"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -584,14 +584,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalTracker) && $globalTracker) {
+	if (isset($globalTracker) && $globalTracker) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -625,14 +625,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalSatellite) && $globalSatellite) {
+	if (isset($globalSatellite) && $globalSatellite) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellites"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -668,7 +668,7 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 
         <li class="dropdown">
@@ -677,12 +677,12 @@ 
           	<li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
 		<li><hr /></li>
 		<li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li>
 <?php
-    }
+	}
 ?>
 	    <?php if (isset($globalContribute) && $globalContribute) { ?>
                 <li><hr /></li>
@@ -703,14 +703,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -742,18 +742,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -764,15 +764,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -780,22 +780,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -806,7 +806,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -815,7 +815,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -824,27 +824,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    } elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
+	} elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
@@ -854,8 +854,8 @@ 
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
-    //} elseif ($globalMapProvider == 'OpenStreetMap') {
-    } else {
+	//} elseif ($globalMapProvider == 'OpenStreetMap') {
+	} else {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -864,7 +864,7 @@ 
   }).addTo(map);
 
 <?php
-    }
+	}
 ?>
         </script>
     </div>