Ysurac / FlightAirMap

require/class.AIS.php

Indentation +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
 		return ($dec);
 	}
 	
-    /*
+	/*
     $ais_map64 = array(
        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', // 48
        ':', ';', '<', '=', '>', '?', '@', 'A', 'B', 'C',
@@ -97,13 +97,13 @@ 
 		//  ' ' --- '?', // 0x20 - 0x3F
 		//  '@' --- '_', // 0x40 - 0x5F
 		$ais_chars = array(
-		    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-		    'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-		    'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']',
-		    '^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'',
-		    '(', ')', '*', '+', ',', '-', '.', '/', '0', '1',
-		    '2', '3', '4', '5', '6', '7', '8', '9', ':', ';',
-		    '<', '=', '>', '?'
+			'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+			'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+			'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']',
+			'^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'',
+			'(', ')', '*', '+', ',', '-', '.', '/', '0', '1',
+			'2', '3', '4', '5', '6', '7', '8', '9', ':', ';',
+			'<', '=', '>', '?'
 		);
 		// "
 		$rv = '';
@@ -421,8 +421,8 @@ 
 				}
 				if ($num_seq > 1) { // for multipart messages
 					if ($cmsg_sid != $msg_sid // different msg_sid
-					    || $msg_sid == -1 // invalid initial msg_sid
-					    || ($seq - $pseq) != 1 // not insequence
+						|| $msg_sid == -1 // invalid initial msg_sid
+						|| ($seq - $pseq) != 1 // not insequence
 					) {  // invalid for multipart message
 						$msg_sid = -1;
 						$cmsg_sid = -1;
@@ -435,7 +435,7 @@ 
 				$itu = $itu.$pcs[5]; // get itu message
 				$filler += (int)$pcs[6][0]; // get filler
 				if ($num_seq == 1 // valid single message
-				    || $num_seq == $pseq // valid multi-part message
+					|| $num_seq == $pseq // valid multi-part message
 				) {
 					/*
 					if ($num_seq != 1) { // test
@@ -520,13 +520,13 @@ 
 		else $pad = '';
 		$rv = '';
 		$ais_chars = array(
-		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
-		    'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19,
-		    'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29,
-		    '^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39,
-		    '('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49,
-		    '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59,
-		    '<'=>60, '='=>61, '>'=>62, '?'=>63
+			'@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
+			'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19,
+			'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29,
+			'^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39,
+			'('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49,
+			'2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59,
+			'<'=>60, '='=>61, '>'=>62, '?'=>63
 		);
 		// "
 		$_a = str_split($name);

aircraft-statistics-airline-country.php

Indentation +20 added lines, -20 removed lines

@@ -21,18 +21,18 @@ 
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
 	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
-    	print '<option></option>';
-    	$Stats = new Stats();
-    	$aircraft_types = $Stats->getAllAircraftTypes();
-    	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-    	foreach($aircraft_types as $aircrafttype)
-    	{
-    		if($aircraft_type == $aircrafttype['aircraft_icao'])
-    		{
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		} else {
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		}
+		print '<option></option>';
+		$Stats = new Stats();
+		$aircraft_types = $Stats->getAllAircraftTypes();
+		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		foreach($aircraft_types as $aircrafttype)
+		{
+			if($aircraft_type == $aircrafttype['aircraft_icao'])
+			{
+				print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			} else {
+				print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			}
 	}
 	print '</select>';
 	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
@@ -61,18 +61,18 @@ 
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
-        $country_data = '';
+		$country_data = '';
 	foreach($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],';
 	}
-        $country_data = substr($country_data, 0, -1);
-        print $country_data;
-        print '];';
-        print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-        print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-        print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-        print 'new Datamap({
+		$country_data = substr($country_data, 0, -1);
+		print $country_data;
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 	    element: document.getElementById("chartCountry"),
 	    projection: "mercator", // big world map
 	    fills: { defaultFill: "#F5F5F5" },

aircraft-detailed.php

Indentation +11 added lines, -11 removed lines

@@ -42,8 +42,8 @@ 
 		print '<div class="select-item">';
 		print '<form action="'.$globalURL.'/aircraft" method="get">';
 		print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
-    		print '<option></option>';
-    		$Stats = new Stats();
+			print '<option></option>';
+			$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
 		foreach($aircraft_types as $aircrafttype)
@@ -54,20 +54,20 @@ 
 			} else {
 				print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_manufacturer'].' '.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 			}
-    		}
-    		print '</select>';
-	    	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
+			}
+			print '</select>';
+			print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
 	  	print '</form>';
 	  	print '</div>';
 	    
 		if ($aircraft_type != "NA")
 		{
-	    		print '<div class="info column">';
-	      		print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
-	      		print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
-	      		print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
-	      		if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
-	    		print '</div>';
+				print '<div class="info column">';
+		  		print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
+		  		print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
+		  		print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
+		  		if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+				print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special aircraft profile shows all flights in where the aircraft type is unknown.").'</div>';
 		}

require/libs/SimplePie.compiled.php

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

statistics.php

Indentation +8 added lines, -8 removed lines

@@ -254,16 +254,16 @@ 
                 <div class="more">
             	    <?php
             	    
-            		if ($year != '' && $month != '') {
-            	    ?>
+					if ($year != '' && $month != '') {
+					?>
             	    <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
             	    <a href="<?php print $globalURL; ?>/marine/statistics/type" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		}
-            	    ?>
+					}
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -297,7 +297,7 @@ 
 ?>
                 <div class="more">
             	    <?php
-            	    /*
+					/*
             		if ($year != '' && $month != '') {
             	    ?>
             	    <a href="<?php print $globalURL; ?>/tracker/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
@@ -308,7 +308,7 @@ 
             	    <?php
             		}
             		*/
-            	    ?>
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->

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

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

require/class.Image.php

Indentation +102 added lines, -102 removed lines

@@ -13,11 +13,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the aircraft registration
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -38,11 +38,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the ship name
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the ship name
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getMarineImage($mmsi,$imo = '',$name = '')
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
@@ -69,11 +69,11 @@ 
 	}
 
 	/**
-	* Gets the image copyright based on the Exif data
-	*
-	* @return String image copyright
-	*
-	*/
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @return String image copyright
+	 *
+	 */
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
@@ -88,11 +88,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the aircraft registration
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch, $globalOffline;
@@ -120,11 +120,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the marine name
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the marine name
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch, $globalOffline;
@@ -161,12 +161,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft image
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
@@ -210,14 +210,14 @@ 
 	}
 
 	/**
-	* Gets the vessel image
-	*
-	* @param String $mmsi the vessel mmsi
-	* @param String $imo the vessel imo
-	* @param String $name the vessel name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the vessel image
+	 *
+	 * @param String $mmsi the vessel mmsi
+	 * @param String $imo the vessel imo
+	 * @param String $name the vessel name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalMarineImageSources;
@@ -251,13 +251,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Planespotters
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -285,13 +285,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Deviantart
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromDeviantart($type,$registration, $name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -325,13 +325,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from JetPhotos
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
@@ -367,13 +367,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from PlanePictures
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
@@ -401,13 +401,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Flickr
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -451,13 +451,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Bing
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
@@ -488,13 +488,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from airport-data
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromAirportData($type,$aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
@@ -513,13 +513,13 @@ 
 	}
 
 	/**
-	* Gets image from WikiMedia
-	*
-	* @param String $registration the registration of the aircraft/mmsi
-	* @param String $name name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets image from WikiMedia
+	 *
+	 * @param String $registration the registration of the aircraft/mmsi
+	 * @param String $name name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -574,13 +574,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from custom url
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromCustomSource($type,$registration,$name='') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

require/class.METAR.php

Indentation +34 added lines, -34 removed lines

@@ -14,35 +14,35 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 
 	/*
@@ -177,7 +177,7 @@ 
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
 			}
-                     /*
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -188,7 +188,7 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
+				// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
@@ -246,9 +246,9 @@ 
 				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];