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" },

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

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.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];

require/class.APRS.php

Indentation +2 added lines, -2 removed lines

@@ -176,8 +176,8 @@
 
 	private function urshift($n, $s) {
 		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
-		    (0x40000000 >> ($s - 1));
+			(($n & 0x7fffffff) >> $s) | 
+			(0x40000000 >> ($s - 1));
 	}
 
 	/*

require/class.SBS.php

Indentation +14 added lines, -14 removed lines

@@ -198,20 +198,20 @@
 
 	private function parityCheck($msg, $bin) {
 		$modes_checksum_table = array(
-		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
-		    0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
-		    0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
-		    0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
-		    0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
-		    0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
-		    0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
-		    0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
-		    0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
-		    0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
-		    0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
+			0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
+			0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
+			0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
+			0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
+			0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
+			0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
+			0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
+			0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
+			0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
+			0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
+			0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
 		);
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);

getImages.php

Indentation +51 added lines, -51 removed lines

@@ -4,31 +4,31 @@ 
 	$hex = str_replace("#", "", $hex);
 	$color = array();
 	if (strlen($hex) == 3) {
-	    $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
-	    $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
-	    $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
+		$color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
+		$color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
+		$color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
 	} else if (strlen($hex) == 6) {
-	    $color['r'] = hexdec(substr($hex, 0, 2));
-	    $color['g'] = hexdec(substr($hex, 2, 2));
-	    $color['b'] = hexdec(substr($hex, 4, 2));
+		$color['r'] = hexdec(substr($hex, 0, 2));
+		$color['g'] = hexdec(substr($hex, 2, 2));
+		$color['b'] = hexdec(substr($hex, 4, 2));
 	}
 	return $color;
 }
 
 
 if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { 
-    exit(0);
+	exit(0);
 }
 $color = $_GET['color'];
 if (!isset($_GET['filename']) || !preg_match('/^[a-z0-9-_]+\.png$/', strtolower($_GET['filename']))) {
-    echo "Incorrect filename";
-    exit(0);
+	echo "Incorrect filename";
+	exit(0);
 }
 $filename = $_GET['filename'];
 if (file_exists(dirname(__FILE__).'/cache/'.$color.'-'.$filename) && is_readable(dirname(__FILE__).'/cache/'.$color.'-'.$filename)) {
-    header('Content-type: image/png');
-    readfile(dirname(__FILE__).'/cache/'.$color.'-'.$filename);
-    exit(0);
+	header('Content-type: image/png');
+	readfile(dirname(__FILE__).'/cache/'.$color.'-'.$filename);
+	exit(0);
 }
 if (isset($_GET['tracker'])) {
 	$original = dirname(__FILE__).'/images/vehicules/color/'.$filename;
@@ -45,68 +45,68 @@ 
 	$original = dirname(__FILE__).'/images/aircrafts/new/'.$filename;
 }
 if (!file_exists($original)) {
-    echo "File not found";
+	echo "File not found";
 }
 
 if (extension_loaded('gd') && function_exists('gd_info')) {
-    $image = imagecreatefrompng($original);
-    $index = imagecolorexact($image,26,49,81);
-    if ($index < 0) {
+	$image = imagecreatefrompng($original);
+	$index = imagecolorexact($image,26,49,81);
+	if ($index < 0) {
 	$index = imagecolorexact($image,25,49,79);
-    }
-    if ($index < 0) {
+	}
+	if ($index < 0) {
 	$index = imagecolorexact($image,0,0,0);
-    }
-    $c = hexToRGB($color);
-    imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
+	}
+	$c = hexToRGB($color);
+	imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
  /*
     $ig = imagecolorat($image, 0, 0);
     imagecolortransparent($image, $ig);
    */
 
-    header('Content-type: image/png');
-    if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
+	header('Content-type: image/png');
+	if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
 	$resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT);
 	$newimg = imagecreatetruecolor($resize,$resize);
-        imagealphablending($newimg, false);
+		imagealphablending($newimg, false);
 	imagesavealpha($newimg, true);
 	imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image));
 	if (isset($_GET['heading'])) {
-    	    $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
-    	    $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
-    	    imagealphablending($rotation, false);
-	    imagesavealpha($rotation, true);
-    	    imagepng($rotation);
-    	    imagedestroy($newimg);
-    	    imagedestroy($image);
-    	    imagedestroy($rotation);
+			$heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
+			$rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
+			imagealphablending($rotation, false);
+		imagesavealpha($rotation, true);
+			imagepng($rotation);
+			imagedestroy($newimg);
+			imagedestroy($image);
+			imagedestroy($rotation);
 	
 	} else {
-    	    imagepng($newimg);
-    	    imagedestroy($newimg);
-    	    imagedestroy($image);
-        }
-    } else {
+			imagepng($newimg);
+			imagedestroy($newimg);
+			imagedestroy($image);
+		}
+	} else {
 	imagealphablending($image, false);
-        imagesavealpha($image, true);
+		imagesavealpha($image, true);
 	imagepng($image);
 	imagepng($image);
 	if (is_writable(dirname(__FILE__).'/cache')) {
-    	    imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename);
+			imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename);
+	}
+		imagedestroy($image);
 	}
-        imagedestroy($image);
-    }
 } else {
-    header('Content-type: image/png');
-    if (isset($_GET['tracker'])) {
-        readfile(dirname(__FILE__).'/images/vehicules/'.$filename);
-    } elseif (isset($_GET['marine'])) {
-        readfile(dirname(__FILE__).'/images/vehicules/'.$filename);
-    } elseif (isset($_GET['satellite'])) {
-        readfile(dirname(__FILE__).'/images/satellites/'.$filename);
-    } else {
-        if ($color == 'FF0000') readfile(dirname(__FILE__).'/images/aircrafts/selected/'.$filename);
+	header('Content-type: image/png');
+	if (isset($_GET['tracker'])) {
+		readfile(dirname(__FILE__).'/images/vehicules/'.$filename);
+	} elseif (isset($_GET['marine'])) {
+		readfile(dirname(__FILE__).'/images/vehicules/'.$filename);
+	} elseif (isset($_GET['satellite'])) {
+		readfile(dirname(__FILE__).'/images/satellites/'.$filename);
+	} else {
+		if ($color == 'FF0000') readfile(dirname(__FILE__).'/images/aircrafts/selected/'.$filename);
 	else readfile(dirname(__FILE__).'/images/aircrafts/'.$filename);
-    }
+	}
 }
 ?>
\ No newline at end of file