Ysurac / FlightAirMap

statistics-year.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 if (!isset($filter_name)) $filter_name = '';
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 
 require_once('header.php');

statistics-country.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 if (!isset($filter_name)) $filter_name = '';
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 
 require_once('header.php');

require/class.METAR.php

Indentation +263 added lines, -263 removed lines

@@ -7,109 +7,109 @@ 
 	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'
 	);
 	
 	public function __construct($dbc = null) {
-                $Connection = new Connection($dbc);
-                $this->db = $Connection->db;
-        }
+				$Connection = new Connection($dbc);
+				$this->db = $Connection->db;
+		}
 
-       public static function check_last_update() {
-    		global $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+	   public static function check_last_update() {
+			global $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(NOW(), INTERVAL 20 MINUTE)";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '20 MINUTES'";
 		}
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                $sth->closeCursor();
-                if ($row['nb'] > 0) return false;
-                else return true;
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				$sth->closeCursor();
+				if ($row['nb'] > 0) return false;
+				else return true;
+		}
 
-        public static function insert_last_update() {
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
+		public static function insert_last_update() {
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 
         
-        public function parse($data) {
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
-    		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
-    		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
-    		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
-    		$result = array();
-    		$result['location'] = $pieces[$pos];
-    		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
-    		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
-    			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
-    			// Wind Speed
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+		public function parse($data) {
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
+			$codes = implode('|', array_keys($this->texts));
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+			//$pieces = explode(' ',$data);
+			$pieces = preg_split('/\s/',$data);
+			$pos = 0;
+			if ($pieces[0] == 'METAR') $pos++;
+			elseif ($pieces[0] == 'SPECI') $pos++;
+			if (strlen($pieces[$pos]) != 4) $pos++;
+			$result = array();
+			$result['location'] = $pieces[$pos];
+			$pos++;
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
+			$result['time'] = substr($pieces[$pos],2,4);
+			$c = count($pieces);
+			for($pos++; $pos < $c; $pos++) {
+				$piece = $pieces[$pos];
+				if ($piece == 'RMK') break;
+				if ($piece == 'AUTO') $result['auto'] = true;
+				if ($piece == 'COR') $result['correction'] = true;
+				// Wind Speed
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
+					$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
-    			}
+				}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
     				$result['wind_direction'] = (float)$matches[1];
@@ -126,35 +126,35 @@ 
     				}
     			}
     			*/
-    			// Temperature
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+				// Temperature
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
+					$temp = (float)$matches[1];
 				if ($matches[1]{0} == 'M') {
 					$temp = ((float)substr($matches[1], 1)) * -1;
 				}
-    				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+					$result['temperature'] = $temp;
+					$dew = (float)$matches[2];
 				if ($matches[2]{0} == 'M') {
 					$dew = ((float)substr($matches[2], 1)) * -1;
 				}
 				$result['dew'] = $dew;
-    			}
-    			// QNH
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
-    			// #^(Q|A)(////|[0-9]{4})( )#
-    				if ($matches[1] == 'Q') {
-    					// hPa
-    					$result['QNH'] = $matches[2];
-    				} else {
-    					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
 				}
-    				/*
+				// QNH
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
+				// #^(Q|A)(////|[0-9]{4})( )#
+					if ($matches[1] == 'Q') {
+						// hPa
+						$result['QNH'] = $matches[2];
+					} else {
+						// inHg
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+				}
+					/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
     				$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];
@@ -165,9 +165,9 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
+				// 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;
 				} else {
 					if ($matches[1] == '9999') {
@@ -180,28 +180,28 @@ 
 					$result['visibility'] = '> 10000';
 					$result['weather'] = "CAVOK";
 				}
-    			}
-    			// Cloud Coverage
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
-    				$type = $matches[1];
-    				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
-    				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
-    				$result['cloud'][] = $cloud;
-    			}
-    			// RVR
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
-    				$rvr = array();
+				}
+				// Cloud Coverage
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
+					$type = $matches[1];
+					$cloud = array();
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+					$cloud['type_code'] = $type;
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
+					$result['cloud'][] = $cloud;
+				}
+				// RVR
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
+					$rvr = array();
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
@@ -210,33 +210,33 @@ 
 				$result['RVR'] = $rvr;
 			}
     			
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
-    				//print_r($matches);
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
-    				$result['RVR']['runway'] = $matches[1];
-        			$result['RVR']['deposits'] = $matches[2];
-        			$result['RVR']['extent'] = $matches[3];
-        			$result['RVR']['depth'] = $matches[4];
-        			$result['RVR']['friction'] = $matches[5];
-    			}
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    				//echo $piece;
-    				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
+					//print_r($matches);
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
+					$result['RVR']['runway'] = $matches[1];
+					$result['RVR']['deposits'] = $matches[2];
+					$result['RVR']['extent'] = $matches[3];
+					$result['RVR']['depth'] = $matches[4];
+					$result['RVR']['friction'] = $matches[5];
+				}
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+					//echo $piece;
+					//print_r($matches);
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+					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];
 				$result['RVR_range'] = $range;
-    			}
-    			// Weather
-    			if (preg_match($regWeather, $piece, $matches)) {
+				}
+				// Weather
+				if (preg_match($regWeather, $piece, $matches)) {
 				$text = Array();
 				switch ($matches[1]) {
 					case '+':
@@ -259,35 +259,35 @@ 
 				}
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
-    			}
-    		}
-    		return $result;
+				}
+			}
+			return $result;
         
-        }
+		}
         
 	public function getMETAR($icao) {
-    		global $globalMETARcycle, $globalDBdriver;
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
-                } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
-                }
-                $query_values = array(':icao' => $icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
-            		$all = $this->downloadMETAR($icao);
-                }
-                return $all;
-        }
+			global $globalMETARcycle, $globalDBdriver;
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
+				} else {
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+					else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+				}
+				$query_values = array(':icao' => $icao);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
+					$all = $this->downloadMETAR($icao);
+				}
+				return $all;
+		}
 
-       public function addMETAR($location,$metar,$date) {
+	   public function addMETAR($location,$metar,$date) {
 		global $globalDBdriver;
 		$date = date('Y-m-d H:i:s',strtotime($date));
 		if ($globalDBdriver == 'mysql') {
@@ -295,106 +295,106 @@ 
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteMETAR($id) {
-                $query = "DELETE FROM metar WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllMETARLocation() {
-                $query = "DELETE FROM metar";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteMETAR($id) {
+				$query = "DELETE FROM metar WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllMETARLocation() {
+				$query = "DELETE FROM metar";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addMETARCycle() {
-    		global $globalDebug, $globalIVAO, $globalTransaction;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		if (isset($globalIVAO) && $globalIVAO) {
-        		//$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
+		public function addMETARCycle() {
+			global $globalDebug, $globalIVAO, $globalTransaction;
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			if (isset($globalIVAO) && $globalIVAO) {
+				//$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
 			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
-    			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
-    		} else {
+				$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
+			} else {
 			//$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
 			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
-    			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
-    		}
-    		if ($handle) {
+				$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
+			}
+			if ($handle) {
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
 			$date = '';
-    			//foreach(explode("\n",$cycle) as $line) {
-    			if ($globalTransaction) $this->db->beginTransaction();
-	    		while(($line = fgets($handle,4096)) !== false) {
+				//foreach(explode("\n",$cycle) as $line) {
+				if ($globalTransaction) $this->db->beginTransaction();
+				while(($line = fgets($handle,4096)) !== false) {
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
-    				} elseif ($line != '') {
-    				    //$this->parse($line);
-    				    if ($date == '') $date = date('Y/m/d H:m');
-        			    $pos = 0;
-        			    $pieces = preg_split('/\s/',$line);
-        			    if ($pieces[0] == 'METAR') $pos++;
-        			    if (strlen($pieces[$pos]) != 4) $pos++;
-		        	    $location = $pieces[$pos];
-        	        	    echo $this->addMETAR($location,$line,$date);
-    				}
-    			}
-    			fclose($handle);
-    			if ($globalTransaction) $this->db->commit();
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+					} elseif ($line != '') {
+						//$this->parse($line);
+						if ($date == '') $date = date('Y/m/d H:m');
+						$pos = 0;
+						$pieces = preg_split('/\s/',$line);
+						if ($pieces[0] == 'METAR') $pos++;
+						if (strlen($pieces[$pos]) != 4) $pos++;
+						$location = $pieces[$pos];
+							echo $this->addMETAR($location,$line,$date);
+					}
+				}
+				fclose($handle);
+				if ($globalTransaction) $this->db->commit();
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
-        }
-        public function downloadMETAR($icao) {
-    		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
-    		$cycle = $Common->getData($url);
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
-    			}
-    			//echo $line."\n";
-    		}
-    		return array();
+		}
+		public function downloadMETAR($icao) {
+			global $globalMETARurl;
+			if ($globalMETARurl == '') return array();
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
+			$cycle = $Common->getData($url);
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					if (strlen($location == 4)) {
+					$this->addMETAR($location,$line,$date);
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
+					} else return array();
+				}
+				//echo $line."\n";
+			}
+			return array();
         
-        }
+		}
 }
 /*
 $METAR = new METAR();

header.php

Indentation +49 added lines, -49 removed lines

@@ -28,7 +28,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]);
@@ -167,16 +167,16 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <?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) {
@@ -188,7 +188,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) {
@@ -199,13 +199,13 @@ 
 ?>
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script>
 <?php
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -360,15 +360,15 @@ 
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
 <?php
-    if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
+	if ((!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
-    } else {
+	} else {
 ?>
 			<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>
@@ -376,34 +376,34 @@ 
             <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>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -445,14 +445,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>
@@ -483,18 +483,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" />
@@ -505,15 +505,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);
@@ -521,22 +521,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'])) {
+	} 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]['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,
@@ -547,7 +547,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -555,7 +555,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).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,
@@ -564,7 +564,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,
@@ -573,27 +573,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
-    }
+	}
 ?>
         </script>
     </div>

require/class.Spotter.php

Indentation +1457 added lines, -1457 removed lines

@@ -55,10 +55,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -149,14 +149,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
@@ -323,11 +323,11 @@ 
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
 					} else $temp_array['aircraft_shadow'] = 'default.png';
-                                } else {
-                            		$temp_array['aircraft_shadow'] = 'default.png';
+								} else {
+									$temp_array['aircraft_shadow'] = 'default.png';
 					$temp_array['aircraft_name'] = 'N/A';
 					$temp_array['aircraft_manufacturer'] = 'N/A';
-                            	}
+								}
 			}
 			$fromsource = NULL;
 			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
@@ -523,11 +523,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -874,11 +874,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -917,12 +917,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		date_default_timezone_set('UTC');
@@ -950,7 +950,7 @@ 
 				return false;
 			}
 		}
-    		$additional_query = '';
+			$additional_query = '';
 		if ($interval != "")
 		{
 			if (!is_string($interval))
@@ -990,12 +990,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1036,11 +1036,11 @@ 
     
     
 	/**
-	* Gets all the spotter information sorted by the newest aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftRegistration($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1080,11 +1080,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1123,12 +1123,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest departure airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest departure airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByDepartureAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1170,11 +1170,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest arrival airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest arrival airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByArrivalAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1213,11 +1213,11 @@ 
 	
 
 	/**
-	* Gets all the spotter information based on the spotter id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the spotter id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByID($id = '')
 	{
 		global $global_query;
@@ -1239,11 +1239,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1295,11 +1295,11 @@ 
 	}
 	
 	/**
-	* Gets all the spotter information based on the owner
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1352,11 +1352,11 @@ 
 	}
 	
 	/**
-	* Gets all the spotter information based on the pilot
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1405,11 +1405,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAircraft($aircraft_type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1463,11 +1463,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRegistration($registration = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1524,11 +1524,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1581,11 +1581,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1639,11 +1639,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the date
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the date
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
@@ -1707,11 +1707,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the country name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the country name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1765,11 +1765,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the manufacturer name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the manufacturer name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByManufacturer($aircraft_manufacturer = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1825,13 +1825,13 @@ 
   
   
 	/**
-	* Gets a list of all aircraft that take a route
-	*
-	* @param String $departure_airport_icao ICAO code of departure airport
-	* @param String $arrival_airport_icao ICAO code of arrival airport
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets a list of all aircraft that take a route
+	 *
+	 * @param String $departure_airport_icao ICAO code of departure airport
+	 * @param String $arrival_airport_icao ICAO code of arrival airport
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRoute($departure_airport_icao = '', $arrival_airport_icao = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1900,11 +1900,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the special column in the table
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the special column in the table
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByHighlight($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1943,11 +1943,11 @@ 
 	}
 
 	/**
-	* Gets all the highlight based on a aircraft registration
-	*
-	* @return String the highlight text
-	*
-	*/
+	 * Gets all the highlight based on a aircraft registration
+	 *
+	 * @return String the highlight text
+	 *
+	 */
 	public function getHighlightByRegistration($registration,$filter = array())
 	{
 		global $global_query;
@@ -1969,13 +1969,13 @@ 
 
 	
 	/**
-	* Gets the squawk usage from squawk code
-	*
-	* @param String $squawk squawk code
-	* @param String $country country
-	* @return String usage
-	*
-	*/
+	 * Gets the squawk usage from squawk code
+	 *
+	 * @param String $squawk squawk code
+	 * @param String $country country
+	 * @return String usage
+	 *
+	 */
 	public function getSquawkUsage($squawk = '',$country = 'FR')
 	{
 		
@@ -1996,12 +1996,12 @@ 
 	}
 
 	/**
-	* Gets the airport icao from the iata
-	*
-	* @param String $airport_iata the iata code of the airport
-	* @return String airport iata
-	*
-	*/
+	 * Gets the airport icao from the iata
+	 *
+	 * @param String $airport_iata the iata code of the airport
+	 * @return String airport iata
+	 *
+	 */
 	public function getAirportIcao($airport_iata = '')
 	{
 		
@@ -2021,14 +2021,14 @@ 
 	}
 
 	/**
-	* Gets the airport distance
-	*
-	* @param String $airport_icao the icao code of the airport
-	* @param Float $latitude the latitude
-	* @param Float $longitude the longitude
-	* @return Float distance to the airport
-	*
-	*/
+	 * Gets the airport distance
+	 *
+	 * @param String $airport_icao the icao code of the airport
+	 * @param Float $latitude the latitude
+	 * @param Float $longitude the longitude
+	 * @return Float distance to the airport
+	 *
+	 */
 	public function getAirportDistance($airport_icao,$latitude,$longitude)
 	{
 		
@@ -2049,12 +2049,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the icao
-	*
-	* @param String $airport the icao code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the icao
+	 *
+	 * @param String $airport the icao code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfo($airport = '')
 	{
 		
@@ -2100,12 +2100,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the country
-	*
-	* @param Array $countries Airports countries
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the country
+	 *
+	 * @param Array $countries Airports countries
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCountry($countries)
 	{
 		$lst_countries = '';
@@ -2143,12 +2143,12 @@ 
 	}
 	
 	/**
-	* Gets airports info based on the coord
-	*
-	* @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
-	* @return Array airport information
-	*
-	*/
+	 * Gets airports info based on the coord
+	 *
+	 * @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCoord($coord)
 	{
 		global $globalDBdriver;
@@ -2179,12 +2179,12 @@ 
 	}
 
 	/**
-	* Gets waypoints info based on the coord
-	*
-	* @param Array $coord waypoints coord
-	* @return Array airport information
-	*
-	*/
+	 * Gets waypoints info based on the coord
+	 *
+	 * @param Array $coord waypoints coord
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllWaypointsInfobyCoord($coord)
 	{
 		if (is_array($coord)) {
@@ -2218,12 +2218,12 @@ 
 	
 	
 	/**
-	* Gets the airline info based on the icao code or iata code
-	*
-	* @param String $airline_icao the iata code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airline info based on the icao code or iata code
+	 *
+	 * @param String $airline_icao the iata code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2254,7 +2254,7 @@ 
 			} else {
 				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
 			}
-                        /*
+						/*
 			$airline_array = array();
 			$temp_array = array();
 		
@@ -2287,12 +2287,12 @@ 
 	}
 	
 	/**
-	* Gets the airline info based on the airline name
-	*
-	* @param String $airline_name the name of the airline
-	* @return Array airline information
-	*
-	*/
+	 * Gets the airline info based on the airline name
+	 *
+	 * @param String $airline_name the name of the airline
+	 * @return Array airline information
+	 *
+	 */
 	public function getAllAirlineInfoByName($airline_name, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2320,12 +2320,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft info based on the aircraft type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAllAircraftInfo($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2357,12 +2357,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft icao based on the aircraft name/type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return String aircraft information
-	*
-	*/
+	 * Gets the aircraft icao based on the aircraft name/type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return String aircraft information
+	 *
+	 */
 	public function getAircraftIcao($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2387,12 +2387,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft modes
-	*
-	* @param String $aircraft_modes the aircraft ident (hex)
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft modes
+	 *
+	 * @param String $aircraft_modes the aircraft ident (hex)
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftType($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -2412,12 +2412,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftTypeByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2435,12 +2435,12 @@ 
 	}
 
 	/**
-	* Gets the spotter_id and flightaware_id based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array spotter_id and flightaware_id
-	*
-	*/
+	 * Gets the spotter_id and flightaware_id based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array spotter_id and flightaware_id
+	 *
+	 */
 	public function getAllIDByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2459,12 +2459,12 @@ 
 	}
 
 	/**
-	* Gets correct aircraft operator code
-	*
-	* @param String $operator the aircraft operator code (callsign)
-	* @return String aircraft operator code
-	*
-	*/
+	 * Gets correct aircraft operator code
+	 *
+	 * @param String $operator the aircraft operator code (callsign)
+	 * @return String aircraft operator code
+	 *
+	 */
 	public function getOperator($operator)
 	{
 		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
@@ -2481,16 +2481,16 @@ 
 	}
 
 	/**
-	* Gets the aircraft route based on the aircraft callsign
-	*
-	* @param String $callsign the aircraft callsign
-	* @return Array aircraft type
-	*
-	*/
+	 * Gets the aircraft route based on the aircraft callsign
+	 *
+	 * @param String $callsign the aircraft callsign
+	 * @return Array aircraft type
+	 *
+	 */
 	public function getRouteInfo($callsign)
 	{
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-                if ($callsign == '') return array();
+				if ($callsign == '') return array();
 		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
@@ -2504,12 +2504,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftInfoByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2536,12 +2536,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft owner & base based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft owner & base based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftOwnerByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2558,11 +2558,11 @@ 
 	
   
   /**
-	* Gets all flights (but with only little info)
-	*
-	* @return Array basic flight information
-	*
-	*/
+   * Gets all flights (but with only little info)
+   *
+   * @return Array basic flight information
+   *
+   */
 	public function getAllFlightsforSitemap()
 	{
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
@@ -2570,7 +2570,7 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-                  /*
+				  /*
 		$flight_array = array();
 		$temp_array = array();
 		
@@ -2592,11 +2592,11 @@ 
 	}
   
 	/**
-	* Gets a list of all aircraft manufacturers
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+	 * Gets a list of all aircraft manufacturers
+	 *
+	 * @return Array list of aircraft types
+	 *
+	 */
 	public function getAllManufacturers()
 	{
 		/*
@@ -2625,11 +2625,11 @@ 
   
   
   /**
-	* Gets a list of all aircraft types
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+   * Gets a list of all aircraft types
+   *
+   * @return Array list of aircraft types
+   *
+   */
 	public function getAllAircraftTypes($filters = array())
 	{
 		/*
@@ -2664,11 +2664,11 @@ 
 	
 	
 	/**
-	* Gets a list of all aircraft registrations
-	*
-	* @return Array list of aircraft registrations
-	*
-	*/
+	 * Gets a list of all aircraft registrations
+	 *
+	 * @return Array list of aircraft registrations
+	 *
+	 */
 	public function getAllAircraftRegistrations($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2693,12 +2693,12 @@ 
 	}
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2729,11 +2729,11 @@ 
 
 
 	/**
-	* Gets a list of all airline names
-	*
-	* @return Array list of airline names
-	*
-	*/
+	 * Gets a list of all airline names
+	 *
+	 * @return Array list of airline names
+	 *
+	 */
 	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2782,11 +2782,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all alliance names
-	*
-	* @return Array list of alliance names
-	*
-	*/
+	 * Gets a list of all alliance names
+	 *
+	 * @return Array list of alliance names
+	 *
+	 */
 	public function getAllAllianceNames($forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2811,11 +2811,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all airline countries
-	*
-	* @return Array list of airline countries
-	*
-	*/
+	 * Gets a list of all airline countries
+	 *
+	 * @return Array list of airline countries
+	 *
+	 */
 	public function getAllAirlineCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2843,11 +2843,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival names
-	*
-	* @return Array list of airport names
-	*
-	*/
+	 * Gets a list of all departure & arrival names
+	 *
+	 * @return Array list of airport names
+	 *
+	 */
 	public function getAllAirportNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2895,11 +2895,11 @@ 
 	} 
 
 	/**
-	* Gets a list of all owner names
-	*
-	* @return Array list of owner names
-	*
-	*/
+	 * Gets a list of all owner names
+	 *
+	 * @return Array list of owner names
+	 *
+	 */
 	public function getAllOwnerNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2913,11 +2913,11 @@ 
 	} 
 
 	/**
-	* Gets a list of all pilot names and pilot ids
-	*
-	* @return Array list of pilot names and pilot ids
-	*
-	*/
+	 * Gets a list of all pilot names and pilot ids
+	 *
+	 * @return Array list of pilot names and pilot ids
+	 *
+	 */
 	public function getAllPilotNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2932,11 +2932,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival airport countries
-	*
-	* @return Array list of airport countries
-	*
-	*/
+	 * Gets a list of all departure & arrival airport countries
+	 *
+	 * @return Array list of airport countries
+	 *
+	 */
 	public function getAllAirportCountries($filters = array())
 	{
 		$airport_array = array();
@@ -2984,11 +2984,11 @@ 
 	
 	
 	/**
-	* Gets a list of all countries (airline, departure airport & arrival airport)
-	*
-	* @return Array list of countries
-	*
-	*/
+	 * Gets a list of all countries (airline, departure airport & arrival airport)
+	 *
+	 * @return Array list of countries
+	 *
+	 */
 	public function getAllCountries($filters = array())
 	{
 		$Connection= new Connection($this->db);
@@ -3065,11 +3065,11 @@ 
 	
 	
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -3093,9 +3093,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3126,9 +3126,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3158,9 +3158,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3198,9 +3198,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3242,9 +3242,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3277,9 +3277,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3320,9 +3320,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3354,9 +3354,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3400,11 +3400,11 @@ 
 
 
 	/**
-	* Gets a list of all dates
-	*
-	* @return Array list of date names
-	*
-	*/
+	 * Gets a list of all dates
+	 *
+	 * @return Array list of date names
+	 *
+	 */
 	public function getAllDates()
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -3445,11 +3445,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function getAllRoutes()
 	{
 		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
@@ -3475,13 +3475,13 @@ 
 	}
 
 	/**
-	* Update ident spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
 	{
 		if (!is_numeric(substr($ident, 0, 3)))
@@ -3502,14 +3502,14 @@ 
 		} else {
 			$airline_array = $this->getAllAirlineInfo("NA");
 		}
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 
 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3522,19 +3522,19 @@ 
 
 	}
 	/**
-	* Update latest spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/	
+	 * Update latest spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
 	{
 		if ($groundspeed == '') $groundspeed = NULL;
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
+				$query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3548,32 +3548,32 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $altitude altitude of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
@@ -3788,8 +3788,8 @@ 
     
 		if ($globalIVAO && $aircraft_icao != '')
 		{
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
-            		else $airline_icao = '';
+					if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
+					else $airline_icao = '';
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
@@ -3820,53 +3820,53 @@ 
 	
 		if (count($airline_array) == 0) 
 		{
-                        $airline_array = $this->getAllAirlineInfo('NA');
-                }
-                if (count($aircraft_array) == 0) 
-                {
-                        $aircraft_array = $this->getAllAircraftInfo('NA');
-                }
-                if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
-                {
-                        $departure_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
-                {
-                        $arrival_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if ($registration == '') $registration = 'NA';
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
+						$airline_array = $this->getAllAirlineInfo('NA');
+				}
+				if (count($aircraft_array) == 0) 
+				{
+						$aircraft_array = $this->getAllAircraftInfo('NA');
+				}
+				if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
+				{
+						$departure_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
+				{
+						$arrival_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if ($registration == '') $registration = 'NA';
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				if (!isset($aircraft_owner)) $aircraft_owner = NULL;
+				$query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
 
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 		if ($airline_type == '') {
 			$timeelapsed = microtime(true);
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
 			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 		}
 		if ($airline_type == null) $airline_type = '';
-                $aircraft_type = $aircraft_array[0]['type'];
-                $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
-                $departure_airport_name = $departure_airport_array[0]['name'];
-	        $departure_airport_city = $departure_airport_array[0]['city'];
-            	$departure_airport_country = $departure_airport_array[0]['country'];
+				$aircraft_type = $aircraft_array[0]['type'];
+				$aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
+				$departure_airport_name = $departure_airport_array[0]['name'];
+			$departure_airport_city = $departure_airport_array[0]['city'];
+				$departure_airport_country = $departure_airport_array[0]['country'];
                 
-                $arrival_airport_name = $arrival_airport_array[0]['name'];
-                $arrival_airport_city = $arrival_airport_array[0]['city'];
-                $arrival_airport_country = $arrival_airport_array[0]['country'];
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
+				$arrival_airport_name = $arrival_airport_array[0]['name'];
+				$arrival_airport_city = $arrival_airport_array[0]['city'];
+				$arrival_airport_country = $arrival_airport_array[0]['country'];
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
 
 		try {
 		        
@@ -3874,7 +3874,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -3883,11 +3883,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -3903,11 +3903,11 @@ 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -3918,11 +3918,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -3966,11 +3966,11 @@ 
 	
 	
 	 /**
-	* Gets all airlines that have flown over
-	*
-	* @return Array the airline list
-	*
-	*/
+	  * Gets all airlines that have flown over
+	  *
+	  * @return Array the airline list
+	  *
+	  */
 	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -3984,7 +3984,7 @@ 
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
+				if ($sincedate != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
@@ -4038,26 +4038,26 @@ 
 	}
 
 	 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all pilots that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.pilot_id, s.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 			FROM spotter_output LEFT JOIN (SELECT DISTINCT pilot_id, pilot_name, max(date) as date FROM spotter_output GROUP BY pilot_id, pilot_name) s ON s.pilot_id = spotter_output.pilot_id".$filter_query." spotter_output.pilot_id <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4112,25 +4112,25 @@ 
 	}
 	
 	/**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	 * Gets all pilots that have flown over
+	 *
+	 * @return Array the pilots list
+	 *
+	 */
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
 	{
 		global $globalDBdriver;
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4159,26 +4159,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 					FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4229,26 +4229,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4275,11 +4275,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by aircraft
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -4311,11 +4311,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -4347,11 +4347,11 @@ 
 	
 	
 	/**
-	* Gets all airlines that have flown over by airport
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by airport
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4382,11 +4382,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by airport icao
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by airport icao
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4416,11 +4416,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4451,11 +4451,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4484,11 +4484,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by date
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by date
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4532,11 +4532,11 @@ 
 	
 	
 	/**
-	* Gets all airline countries that have flown over by date
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by date
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4579,11 +4579,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by ident/callsign
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by ident/callsign
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByIdent($ident,$filters = array())
 	{
 		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
@@ -4600,11 +4600,11 @@ 
 	}
 
 	/**
-	* Gets all airlines by owner
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines by owner
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByOwner($owner,$filters = array())
 	{
 		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
@@ -4621,11 +4621,11 @@ 
 	}
 
 	/**
-	* Gets flight duration by owner
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Gets flight duration by owner
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function getFlightDurationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -4670,11 +4670,11 @@ 
 	}
 
 	/**
-	* Count flights by owner
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Count flights by owner
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function countFlightsByOwner($owner,$filters = array())
 	{
 		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
@@ -4690,11 +4690,11 @@ 
 	}
 
 	/**
-	* Count flights by pilot
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Count flights by pilot
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function countFlightsByPilot($pilot,$filters = array())
 	{
 		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
@@ -4710,11 +4710,11 @@ 
 	}
 
 	/**
-	* Gets flight duration by pilot
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Gets flight duration by pilot
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function getFlightDurationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -4759,11 +4759,11 @@ 
 	}
 
 	/**
-	* Gets all airlines used by pilot
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines used by pilot
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByPilot($pilot,$filters = array())
 	{
 		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
@@ -4780,11 +4780,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by route
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by route
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4816,11 +4816,11 @@ 
 	}
 
 	/**
-	* Gets all airline countries that have flown over by route
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by route
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4852,11 +4852,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by country
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by country
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByCountry($country,$filters = array())
 	{
 		$country = filter_var($country,FILTER_SANITIZE_STRING);
@@ -4886,11 +4886,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by country
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by country
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4919,11 +4919,11 @@ 
 
 
 	/**
-	* Gets all airlines countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airlines countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -4978,11 +4978,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5004,15 +5004,15 @@ 
 		$SpotterLive = new SpotterLive();
 		$filter_query = $SpotterLive->getFilter($filters,true,true);
 		$filter_query .= ' over_country IS NOT NULL';
-                if ($olderthanmonths > 0) {
+				if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
 				$filter_query .= ' AND spotter_live.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$filter_query .= " AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$filter_query .= " AND spotter_live.date > '".$sincedate."' ";
 			} else {
 				$filter_query .= " AND spotter_live.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5042,11 +5042,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5116,11 +5116,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by airline
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -5191,11 +5191,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by months
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by months
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5239,11 +5239,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
 	{
 		$Image = new Image($this->db);
@@ -5282,11 +5282,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5315,11 +5315,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5357,11 +5357,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5389,11 +5389,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5422,11 +5422,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5463,11 +5463,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5493,11 +5493,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by aircraft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5524,11 +5524,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5564,11 +5564,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5610,11 +5610,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5665,11 +5665,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by date
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by date
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5711,11 +5711,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5743,11 +5743,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by pilot
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by pilot
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5793,11 +5793,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by owner
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by owner
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5842,11 +5842,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5885,11 +5885,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by owner
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by owner
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5960,11 +5960,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by pilot
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by pilot
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6036,11 +6036,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by ident/callsign
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6065,11 +6065,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by owner
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by owner
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6117,11 +6117,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by pilot
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by pilot
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6170,11 +6170,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6203,11 +6203,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6249,11 +6249,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by route
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by route
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6287,11 +6287,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6322,11 +6322,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6366,11 +6366,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by country
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by country
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6401,18 +6401,18 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturers that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturers that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturers($filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
-                $query_values = array();
+				$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_output.date) = :year";
@@ -6465,11 +6465,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -6477,15 +6477,15 @@ 
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6550,11 +6550,11 @@ 
 
 
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -6562,15 +6562,15 @@ 
 		$Image = new Image($this->db);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6579,7 +6579,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -6611,26 +6611,26 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6664,7 +6664,7 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				$query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 
@@ -6687,35 +6687,35 @@ 
 	}
 
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -6740,26 +6740,26 @@ 
 	}
 
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6793,10 +6793,10 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				$query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
-    		//echo $query;
+			//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
       
@@ -6817,35 +6817,35 @@ 
 	}
 	
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -6870,11 +6870,11 @@ 
 	}	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6908,11 +6908,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6943,11 +6943,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6980,11 +6980,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7014,11 +7014,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7051,11 +7051,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7085,11 +7085,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7122,11 +7122,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7157,11 +7157,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7194,11 +7194,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7228,11 +7228,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7278,11 +7278,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7325,11 +7325,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7361,11 +7361,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7397,11 +7397,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7434,11 +7434,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7467,11 +7467,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7487,11 +7487,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7509,11 +7509,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7547,11 +7547,11 @@ 
 
 
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7581,31 +7581,31 @@ 
 	
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @param Boolean $limit Limit result to 10 or not
-	* @param Integer $olderthanmonths Only show result older than x months
-	* @param String $sincedate Only show result since x date
-	* @param Boolean $icaoaskey Show result by ICAO
-	* @param Array $filters Filter used here
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @param Boolean $limit Limit result to 10 or not
+	 * @param Integer $olderthanmonths Only show result older than x months
+	 * @param String $sincedate Only show result since x date
+	 * @param Boolean $icaoaskey Show result by ICAO
+	 * @param Array $filters Filter used here
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -7639,7 +7639,7 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				$query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7668,35 +7668,35 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7727,26 +7727,26 @@ 
 
 
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -7780,7 +7780,7 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7808,35 +7808,35 @@ 
 	}
 	
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7866,11 +7866,11 @@ 
 	}	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7902,11 +7902,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7937,11 +7937,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7975,11 +7975,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8009,11 +8009,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8047,11 +8047,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8082,11 +8082,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an departure airport
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an departure airport
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8119,11 +8119,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8153,11 +8153,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8191,11 +8191,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8226,11 +8226,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8276,11 +8276,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8323,11 +8323,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8359,11 +8359,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8394,11 +8394,11 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8429,11 +8429,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8462,11 +8462,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByOwner($owner, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8482,11 +8482,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByPilot($pilot, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8504,11 +8504,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8541,11 +8541,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
 	{
 		global $globalDBdriver;
@@ -8577,11 +8577,11 @@ 
 
 
 	/**
-	* Counts all airport departure countries
-	*
-	* @return Array the airport departure list
-	*
-	*/
+	 * Counts all airport departure countries
+	 *
+	 * @return Array the airport departure list
+	 *
+	 */
 	public function countAllDepartureCountries($filters = array(),$year = '',$month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -8640,11 +8640,11 @@ 
 	
 	
 	/**
-	* Counts all airport arrival countries
-	*
-	* @return Array the airport arrival list
-	*
-	*/
+	 * Counts all airport arrival countries
+	 *
+	 * @return Array the airport arrival list
+	 *
+	 */
 	public function countAllArrivalCountries($limit = true,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -8706,11 +8706,11 @@ 
 
 
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutes($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8749,11 +8749,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8789,11 +8789,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft registration
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft registration
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByRegistration($registration, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8831,11 +8831,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airline
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airline
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8873,11 +8873,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airport
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airport
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8914,11 +8914,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an country
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an country
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByCountry($country, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8954,11 +8954,11 @@ 
 
 
 	/**
-	* Gets all route combinations based on an date
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an date
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9008,11 +9008,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an ident/callsign
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an ident/callsign
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9048,11 +9048,11 @@ 
 	}
 	
 	/**
-	* Gets all route combinations based on an owner
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an owner
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9088,11 +9088,11 @@ 
 	}
 	
 	/**
-	* Gets all route combinations based on a pilot
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on a pilot
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9129,11 +9129,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an manufacturer
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an manufacturer
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9171,11 +9171,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations with waypoints
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations with waypoints
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesWithWaypoints($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9212,11 +9212,11 @@ 
 	}
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -9282,11 +9282,11 @@ 
 	}
 
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
@@ -9327,11 +9327,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9376,11 +9376,11 @@ 
 	}
 	
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9425,11 +9425,11 @@ 
 	}	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9451,7 +9451,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9471,11 +9471,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9497,7 +9497,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9518,11 +9518,11 @@ 
 
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonthByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9545,7 +9545,7 @@ 
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9567,11 +9567,11 @@ 
 	
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9613,11 +9613,11 @@ 
 	}
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9662,11 +9662,11 @@ 
 	}
 
 	/**
-	* Counts all military month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all military month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMilitaryMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9707,11 +9707,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwners($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9753,11 +9753,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwnersByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9800,11 +9800,11 @@ 
 	}
 
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilots($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9846,11 +9846,11 @@ 
 	}
 	
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilotsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9893,11 +9893,11 @@ 
 	}
 
 	/**
-	* Counts all month airline
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month airline
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9939,11 +9939,11 @@ 
 	}
 	
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircrafts($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9986,11 +9986,11 @@ 
 	
 
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircraftsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10033,11 +10033,11 @@ 
 	}
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivals($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10080,11 +10080,11 @@ 
 	
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10128,11 +10128,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10154,7 +10154,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -10177,11 +10177,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10242,11 +10242,11 @@ 
 	}
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirlines($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10309,11 +10309,11 @@ 
 
 
 	/**
-	* Counts all hours by airline
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airline
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirline($airline_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10359,11 +10359,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10406,11 +10406,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft registration
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft registration
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRegistration($registration, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10453,11 +10453,11 @@ 
 	
 	
 	/**
-	* Counts all hours by airport
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airport
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirport($airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10501,11 +10501,11 @@ 
 	
 	
 	/**
-	* Counts all hours by manufacturer
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by manufacturer
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10549,11 +10549,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10597,11 +10597,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10644,11 +10644,11 @@ 
 	}
 	
 	/**
-	* Counts all hours by a owner
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a owner
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByOwner($owner, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10691,11 +10691,11 @@ 
 	}
 	
 	/**
-	* Counts all hours by a pilot
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a pilot
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByPilot($pilot, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10740,11 +10740,11 @@ 
 	
 	
 	/**
-	* Counts all hours by route
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by route
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10788,11 +10788,11 @@ 
 	
 	
 	/**
-	* Counts all hours by country
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by country
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByCountry($country, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10837,11 +10837,11 @@ 
 
 
 	/**
-	* Counts all aircraft that have flown over
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all aircraft that have flown over
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallAircrafts($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10874,11 +10874,11 @@ 
 	}
 
 	/**
-	* Counts all flight that really arrival
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all flight that really arrival
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallArrival($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10911,11 +10911,11 @@ 
 	}
 
 	/**
-	* Counts all pilots that have flown over
-	*
-	* @return Integer the number of pilots
-	*
-	*/
+	 * Counts all pilots that have flown over
+	 *
+	 * @return Integer the number of pilots
+	 *
+	 */
 	public function countOverallPilots($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10947,11 +10947,11 @@ 
 	}
 
 	/**
-	* Counts all owners that have flown over
-	*
-	* @return Integer the number of owners
-	*
-	*/
+	 * Counts all owners that have flown over
+	 *
+	 * @return Integer the number of owners
+	 *
+	 */
 	public function countOverallOwners($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10984,11 +10984,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallFlights($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11022,11 +11022,11 @@ 
 	}
 	
 	/**
-	* Counts all military flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all military flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallMilitaryFlights($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11061,11 +11061,11 @@ 
 	
 	
 	/**
-	* Counts all airlines that have flown over
-	*
-	* @return Integer the number of airlines
-	*
-	*/
+	 * Counts all airlines that have flown over
+	 *
+	 * @return Integer the number of airlines
+	 *
+	 */
 	public function countOverallAirlines($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11092,8 +11092,8 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-                if ($query == '') $queryi .= $this->getFilter($filters);
-                else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+				if ($query == '') $queryi .= $this->getFilter($filters);
+				else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
 
 
 		$sth = $this->db->prepare($queryi);
@@ -11103,11 +11103,11 @@ 
 
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -11147,11 +11147,11 @@ 
 	}
     
 	/**
-	* Gets all the spotter information based on calculated upcoming flights
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on calculated upcoming flights
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
 	{
 		global $global_query, $globalDBdriver, $globalTimezone;
@@ -11226,12 +11226,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
 	{
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -11252,13 +11252,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -11294,12 +11294,12 @@ 
 	
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -11378,12 +11378,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft registration
-	*
-	* @param String $flightaware_id the flight aware id
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration
+	 *
+	 * @param String $flightaware_id the flight aware id
+	 * @return String the aircraft registration
+	 *
+	 */
 	
 	public function getAircraftRegistration($flightaware_id)
 	{
@@ -11412,12 +11412,12 @@ 
 
 
 	/**
-	* Gets the aircraft registration from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -11430,19 +11430,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    //return $row['Registration'];
-		    return $row['registration'];
+			//return $row['Registration'];
+			return $row['registration'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets the aircraft type from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft type
-	*
-	*/
+	 * Gets the aircraft type from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft type
+	 *
+	 */
 	public function getAircraftTypeBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -11455,19 +11455,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    if ($row['type_flight'] == null) return '';
-		    else return $row['type_flight'];
+			if ($row['type_flight'] == null) return '';
+			else return $row['type_flight'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -11504,11 +11504,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -11536,12 +11536,12 @@ 
 	}
 
 	/**
-	* converts the registration code using the country prefix
-	*
-	* @param String $registration the aircraft registration
-	* @return String the aircraft registration
-	*
-	*/
+	 * converts the registration code using the country prefix
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function convertAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11593,12 +11593,12 @@ 
 	}
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11617,8 +11617,8 @@ 
 				$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			$country = '';
 			//first get the prefix based on two characters
@@ -11654,12 +11654,12 @@ 
 	}
 
 	/**
-	* Registration prefix from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the registration prefix
-	*
-	*/
+	 * Registration prefix from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the registration prefix
+	 *
+	 */
 	public function registrationPrefixFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11678,8 +11678,8 @@ 
 				//$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			//first get the prefix based on two characters
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
@@ -11715,12 +11715,12 @@ 
 
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistrationCode($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11737,11 +11737,11 @@ 
 	}
 	
 	/**
-	* Set a new highlight value for a flight
-	*
-	* @param String $flightaware_id flightaware_id from spotter_output table
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight
+	 *
+	 * @param String $flightaware_id flightaware_id from spotter_output table
+	 * @param String $highlight New highlight value
+	 */
 	public function setHighlightFlight($flightaware_id,$highlight) {
 		
 		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
@@ -11750,12 +11750,12 @@ 
 	}
 
 	/**
-	* Set a new highlight value for a flight by Registration
-	*
-	* @param String $registration Registration of the aircraft
-	* @param String $date Date of spotted aircraft
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight by Registration
+	 *
+	 * @param String $registration Registration of the aircraft
+	 * @param String $date Date of spotted aircraft
+	 * @param String $highlight New highlight value
+	 */
 	public function setHighlightFlightByRegistration($registration,$highlight, $date = '') {
 		if ($date == '') {
 			$query  = "UPDATE spotter_output SET highlight = :highlight WHERE spotter_id IN (SELECT MAX(spotter_id) FROM spotter_output WHERE registration = :registration)";
@@ -11769,12 +11769,12 @@ 
 	}
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -12063,11 +12063,11 @@ 
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-                } else {
+				} else {
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-    		}
+			}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		return $sth->fetchAll(PDO::FETCH_ASSOC);

require/class.SpotterLive.php

Indentation +204 added lines, -204 removed lines

@@ -12,10 +12,10 @@ 
 
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -111,11 +111,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -157,11 +157,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -214,11 +214,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -236,7 +236,7 @@ 
 			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
-                } else {
+				} else {
 /*
 			$query  = "SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
@@ -248,7 +248,7 @@ 
 //			echo $query;
 		}
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -260,11 +260,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -291,11 +291,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -320,11 +320,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		$Spotter = new Spotter($this->db);
@@ -334,145 +334,145 @@ 
 				return false;
 			}
 		}
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataByIdent($ident,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataById($id,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -485,12 +485,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -518,18 +518,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -543,23 +543,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 		} else {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -571,18 +571,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -590,8 +590,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -599,20 +599,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -623,9 +623,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -669,17 +669,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -691,17 +691,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -714,11 +714,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -744,14 +744,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -777,14 +777,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -810,14 +810,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -844,19 +844,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -991,10 +991,10 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -1004,14 +1004,14 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$SpotterArchive = new SpotterArchive($this->db);
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

require/class.Connection.php

Indentation +23 added lines, -23 removed lines

@@ -7,18 +7,18 @@ 
 	public $latest_schema = 36;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalDBdriver;
-	    if ($dbc === null) {
+		global $globalDBdriver;
+		if ($dbc === null) {
 		if ($this->db === null && $dbname === null) {
-		    if ($user === null && $pass === null) {
+			if ($user === null && $pass === null) {
 			$this->createDBConnection();
-		    } else {
+			} else {
 			$this->createDBConnection(null,$user,$pass);
-		    }
+			}
 		} else {
-		    $this->createDBConnection($dbname);
+			$this->createDBConnection($dbname);
 		}
-	    } elseif ($dbname === null || $dbname === 'default') {
+		} elseif ($dbname === null || $dbname === 'default') {
 		$this->db = $dbc;
 		if ($this->connectionExists() === false) {
 			/*
@@ -28,10 +28,10 @@ 
 			*/
 			$this->createDBConnection();
 		}
-	    } else {
+		} else {
 		//$this->connectionExists();
 		$this->dbs[$dbname] = $dbc;
-	    }
+		}
 	}
 
 	public function db() {
@@ -47,11 +47,11 @@ 
 	}
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -148,7 +148,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -165,14 +165,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -276,8 +276,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 				try {
@@ -298,8 +298,8 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }

install/class.update_schema.php

Indentation +603 added lines, -603 removed lines

@@ -8,18 +8,18 @@ 
 class update_schema {
 
 	public static function update_schedule() {
-	    $Connection = new Connection();
-	    $Schedule = new Schedule();
-	    $query = "SELECT * FROM schedule";
-            try {
-            	$sth = $Connection->db->prepare($query);
+		$Connection = new Connection();
+		$Schedule = new Schedule();
+		$query = "SELECT * FROM schedule";
+			try {
+				$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+			} catch(PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
-    	    }
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
-    	    }
+			}
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+			}
 	
 	}
 /*
@@ -43,198 +43,198 @@ 
     	}
 */	
 	private static function update_from_1() {
-    		$Connection = new Connection();
-    		// Add new column to routes table
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
+			$Connection = new Connection();
+			// Add new column to routes table
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		// Copy schedules data to routes table
-    		self::update_schedule();
-    		// Delete schedule table
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			// Copy schedules data to routes table
+			self::update_schedule();
+			// Delete schedule table
 		$query = "DROP TABLE `schedule`";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
-    		}
-    		// Add source column
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
+			}
+			// Add source column
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Delete unused column
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Add ModeS column
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
+			}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		// Add auto_increment for aircraft_modes
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
+			}
+			// Add auto_increment for aircraft_modes
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		$error .= create_db::import_file('../db/acars_live.sql');
 		$error .= create_db::import_file('../db/config.sql');
 		// Update schema_version to 2
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-        }
+		}
 
 	private static function update_from_2() {
-    		$Connection = new Connection();
-    		// Add new column decode to acars_live table
+			$Connection = new Connection();
+			// Add new column decode to acars_live table
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Create table acars_archive
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Create table acars_archive
 		$error .= create_db::import_file('../db/acars_archive.sql');
 		// Update schema_version to 3
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_3() {
-    		$Connection = new Connection();
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
+			$Connection = new Connection();
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		// Add image_source_website column to spotter_image
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			// Add image_source_website column to spotter_image
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		// Update schema_version to 4
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	
 	private static function update_from_4() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 	
-    		$error = '';
-    		// Create table acars_label
+			$error = '';
+			// Create table acars_label
 		$error .= create_db::import_file('../db/acars_label.sql');
 		if ($error == '') {
-		    // Update schema_version to 5
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+			// Update schema_version to 5
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
-    		    }
-    		}
+				}
+			}
 		return $error;
 	}
 
 	private static function update_from_5() {
-    		$Connection = new Connection();
-    		// Add columns to translation
+			$Connection = new Connection();
+			// Add columns to translation
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to aircraft
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to spotter_live
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Update table aircraft
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to aircraft
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to spotter_live
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/aircraft.sql');
 		$error .= create_db::import_file('../db/spotter_archive.sql');
 
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_6() {
-    		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
+			$Connection = new Connection();
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
@@ -247,147 +247,147 @@ 
 			ALTER TABLE aircraft ADD INDEX(icao);
 			ALTER TABLE airport ADD INDEX(icao);
 			ALTER TABLE translation ADD INDEX(Operator);";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
-    		    }
-    		}
-    		$error = '';
-    		// Update table countries
-    		if ($Connection->tableExists('airspace')) {
-    		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+				}
+			}
+			$error = '';
+			// Update table countries
+			if ($Connection->tableExists('airspace')) {
+				$error .= update_db::update_countries();
+			if ($error != '') return $error;
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-    	}
+		}
 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
-    		$error = '';
-    		// Update table aircraft
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
 		if ($error != '') return $error;
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_8() {
-    		$Connection = new Connection();
-    		$error = '';
-    		// Update table aircraft
+			$Connection = new Connection();
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
 		if ($error != '') return $error;
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
+			}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_9() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Update table atc
+			// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_10() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
-    		}
+			$Connection = new Connection();
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/metar.sql');
@@ -398,76 +398,76 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
+			}
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
 		$error = '';
 		
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_12() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
@@ -484,166 +484,166 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_13() {
-    		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+			$Connection = new Connection();
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+				} catch(PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
-    			}
+				}
 		}
-    		$error = '';
+			$error = '';
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_14() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_flight')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 
 	private static function update_from_15() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update stats) : ".$e->getMessage()."\n";
-    		}
+			// Add tables
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update stats) : ".$e->getMessage()."\n";
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_16() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_registration')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_registration')) {
 			$error .= create_db::import_file('../db/stats_registration.sql');
 		}
-    		if (!$Connection->tableExists('stats_callsign')) {
+			if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_17() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_country')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_18() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
-    	        	try {
-	            	    $sth = $Connection->db->prepare($query);
-			    $sth->execute();
-    			} catch(PDOException $e) {
-			    return "error (update stats) : ".$e->getMessage()."\n";
-    			}
-    		}
+			// Modify stats_airport table
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
+					try {
+						$sth = $Connection->db->prepare($query);
+				$sth->execute();
+				} catch(PDOException $e) {
+				return "error (update stats) : ".$e->getMessage()."\n";
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_19() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airport table
+			// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
 		if ($error != '') return 'Import airport.sql : '.$error;
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -651,9 +651,9 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -661,74 +661,74 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_20() {
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airline table
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
+			// Update airline table
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
-        		try {
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
+				try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
@@ -738,12 +738,12 @@ 
 		}
 		*/
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -762,35 +762,35 @@ 
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_22() {
 		global $globalDBdriver;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
 		// Add table stats polar
-    		if (!$Connection->tableExists('stats_source')) {
+			if (!$Connection->tableExists('stats_source')) {
 			if ($globalDBdriver == 'mysql') {
-    				$error .= create_db::import_file('../db/stats_source.sql');
+					$error .= create_db::import_file('../db/stats_source.sql');
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -821,14 +821,14 @@ 
 		}
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
 		try {
@@ -1176,7 +1176,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
@@ -1250,7 +1250,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
@@ -1260,7 +1260,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
@@ -1270,7 +1270,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
 		try {
@@ -1562,7 +1562,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		$query = "UPDATE config SET value = '36' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -1574,169 +1574,169 @@ 
 	}
 
 
-    	public static function check_version($update = false) {
-    	    global $globalDBname;
-    	    $version = 0;
-    	    $Connection = new Connection();
-    	    if ($Connection->tableExists('aircraft')) {
-    		if (!$Connection->tableExists('config')) {
-    		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+		public static function check_version($update = false) {
+			global $globalDBname;
+			$version = 0;
+			$Connection = new Connection();
+			if ($Connection->tableExists('aircraft')) {
+			if (!$Connection->tableExists('config')) {
+				$version = '1';
+				if ($update) return self::update_from_1();
+				else return $version;
 		} else {
-    		    $Connection = new Connection();
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-		        $sth->execute();
-		    } catch(PDOException $e) {
+				$Connection = new Connection();
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
+			try {
+					$sth = $Connection->db->prepare($query);
+				$sth->execute();
+			} catch(PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
-    		    }
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($update) {
-    			if ($result['value'] == '2') {
-    			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '3') {
-    			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '4') {
-    			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '5') {
-    			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '6') {
-    			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '7') {
-    			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '8') {
-    			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '9') {
-    			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '10') {
-    			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '11') {
-    			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '12') {
-    			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '13') {
-    			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '14') {
-    			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '15') {
-    			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '16') {
-    			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '17') {
-    			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '18') {
-    			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '19') {
-    			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '20') {
-    			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '21') {
-    			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '22') {
-    			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '23') {
-    			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '24') {
-    			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '25') {
-    			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '26') {
-    			    $error = self::update_from_26();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '27') {
-    			    $error = self::update_from_27();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '28') {
-    			    $error = self::update_from_28();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '29') {
-    			    $error = self::update_from_29();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '30') {
-    			    $error = self::update_from_30();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '31') {
-    			    $error = self::update_from_31();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '32') {
-    			    $error = self::update_from_32();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '33') {
-    			    $error = self::update_from_33();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '34') {
-    			    $error = self::update_from_34();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '35') {
-    			    $error = self::update_from_35();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
-    		    }
-    		    else return $result['value'];
+				}
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($update) {
+				if ($result['value'] == '2') {
+					$error = self::update_from_2();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '3') {
+					$error = self::update_from_3();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '4') {
+					$error = self::update_from_4();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '5') {
+					$error = self::update_from_5();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '6') {
+					$error = self::update_from_6();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '7') {
+					$error = self::update_from_7();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '8') {
+					$error = self::update_from_8();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '9') {
+					$error = self::update_from_9();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '10') {
+					$error = self::update_from_10();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '11') {
+					$error = self::update_from_11();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '12') {
+					$error = self::update_from_12();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '13') {
+					$error = self::update_from_13();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '14') {
+					$error = self::update_from_14();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '15') {
+					$error = self::update_from_15();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '16') {
+					$error = self::update_from_16();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '17') {
+					$error = self::update_from_17();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '18') {
+					$error = self::update_from_18();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '19') {
+					$error = self::update_from_19();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '20') {
+					$error = self::update_from_20();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '21') {
+					$error = self::update_from_21();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '22') {
+					$error = self::update_from_22();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '23') {
+					$error = self::update_from_23();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '24') {
+					$error = self::update_from_24();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '25') {
+					$error = self::update_from_25();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '26') {
+					$error = self::update_from_26();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '27') {
+					$error = self::update_from_27();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '28') {
+					$error = self::update_from_28();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '29') {
+					$error = self::update_from_29();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '30') {
+					$error = self::update_from_30();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '31') {
+					$error = self::update_from_31();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '32') {
+					$error = self::update_from_32();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '33') {
+					$error = self::update_from_33();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '34') {
+					$error = self::update_from_34();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '35') {
+					$error = self::update_from_35();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} else return '';
+				}
+				else return $result['value'];
 		}
 		
-	    } else return $version;
-    	}
+		} else return $version;
+		}
     	
 }
 //echo update_schema::check_version();

scripts/daemon-spotter.php

Indentation +696 added lines, -696 removed lines

@@ -19,47 +19,47 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 if (PHP_SAPI != 'cli') {
-    echo "This script MUST be called from console, not a web browser.";
+	echo "This script MUST be called from console, not a web browser.";
 //    exit();
 }
 
 // This is to be compatible with old version of settings.php
 if (!isset($globalSources)) {
-    if (isset($globalSBS1Hosts)) {
-        //$hosts = $globalSBS1Hosts;
-        foreach ($globalSBS1Hosts as $host) {
-	    $globalSources[] = array('host' => $host);
-    	}
-    } else {
-        if (!isset($globalSBS1Host)) {
-	    echo '$globalSources MUST be defined !';
-	    die;
+	if (isset($globalSBS1Hosts)) {
+		//$hosts = $globalSBS1Hosts;
+		foreach ($globalSBS1Hosts as $host) {
+		$globalSources[] = array('host' => $host);
+		}
+	} else {
+		if (!isset($globalSBS1Host)) {
+		echo '$globalSources MUST be defined !';
+		die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
-    }
+	}
 }
 
 $options = getopt('s::',array('source::','server','idsource::'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['s']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['source']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['server'])) $globalServer = TRUE;
 if (isset($options['idsource'])) $id_source = $options['idsource'];
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+	if ($globalDebug) echo "Using Server Mode\n";
+	$SI=new SpotterServer();
 } else $SI=new SpotterImport($Connection->db);
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
@@ -69,12 +69,12 @@ 
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
-        global $sockets;
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-        die("Bye!\n");
-    });
-    pcntl_signal_dispatch();
+	pcntl_signal(SIGINT,  function() {
+		global $sockets;
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+		die("Bye!\n");
+	});
+	pcntl_signal_dispatch();
 }
 
 // let's try and connect
@@ -84,162 +84,162 @@ 
 $reset = 0;
 
 function create_socket($host, $port, &$errno, &$errstr) {
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_STREAM, 0);
-    $r = @socket_connect($s, $ip, $port);
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_STREAM, 0);
+	$r = @socket_connect($s, $ip, $port);
+	if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function create_socket_udp($host, $port, &$errno, &$errstr) {
-    echo "Create an UDP socket...\n";
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_DGRAM, 0);
-    $r = @socket_bind($s, $ip, $port);
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	echo "Create an UDP socket...\n";
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_DGRAM, 0);
+	$r = @socket_bind($s, $ip, $port);
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function connect_all($hosts) {
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset;
-    $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
-    foreach ($hosts as $id => $value) {
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset;
+	$reset++;
+	if ($globalDebug) echo 'Connect to all...'."\n";
+	foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
-        	//$formats[$id] = 'deltadbtxt';
-        	$globalSources[$id]['format'] = 'deltadbtxt';
-        	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
-        	//$formats[$id] = 'vatsimtxt';
-        	$globalSources[$id]['format'] = 'vatsimtxt';
-        	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'opensky';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
-        	//$formats[$id] = 'radarvirtueljson';
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
-        	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
-        	//$formats[$id] = 'planeupdatefaa';
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
-        	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'phpvmacars';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
-        	//$formats[$id] = 'whazzup';
-        	$globalSources[$id]['format'] = 'whazzup';
-        	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
-        	//$formats[$id] = 'pirepsjson';
-        	$globalSources[$id]['format'] = 'pirepsjson';
-        	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'fr24json';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
-        	//$formats[$id] = 'tsv';
-        	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
-            }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
-        	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
-	    if (isset($hostport[1])) {
+			if (preg_match('/deltadb.txt$/i',$host)) {
+			//$formats[$id] = 'deltadbtxt';
+			$globalSources[$id]['format'] = 'deltadbtxt';
+			//$last_exec['deltadbtxt'] = 0;
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
+			//$formats[$id] = 'vatsimtxt';
+			$globalSources[$id]['format'] = 'vatsimtxt';
+			//$last_exec['vatsimtxt'] = 0;
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'aircraftlistjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/opensky/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'opensky';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+			//$formats[$id] = 'radarvirtueljson';
+			$globalSources[$id]['format'] = 'radarvirtueljson';
+			//$last_exec['radarvirtueljson'] = 0;
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+			//$formats[$id] = 'planeupdatefaa';
+			$globalSources[$id]['format'] = 'planeupdatefaa';
+			//$last_exec['planeupdatefaa'] = 0;
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'phpvmacars';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vam';
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+			} else if (preg_match('/whazzup/i',$host)) {
+			//$formats[$id] = 'whazzup';
+			$globalSources[$id]['format'] = 'whazzup';
+			//$last_exec['whazzup'] = 0;
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+			} else if (preg_match('/recentpireps/i',$host)) {
+			//$formats[$id] = 'pirepsjson';
+			$globalSources[$id]['format'] = 'pirepsjson';
+			//$last_exec['pirepsjson'] = 0;
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'fr24json';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			//} else if (preg_match('/10001/',$host)) {
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+			//$formats[$id] = 'tsv';
+			$globalSources[$id]['format'] = 'tsv';
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+			}
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+			if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
+		$hostport = explode(':',$host);
+		if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
-	    } else {
+		} else {
 		$port = $globalSources[$id]['port'];
 		$hostn = $globalSources[$id]['host'];
-	    }
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-        	$s = create_socket_udp($hostn,$port, $errno, $errstr);
-	    }
-	    if ($s) {
-    	        $sockets[$id] = $s;
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn)) {
+		}
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$s = create_socket_udp($hostn,$port, $errno, $errstr);
+		}
+		if ($s) {
+				$sockets[$id] = $s;
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
+			if (preg_match('/aprs/',$hostn)) {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-    		    } elseif ($port == '10001') {
-        		//$formats[$id] = 'tsv';
-        		$globalSources[$id]['format'] = 'tsv';
-		    } elseif ($port == '30002') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'raw';
-		    } elseif ($port == '5001') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'flightgearmp';
-		    } elseif ($port == '30005') {
+				} elseif ($port == '10001') {
+				//$formats[$id] = 'tsv';
+				$globalSources[$id]['format'] = 'tsv';
+			} elseif ($port == '30002') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'raw';
+			} elseif ($port == '5001') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'flightgearmp';
+			} elseif ($port == '30005') {
 			// Not yet supported
-        		//$formats[$id] = 'beast';
-        		$globalSources[$id]['format'] = 'beast';
-		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
+				//$formats[$id] = 'beast';
+				$globalSources[$id]['format'] = 'beast';
+			//} else $formats[$id] = 'sbs';
+			} else $globalSources[$id]['format'] = 'sbs';
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-            } else {
+			} else {
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -266,18 +266,18 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
 }
 connect_all($globalSources);
 foreach ($globalSources as $key => $source) {
-    if (isset($source['format']) && $source['format'] == 'aprs') {
+	if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
 	break;
-    }
+	}
 }
 
 if ($use_aprs) {
@@ -316,70 +316,70 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    if (count($last_exec) > 0) {
+	if (count($last_exec) > 0) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+		if ($globalDebug) echo 'Sleeping...'."\n";
+		sleep($globalMinFetch-$max+2);
+	}
 	}
-    }
 
     
-    //foreach ($formats as $id => $value) {
-    foreach ($globalSources as $id => $value) {
+	//foreach ($formats as $id => $value) {
+	foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '' && count($line) > 7) {
-    		    $line = explode(',', $line);
-	            $data = array();
-	            $data['hex'] = $line[1]; // hex
-	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
-	            $data['verticalrate'] = ''; // vertical rate
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
-	            $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'deltadbtxt';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
-    		    $SI->add($data);
-		    unset($data);
-    		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '' && count($line) > 7) {
+				$line = explode(',', $line);
+				$data = array();
+				$data['hex'] = $line[1]; // hex
+				$data['ident'] = $line[2]; // ident
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'deltadbtxt';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+				$SI->add($data);
+			unset($data);
+			}
+			}
+			$last_exec[$id]['last'] = time();
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    $reset = 0;
-	    foreach ($buffer as $line) {
-    		if ($line != '') {
-    		    $line = explode(':', $line);
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		$reset = 0;
+		foreach ($buffer as $line) {
+			if ($line != '') {
+				$line = explode(':', $line);
+				if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -392,36 +392,36 @@ 
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
 			$data['latitude'] = $line[5]; // lat
-	        	$data['longitude'] = $line[6]; // long
-	        	$data['verticalrate'] = ''; // vertical rate
-	        	$data['squawk'] = ''; // squawk
-	        	$data['emergency'] = ''; // emergency
-	        	$data['waypoints'] = $line[30];
+				$data['longitude'] = $line[6]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			//if (isset($line[37])) $data['last_update'] = $line[37];
-		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
-		        $data['arrival_airport_icao'] = $line[13];
+				$data['departure_airport_icao'] = $line[11];
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+				$data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
 			if (isset($line[35])) $data['info'] = $line[35];
-    			$data['id_source'] = $id_source;
-	    		//$data['arrival_airport_time'] = ;
-	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
-	    		    if (isset($aircraft_data[1])) {
-	    			$data['aircraft_icao'] = $aircraft_data[1];
-	    		    }
-        		}
-	    		/*
+				$data['id_source'] = $id_source;
+				//$data['arrival_airport_time'] = ;
+				if ($line[9] != '') {
+					$aircraft_data = explode('/',$line[9]);
+					if (isset($aircraft_data[1])) {
+					$data['aircraft_icao'] = $aircraft_data[1];
+					}
+				}
+				/*
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
-	    		$data['format_source'] = $value['format'];
+				$data['format_source'] = $value['format'];
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
+				if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -439,247 +439,247 @@ 
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
 			}
-    			unset($data);
-    		    }
-    		}
-    	    }
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['acList'])) {
+				unset($data);
+				}
+			}
+			}
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['acList'])) {
 		$reset = 0;
 		foreach ($all_data['acList'] as $line) {
-		    $data = array();
-		    $data['hex'] = $line['Icao']; // hex
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
-		    //$data['verticalrate'] = $line['']; // verticale rate
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-		    /*
+			$data = array();
+			$data['hex'] = $line['Icao']; // hex
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			//$data['verticalrate'] = $line['']; // verticale rate
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			$data['emergency'] = ''; // emergency
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+			/*
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 		    else $data['datetime'] = date('Y-m-d H:i:s');
 		    */
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-	    	    $data['format_source'] = 'aircraftlistjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($data['datetime'])) $SI->add($data);
-		    unset($data);
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				$data['format_source'] = 'aircraftlistjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($data['datetime'])) $SI->add($data);
+			unset($data);
 		}
-	    } else {
+		} else {
 		$reset = 0;
 		foreach ($all_data as $line) {
-		    $data = array();
-		    $data['hex'] = $line['hex']; // hex
-		    $data['ident'] = $line['flight']; // ident
-		    $data['altitude'] = $line['altitude']; // altitude
-		    $data['speed'] = $line['speed']; // speed
-		    $data['heading'] = $line['track']; // heading
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
-		    $data['squawk'] = $line['squawk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['format_source'] = 'aircraftlistjson';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line['hex']; // hex
+			$data['ident'] = $line['flight']; // ident
+			$data['altitude'] = $line['altitude']; // altitude
+			$data['speed'] = $line['speed']; // speed
+			$data['heading'] = $line['track']; // heading
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			$data['verticalrate'] = $line['vrt']; // verticale rate
+			$data['squawk'] = $line['squawk']; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['format_source'] = 'aircraftlistjson';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-	    }
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+		}
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    $data['ident'] = $line[3]; // ident
-		    $data['altitude'] = $line[6]; // altitude
-		    $data['speed'] = $line[8]; // speed
-		    $data['heading'] = $line[7]; // heading
-		    $data['latitude'] = $line[4]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    //$data['verticalrate'] = $line[]; // verticale rate
-		    $data['squawk'] = $line[10]; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['registration'] = $line[2];
-		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
-		    if (count($deparr) == 2) {
+			$data = array();
+			$data['hex'] = $key; // hex
+			$data['ident'] = $line[3]; // ident
+			$data['altitude'] = $line[6]; // altitude
+			$data['speed'] = $line[8]; // speed
+			$data['heading'] = $line[7]; // heading
+			$data['latitude'] = $line[4]; // lat
+			$data['longitude'] = $line[5]; // long
+			//$data['verticalrate'] = $line[]; // verticale rate
+			$data['squawk'] = $line[10]; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['registration'] = $line[2];
+			$data['aircraft_icao'] = $line[0];
+			$deparr = explode('-',$line[1]);
+			if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
-		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
-	    	    $data['format_source'] = 'planeupdatefaa';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			}
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+				$data['format_source'] = 'planeupdatefaa';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $line[0]; // hex
-		    $data['ident'] = trim($line[1]); // ident
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
-		    $data['speed'] = round($line[9]*1.94384); // speed
-		    $data['heading'] = round($line[10]); // heading
-		    $data['latitude'] = $line[5]; // lat
-		    $data['longitude'] = $line[6]; // long
-		    $data['verticalrate'] = $line[11]; // verticale rate
-		    //$data['squawk'] = $line[10]; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
-	    	    $data['format_source'] = 'opensky';
-    		    $data['id_source'] = $id_source;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0]; // hex
+			$data['ident'] = trim($line[1]); // ident
+			$data['altitude'] = round($line[7]*3.28084); // altitude
+			$data['speed'] = round($line[9]*1.94384); // speed
+			$data['heading'] = round($line[10]); // heading
+			$data['latitude'] = $line[5]; // lat
+			$data['longitude'] = $line[6]; // long
+			$data['verticalrate'] = $line[11]; // verticale rate
+			//$data['squawk'] = $line[10]; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+				$data['format_source'] = 'opensky';
+				$data['id_source'] = $id_source;
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
-	    foreach ($all_data as $key => $line) {
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (!empty($all_data)) $reset = 0;
+		foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
-		    $data = array();
-		    $data['hex'] = $line[0];
-		    $data['ident'] = $line[16]; //$line[13]
-	    	    $data['altitude'] = $line[4]; // altitude
-	    	    $data['speed'] = $line[5]; // speed
-	    	    $data['heading'] = $line[3]; // heading
-	    	    $data['latitude'] = $line[1]; // lat
-	    	    $data['longitude'] = $line[2]; // long
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
-	    	    $data['squawk'] = $line[6]; // squawk
-	    	    $data['aircraft_icao'] = $line[8];
-	    	    $data['registration'] = $line[9];
-		    $data['departure_airport_iata'] = $line[11];
-		    $data['arrival_airport_iata'] = $line[12];
-	    	    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
-	    	    $data['format_source'] = 'fr24json';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0];
+			$data['ident'] = $line[16]; //$line[13]
+				$data['altitude'] = $line[4]; // altitude
+				$data['speed'] = $line[5]; // speed
+				$data['heading'] = $line[3]; // heading
+				$data['latitude'] = $line[1]; // lat
+				$data['longitude'] = $line[2]; // long
+				$data['verticalrate'] = $line[15]; // verticale rate
+				$data['squawk'] = $line[6]; // squawk
+				$data['aircraft_icao'] = $line[8];
+				$data['registration'] = $line[9];
+			$data['departure_airport_iata'] = $line[11];
+			$data['arrival_airport_iata'] = $line[12];
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
+				$data['format_source'] = 'fr24json';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['fr24json'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
-	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
-	    if (json_last_error() != JSON_ERROR_NONE) {
+			//$last_exec['fr24json'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
+		//echo $buffer;
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
+		$all_data = json_decode($buffer,true);
+		if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
-	    }
-	    if (isset($all_data['mrkrs'])) {
+		}
+		if (isset($all_data['mrkrs'])) {
 		$reset = 0;
 		foreach ($all_data['mrkrs'] as $key => $line) {
-		    if (isset($line['inf'])) {
+			if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
-	    		$data['latitude'] = $line['pt'][0]; // lat
-	    		$data['longitude'] = $line['pt'][1]; // long
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
-	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+				$data['latitude'] = $line['pt'][0]; // lat
+				$data['longitude'] = $line['pt'][1]; // long
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+				//$data['aircraft_icao'] = $line[8];
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
-	    		//$data['emergency'] = ''; // emergency
+				//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
-	    		$data['format_source'] = 'radarvirtueljson';
-    			$data['id_source'] = $id_source;
+				$data['format_source'] = 'radarvirtueljson';
+				$data['id_source'] = $id_source;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
+		}
 		}
-	    }
-    	    //$last_exec['radarvirtueljson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+			//$last_exec['radarvirtueljson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host'].'?'.time());
+		$all_data = json_decode(utf8_encode($buffer),true);
 	    
-	    if (isset($all_data['pireps'])) {
+		if (isset($all_data['pireps'])) {
 		$reset = 0;
-	        foreach ($all_data['pireps'] as $line) {
-		    $data = array();
-		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
-		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
-		    //$data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
-		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
-		    $data['format_source'] = 'pireps';
-    		    $data['id_source'] = $id_source;
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if ($line['icon'] == 'plane') {
+			foreach ($all_data['pireps'] as $line) {
+			$data = array();
+			$data['id'] = $line['id'];
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+			$data['ident'] = $line['callsign']; // ident
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
+			//$data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+			//$data['arrival_airport_time'] = $line['arrtime'];
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
+			else $data['info'] = '';
+			$data['format_source'] = 'pireps';
+				$data['id_source'] = $id_source;
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if ($line['icon'] == 'plane') {
 			$SI->add($data);
-		    //    print_r($data);
-    		    } elseif ($line['icon'] == 'ct') {
+			//    print_r($data);
+				} elseif ($line['icon'] == 'ct') {
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
@@ -694,163 +694,163 @@ 
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
-		    }
-		    unset($data);
+			}
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['pirepsjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+			//$last_exec['pirepsjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
-	    	    $data['ident'] = $line['flightnum']; // ident
-	    	    $data['altitude'] = $line['alt']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lng']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['lastupdate'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['depicao'];
-	    	    $data['departure_airport_time'] = $line['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
-    		    $data['arrival_airport_time'] = $line['arrtime'];
-    		    $data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    if (isset($line['aircraftname'])) {
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+				$data['ident'] = $line['flightnum']; // ident
+				$data['altitude'] = $line['alt']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lng']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['lastupdate'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['depicao'];
+				$data['departure_airport_time'] = $line['deptime'];
+				$data['arrival_airport_icao'] = $line['arricao'];
+				$data['arrival_airport_time'] = $line['arrtime'];
+				$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
-	    		}
-	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$aircraft_data = explode('-',$line['aircraftname']);
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
+				else {
+					$aircraft_data = explode(' ',$line['aircraftname']);
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
+					else $data['aircraft_icao'] = $line['aircraftname'];
+				}
+				}
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'phpvmacars';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    $data['pilot_name'] = $line['pilot_name'];
-	    	    $data['pilot_id'] = $line['pilot_id'];
-	    	    $data['ident'] = trim($line['callsign']); // ident
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['latitude']; // lat
-	    	    $data['longitude'] = $line['longitude']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['last_update'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['departure'];
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
-    		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-	    	    $data['aircraft_icao'] = $line['plane_type'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vam';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = trim($line['flight_id']);
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+				$data['pilot_name'] = $line['pilot_name'];
+				$data['pilot_id'] = $line['pilot_id'];
+				$data['ident'] = trim($line['callsign']); // ident
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['latitude']; // lat
+				$data['longitude'] = $line['longitude']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['last_update'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['departure'];
+				//$data['departure_airport_time'] = $line['departure_time'];
+				$data['arrival_airport_icao'] = $line['arrival'];
+				//$data['arrival_airport_time'] = $line['arrival_time'];
+				//$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+				$data['aircraft_icao'] = $line['plane_type'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vam';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-    	    //$last_exec[$id]['last'] = time();
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			//$last_exec[$id]['last'] = time();
 
-	    //$read = array( $sockets[$id] );
-	    $read = $sockets;
-	    $write = NULL;
-	    $e = NULL;
-	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
-	    if ($n > 0) {
+		//$read = array( $sockets[$id] );
+		$read = $sockets;
+		$write = NULL;
+		$e = NULL;
+		$n = socket_select($read, $write, $e, $timeout);
+		if ($e != NULL) var_dump($e);
+		if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-        	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
-        	    } else {
-	    	        $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
-	    	    }
-        	    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
-        	    //echo $buffer."\n";
-		    // lets play nice and handle signals such as ctrl-c/kill properly
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-		    $error = false;
-		    //$SI::del();
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
-		    // SBS format is CSV format
-		    if ($buffer != '') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+				if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
+				$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
+				} else {
+					$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+				}
+				//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
+				//echo $buffer."\n";
+			// lets play nice and handle signals such as ctrl-c/kill properly
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			$error = false;
+			//$SI::del();
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			// SBS format is CSV format
+			if ($buffer != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    $ACARS->deleteLiveAcarsData();
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
-			    // AVR format
-			    $data = $SBS->parse($buffer);
-			    if (is_array($data)) {
+				// AVR format
+				$data = $SBS->parse($buffer);
+				if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-                            }
-                        } elseif ($format == 'flightgearsp') {
-                    	    //echo $buffer."\n";
-                    	    if (strlen($buffer) > 5) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+								if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+							}
+						} elseif ($format == 'flightgearsp') {
+							//echo $buffer."\n";
+							if (strlen($buffer) > 5) {
 				$line = explode(',',$buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -866,124 +866,124 @@ 
 				$data['format_source'] = 'flightgearsp';
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-                        } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-			    $ACARS->deleteLiveAcarsData();
+				}
+						} elseif ($format == 'acars') {
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+				if (substr($buffer,0,1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
 				$line = explode(' ',$buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
-				    $data['ident'] = $userserver[0];
-				    $data['registration'] = $userserver[0];
-				    $data['latitude'] = $line[4];
-				    $data['longitude'] = $line[5];
-				    $data['altitude'] = $line[6];
-				    $data['datetime'] = date('Y-m-d H:i:s');
-				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					$userserver = explode('@',$line[0]);
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+					$data['ident'] = $userserver[0];
+					$data['registration'] = $userserver[0];
+					$data['latitude'] = $line[4];
+					$data['longitude'] = $line[5];
+					$data['altitude'] = $line[6];
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$aircraft_type = $line[10];
+					$aircraft_type = preg_split(':/:',$aircraft_type);
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				}
 				}
-			    }
 			} elseif ($format == 'beast') {
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
-			    die;
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
+				die;
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
-			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+				$line = explode("\t", $buffer);
+				for($k = 0; $k < count($line); $k=$k+2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
-			    }
-    			    if (count($lined) > 3) {
-    				$data['hex'] = $lined['hexid'];
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
-    				$data['id_source'] = $id_source;
-    				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-    				unset($lined);
-    				unset($data);
-    			    } else $error = true;
+					$lined[$key] = $line[$k+1];
+				}
+					if (count($lined) > 3) {
+					$data['hex'] = $lined['hexid'];
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
+					$data['datetime'] = date('Y-m-d H:i:s');;
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+					$data['id_source'] = $id_source;
+					$data['format_source'] = 'tsv';
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					unset($lined);
+					unset($data);
+					} else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
-			    if ($aprs_connect == 0) {
+				if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 				$aprs_connect = 1;
-			    }
+				}
 			    
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
+				}
 			    
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    //echo $buffer."\n";
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
+				$buffer = str_replace('APRS <- ','',$buffer);
+				$buffer = str_replace('APRS -> ','',$buffer);
+				//echo $buffer."\n";
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				//print_r($line);
 				if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
-				    $aprs_last_tx = time();
-				    $data = array();
-				    //print_r($line);
-				    $data['hex'] = $line['address'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
-				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    $data['ident'] = $line['ident'];
-				    $data['latitude'] = $line['latitude'];
-				    $data['longitude'] = $line['longitude'];
-				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
-				    $data['altitude'] = $line['altitude'];
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
-				    //else $data['heading'] = 0;
-				    $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
-    				    $data['id_source'] = $id_source;
-				    $data['format_source'] = 'aprs';
-				    $data['source_name'] = $line['source'];
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				    $currentdate = date('Y-m-d H:i:s');
-				    $aprsdate = strtotime($data['datetime']);
-				    // Accept data if time <= system time + 20s
-				    if (($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+					$aprs_last_tx = time();
+					$data = array();
+					//print_r($line);
+					$data['hex'] = $line['address'];
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+					else $data['datetime'] = date('Y-m-d H:i:s');
+					//$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = $line['ident'];
+					$data['latitude'] = $line['latitude'];
+					$data['longitude'] = $line['longitude'];
+					//$data['verticalrate'] = $line[16];
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
+					else $data['speed'] = 0;
+					$data['altitude'] = $line['altitude'];
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
+					//else $data['heading'] = 0;
+					$data['aircraft_type'] = $line['stealth'];
+					if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
+						$data['id_source'] = $id_source;
+					$data['format_source'] = 'aprs';
+					$data['source_name'] = $line['source'];
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$currentdate = date('Y-m-d H:i:s');
+					$aprsdate = strtotime($data['datetime']);
+					// Accept data if time <= system time + 20s
+					if (($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
-				    } else {
+					} else {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
-				    }
-				    unset($data);
+					}
+					unset($data);
 				} 
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					echo '!! Weather Station not yet supported'."\n";
 				}
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -991,29 +991,29 @@ 
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
     					date_default_timezone_set('UTC');
     				*/
-    				// Force datetime to current UTC datetime
-    				date_default_timezone_set('UTC');
-    				$data['datetime'] = date('Y-m-d H:i:s');
-    				$data['ident'] = trim($line[10]);
-    				$data['latitude'] = $line[14];
-    				$data['longitude'] = $line[15];
-    				$data['verticalrate'] = $line[16];
-    				$data['emergency'] = $line[20];
-    				$data['speed'] = $line[12];
-    				$data['squawk'] = $line[17];
-    				$data['altitude'] = $line[11];
-    				$data['heading'] = $line[13];
-    				$data['ground'] = $line[21];
-    				$data['emergency'] = $line[19];
-    				$data['format_source'] = 'sbs';
+					// Force datetime to current UTC datetime
+					date_default_timezone_set('UTC');
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = trim($line[10]);
+					$data['latitude'] = $line[14];
+					$data['longitude'] = $line[15];
+					$data['verticalrate'] = $line[16];
+					$data['emergency'] = $line[20];
+					$data['speed'] = $line[12];
+					$data['squawk'] = $line[17];
+					$data['altitude'] = $line[11];
+					$data['heading'] = $line[13];
+					$data['ground'] = $line[21];
+					$data['emergency'] = $line[19];
+					$data['format_source'] = 'sbs';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
-    				unset($data);
-    			    } else $error = true;
-			    if ($error) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$data['id_source'] = $id_source;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
+					else $error = true;
+					unset($data);
+					} else $error = true;
+				if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
 				} else {
@@ -1029,13 +1029,13 @@ 
 					connect_all($sourceer);
 					$sourceer = array();
 				}
-			    }
+				}
 			}
 			// Sleep for xxx microseconds
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
-		    } else {
+			} else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1044,9 +1044,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1057,23 +1057,23 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    }
+				}
+			}
 			}
-		    }
 		}
-	    } else {
+		} else {
 		$error = socket_strerror(socket_last_error());
 		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) {
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+				if ($globalDebug) echo "Shutdown all sockets...";
 			    
-			    foreach ($sockets as $sock) {
+				foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
 				@socket_close($sock);
-			    }
+				}
 			    
 			}
 			if ($globalDebug) echo "Restart all connections...";
@@ -1084,13 +1084,13 @@ 
 			if ($reset > 40) exit('Too many attempts...');
 			connect_all($globalSources);
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    $SI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		$SI->checkAll();
+	}
 	}
-    }
 }
 
 ?>