Ysurac / FlightAirMap

require/class.ATC.php

Braces +14 added lines, -5 removed lines

@@ -20,20 +20,27 @@ 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 		foreach($globalStatsFilters[$globalFilterName] as $source) {
-			if (isset($source['source'])) $filter['source'][] = $source['source'];
+			if (isset($source['source'])) {
+				$filter['source'][] = $source['source'];
+			}
 		}
 	    } else {
 		$filter = $globalStatsFilters[$globalFilterName];
 	    }
 	}
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+	if (is_array($globalFilter)) {
+		$filter = array_merge($filter,$globalFilter);
+	}
 	$filter_query_join = '';
 	$filter_query_where = '';
 	if (isset($filter['source']) && !empty($filter['source'])) {
 	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 	}
-	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+	if ($filter_query_where == '' && $where) {
+		$filter_query_where = ' WHERE';
+	} elseif ($filter_query_where != '' && $and) {
+		$filter_query_where .= ' AND';
+	}
 	$filter_query = $filter_query_join.$filter_query_where;
 	return $filter_query;
     }
@@ -57,7 +64,9 @@ 
     		$info = str_replace('^','<br />',$info);
     		$info = str_replace('&amp;sect;','',$info);
     		$info = str_replace('"','',$info);
-    		if ($type == '') $type = NULL;
+    		if ($type == '') {
+    			$type = NULL;
+    		}
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
                 $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
                  try {

live-santa-czml.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
-if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
+if (!isset($_GET['now'])) {
+	$output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
+}
 $output .= '}';
 //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
@@ -37,7 +39,9 @@ 
 $output .= '},';
 $output .= '{';
 $output .= '"id": "santaclaus",';
-if (!isset($_GET['now'])) $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
+if (!isset($_GET['now'])) {
+	$output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
+}
 $output .= '"properties": {';
 // Not yet supported in CZML with Cesium
 $output .= '},';

js/map.js.php

Braces +128 added lines, -33 removed lines

@@ -6,8 +6,11 @@ 
 //$_COOKIE['MapFormat'] = '2d';
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 ?>
 <?php
 	if (isset($_GET['archive'])) {
@@ -19,8 +22,11 @@ 
 		//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 		//$lastupd = 20;
 		$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-		if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-		else $enddate = time();
+		if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+			$enddate = $_GET['enddate'];
+		} else {
+			$enddate = time();
+		}
 		setcookie("archive_begin",$begindate);
 		setcookie("archive_end",$enddate);
 		setcookie("archive_update",$lastupd);
@@ -127,7 +133,17 @@ 
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 ?>
@@ -140,9 +156,19 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom-1;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -167,16 +193,27 @@ 
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -188,7 +225,12 @@ 
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -234,20 +276,26 @@ 
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -295,7 +343,12 @@ 
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,
@@ -354,8 +407,11 @@ 
 
 	function update_airportsLayer() {
 	    <?php
-		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-		else $getZoom = '7';
+		if (isset($_COOKIE['AirportZoom'])) {
+			$getZoom = $_COOKIE['AirportZoom'];
+		} else {
+			$getZoom = '7';
+		}
 	    ?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
@@ -689,9 +745,13 @@ 
 		    if (callsign != ""){ markerLabel += callsign; }
 		    if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
 <?php
-	if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-	elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['IconColor'])) {
+		$IconColor = $_COOKIE['IconColor'];
+	} elseif (isset($globalAircraftIconColor)) {
+		$IconColor = $globalAircraftIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 		    info_update(feature.properties.fc);
@@ -739,7 +799,12 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -786,7 +851,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -832,7 +902,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -1173,14 +1248,24 @@ 
 	if (isset($_GET['archive'])) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadPage = setInterval(
-    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 var currentdate = new Date(Date.UTC());
 var currentyear = new Date().getFullYear();
 var begindate = new Date(Date.UTC(currentyear,12,24,2,0,0,0));
@@ -1192,7 +1277,12 @@ 
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -1208,7 +1298,12 @@ 
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

live-santa-geojson.php

Braces +5 added lines, -2 removed lines

@@ -22,8 +22,11 @@
 $j = 0;
 $prev_satname = '';
 $timearray = array();
-if (isset($_GET['now'])) $begin = time();
-else $begin = strtotime(date("Y").'-12-24T02:00:00Z');
+if (isset($_GET['now'])) {
+	$begin = time();
+} else {
+	$begin = strtotime(date("Y").'-12-24T02:00:00Z');
+}
 for ($i =0; $i <= 288; $i++) {
 	$timearray[] = ($begin + $i*300)*1000;
 }

require/class.Stats.php

Braces +386 added lines, -134 removed lines

@@ -12,7 +12,9 @@ 
 	
 	public function __construct($dbc = null) {
 		global $globalFilterName;
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
+		if (isset($globalFilterName)) {
+			$this->filter_name = $globalFilterName;
+		}
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
         }
@@ -59,7 +61,9 @@ 
                 }
         }
 	public function getAllAirlineNames($filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -71,7 +75,9 @@ 
                 return $all;
         }
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -83,7 +89,9 @@ 
                 return $all;
         }
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -95,7 +103,9 @@ 
                 return $all;
         }
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -110,9 +120,14 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -132,9 +147,14 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
@@ -154,9 +174,14 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -177,9 +202,14 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -199,9 +229,14 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -222,9 +257,14 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':filter_name' => $filter_name));
@@ -245,9 +285,14 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -267,9 +312,14 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+		}
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -289,10 +339,15 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') {
 		$Connection = new Connection();
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
-			if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-			else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+			if ($limit) {
+				$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+			} else {
+				$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+			}
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -313,9 +368,14 @@ 
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -335,9 +395,14 @@ 
 	}
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -357,9 +422,14 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -385,7 +455,9 @@ 
         			$icao = $value['airport_departure_icao'];
         			if (isset($all[$icao])) {
         				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $all[$icao] = $value;
+        			} else {
+        				$all[$icao] = $value;
+        			}
         		}
         		$count = array();
         		foreach ($all as $key => $row) {
@@ -397,9 +469,14 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -425,7 +502,9 @@ 
         			$icao = $value['airport_arrival_icao'];
         			if (isset($all[$icao])) {
         				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-        			} else $all[$icao] = $value;
+        			} else {
+        				$all[$icao] = $value;
+        			}
         		}
         		$count = array();
         		foreach ($all as $key => $row) {
@@ -438,13 +517,21 @@ 
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			}
 		} else {
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			}
 		}
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -468,7 +555,9 @@ 
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -490,7 +579,9 @@ 
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -516,7 +607,9 @@ 
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -538,7 +631,9 @@ 
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
 		$query_data = array('filter_name' => $filter_name);
                  try {
@@ -560,7 +655,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -581,7 +678,9 @@ 
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -602,9 +701,14 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		} else {
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		}
 		if ($orderby == 'hour') {
 			/*
 			if ($globalDBdriver == 'mysql') {
@@ -613,7 +717,9 @@ 
 			*/
 			$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
@@ -634,7 +740,9 @@ 
 	
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -648,7 +756,9 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
 		if (empty($all)) {
 		        $filters = array();
@@ -662,7 +772,9 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -676,7 +788,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -690,7 +804,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -713,7 +829,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		/*
 		$query = "SELECT COUNT(*) AS nb_owner FROM stats_owner";
                  try {
@@ -738,7 +856,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
@@ -752,7 +872,9 @@ 
 	}
 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
@@ -765,7 +887,9 @@ 
                 return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -778,7 +902,9 @@ 
                 return $all;
         }
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
 	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -797,7 +923,9 @@ 
         }
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -815,7 +943,9 @@ 
         }
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
                 } else {
@@ -832,7 +962,9 @@ 
         }
 	public function getStatsAirlineTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
                 } else {
@@ -849,7 +981,9 @@ 
         }
 	public function getStatsOwnerTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
@@ -866,7 +1000,9 @@ 
         }
 	public function getStatsPilotTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
             	} else {
@@ -884,7 +1020,9 @@ 
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
                 } else {
@@ -900,7 +1038,9 @@ 
         }
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 		} else {
@@ -1383,47 +1523,69 @@ 
 			$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
 		} else {
 		*/
-			if ($globalDebug) echo 'Update stats !'."\n";
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Update stats !'."\n";
+			}
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer']);
 			}
-			if ($globalDebug) echo 'Count all airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name']);
 			}
-			if ($globalDebug) echo 'Count all registrations...'."\n";
+			if ($globalDebug) {
+				echo 'Count all registrations...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao']);
 			}
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all owners...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners...'."\n";
+			}
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count']);
 			}
-			if ($globalDebug) echo 'Count all pilots...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots...'."\n";
+			}
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source']);
 			}
 			
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order departure airports...'."\n";
+			}
 	        	$alldata = array();
 	        	
     			foreach ($pall as $value) {
@@ -1434,7 +1596,9 @@ 
     				$icao = $value['airport_departure_icao'];
         			if (isset($alldata[$icao])) {
     					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $alldata[$icao] = $value;
+        			} else {
+        				$alldata[$icao] = $value;
+        			}
 			}
     			$count = array();
     			foreach ($alldata as $key => $row) {
@@ -1444,11 +1608,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
 			}
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports...'."\n";
+			}
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['airport_arrival_icao'];
@@ -1458,7 +1628,9 @@ 
     				$icao = $value['airport_arrival_icao'];
         			if (isset($alldata[$icao])) {
         				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-	        		} else $alldata[$icao] = $value;
+	        		} else {
+	        			$alldata[$icao] = $value;
+	        		}
     			}
         		$count = array();
         		foreach ($alldata as $key => $row) {
@@ -1469,7 +1641,9 @@ 
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
 			}
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries...'."\n";
+				}
 				$SpotterArchive = new SpotterArchive();
 				$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				foreach ($alldata as $number) {
@@ -1481,46 +1655,66 @@ 
 			// Add by month using getstat if month finish...
 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths();
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all military flights by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMilitaryMonths();
 			foreach ($alldata as $number) {
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwners();
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilots();
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircrafts();
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivals();
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Airports data...'."\n";
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo 'Airports data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$this->deleteStatAirport('daily');
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -1640,37 +1834,53 @@ 
 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft registrations by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source']);
 			}
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports by airlines...'."\n";
+			}
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order detected departure airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_departure_icao'];
@@ -1691,11 +1901,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports by airlines...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_arrival_icao'];
@@ -1716,35 +1932,49 @@ 
                         foreach ($alldata as $number) {
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonthsByAirlines();
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
     			foreach ($dall as $value) {
@@ -1767,7 +1997,9 @@ 
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo '...Arrival'."\n";
+			if ($globalDebug) {
+				echo '...Arrival'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
         		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
     			foreach ($dall as $value) {
@@ -1791,13 +2023,19 @@ 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
 			}
 
-			if ($globalDebug) echo 'Flights data...'."\n";
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
+			if ($globalDebug) {
+				echo 'Flights data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '-> countAllDatesLastMonth...'."\n";
+			}
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
 			}
-			if ($globalDebug) echo '-> countAllDates...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllDates...'."\n";
+			}
 			//$previousdata = $this->countAllDatesByAirlines();
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
 			$values = array();
@@ -1810,14 +2048,18 @@ 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
 			}
 			
-			if ($globalDebug) echo '-> countAllHours...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllHours...'."\n";
+			}
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
 			}
 			
 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				//$filter_name = $filter['name'];
 				$filter_name = $name;
@@ -1825,10 +2067,14 @@ 
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 				if (isset($last_update[0]['value'])) {
 					$last_update_day = $last_update[0]['value'];
-				} else $last_update_day = '2012-12-12 12:12:12';
+				} else {
+					$last_update_day = '2012-12-12 12:12:12';
+				}
 
 				// Count by filter
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
+				if ($globalDebug) {
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
+				}
 				$Spotter = new Spotter($this->db);
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
 				foreach ($alldata as $number) {
@@ -1866,7 +2112,9 @@ 
 	    				$icao = $value['airport_departure_icao'];
         				if (isset($alldata[$icao])) {
     						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        				} else $alldata[$icao] = $value;
+        				} else {
+        					$alldata[$icao] = $value;
+        				}
 				}
 	    			$count = array();
     				foreach ($alldata as $key => $row) {
@@ -1887,7 +2135,9 @@ 
 	    				$icao = $value['airport_arrival_icao'];
         				if (isset($alldata[$icao])) {
         					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-		        		} else $alldata[$icao] = $value;
+		        		} else {
+		        			$alldata[$icao] = $value;
+		        		}
 	    			}
         			$count = array();
         			foreach ($alldata as $key => $row) {
@@ -1901,7 +2151,9 @@ 
 				$alldata = $Spotter->countAllMonths($filter);
 				$lastyear = false;
 				foreach ($alldata as $number) {
-					if ($number['year_name'] != date('Y')) $lastyear = true;
+					if ($number['year_name'] != date('Y')) {
+						$lastyear = true;
+					}
 					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);

statistics.php

Braces +44 added lines, -24 removed lines

@@ -6,7 +6,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
 	unset($_COOKIE['stats_airline_icao']);
@@ -15,8 +17,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
 	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+	if (isset($globalFilter['airline'])) {
+		$airline_icao = $globalFilter['airline'][0];
+	}
+	}
 setcookie('stats_airline_icao',$airline_icao);
 require_once('header.php');
 
@@ -36,7 +40,9 @@ 
 	if (isset($last_update[0]['value'])) {
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
-		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
+		if (isset($globalTimezone) && $globalTimezone != '') {
+			date_default_timezone_set($globalTimezone);
+		}
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
     ?>
@@ -89,8 +95,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
                   $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+		    if (count($aircraft_array) == 0) {
+		    	print _("No data available");
+		    } else {
 
                     print '<div id="chart1" class="chart" width="100%"></div>
                     <script> 
@@ -186,8 +193,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
-	if (count($pilot_array) == 0) print _("No data available");
-	else {
+	if (count($pilot_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -232,8 +240,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
-	if (count($owner_array) == 0) print _("No data available");
-	else {
+	if (count($owner_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart7" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -279,8 +288,9 @@ 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
 <?php
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
-	if (count($flightover_array) == 0) print _("No data available");
-	else {
+	if (count($flightover_array) == 0) {
+		print _("No data available");
+	} else {
 	    print '<div id="chart10" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -424,8 +434,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
                   $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+		    if (count($year_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart8" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -470,8 +481,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
                   $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
+		    if (count($month_array) == 0) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart9" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -516,8 +528,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
                     $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
+		    if (empty($date_array)) {
+		    	print _("No data available");
+		    } else {
                   print '<div id="chart5" class="chart" width="100%"></div>
                     <script> 
                         google.load("visualization", "1", {packages:["corechart"]});
@@ -563,8 +576,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
                   $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
+		    if (empty($hour_array)) {
+		    	print _("No data available");
+		    } else {
 
                   print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
@@ -632,8 +646,11 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			if (!isset($polar_data)) {
+        				$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        			} else {
+        	    			$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+        	    		}
         		    }
         	?>
             <div class="col-md-6">
@@ -680,8 +697,11 @@ 
         		foreach ($msg as $eachmsg) {
         		    //$eachmsg = $msg[0];
         		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
+        		    if ($data > 500) {
+        		    	$max = (round(($data+100)/100))*100;
+        		    } else {
+        		    	$max = 500;
+        		    }
         	?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>

live-geojson.php

Braces +139 added lines, -54 removed lines

@@ -18,26 +18,49 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = true;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
-} else $min = false;
+} else {
+	$min = false;
+}
 
 if (isset($_GET['ident'])) {
 	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
@@ -87,20 +110,30 @@ 
 	}
 */
 	$flightcnt = count($spotter_array);
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
-else $usenextlatlon = true;
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
+	$usenextlatlon = false;
+} else {
+	$usenextlatlon = true;
+}
 $j = 0;
 $prev_flightaware_id = '';
 $aircrafts_shadow = array();
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -137,11 +170,16 @@ 
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"id": "'.$spotter_item['flightaware_id'].'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -149,13 +187,21 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -168,25 +214,37 @@ 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_icao = $spotter_item['aircraft_icao'];
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
-								else {
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
+								} else {
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
-									else $spotter_item['aircraft_shadow'] = '';
+									if (count($aircraft_info) > 0) {
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
+									} else {
+										$spotter_item['aircraft_shadow'] = '';
+									}
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
 								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -194,8 +252,11 @@ 
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -207,8 +268,11 @@ 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -226,10 +290,16 @@ 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
 						if (isset($archivespeed)) {
 							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
@@ -239,7 +309,9 @@ 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 						}
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -247,8 +319,11 @@ 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -266,8 +341,11 @@ 
 							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
 						}
 						// type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 							$output .= '"type": "Point",';
@@ -334,7 +412,9 @@ 
 			}
 */
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
+				if ($history == '' && isset($_COOKIE['history'])) {
+					$history = $_COOKIE['history'];
+				}
 				
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
 				|| (!isset($_COOKIE['flightpath']) 
@@ -356,8 +436,11 @@ 
 						$output_history .= ']}},';
 						$output .= $output_history;
 					    }
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    if ($compress) {
+					    	$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    } else {
+					    	$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
+					    }
 					}
 					$output_history .= '[';
 					$output_history .=  $spotter_history['longitude'].', ';
@@ -403,7 +486,9 @@ 
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$j.'"';
 		} else {
 			$output .= '"features": ';

require/class.SpotterImport.php

Braces +318 added lines, -113 removed lines

@@ -53,7 +53,9 @@ 
 	$dbc = $this->db;
 	$this->all_flights[$id]['schedule_check'] = true;
 	if ($globalSchedulesFetch) {
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
+	if ($globalDebug) {
+		echo 'Getting schedule info...'."\n";
+	}
 	$Spotter = new Spotter($dbc);
 	$Schedule = new Schedule($dbc);
 	$Translation = new Translation($dbc);
@@ -63,7 +65,9 @@ 
 	    if ($Schedule->checkSchedule($operator) == 0) {
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
+		    if ($globalDebug) {
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
 		    // Should also check if route schedule = route from DB
@@ -72,7 +76,9 @@ 
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
 			    if ($airport_icao != '') {
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
+				if ($globalDebug) {
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
+				}
 			    }
 			}
 		    }
@@ -81,7 +87,9 @@ 
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
 			    if ($airport_icao != '') {
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
+				if ($globalDebug) {
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
+				}
 			    }
 			}
 		    }
@@ -109,7 +117,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	if ($globalDebug) echo "Update last seen flights data...\n";
+	if ($globalDebug) {
+		echo "Update last seen flights data...\n";
+	}
 	foreach ($this->all_flights as $key => $flight) {
 	    if (isset($this->all_flights[$key]['id'])) {
 		//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
@@ -122,24 +132,32 @@ 
 
     public function arrival($key) {
 	global $globalClosestMinDist, $globalDebug;
-	if ($globalDebug) echo 'Update arrival...'."\n";
+	if ($globalDebug) {
+		echo 'Update arrival...'."\n";
+	}
 	$Spotter = new Spotter($this->db);
         $airport_icao = '';
         $airport_time = '';
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
+        	$globalClosestMinDist = 50;
+        }
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
     	    if (isset($closestAirports[0])) {
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
         	    $airport_icao = $closestAirports[0]['icao'];
         	    $airport_time = $this->all_flights[$key]['datetime'];
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        	    if ($globalDebug) {
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        	    }
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
         	    foreach ($closestAirports as $airport) {
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
         		    $airport_icao = $airport['icao'];
         		    $airport_time = $this->all_flights[$key]['datetime'];
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        		    if ($globalDebug) {
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        		    }
         		    break;
         		}
         	    }
@@ -147,14 +165,20 @@ 
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+        		if ($globalDebug) {
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+        		}
         	}
     	    } else {
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+    		    if ($globalDebug) {
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+    		    }
     	    }
 
         } else {
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+        	if ($globalDebug) {
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+        	}
         }
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
     }
@@ -164,12 +188,16 @@ 
     public function del() {
 	global $globalDebug;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_flights as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if (isset($this->all_flights[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+            		if ($globalDebug) {
+            			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+            		}
 			/*
 			$SpotterLive = new SpotterLive();
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
@@ -179,7 +207,9 @@ 
             		$Spotter = new Spotter($this->db);
             		if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Spotter->db = null;
@@ -193,8 +223,10 @@ 
     public function add($line) {
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights;
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
-/*
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
+	/*
 	$Spotter = new Spotter();
 	$dbc = $Spotter->db;
 	$SpotterLive = new SpotterLive($dbc);
@@ -222,11 +254,15 @@ 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
 		    $source = $line['source_name'];
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		/*
@@ -242,8 +278,11 @@ 
 		//$this->db = $dbc;
 
 		$hex = trim($line['hex']);
-	        if (!isset($line['id'])) $id = trim($line['hex']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['hex']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		//print_r($this->all_flights);
 		if (!isset($this->all_flights[$id]['hex']) && ctype_xdigit($hex)) {
@@ -258,13 +297,20 @@ 
 			$Spotter = new Spotter($this->db);
 			$aircraft_icao = $Spotter->getAllAircraftType($hex);
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
 
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+			    if ($line['aircraft_type'] == 'PARA_GLIDER') {
+			    	$aircraft_icao = 'GLID';
+			    } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+			    	$aircraft_icao = 'UHEL';
+			    } elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+			    	$aircraft_icao = 'TOWPLANE';
+			    } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+			    	$aircraft_icao = 'POWAIRC';
+			    }
 			}
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
 		    } else if (isset($line['aircraft_name'])) {
@@ -272,29 +318,47 @@ 
 			$Spotter = new Spotter($this->db);
 			$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
 			$Spotter->db = null;
-			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
-			else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
+			if ($aircraft_icao != '') {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			} else {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
+			}
+		    } else {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
-//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
+			//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+			}
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     } else {
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     }
 
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n";
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
+		    if ($globalDebug) {
+		    	echo "*********** New aircraft hex : ".$hex." ***********\n";
+		    }
+		    if ($globalAllFlights !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				}
 				/*
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
 				print_r($this->all_flights[$id]);
@@ -302,7 +366,9 @@ 
 				*/
 				return '';
 		    }
-		} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+		} else {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
@@ -323,15 +389,25 @@ 
 			$timeelapsed = microtime(true);
             		$Spotter = new Spotter($this->db);
             		$fromsource = NULL;
-            		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-            		elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-			elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
-			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+            		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+            			$fromsource = $globalAirlinesSource;
+            		} elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
+            			$fromsource = 'vatsim';
+            		} elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
+				$fromsource = 'ivao';
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
+				$fromsource = 'vatsim';
+			} elseif (isset($globalIVAO) && $globalIVAO) {
+				$fromsource = 'ivao';
+			}
             		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+			if ($globalDebug && $result != 'success') {
+				echo '!!! ERROR : '.$result."\n";
+			}
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
 		    }
 
 /*
@@ -342,7 +418,9 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    if (!isset($this->all_flights[$id]['id'])) {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    }
 
 		    //$putinarchive = true;
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -359,7 +437,9 @@ 
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -372,7 +452,9 @@ 
 				$Translation->db = null;
 			}
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
 
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -381,9 +463,13 @@ 
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
 		    	    }
 			}
-			if (!isset($globalFork)) $globalFork = TRUE;
+			if (!isset($globalFork)) {
+				$globalFork = TRUE;
+			}
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
+					$this->get_Schedule($id,trim($line['ident']));
+				}
 			}
 		    }
 		}
@@ -399,16 +485,23 @@ 
 		    // use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
@@ -416,21 +509,31 @@ 
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
 				$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
+				if (!empty($all_country)) {
+					$this->all_flights[$id]['over_country'] = $all_country['iso2'];
+				}
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
-				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_flights[$id]['archive_latitude'])) {
+					$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -452,9 +555,13 @@ 
 			    */
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
-				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
+				if (!isset($this->all_flights[$id]['archive_longitude'])) {
+					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -485,7 +592,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -507,11 +616,17 @@ 
 			// Here we force archive of flight because after ground it's a new one (or should be)
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
+			} elseif (isset($line['id'])) {
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			}
+		    }
+		    if ($line['ground'] != 1) {
+		    	$line['ground'] = 0;
 		    }
-		    if ($line['ground'] != 1) $line['ground'] = 0;
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
 		    //$dataFound = true;
 		}
@@ -519,28 +634,40 @@ 
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
 			    $highlight = '';
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
+			    }
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
+			    }
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+			    }
 			    if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
 				$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				$this->all_flights[$id]['putinarchive'] = true;
 				//$putinarchive = true;
 				//$highlight = '';
 			    }
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    } else {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    }
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true;
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) {
+				$this->all_flights[$id]['putinarchive'] = true;
+			}
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
@@ -552,21 +679,30 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true;
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) {
+		    	$this->all_flights[$id]['putinarchive'] = true;
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) {
+		    	$this->all_flights[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+  		    }
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
   		    // If not enough messages and ACARS set heading to 0
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
   		}
-		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
-		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
+		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
+			$dataFound = false;
+		} elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
+			$dataFound = false;
+		}
 
 //		print_r($this->all_flights[$id]);
 		//gets the callsign from the last hour
@@ -581,23 +717,36 @@ 
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
+				if ($globalDebug) {
+					echo "Check if aircraft is already in DB...";
+				}
 				$timeelapsed = microtime(true);
 				$SpotterLive = new SpotterLive($this->db);
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
 				    $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				} elseif (isset($line['id'])) {
 				    $recent_ident = $SpotterLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 				    $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				} else $recent_ident = '';
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 				$SpotterLive->db=null;
 
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+				if ($globalDebug && $recent_ident == '') {
+					echo " Not in DB.\n";
+				} elseif ($globalDebug && $recent_ident != '') {
+					echo " Already in DB.\n";
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -605,7 +754,9 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
+				}
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
@@ -649,26 +800,44 @@ 
 				
 				if (!$ignoreImport) {
 				    $highlight = '';
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
+				    	$highlight = 'Squawk 7500 : Hijack';
+				    }
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
+				    }
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
+				    	$highlight = 'Squawk 7700 : Emergency';
+				    }
+				    if (!isset($this->all_flights[$id]['id'])) {
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    $Spotter = new Spotter($this->db);
 				    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name']);
 				    $Spotter->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebug && isset($result)) {
+				    	echo $result."\n";
+				    }
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -681,13 +850,17 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
 				    
 				    $this->del();
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
+				} elseif ($globalDebug) {
+					echo 'Ignore data'."\n";
+				}
 				//$ignoreImport = false;
 				$this->all_flights[$id]['addedSpotter'] = 1;
 				//print_r($this->all_flights[$id]);
@@ -704,12 +877,16 @@ 
 			*/
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
+				    }
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
 				    $SpotterLive = new SpotterLive($this->db);
 				    $SpotterLive->deleteLiveSpotterData();
 				    $SpotterLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -732,11 +909,17 @@ 
 		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
 		    if ($globalDebug) {
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
+				if (isset($this->all_flights[$id]['source_name'])) {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
+				} else {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
+				}
 			} else {
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
+				if (isset($this->all_flights[$id]['source_name'])) {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
+				} else {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
+				}
 			}
 		    }
 		    $ignoreImport = false;
@@ -782,19 +965,25 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
+				}
 				$timeelapsed = microtime(true);
 				$SpotterLive = new SpotterLive($this->db);
 				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 				$SpotterLive->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				//if ($line['format_source'] != 'aprs') {
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 					$source = $this->all_flights[$id]['source_name'];
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_flights[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source();
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -815,7 +1004,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -833,7 +1024,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -844,20 +1037,30 @@ 
 				}
 
 				$this->all_flights[$id]['lastupdate'] = time();
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
+				if ($this->all_flights[$id]['putinarchive']) {
+					$send = true;
+				}
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
-				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($globalDebug) {
+					echo $result."\n";
+				}
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
+			    if ($globalDebug) {
+			    	echo "---- Deleting Live Spotter data Not updated since 2 hour...";
+			    }
 			    $SpotterLive = new SpotterLive($this->db);
 			    $SpotterLive->deleteLiveSpotterDataNotUpdated();
 			    $SpotterLive->db = null;
 			    //SpotterLive->deleteLiveSpotterData();
-			    if ($globalDebug) echo " Done\n";
+			    if ($globalDebug) {
+			    	echo " Done\n";
+			    }
 			    $this->last_delete_hourly = time();
 			}
 			
@@ -865,7 +1068,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_flights[$id];
+		if ($send) {
+			return $this->all_flights[$id];
+		}
 	    }
 	}
     }

live-czml.php

Braces +62 added lines, -21 removed lines

@@ -40,22 +40,43 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
+}
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -132,8 +153,12 @@ 
 	} else {
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 $minitime = time();
@@ -156,7 +181,9 @@ 
 $j = 0;
 $prev_flightaware_id = '';
 $speed = 1;
-if (isset($archivespeed)) $speed = $archivespeed;
+if (isset($archivespeed)) {
+	$speed = $archivespeed;
+}
 $output = '[';
 $output .= '{"id" : "document", "name" : "fam","version" : "1.0"';
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
@@ -226,7 +253,9 @@ 
 					$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
 					$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
 					$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
-				} else $aircraft_shadow = '';
+				} else {
+					$aircraft_shadow = '';
+				}
 				if ($aircraft_shadow != '') {
 					if (isset($modelsdb[$aircraft_shadow])) {
 						$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20 ,';
@@ -323,7 +352,9 @@ 
 						$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20,';
 						$output .= '"heightReference": "'.$heightrelative.'"},';
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+						if ($spotter_item['aircraft_icao'] != '') {
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+						}
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 					}
 				} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
@@ -335,7 +366,9 @@ 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20,';
 					$output .= '"heightReference": "'.$heightrelative.'"},';
 					//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-					if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+					if ($spotter_item['aircraft_icao'] != '') {
+						$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+					}
 					$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 				}
 
@@ -343,7 +376,9 @@ 
 				$output .= '"model": {"gltf" : "'.$globalURL.'/models/Cesium_Air.glb","scale" : 1.0,"minimumPixelSize": 20,';
 				$output .= '"heightReference": "'.$heightrelative.'"},';
 				//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
-				if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+				if ($spotter_item['aircraft_icao'] != '') {
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+				}
 				$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
 			}
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
@@ -356,8 +391,12 @@ 
 	//		$output .= '"interpolationDegree" : 5,';
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"cartographicDegrees": [';
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($minitime > strtotime($spotter_item['date'])) {
+				$minitime = strtotime($spotter_item['date']);
+			}
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
@@ -371,7 +410,9 @@ 
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
+			if ($maxitime < strtotime($spotter_item['date'])) {
+				$maxitime = strtotime($spotter_item['date']);
+			}
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
 				$output .= $prevlat.', ';