Ysurac / FlightAirMap

js/map-satellite.2d.js.php

Braces +42 added lines, -10 removed lines

@@ -13,8 +13,11 @@ 
 <?php
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 $compress = false;
 ?>
 
@@ -145,9 +148,13 @@ 
 		    if (callsign != ""){ markerSatelliteLabel += callsign; }
 		    if (type != ""){ markerSatelliteLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['SatelliteIconColor'])) $IconColor = $_COOKIE['SatelliteIconColor'];
-	elseif (isset($globalSatelliteIconColor)) $IconColor = $globalSatelliteIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['SatelliteIconColor'])) {
+		$IconColor = $_COOKIE['SatelliteIconColor'];
+	} elseif (isset($globalSatelliteIconColor)) {
+		$IconColor = $globalSatelliteIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famsatid)) {
 ?>
 		    info_satellite_update(feature.properties.fc);
@@ -174,7 +181,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
 		}
@@ -231,7 +243,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
 		}
@@ -287,7 +304,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
 		}
@@ -456,14 +478,24 @@ 
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 var reloadSatellitePage = setInterval(function(){if (noTimeout) updateSat(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 var reloadSatellitePage = setInterval(
-    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

js/map.2d.js.php

Braces +134 added lines, -30 removed lines

@@ -13,10 +13,15 @@ 
 "use strict";
 <?php
 
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
+if (!isset($globalOpenWeatherMapKey)) {
+	$globalOpenWeatherMapKey = '';
+}
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 /*
 if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') {
@@ -142,7 +147,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 {
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
@@ -168,9 +183,21 @@ 
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) {
+	print $viewzoom-1;
+} elseif (isset($viewzoom)) {
+	print $viewzoom;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
+		var zoom = <?php if (isset($viewzoom)) {
+	print $viewzoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -196,16 +223,27 @@ 
 	var 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: '© <a href="https://www.mapbox.com/about/maps/">Mapbox</a> © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> <strong><a href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a></strong>',
 	    id: '<?php print $MapBoxId; ?>',
 	    token: '<?php print $globalMapboxToken; ?>'
@@ -224,7 +262,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);
@@ -233,7 +276,12 @@ 
 ?>
 	L.tileLayer('https://tiles.openseamap.org/seamark/{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, ' +
 		'&copy; <a href="http://openseamap.org">OpenSeaMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
@@ -243,7 +291,12 @@ 
 ?>
 	L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}', {
 	    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: 'Tiles &copy; Esri &mdash; Sources: Esri, DeLorme, NAVTEQ, USGS, Intermap, iPC, NRCAN, Esri Japan, METI, Esri China (Hong Kong), Esri (Thailand), TomTom, 2012'
 	}).addTo(map);
 <?php
@@ -251,7 +304,12 @@ 
 ?>
 	L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
 	    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: 'Tiles &copy; Esri &mdash; Sources: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
 	}).addTo(map);
 <?php
@@ -259,7 +317,12 @@ 
 ?>
 	L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Ocean_Basemap/MapServer/tile/{z}/{y}/{x}', {
 	    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: 'Tiles &copy; Esri &mdash; Sources: GEBCO, NOAA, CHS, OSU, UNH, CSUMB, National Geographic, DeLorme, NAVTEQ, and Esri'
 	}).addTo(map);
 <?php
@@ -267,7 +330,12 @@ 
 ?>
 	L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}', {
 	    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: 'Tiles &copy; Esri &mdash; Sources: National Geographic, Esri, DeLorme, NAVTEQ, UNEP-WCMC, USGS, NASA, ESA, METI, NRCAN, GEBCO, NOAA, iPC'
 	}).addTo(map);
 <?php
@@ -312,20 +380,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
@@ -354,7 +428,12 @@ 
 	    maxZoom: 5,
 	    tms : true,
 	    zindex : 3,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Natural Earth'
 	}).addTo(map);
 <?php
@@ -362,9 +441,24 @@ 
 		$customid = $MapType;
 ?>
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
 	}).addTo(map);
 
@@ -404,7 +498,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,
@@ -494,7 +593,12 @@ 
 	});
 	if (archive === false) {
 		update_locationsLayer();
-		setInterval(function(){if (noTimeout) { map.removeLayer(locationsLayer); update_locationsLayer();} },<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+		setInterval(function(){if (noTimeout) { map.removeLayer(locationsLayer); update_locationsLayer();} },<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 	}
 	var currentdate = new Date();
 	var currentyear = new Date().getFullYear();

search-kml.php

Braces +18 added lines, -7 removed lines

@@ -16,8 +16,12 @@ 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -31,8 +35,12 @@ 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -67,8 +75,11 @@ 
 
 header('Content-Type: text/xml');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);

install/install-action.php

Braces +78 added lines, -28 removed lines

@@ -75,7 +75,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	}
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -93,7 +95,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		}
 		if ((!isset($globalAircraft) || $globalAircraft === TRUE) && (!isset($globalVA) || $globalVA === FALSE)) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -107,7 +111,9 @@ 
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -128,8 +136,10 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
-/*
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
+	/*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -154,7 +164,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	}
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
@@ -188,7 +200,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		}
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -209,18 +223,26 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -245,7 +267,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		}
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -265,7 +289,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -300,7 +326,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -321,12 +349,16 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			}
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -376,7 +408,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') {
+				$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			}
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 		unset($_SESSION['sources']);
@@ -387,15 +421,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -416,33 +456,43 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		}
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			}
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

require/class.AIS.php

Braces +204 added lines, -79 removed lines

@@ -123,7 +123,9 @@ 
 			$temp += 1;
 			$flat = (float)($temp / (60.0 * 10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flat = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flat; // float
 	}
 
@@ -135,7 +137,9 @@ 
 			$temp += 1;
 			$flon = (float)($temp / (60.0 * 10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flon = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flon;
 	}
 
@@ -158,10 +162,8 @@ 
     */
 	private function asciidec_2_8bit($ascii) {
 		//only process in the following range: 48-87, 96-119
-		if ($ascii < 48) { }
-		else {
-			if($ascii>119) { }
-			else {
+		if ($ascii < 48) { } else {
+			if($ascii>119) { } else {
 				if ($ascii>87 && $ascii<96) ;
 				else {
 					$ascii=$ascii+40;
@@ -263,7 +265,9 @@ 
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
 			$ro->cog = bindec(substr($_aisdata,112,12))/10;
@@ -273,7 +277,9 @@ 
 			$ro->name = $this->binchar($_aisdata,143,120);
 			$ro->cls = 2; // class B
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->typeid = bindec(substr($_aisdata,263,8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
@@ -304,9 +310,13 @@ 
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
 			$ro->cog = bindec(substr($_aisdata,85,9));
-			if ($ro->cog == 511) $ro->cog = 0.0;
+			if ($ro->cog == 511) {
+				$ro->cog = 0.0;
+			}
 			$ro->sog = bindec(substr($_aisdata,79,6));
-			if ($ro->sog == 63) $ro->sog = 0.0;
+			if ($ro->sog == 63) {
+				$ro->sog = 0.0;
+			}
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
 			$ro->cls = 1; // class A
@@ -354,28 +364,48 @@ 
 	}
 	
 	public function getShipType($code) {
-		if (isset($this->shiptype[$code])) return $this->shiptype[$code];
-		else return '';
+		if (isset($this->shiptype[$code])) {
+			return $this->shiptype[$code];
+		} else {
+			return '';
+		}
 	}
 
 	public function getShipTypeID($type) {
 		$typeid = array_search($type,$this->shiptype);
-		if ($typeid !== FALSE) return $typeid;
-		elseif ($type == 'Cargo' || $type == 'General Cargo' || $type == 'Bulk Carrier' || $type == 'Container Ship' || $type == 'Cargo A' || $type == 'Reefer' || $type == 'Vehicles Carrier' || $type == 'Ro-Ro Cargo') return 70;
-		elseif ($type == 'Passengers Ship' || $type == 'Passenger' || $type == 'Ro-Ro/Passenger Ship' || $type == 'Motor Passenger') return 60;
-		elseif ($type == 'Tanker' || $type == 'Crude Oil Tanker' || $type == 'Oil Products Tanker' || $type == 'Oil/Chemical Tanker' || $type == 'Bunkering Tanker') return 80;
-		elseif ($type == 'Lpg Tanker' || $type == 'Lng Tanker') return 84;
-		elseif ($type == 'Sailing Vessel') return 36;
-		elseif ($type == 'Yacht') return 37;
-		elseif ($type == 'Trailing Suction Hopper Dredger' || $type == 'Drilling Jack Up' || $type == 'Suction Dredger' || $type == 'Hopper Dredger') return 33;
-		elseif ($type == 'High speed craft') return 40;
-		elseif ($type == 'Crew Boat') return 53;
-		elseif ($type == 'Icebreaker') return 52;
-		elseif ($type == 'Pollution Control Vessel') return 54;
-		elseif ($type == 'Other Type') return 90;
-		elseif ($type == 'Anchor Handling Vessel' || $type == 'Offshore Supply Ship' || $type == 'Research/Survey Vessel' || $type == 'Utility Vessel' || $type == 'Pipe Burying Vessel' || $type == 'Heavy Lift Vessel' || $type == 'Crane Ship' || $type == 'Buoy-laying Vessel') return 59;
-		elseif ($type == 'Fish Carrier' || $type == 'Trawler' || $type == 'Trawlers' || $type == 'Fishing Vessel' || $type == 'Trawlers|unknown Not Fishing' || $type == 'Purse Seines|trawlers' || $type == 'Purse Seines' || $type == 'Trollers' || $type == 'Set Longlines' || $type == 'Set Gillnets|trawlers') return 30;
-		else return 0;
+		if ($typeid !== FALSE) {
+			return $typeid;
+		} elseif ($type == 'Cargo' || $type == 'General Cargo' || $type == 'Bulk Carrier' || $type == 'Container Ship' || $type == 'Cargo A' || $type == 'Reefer' || $type == 'Vehicles Carrier' || $type == 'Ro-Ro Cargo') {
+			return 70;
+		} elseif ($type == 'Passengers Ship' || $type == 'Passenger' || $type == 'Ro-Ro/Passenger Ship' || $type == 'Motor Passenger') {
+			return 60;
+		} elseif ($type == 'Tanker' || $type == 'Crude Oil Tanker' || $type == 'Oil Products Tanker' || $type == 'Oil/Chemical Tanker' || $type == 'Bunkering Tanker') {
+			return 80;
+		} elseif ($type == 'Lpg Tanker' || $type == 'Lng Tanker') {
+			return 84;
+		} elseif ($type == 'Sailing Vessel') {
+			return 36;
+		} elseif ($type == 'Yacht') {
+			return 37;
+		} elseif ($type == 'Trailing Suction Hopper Dredger' || $type == 'Drilling Jack Up' || $type == 'Suction Dredger' || $type == 'Hopper Dredger') {
+			return 33;
+		} elseif ($type == 'High speed craft') {
+			return 40;
+		} elseif ($type == 'Crew Boat') {
+			return 53;
+		} elseif ($type == 'Icebreaker') {
+			return 52;
+		} elseif ($type == 'Pollution Control Vessel') {
+			return 54;
+		} elseif ($type == 'Other Type') {
+			return 90;
+		} elseif ($type == 'Anchor Handling Vessel' || $type == 'Offshore Supply Ship' || $type == 'Research/Survey Vessel' || $type == 'Utility Vessel' || $type == 'Pipe Burying Vessel' || $type == 'Heavy Lift Vessel' || $type == 'Crane Ship' || $type == 'Buoy-laying Vessel') {
+			return 59;
+		} elseif ($type == 'Fish Carrier' || $type == 'Trawler' || $type == 'Trawlers' || $type == 'Fishing Vessel' || $type == 'Trawlers|unknown Not Fishing' || $type == 'Purse Seines|trawlers' || $type == 'Purse Seines' || $type == 'Trollers' || $type == 'Set Longlines' || $type == 'Set Gillnets|trawlers') {
+			return 30;
+		} else {
+			return 0;
+		}
 	}
 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
@@ -412,11 +442,20 @@ 
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
 		$end = strrpos ( $rawdata , '*' );
-		if ($end === FALSE) return -1; // check for NULLS!!!
+		if ($end === FALSE) {
+			return -1;
+		}
+		// check for NULLS!!!
 		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
+		if ( strlen($cs) != 2 ) {
+			return -1;
+		}
+		// correct cs length
 		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
+		for ( $alias=1; $alias<$end; $alias++) {
+			$chksum ^= ord( $rawdata[$alias] );
+		}
+		// perform XOR for NMEA checksum
 		if ( $chksum == $dcs ) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
@@ -427,8 +466,14 @@ 
 			$num_seq = (int)$pcs[1]; // number of sequences
 			$seq = (int)$pcs[2]; // get sequence
 			// get msg sequence id
-			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			if ($pcs[3] == '') {
+				$msg_sid = -1;
+			}
+			// non-multipart message, set to -1
+			else {
+				$msg_sid = (int)$pcs[3];
+			}
+			// multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -491,10 +536,18 @@ 
 				//DEBUG echo "[$start $end $tst]\n";
 				$result = $this->process_ais_raw( $tst, "" );
 				$last_pos = $end + 1;
-			} else break;
+			} else {
+				break;
+			}
+		}
+		if ($last_pos > 0) {
+			$cbuf = substr($cbuf, $last_pos);
 		}
-		if ($last_pos > 0) $cbuf = substr($cbuf, $last_pos); // move...
-		if (strlen($cbuf) > 1024) $cbuf = ""; // prevent overflow simple mode...
+		// move...
+		if (strlen($cbuf) > 1024) {
+			$cbuf = "";
+		}
+		// prevent overflow simple mode...
 		return $result;
 	}
 
@@ -514,7 +567,9 @@ 
 		if ($lat<0.0) {
 			$lat = -$lat;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$latd = 0x00000000;
 		$latd = intval ($lat * 600000.0);
 		if ($neg==true) {
@@ -530,7 +585,9 @@ 
 		if ($lon<0.0) {
 			$lon = -$lon;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$lond = 0x00000000;
 		$lond = intval ($lon * 600000.0);
 		if ($neg==true) {
@@ -543,9 +600,14 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
-		else $pad = '';
+		if ($len > $max_len) {
+			$name = substr($name,0,$max_len);
+		}
+		if ($len < $max_len) {
+			$pad = str_repeat('0', ($max_len - $len) * 6);
+		} else {
+			$pad = '';
+		}
 		$rv = '';
 		$ais_chars = array(
 		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
@@ -560,8 +622,11 @@ 
 		$_a = str_split($name);
 		if (!empty($_a)) {
 			foreach ($_a as $_1) {
-				if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
-				else $dec = 0;
+				if (isset($ais_chars[$_1])) {
+					$dec = $ais_chars[$_1];
+				} else {
+					$dec = 0;
+				}
 				$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
 				$rv .= $bin;
 				//echo "$_1 $dec ($bin)<br/>";
@@ -574,7 +639,9 @@ 
 		$len_bit = strlen($_enc);
 		$rem6 = $len_bit % 6;
 		$pad6_len = 0;
-		if ($rem6) $pad6_len = 6 - $rem6;
+		if ($rem6) {
+			$pad6_len = 6 - $rem6;
+		}
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
 		$len_enc = strlen($_enc) / 6;
@@ -583,8 +650,11 @@ 
 		for ($i=0; $i<$len_enc; $i++) {
 			$offset = $i * 6;
 			$dec = bindec(substr($_enc,$offset,6));
-			if ($dec < 40) $dec += 48;
-			else $dec += 56;
+			if ($dec < 40) {
+				$dec += 48;
+			} else {
+				$dec += 56;
+			}
 			//echo chr($dec)." $dec<br/>";
 			$itu .= chr($dec);
 		}
@@ -597,26 +667,42 @@ 
 		}
 		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
 		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
-		else $lsbc = '0';
+		if ($lsb >=0 && $lsb <= 15 ) {
+			$lsbc = $hex_arr[$lsb];
+		} else {
+			$lsbc = '0';
+		}
 		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
-		else $msbc = '0';
+		if ($msb >=0 && $msb <= 15 ) {
+			$msbc = $hex_arr[$msb];
+		} else {
+			$msbc = '0';
+		}
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
 	}
 
 	public function parse($buffer) {
 		$data = $this->process_ais_buf($buffer);
-		if (!is_object($data)) return array();
+		if (!is_object($data)) {
+			return array();
+		}
 		$result = array();
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim($data->name);
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->cog != 0) $result['heading'] = $data->cog;
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
 		/*
 		    $ro->cls = 0; // AIS class undefined, also indicate unparsed msg
 		    $ro->id = bindec(substr($_aisdata,0,6));
@@ -626,15 +712,25 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
-			else return 'Ship';
+			if (substr($mmsi,0,3) == '974') {
+				return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			} elseif (substr($mmsi,0,3) == '972') {
+				return 'MOB (Man Overboard) device';
+			} elseif (substr($mmsi,0,3) == '970') {
+				return 'AIS SART (Search and Rescue Transmitter)';
+			} elseif (substr($mmsi,0,3) == '111') {
+				return 'SAR (Search and Rescue) aircraft';
+			} elseif (substr($mmsi,0,2) == '98') {
+				return 'Auxiliary craft associated with a parent ship';
+			} elseif (substr($mmsi,0,2) == '99') {
+				return 'Aids to Navigation';
+			} elseif (substr($mmsi,0,2) == '00') {
+				return 'Coastal stations';
+			} elseif (substr($mmsi,0,1) == '0') {
+				return 'Group of ships';
+			} else {
+				return 'Ship';
+			}
 		}
 
 	
@@ -650,32 +746,61 @@ 
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim(str_replace('@','',$data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') {
+			$result['mmsi'] = '3'.$result['mmsi'];
+		}
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->heading !== '') $result['heading'] = $data->heading;
-		elseif ($data->cog != 0) $result['heading'] = $data->cog;
-		if ($data->status != '') $result['status'] = $data->status;
-		if ($data->statusid !== '') $result['statusid'] = $data->statusid;
-		if ($data->type !== '') $result['type'] = $data->type;
-		if ($data->typeid !== '') $result['typeid'] = $data->typeid;
-		if ($data->imo !== '') $result['imo'] = $data->imo;
-		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign));
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->heading !== '') {
+			$result['heading'] = $data->heading;
+		} elseif ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
+		if ($data->status != '') {
+			$result['status'] = $data->status;
+		}
+		if ($data->statusid !== '') {
+			$result['statusid'] = $data->statusid;
+		}
+		if ($data->type !== '') {
+			$result['type'] = $data->type;
+		}
+		if ($data->typeid !== '') {
+			$result['typeid'] = $data->typeid;
+		}
+		if ($data->imo !== '') {
+			$result['imo'] = $data->imo;
+		}
+		if ($data->callsign !== '') {
+			$result['callsign'] = trim(str_replace('@','',$data->callsign));
+		}
 		if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') {
 			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			if ($eta_ts != '') {
+				$result['eta_ts'] = $eta_ts;
+			}
 		} elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) {
 			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
-			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
+			if ($eta_ts != '') {
+				$result['eta_ts'] = $eta_ts;
+			}
 		}
 		if ($data->destination != '') {
 			$dest = trim(str_replace('@','',$data->destination));
-			if ($dest != '') $result['destination'] = $dest;
+			if ($dest != '') {
+				$result['destination'] = $dest;
+			}
 		}
 		$result['all'] = (array) $data;
 		/*

live-geojson.php

Braces +364 added lines, -147 removed lines

@@ -12,7 +12,9 @@ 
 $tracker = false;
 $marine = false;
 $usecoord = false;
-if (isset($_GET['test'])) exit();
+if (isset($_GET['test'])) {
+	exit();
+}
 if (isset($_GET['tracker'])) {
     $tracker = true;
 }
@@ -57,31 +59,62 @@ 
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $limit = 0;
 $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','famaprs'));
-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_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') $filter['race'] = filter_var($_COOKIE['filter_race'],FILTER_SANITIZE_NUMBER_INT);
-if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') $filter['blocked'] = true;
+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','famaprs'));
+}
+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_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],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($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+}
+if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') {
+	$filter['race'] = filter_var($_COOKIE['filter_race'],FILTER_SANITIZE_NUMBER_INT);
+}
+if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') {
+	$filter['blocked'] = true;
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
-} else $min = false;
+} else {
+	$min = false;
+}
 
 
 if (isset($_COOKIE['map_2d_limit'])) {
@@ -197,24 +230,38 @@ 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
 		}
 	}
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
 $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
-if ($currenttime != '') $currenttime = round($currenttime/1000);
+if ($currenttime != '') {
+	$currenttime = round($currenttime/1000);
+}
 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation === FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
-else $usenextlatlon = true;
-if ($usenextlatlon === false) $currenttime = '';
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation === FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
+	$usenextlatlon = false;
+} else {
+	$usenextlatlon = true;
+}
+if ($usenextlatlon === false) {
+	$currenttime = '';
+}
 $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.'",';
 
@@ -259,18 +306,29 @@ 
 						}
 						$output .= '"properties": {';
 						if (isset($spotter_item['flightaware_id'])) {
-							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'].'",';
+							}
 						} elseif (isset($spotter_item['famtrackid'])) {
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
+							if ($compress) {
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
+							} else {
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
+							}
 						} elseif (isset($spotter_item['fammarine_id'])) {
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
+							if ($compress) {
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
+							} else {
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_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",';
@@ -278,16 +336,25 @@ 
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": '.json_encode(str_replace('\\','',$spotter_item['ident'])).',';
-							else $output .= '"callsign": '.json_encode(str_replace('\\','',$spotter_item['ident'])).',';
+							if ($compress) {
+								$output .= '"c": '.json_encode(str_replace('\\','',$spotter_item['ident'])).',';
+							} else {
+								$output .= '"callsign": '.json_encode(str_replace('\\','',$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'])) {
-							if ($compress) $output .= '"reg": '.json_encode($spotter_item['registration']).',';
-							else $output .= '"registration": '.json_encode($spotter_item['registration']).',';
+							if ($compress) {
+								$output .= '"reg": '.json_encode($spotter_item['registration']).',';
+							} else {
+								$output .= '"registration": '.json_encode($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'].')",';
@@ -298,20 +365,30 @@ 
 							$output .= '"aircraft_name": "NA",';
 						}
 						if (isset($spotter_item['aircraft_icao'])) {
-							if ($compress) $output .= '"ai": "'.$spotter_item['aircraft_icao'].'",';
-							else $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+							if ($compress) {
+								$output .= '"ai": "'.$spotter_item['aircraft_icao'].'",';
+							} else {
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
+							}
 						}
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker && !$marine) {
-							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';
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.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';
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
+									} else {
+										$spotter_item['aircraft_shadow'] = '';
+									}
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
 								}
 							}
@@ -319,90 +396,171 @@ 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
 							if ($tracker) {
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
-									if ($compress) $output .= '"as": "ambulance.png",';
-									else $output .= '"aircraft_shadow": "ambulance.png",';
+									if ($compress) {
+										$output .= '"as": "ambulance.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ambulance.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
-									if ($compress) $output .= '"as": "police.png",';
-									else $output .= '"aircraft_shadow": "police.png",';
+									if ($compress) {
+										$output .= '"as": "police.png",';
+									} else {
+										$output .= '"aircraft_shadow": "police.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
-									if ($compress) $output .= '"as": "truck.png",';
-									else $output .= '"aircraft_shadow": "truck.png",';
+									if ($compress) {
+										$output .= '"as": "truck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "truck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
-									if ($compress) $output .= '"as": "truck.png",';
-									else $output .= '"aircraft_shadow": "truck.png",';
+									if ($compress) {
+										$output .= '"as": "truck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "truck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
-									if ($compress) $output .= '"as": "aircraft.png",';
-									else $output .= '"aircraft_shadow": "aircraft.png",';
+									if ($compress) {
+										$output .= '"as": "aircraft.png",';
+									} else {
+										$output .= '"aircraft_shadow": "aircraft.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
-									if ($compress) $output .= '"as": "aircraft.png",';
-									else $output .= '"aircraft_shadow": "aircraft.png",';
+									if ($compress) {
+										$output .= '"as": "aircraft.png",';
+									} else {
+										$output .= '"aircraft_shadow": "aircraft.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
-									if ($compress) $output .= '"as": "helico.png",';
-									else $output .= '"aircraft_shadow": "helico.png",';
+									if ($compress) {
+										$output .= '"as": "helico.png",';
+									} else {
+										$output .= '"aircraft_shadow": "helico.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
-									if ($compress) $output .= '"as": "rail.png",';
-									else $output .= '"aircraft_shadow": "rail.png",';
+									if ($compress) {
+										$output .= '"as": "rail.png",';
+									} else {
+										$output .= '"aircraft_shadow": "rail.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
-									if ($compress) $output .= '"as": "firetruck.png",';
-									else $output .= '"aircraft_shadow": "firetruck.png",';
+									if ($compress) {
+										$output .= '"as": "firetruck.png",';
+									} else {
+										$output .= '"aircraft_shadow": "firetruck.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
-									if ($compress) $output .= '"as": "bus.png",';
-									else $output .= '"aircraft_shadow": "bus.png",';
+									if ($compress) {
+										$output .= '"as": "bus.png",';
+									} else {
+										$output .= '"aircraft_shadow": "bus.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
-									if ($compress) $output .= '"as": "phone.png",';
-									else $output .= '"aircraft_shadow": "phone.png",';
+									if ($compress) {
+										$output .= '"as": "phone.png",';
+									} else {
+										$output .= '"aircraft_shadow": "phone.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
-									if ($compress) $output .= '"as": "jogger.png",';
-									else $output .= '"aircraft_shadow": "jogger.png",';
+									if ($compress) {
+										$output .= '"as": "jogger.png",';
+									} else {
+										$output .= '"aircraft_shadow": "jogger.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
-									if ($compress) $output .= '"as": "bike.png",';
-									else $output .= '"aircraft_shadow": "bike.png",';
+									if ($compress) {
+										$output .= '"as": "bike.png",';
+									} else {
+										$output .= '"aircraft_shadow": "bike.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
-									if ($compress) $output .= '"as": "motorcycle.png",';
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
+									if ($compress) {
+										$output .= '"as": "motorcycle.png",';
+									} else {
+										$output .= '"aircraft_shadow": "motorcycle.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
-									if ($compress) $output .= '"as": "balloon.png",';
-									else $output .= '"aircraft_shadow": "balloon.png",';
+									if ($compress) {
+										$output .= '"as": "balloon.png",';
+									} else {
+										$output .= '"aircraft_shadow": "balloon.png",';
+									}
 								} else {
-									if ($compress) $output .= '"as": "car.png",';
-									else $output .= '"aircraft_shadow": "car.png",';
+									if ($compress) {
+										$output .= '"as": "car.png",';
+									} else {
+										$output .= '"aircraft_shadow": "car.png",';
+									}
 								}
 							} elseif ($marine) {
 								if (isset($spotter_item['type']) && ($spotter_item['type']  == '50' Performance Cruiser' || $spotter_item['type']  == '50\' Performance Cruiser' || $spotter_item['type'] == 'Sail')) {
-									if ($compress) $output .= '"as": "50perfcruiser.png",';
-									else $output .= '"aircraft_shadow": "50perfcruiser.png",';
+									if ($compress) {
+										$output .= '"as": "50perfcruiser.png",';
+									} else {
+										$output .= '"aircraft_shadow": "50perfcruiser.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type']  == 'Sailaway Cruiser 38') {
-									if ($compress) $output .= '"as": "cruiser38.png",';
-									else $output .= '"aircraft_shadow": "cruiser38.png",';
+									if ($compress) {
+										$output .= '"as": "cruiser38.png",';
+									} else {
+										$output .= '"aircraft_shadow": "cruiser38.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type']  == 'Mini Transat') {
-									if ($compress) $output .= '"as": "transat.png",';
-									else $output .= '"aircraft_shadow": "transat.png",';
+									if ($compress) {
+										$output .= '"as": "transat.png",';
+									} else {
+										$output .= '"aircraft_shadow": "transat.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type']  == '52' Cruising Cat') {
-									if ($compress) $output .= '"as": "catamaran.png",';
-									else $output .= '"aircraft_shadow": "catamaran.png",';
+									if ($compress) {
+										$output .= '"as": "catamaran.png",';
+									} else {
+										$output .= '"aircraft_shadow": "catamaran.png",';
+									}
 								} elseif (isset($spotter_item['type']) && $spotter_item['type']  == 'Caribbean Rose') {
-									if ($compress) $output .= '"as": "carib.png",';
-									else $output .= '"aircraft_shadow": "carib.png",';
+									if ($compress) {
+										$output .= '"as": "carib.png",';
+									} else {
+										$output .= '"aircraft_shadow": "carib.png",';
+									}
 								} else {
-									if ($compress) $output .= '"as": "ship.png",';
-									else $output .= '"aircraft_shadow": "ship.png",';
+									if ($compress) {
+										$output .= '"as": "ship.png",';
+									} else {
+										$output .= '"aircraft_shadow": "ship.png",';
+									}
 								}
 							} else {
-								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'].'",';
@@ -410,8 +568,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'].'",';
@@ -423,8 +584,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'].'",';
@@ -443,11 +607,17 @@ 
 						}
 						
 						if (isset($spotter_item['real_altitude'])) {
-							if ($compress) $output .= '"a": "'.($spotter_item['real_altitude']/100).'",';
-							else $output .= '"altitude": "'.($spotter_item['real_altitude']/100).'",';
+							if ($compress) {
+								$output .= '"a": "'.($spotter_item['real_altitude']/100).'",';
+							} else {
+								$output .= '"altitude": "'.($spotter_item['real_altitude']/100).'",';
+							}
 						} elseif (isset($spotter_item['altitude'])) {
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
+							if ($compress) {
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
+							} else {
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+							}
 						}
 						
 						$heading = $spotter_item['heading'];
@@ -471,19 +641,24 @@ 
 							}
 						}
 						
-						if ($compress)$output .= '"h": "'.$heading.'",';
-						else $output .= '"heading": "'.$heading.'",';
+						if ($compress) {
+							$output .= '"h": "'.$heading.'",';
+						} else {
+							$output .= '"heading": "'.$heading.'",';
+						}
 						if ($currenttime != '') {
 							if (strtotime($spotter_item['date']) < $currenttime) {
 								if (isset($archivespeed)) {
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-									else {
+									if (!isset($idistance) || $fdistance < $idistance) {
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+									} else {
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
@@ -491,12 +666,14 @@ 
 								} elseif ($usenextlatlon) {
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-									else {
+									if (!isset($idistance) || $fdistance < $idistance) {
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+									} else {
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 										}
@@ -535,7 +712,9 @@ 
 							}
 						}
 
-						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']))).'",';
 						}
@@ -543,8 +722,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'].'",';
@@ -575,14 +757,23 @@ 
 						}
 						// type when not aircraft ?
 						if (isset($spotter_item['type'])) {
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
-							else $output .= '"type": "'.$spotter_item['type'].'"';
+							if ($compress) {
+								$output .= '"t": "'.$spotter_item['type'].'"';
+							} else {
+								$output .= '"type": "'.$spotter_item['type'].'"';
+							}
 						} elseif ($marine) {
-							if ($compress) $output .= '"t": "ship"';
-							else $output .= '"type": "ship"';
+							if ($compress) {
+								$output .= '"t": "ship"';
+							} else {
+								$output .= '"type": "ship"';
+							}
 						} else {
-							if ($compress) $output .= '"t": "aircraft"';
-							else $output .= '"type": "aircraft"';
+							if ($compress) {
+								$output .= '"t": "aircraft"';
+							} else {
+								$output .= '"type": "aircraft"';
+							}
 						}
 						$output .= '},';
 						$output .= '"geometry": {';
@@ -590,15 +781,19 @@ 
 								$output .= '"coordinates": [';
 								if ($currenttime != '') {
 									if (strtotime($spotter_item['date']) < $currenttime) {
-										if (!isset($archivespeed)) $archivespeed = 1;
+										if (!isset($archivespeed)) {
+											$archivespeed = 1;
+										}
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-										if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
-										else {
+										if (!isset($idistance) || $fdistance < $idistance) {
+											$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
+										} else {
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
 											$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
-											if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
-											else {
+											if (!isset($idistance) || $fdistance < $idistance) {
+												$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
+											} else {
 												$output .= $spotter_item['longitude'].', ';
 												$output .= $spotter_item['latitude'];
 											}
@@ -676,7 +871,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') 
@@ -746,8 +943,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'].', ';
@@ -768,10 +968,15 @@ 
 							if ($d === false) {
 								if ($compress) {
 									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'",';
-									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') $output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
-									elseif (isset($spotter_history_array[0]['mapmatching_engine'])) $output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') {
+										$output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									} elseif (isset($spotter_history_array[0]['mapmatching_engine'])) {
+										$output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
+									}
 									$output_history .= '"t": "history"},"geometry": {"type": "LineString","coordinates": [';
-								} else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
+								} else {
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
+								}
 								$d = true;
 							}
 							$output_history .= '[';
@@ -794,7 +999,9 @@ 
 							$output_historyd = '[';
 							$output_historyd .=  $spotter_item['longitude'].', ';
 							$output_historyd .=  $spotter_item['latitude'];
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							if (isset($spotter_history['altitude'])) {
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
+							}
 							$output_historyd .= '],';
 							//$output_history = $output_historyd.$output_history;
 							$output_history = $output_history.$output_historyd;
@@ -822,8 +1029,11 @@ 
 				        && $spotter_item['arrival_airport'] != 'NA' 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+				    if ($compress) {
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+				    } else {
+				    	$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+				    }
 				    if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
 				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
@@ -856,8 +1066,11 @@ 
 				    	    || (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
 				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    if ($compress) {
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    } else {
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+				    }
 				    
 				    //$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
@@ -882,7 +1095,9 @@ 
 					$output_dest  = substr($output_dest, 0, -1);
 				    }
 				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
+				    if ($havedata) {
+				    	$output .= $output_dest;
+				    }
 				    unset($output_dest);
 				}
 			}
@@ -890,7 +1105,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.SBS.php

Braces +249 added lines, -87 removed lines

@@ -19,10 +19,15 @@ 
 		// Not yet finished, no CRC checks
 		$data = array();
 		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1);
+		if ($typehex == '*' || $typehex == ':') {
+			$hex = substr($buffer,1);
+		}
 		//elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-1);
-		else $hex = substr($buffer,1,-1);
+		elseif ($typehex == '@' || $typehex == '%') {
+			$hex = substr($buffer,13,-1);
+		} else {
+			$hex = substr($buffer,1,-1);
+		}
 		$bin = gmp_strval( gmp_init($hex,16), 2);
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 		//if (strlen($hex) == 28) {
@@ -90,8 +95,9 @@ 
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
 					$cprlat = intval(substr($bin,54,17),2)/131072.0;
 					$cprlon = intval(substr($bin,71,17),2)/131072.0;
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
-					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+					if ($oe == 0) {
+						$this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+					} elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 						$cprlat_odd = $cprlat;
 						$cprlon_odd = $cprlon;
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -99,8 +105,12 @@ 
 						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
 						$lat_even = (360.0/60)*($j%60+$cprlat_even);
 						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
-						if ($lat_even >= 270) $lat_even = $lat_even - 360;
-						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
+						if ($lat_even >= 270) {
+							$lat_even = $lat_even - 360;
+						}
+						if ($lat_odd >= 270) {
+							$lat_odd = $lat_odd - 360;
+						}
 						// check latitude zone
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 							if ($this::$latlon[$icao]['created'] > time()) {
@@ -108,7 +118,9 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
 								$lat = $lat_even;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 									$data['latitude'] = $lat;
@@ -119,14 +131,18 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
 								$lat = $lat_odd;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 									$data['latitude'] = $lat;
 									$data['longitude'] = $lon;
 								}
 							}
-						} else echo "Not cprNL";
+						} else {
+							echo "Not cprNL";
+						}
 						unset($this::$latlon[$icao]);
 					}
 				} elseif ($tc == 19) {
@@ -135,11 +151,17 @@ 
 					$v_ew = intval(substr($bin,46,10),2);
 					$v_ns_dir = intval(substr($bin,56,1));
 					$v_ns = intval(substr($bin,57,10),2);
-					if ($v_ew_dir) $v_ew = -1*$v_ew;
-					if ($v_ns_dir) $v_ns = -1*$v_ns;
+					if ($v_ew_dir) {
+						$v_ew = -1*$v_ew;
+					}
+					if ($v_ns_dir) {
+						$v_ns = -1*$v_ns;
+					}
 					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
 					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-					if ($heading <0) $heading = $heading+360;
+					if ($heading <0) {
+						$heading = $heading+360;
+					}
 					$data['speed'] = $speed;
 					$data['heading'] = $heading;
 				}
@@ -154,72 +176,194 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
-		if ($lat < 10.47047130) return 59;
-		if ($lat < 14.82817437) return 58;
-		if ($lat < 18.18626357) return 57;
-		if ($lat < 21.02939493) return 56;
-		if ($lat < 23.54504487) return 55;
-		if ($lat < 25.82924707) return 54;
-		if ($lat < 27.93898710) return 53;
-		if ($lat < 29.91135686) return 52;
-		if ($lat < 31.77209708) return 51;
-		if ($lat < 33.53993436) return 50;
-		if ($lat < 35.22899598) return 49;
-		if ($lat < 36.85025108) return 48;
-		if ($lat < 38.41241892) return 47;
-		if ($lat < 39.92256684) return 46;
-		if ($lat < 41.38651832) return 45;
-		if ($lat < 42.80914012) return 44;
-		if ($lat < 44.19454951) return 43;
-		if ($lat < 45.54626723) return 42;
-		if ($lat < 46.86733252) return 41;
-		if ($lat < 48.16039128) return 40;
-		if ($lat < 49.42776439) return 39;
-		if ($lat < 50.67150166) return 38;
-		if ($lat < 51.89342469) return 37;
-		if ($lat < 53.09516153) return 36;
-		if ($lat < 54.27817472) return 35;
-		if ($lat < 55.44378444) return 34;
-		if ($lat < 56.59318756) return 33;
-		if ($lat < 57.72747354) return 32;
-		if ($lat < 58.84763776) return 31;
-		if ($lat < 59.95459277) return 30;
-		if ($lat < 61.04917774) return 29;
-		if ($lat < 62.13216659) return 28;
-		if ($lat < 63.20427479) return 27;
-		if ($lat < 64.26616523) return 26;
-		if ($lat < 65.31845310) return 25;
-		if ($lat < 66.36171008) return 24;
-		if ($lat < 67.39646774) return 23;
-		if ($lat < 68.42322022) return 22;
-		if ($lat < 69.44242631) return 21;
-		if ($lat < 70.45451075) return 20;
-		if ($lat < 71.45986473) return 19;
-		if ($lat < 72.45884545) return 18;
-		if ($lat < 73.45177442) return 17;
-		if ($lat < 74.43893416) return 16;
-		if ($lat < 75.42056257) return 15;
-		if ($lat < 76.39684391) return 14;
-		if ($lat < 77.36789461) return 13;
-		if ($lat < 78.33374083) return 12;
-		if ($lat < 79.29428225) return 11;
-		if ($lat < 80.24923213) return 10;
-		if ($lat < 81.19801349) return 9;
-		if ($lat < 82.13956981) return 8;
-		if ($lat < 83.07199445) return 7;
-		if ($lat < 83.99173563) return 6;
-		if ($lat < 84.89166191) return 5;
-		if ($lat < 85.75541621) return 4;
-		if ($lat < 86.53536998) return 3;
-		if ($lat < 87.00000000) return 2;
+		if ($lat < 0) {
+			$lat = -$lat;
+		}
+		// Table is simmetric about the equator.
+		if ($lat < 10.47047130) {
+			return 59;
+		}
+		if ($lat < 14.82817437) {
+			return 58;
+		}
+		if ($lat < 18.18626357) {
+			return 57;
+		}
+		if ($lat < 21.02939493) {
+			return 56;
+		}
+		if ($lat < 23.54504487) {
+			return 55;
+		}
+		if ($lat < 25.82924707) {
+			return 54;
+		}
+		if ($lat < 27.93898710) {
+			return 53;
+		}
+		if ($lat < 29.91135686) {
+			return 52;
+		}
+		if ($lat < 31.77209708) {
+			return 51;
+		}
+		if ($lat < 33.53993436) {
+			return 50;
+		}
+		if ($lat < 35.22899598) {
+			return 49;
+		}
+		if ($lat < 36.85025108) {
+			return 48;
+		}
+		if ($lat < 38.41241892) {
+			return 47;
+		}
+		if ($lat < 39.92256684) {
+			return 46;
+		}
+		if ($lat < 41.38651832) {
+			return 45;
+		}
+		if ($lat < 42.80914012) {
+			return 44;
+		}
+		if ($lat < 44.19454951) {
+			return 43;
+		}
+		if ($lat < 45.54626723) {
+			return 42;
+		}
+		if ($lat < 46.86733252) {
+			return 41;
+		}
+		if ($lat < 48.16039128) {
+			return 40;
+		}
+		if ($lat < 49.42776439) {
+			return 39;
+		}
+		if ($lat < 50.67150166) {
+			return 38;
+		}
+		if ($lat < 51.89342469) {
+			return 37;
+		}
+		if ($lat < 53.09516153) {
+			return 36;
+		}
+		if ($lat < 54.27817472) {
+			return 35;
+		}
+		if ($lat < 55.44378444) {
+			return 34;
+		}
+		if ($lat < 56.59318756) {
+			return 33;
+		}
+		if ($lat < 57.72747354) {
+			return 32;
+		}
+		if ($lat < 58.84763776) {
+			return 31;
+		}
+		if ($lat < 59.95459277) {
+			return 30;
+		}
+		if ($lat < 61.04917774) {
+			return 29;
+		}
+		if ($lat < 62.13216659) {
+			return 28;
+		}
+		if ($lat < 63.20427479) {
+			return 27;
+		}
+		if ($lat < 64.26616523) {
+			return 26;
+		}
+		if ($lat < 65.31845310) {
+			return 25;
+		}
+		if ($lat < 66.36171008) {
+			return 24;
+		}
+		if ($lat < 67.39646774) {
+			return 23;
+		}
+		if ($lat < 68.42322022) {
+			return 22;
+		}
+		if ($lat < 69.44242631) {
+			return 21;
+		}
+		if ($lat < 70.45451075) {
+			return 20;
+		}
+		if ($lat < 71.45986473) {
+			return 19;
+		}
+		if ($lat < 72.45884545) {
+			return 18;
+		}
+		if ($lat < 73.45177442) {
+			return 17;
+		}
+		if ($lat < 74.43893416) {
+			return 16;
+		}
+		if ($lat < 75.42056257) {
+			return 15;
+		}
+		if ($lat < 76.39684391) {
+			return 14;
+		}
+		if ($lat < 77.36789461) {
+			return 13;
+		}
+		if ($lat < 78.33374083) {
+			return 12;
+		}
+		if ($lat < 79.29428225) {
+			return 11;
+		}
+		if ($lat < 80.24923213) {
+			return 10;
+		}
+		if ($lat < 81.19801349) {
+			return 9;
+		}
+		if ($lat < 82.13956981) {
+			return 8;
+		}
+		if ($lat < 83.07199445) {
+			return 7;
+		}
+		if ($lat < 83.99173563) {
+			return 6;
+		}
+		if ($lat < 84.89166191) {
+			return 5;
+		}
+		if ($lat < 85.75541621) {
+			return 4;
+		}
+		if ($lat < 86.53536998) {
+			return 3;
+		}
+		if ($lat < 87.00000000) {
+			return 2;
+		}
 		return 1;
 	}
 
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
-		if ($nl > 1) return $nl;
-		else return 1;
+		if ($nl > 1) {
+			return $nl;
+		} else {
+			return 1;
+		}
 	}
 
 	private function parityCheck($msg, $bin) {
@@ -242,10 +386,13 @@ 
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);
 		for ($j = 0; $j < strlen($bin); $j++) {
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+			if ($bin[$j]) {
+				$crc = $crc^intval($modes_checksum_table[$j],0);
+			}
 		}
-		if ($crc == $checksum) return true;
-		else {
+		if ($crc == $checksum) {
+			return true;
+		} else {
 			//echo "**** CRC ERROR ****\n";
 			return false;
 		}
@@ -295,22 +442,37 @@ 
 			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
 			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
 			$msg['callsign'] = '';
-			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
-			else $msg['altitude'] = '';
+			if (isset($data['altitude'])) {
+				$msg['altitude'] = $data['altitude'];
+			} else {
+				$msg['altitude'] = '';
+			}
 			$msg['speed'] = $data['speed'];
-			if (isset($data['heading'])) $msg['track'] = $data['heading'];
-			else $msg['track'] = '';
+			if (isset($data['heading'])) {
+				$msg['track'] = $data['heading'];
+			} else {
+				$msg['track'] = '';
+			}
 			$msg['latitude'] = $data['latitude'];
 			$msg['longitude'] = $data['longitude'];
-			if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
-			else $msg['verticalrate'] = '';
-			if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
-			else $msg['squawk'] = 0;
+			if (isset($data['verticalrate'])) {
+				$msg['verticalrate'] = $data['verticalrate'];
+			} else {
+				$msg['verticalrate'] = '';
+			}
+			if (isset($data['squawk'])) {
+				$msg['squawk'] = $data['squawk'];
+			} else {
+				$msg['squawk'] = 0;
+			}
 			$msg['alert'] = 0;
 			$msg['emergency'] = 0;
 			$msg['SPI'] = 0;
-			if (isset($data['ground'])) $msg['ground'] = 1;
-			else $msg['ground'] = 0;
+			if (isset($data['ground'])) {
+				$msg['ground'] = 1;
+			} else {
+				$msg['ground'] = 0;
+			}
 			$result[] = implode(',',$msg);
 		}
 		return $result;

index.php

Braces +614 added lines, -153 removed lines

@@ -57,7 +57,10 @@ 
 <?php
     if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
 ?>
-<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script>
+<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) {
+	print '?tsk='.$tsk;
+}
+?>"></script>
 <script src="<?php echo $globalURL; ?>/js/meuusjs.1.0.3.min.js"></script>
 <script src="<?php echo $globalURL; ?>/js/map.3d.weather.js"></script>
 <?php
@@ -137,10 +140,22 @@ 
 			<h1>Weather</h1>
 			<ul>
 			
-				<li><div class="checkbox"><label><input type="checkbox" name="wind" value="1" onclick="clickWind(this);" <?php if (isset($_COOKIE['weather_wind']) && $_COOKIE['weather_wind'] == 'true') print 'checked'; ?> /><?php echo _("Weather Winds"); ?></label></div></li>
-				<li><div class="checkbox"><label><input type="checkbox" name="wave" value="1" onclick="clickWave(this);" <?php if (isset($_COOKIE['weather_wave']) && $_COOKIE['weather_wave'] == 'true') print 'checked'; ?> /><?php echo _("Ocean surface currents"); ?></label></div></li>
-				<li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') print 'checked'; ?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li>
-				<!-- <li><div class="checkbox"><label><input type="checkbox" name="backwave" value="1" onclick="clickBackWave(this);" <?php if (isset($_COOKIE['weather_backwave']) && $_COOKIE['weather_backwave'] == 'true') print 'checked'; ?> /><?php echo _("Weather Waves height background"); ?></label></div></li> -->
+				<li><div class="checkbox"><label><input type="checkbox" name="wind" value="1" onclick="clickWind(this);" <?php if (isset($_COOKIE['weather_wind']) && $_COOKIE['weather_wind'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Weather Winds"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="wave" value="1" onclick="clickWave(this);" <?php if (isset($_COOKIE['weather_wave']) && $_COOKIE['weather_wave'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Ocean surface currents"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li>
+				<!-- <li><div class="checkbox"><label><input type="checkbox" name="backwave" value="1" onclick="clickBackWave(this);" <?php if (isset($_COOKIE['weather_backwave']) && $_COOKIE['weather_backwave'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Weather Waves height background"); ?></label></div></li> -->
 			
 <?php
 		if (isset($globalOpenWeatherMapKey) && $globalOpenWeatherMapKey != '') {
@@ -162,12 +177,18 @@ 
 <?php
 		if (isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) {
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) print 'checked'; ?> ><?php echo _("Display 3D weather"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display 3D weather"); ?></label></div></li>
 			<!--	<li><div class="checkbox"><label><input type="checkbox" name="displayrain" value="1" onclick="clickDisplayRain(this)" ><?php echo _("Display rain on 3D map"); ?></label></div></li>-->
 <?php
 		}
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') print 'checked'; ?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li>
 			</ul>
 <?php
 	}
@@ -183,13 +204,22 @@ 
 <?php
 		if (!isset($globalAircraft) || $globalAircraft) {
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?></label></div></li>
-				<li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display waypoints"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display airspace"); ?></label></div></li>
 <?php
 		}
 		if (isset($globalMarine) && $globalMarine) {
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') print 'checked'; ?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li>
 <?php
 		}
 ?>
@@ -204,13 +234,22 @@ 
 <?php
 		if (!isset($globalAircraft) || $globalAircraft) {
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li>
-				<li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?> Beta</label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display airspace"); ?> Beta</label></div></li>
 <?php
 		}
 		if (isset($globalMarine) && $globalMarine) {
 ?>
-				<li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') print 'checked'; ?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li>
 <?php
 		}
 ?>
@@ -225,14 +264,32 @@ 
 		<h1>NOTAM</h1>
 		<form>
 			<ul>
-				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') print 'checked'; ?> /><?php echo _("Display NOTAM"); ?></label></div></li>
+				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') {
+	print 'checked';
+}
+?> /><?php echo _("Display NOTAM"); ?></label></div></li>
 				<li><?php echo _("NOTAM scope:"); ?>
 					<select class="selectpicker" onchange="notamscope(this);">
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
+	print ' selected';
+}
+?>>All</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
+	print ' selected';
+}
+?>>Airport/Enroute warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
+	print ' selected';
+}
+?>>Airport warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
+	print ' selected';
+}
+?>>Navigation warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
+	print ' selected';
+}
+?>>Enroute warning</option>
 					</select
 				</li>
 			</ul>
@@ -260,7 +317,10 @@ 
 		    <div class="form-group">
 			<label><?php echo _("From:"); ?></label>
 			<div class='input-group date' id='datetimepicker1'>
-			    <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC'; ?>" required />
+			    <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') {
+	print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC';
+}
+?>" required />
 			    <span class="input-group-addon">
 				<span class="glyphicon glyphicon-calendar"></span>
 			    </span>
@@ -269,7 +329,10 @@ 
 		    <div class="form-group">
 			<label><?php echo _("To:"); ?></label>
 			<div class='input-group date' id='datetimepicker2'>
-			    <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC'; ?>" />
+			    <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') {
+	print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC';
+}
+?>" />
 			    <span class="input-group-addon">
 				<span class="glyphicon glyphicon-calendar"></span>
 			    </span>
@@ -301,8 +364,20 @@ 
 		    </script>
 		<li><?php echo _("Playback speed:"); ?>
 		    <div class="range">
-			<input type="range" min="0" max="50" step="1" id="archivespeed" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			<output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			<input type="range" min="0" max="50" step="1" id="archivespeed" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
+	print $_POST['archivespeed'];
+} elseif (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			<output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 		    </div>
 		</li>
 		<?php
@@ -331,14 +406,20 @@ 
 		    <li><?php echo _("Type of Map:"); ?>
 			    <?php
 				if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
-					if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
-					else $MapType = $_COOKIE['MapType'];
+					if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
+						$MapType = $globalMapProvider;
+					} else {
+						$MapType = $_COOKIE['MapType'];
+					}
 			    ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
 				} else {
-					if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider;
-					else $MapType = $_COOKIE['MapType3D'];
+					if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') {
+						$MapType = $globalMapProvider;
+					} else {
+						$MapType = $_COOKIE['MapType3D'];
+					}
 			    ?>
 			<select  class="selectpicker" onchange="mapType3D(this);">
 			    <?php
@@ -347,24 +428,48 @@ 
 			    <?php
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
 			    ?>
-			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
+			    <option value="offline"<?php if ($MapType == 'offline') {
+	print ' selected';
+}
+?>>Natural Earth (local)</option>
 			    <?php
 				} else {
 				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
 			    ?>
-			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
+			    <option value="offline"<?php if ($MapType == 'offline') {
+	print ' selected';
+}
+?>>Natural Earth (local)</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
-			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
-			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option>
+			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') {
+	print ' selected';
+}
+?>>ArcGIS Streetmap</option>
+			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') {
+	print ' selected';
+}
+?>>ArcGIS Satellite</option>
+			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') {
+	print ' selected';
+}
+?>>ArcGIS Ocean</option>
 			    <?php
 				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				    }
 			    ?>
@@ -374,59 +479,143 @@ 
 			    <?php
 					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here-Aerial') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here-Hybrid') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here-Road') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here-Aerial') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here-Hybrid') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here-Road') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 					}
 			    ?>
 			    <?php
 					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 					}
 			    ?>
 			    <?php
 					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 					}
 			    ?>
-			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
+			    <option value="offline"<?php if ($MapType == 'offline') {
+	print ' selected';
+}
+?>>Natural Earth</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
+			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') {
+	print ' selected';
+}
+?>>National Geographic Street</option>
 			    <?php
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-					else $MapBoxId = $_COOKIE['MapTypeId'];
+					if (!isset($_COOKIE['MapTypeId'])) {
+						$MapBoxId = 'default';
+					} else {
+						$MapBoxId = $_COOKIE['MapTypeId'];
+					}
 			    ?>
-			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') {
+	print ' selected';
+}
+?>>Mapbox GL</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			    <?php
 				}
 			    ?>
@@ -437,10 +626,22 @@ 
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
+	print ' selected';
+}
+?>>stk terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
+	print ' selected';
+}
+?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
+	print ' selected';
+}
+?>>vr terrain</option>
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') {
+	print ' selected';
+}
+?>>ArticDEM</option>
 			</select>
 		    </li>
 <?php
@@ -450,64 +651,124 @@ 
 <?php
     if (isset($globalMap3D) && $globalMap3D) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') print 'checked'; ?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li>
 <?php
     }
 ?>
 <?php
     if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li>
 
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>-->
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || (!isset($_COOKIE['MapRemainingRoute']) && isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>-->
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || (!isset($_COOKIE['MapRemainingRoute']) && isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
 	} elseif (!isset($globalTracker) || $globalTracker === TRUE) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) print 'checked'; ?> ><?php echo _("Enable map matching"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) {
+	print 'checked';
+}
+?> ><?php echo _("Enable map matching"); ?></label></div></li>
 <?php
 	}
 	if (isset($globalSatellite) && $globalSatellite === TRUE) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
 <?php
 	}
     }
     if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
     }
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display ground station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display weather station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display lightning on map"); ?></label></div></li>
 <?php
 	if (isset($globalFires) && $globalFires) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display fires on map"); ?></label></div></li>
 <?php
 	}
 	if (isset($globalMap3D) && $globalMap3D) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) print 'checked'; ?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) {
+	print 'checked';
+}
+?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li>
 <?php
 	}
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="truelight" value="1" onclick="clickTrueLight(this)" <?php if ((!isset($_COOKIE['truelight']) && (!isset($globalMapTrueLight) || $globalMapTrueLight)) || (isset($_COOKIE['truelight']) && $_COOKIE['truelight'] == 'true')) print 'checked'; ?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="truelight" value="1" onclick="clickTrueLight(this)" <?php if ((!isset($_COOKIE['truelight']) && (!isset($globalMapTrueLight) || $globalMapTrueLight)) || (isset($_COOKIE['truelight']) && $_COOKIE['truelight'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li>
 <?php
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) print 'checked'; ?> ><?php echo _("Use shadows"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) print 'checked'; ?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) {
+	print 'checked';
+}
+?> ><?php echo _("Use shadows"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) {
+	print 'checked';
+}
+?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li>
 <?php
     }
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
@@ -520,17 +781,25 @@ 
 			if (function_exists('array_column')) {
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 			} elseif (isset($globalSources)) {
 			    $dispolar = false;
 			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
+			        	$dispolar = true;
+			        }
 			    }
 			    if ($dispolar) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 		        }
@@ -541,7 +810,14 @@ 
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 		    ?>
-		    <li><?php echo _("Max number of flights to display in 2D:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) print $_COOKIE['map_2d_limit']; elseif (isset($globalMap2DAircraftsLimit)) print $globalMap2DAircraftsLimit; else print 15000; ?>" onchange="map2dlimit(this.value);" /></li>
+		    <li><?php echo _("Max number of flights to display in 2D:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) {
+	print $_COOKIE['map_2d_limit'];
+} elseif (isset($globalMap2DAircraftsLimit)) {
+	print $globalMap2DAircraftsLimit;
+} else {
+	print 15000;
+}
+?>" onchange="map2dlimit(this.value);" /></li>
 		    <?php
 			}
 		    ?>
@@ -549,11 +825,21 @@ 
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
-			<li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"></li>
+			<li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>"></li>
 		    <?php
 				}
 			    }
@@ -564,7 +850,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Marine icon color:"); ?>
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -575,7 +868,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Tracker icon color:"); ?>
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -586,8 +886,22 @@ 
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 		    <?php
@@ -598,18 +912,48 @@ 
 ?>
 		    <li><?php echo _("Set scaling factor for rendering resolution:"); ?>
 			<div class="range">
-			    <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?>">
-			    <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?></output>
+			    <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) {
+	print $_COOKIE['resolutionScale'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) {
+	print $_COOKIE['resolutionScale'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <!-- <li><?php echo _("Max number of flights to display in 3D:"); ?> <input type="number" name="3dlimit" value="<?php if (isset($_COOKIE['map_3d_limit'])) print $_COOKIE['map_3d_limit']; elseif (isset($globalMap3DAircraftsLimit)) print $globalMap3DAircraftsLimit; else print 300; ?>" onchange="map3dlimit(this.value);" /></li> -->
-		    <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') print 'checked'; ?> > <?php echo _("Use airlines liveries"); ?></li>
-		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> > <?php echo _("Force Aircraft color"); ?>&nbsp;
+		    <!-- <li><?php echo _("Max number of flights to display in 3D:"); ?> <input type="number" name="3dlimit" value="<?php if (isset($_COOKIE['map_3d_limit'])) {
+	print $_COOKIE['map_3d_limit'];
+} elseif (isset($globalMap3DAircraftsLimit)) {
+	print $globalMap3DAircraftsLimit;
+} else {
+	print 300;
+}
+?>" onchange="map3dlimit(this.value);" /></li> -->
+		    <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') {
+	print 'checked';
+}
+?> > <?php echo _("Use airlines liveries"); ?></li>
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
+	print 'checked';
+}
+?> > <?php echo _("Force Aircraft color"); ?>&nbsp;
 		    <!--<li><?php echo _("Aircraft icon color:"); ?>-->
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -617,9 +961,19 @@ 
 <?php
 	if (isset($globalMarine) && $globalMarine === TRUE) {
 ?>
-		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?>&nbsp;
+		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Marine color"); ?>&nbsp;
 		    <!--<li><?php echo _("Marine icon color:"); ?>-->
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -627,9 +981,19 @@ 
 <?php
 	if (isset($globalTracker) && $globalTracker === TRUE) {
 ?>
-		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?>&nbsp;
+		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Tracker color"); ?>&nbsp;
 		    <!--<li><?php echo _("Tracker icon color:"); ?>-->
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -637,29 +1001,62 @@ 
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Coordinate unit:"); ?>
 			<select class="selectpicker" onchange="unitcoordinate(this);">
-			    <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) echo ' selected'; ?>>DD</option>
-			    <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) echo ' selected'; ?>>DMS</option>
-			    <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) echo ' selected'; ?>>DM</option>
+			    <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) {
+	echo ' selected';
+}
+?>>DD</option>
+			    <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) {
+	echo ' selected';
+}
+?>>DMS</option>
+			    <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) {
+	echo ' selected';
+}
+?>>DM</option>
 		        </select>
 		    </li>
 
@@ -677,9 +1074,18 @@ 
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') || !isset($_COOKIE['filter_ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') || !isset($_COOKIE['filter_ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') || !isset($_COOKIE['filter_ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') || !isset($_COOKIE['filter_ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') || !isset($_COOKIE['filter_ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') || !isset($_COOKIE['filter_ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -687,12 +1093,21 @@ 
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') || !isset($_COOKIE['filter_ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') || !isset($_COOKIE['filter_ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') || !isset($_COOKIE['filter_ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') || !isset($_COOKIE['filter_ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
-			<li><div class="checkbox"><label><input type="checkbox" name="blocked" value="1" onclick="clickBlocked(this)" <?php if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') print 'checked'; ?> ><?php echo _("Only display FAA ASDI blocked aircrafts"); ?></label></div></li>
+			<li><div class="checkbox"><label><input type="checkbox" name="blocked" value="1" onclick="clickBlocked(this)" <?php if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Only display FAA ASDI blocked aircrafts"); ?></label></div></li>
 		    <?php
 			}
 		    ?>
@@ -708,7 +1123,9 @@ 
 				}
 				foreach($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -726,7 +1143,10 @@ 
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
 			    <?php
 				foreach($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
@@ -785,10 +1205,22 @@ 
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -802,7 +1234,10 @@ 
 		    ?>
 		    <li>
 			<?php echo _("Display vessels with MMSI:"); ?>
-			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
+			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) {
+	print $_COOKIE['filter_mmsi'];
+}
+?>" />
 		    </li>
 			<?php
 				if (isset($globalVM) && $globalVM) {
@@ -833,7 +1268,10 @@ 
 		    ?>
 		    <li>
 			<?php echo _("Display with ident:"); ?>
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
+	print $_COOKIE['filter_ident'];
+}
+?>" />
 		    </li>
 		</ul>
 	    </form>
@@ -849,7 +1287,10 @@ 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
 	    <form>
 		<ul>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
+	print 'checked';
+}
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
 		    <li><?php echo _("Type:"); ?>
 			<select class="selectpicker" multiple onchange="sattypes(this);">
 			    <?php
@@ -857,25 +1298,45 @@ 
 				$types = $Satellite->get_tle_types();
 				foreach ($types as $type) {
 					$type_name = $type['tle_type'];
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
+					if ($type_name == 'musson') {
+						$type_name = 'Russian LEO Navigation';
+					} else if ($type_name == 'nnss') {
+						$type_name = 'Navi Navigation Satellite System';
+					} else if ($type_name == 'sbas') {
+						$type_name = 'Satellite-Based Augmentation System';
+					} else if ($type_name == 'glo-ops') {
+						$type_name = 'Glonass Operational';
+					} else if ($type_name == 'gps-ops') {
+						$type_name = 'GPS Operational';
+					} else if ($type_name == 'argos') {
+						$type_name = 'ARGOS Data Collection System';
+					} else if ($type_name == 'tdrss') {
+						$type_name = 'Tracking and Data Relay Satellite System';
+					} else if ($type_name == 'sarsat') {
+						$type_name = 'Search & Rescue';
+					} else if ($type_name == 'dmc') {
+						$type_name = 'Disaster Monitoring';
+					} else if ($type_name == 'resource') {
+						$type_name = 'Earth Resources';
+					} else if ($type_name == 'stations') {
+						$type_name = 'Space Stations';
+					} else if ($type_name == 'geo') {
+						$type_name = 'Geostationary';
+					} else if ($type_name == 'amateur') {
+						$type_name = 'Amateur Radio';
+					} else if ($type_name == 'x-comm') {
+						$type_name = 'Experimental';
+					} else if ($type_name == 'other-comm') {
+						$type_name = 'Other Comm';
+					} else if ($type_name == 'science') {
+						$type_name = 'Space & Earth Science';
+					} else if ($type_name == 'military') {
+						$type_name = 'Miscellaneous Military';
+					} else if ($type_name == 'radar') {
+						$type_name = 'Radar Calibration';
+					} else if ($type_name == 'tle-new') {
+						$type_name = 'Last 30 days launches';
+					}
 					
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';

scripts/update_db.php

Braces +33 added lines, -12 removed lines

@@ -15,7 +15,9 @@ 
 	if(function_exists('exec')) {
 		exec("ps ux", $output, $result);
 		$j = 0;
-		foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ") && !strpos($line, "sudo ")) $j++;
+		foreach ($output as $line) {
+			if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ") && !strpos($line, "sudo ")) $j++;
+		}
 		if ($j > 1) {
 			echo "Script is already runnning...";
 			die();
@@ -25,7 +27,9 @@ 
 require(dirname(__FILE__).'/../install/class.update_db.php');
 $update_db = new update_db();
 
-if ($update_db->check() === false) die();
+if ($update_db->check() === false) {
+	die();
+}
 
 if ((!isset($globalMasterServer) || !$globalMasterServer) && (!isset($globalOffline) || $globalOffline === FALSE)) {
 	if (isset($globalNOTAM) && $globalNOTAM && $update_db->check_last_notam_update()) {
@@ -36,14 +40,18 @@ 
 			$update_db->update_notam();
 		}
 		$update_db->insert_last_notam_update();
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
+		echo "NOTAM are only updated once a day.\n";
+	}
 	if ((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft)) && ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS))) {
 		$update_db->update_all();
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 	//	$Spotter = new Spotter();
 	//	$Spotter->updateFieldsFromOtherTables();
 		$update_db->insert_last_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	}
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
 		echo "Check if new airspace version exist...";
 		echo $update_db->update_airspace_fam();
@@ -52,8 +60,11 @@ 
 	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) {
 		echo "Check if new geoid version exist...";
 		$error = $update_db->update_geoid_fam();
-		if ($error == '') $update_db->insert_last_geoid_update();
-		else echo $error;
+		if ($error == '') {
+			$update_db->insert_last_geoid_update();
+		} else {
+			echo $error;
+		}
 	}
 	if (isset($globalMarine) && $globalMarine && (!isset($globalVM) || $globalVM === FALSE) && $update_db->check_last_marine_identity_update()) {
 		echo "Check if new marine identity version exist...";
@@ -71,13 +82,17 @@ 
 			//echo "Done";
 		}
 		$update_db->insert_last_owner_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+		echo "Owner are only updated every 15 days.\n";
+	}
 
 	if ((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft)) && ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS))) {
 		echo "Updating airlines...\n";
 		echo $update_db->update_airlines_fam();
 		$update_db->insert_last_airlines_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+		echo "Airlines are only updated every 15 days.\n";
+	}
 
 	if ((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft)) && (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS))) {
 		require_once(dirname(__FILE__).'/../require/class.Accident.php');
@@ -86,7 +101,9 @@ 
 		if ($Accident->check_last_accidents_update()) {
 			$Accident->download_update();
 			$Accident->insert_last_accidents_update();
-		} else echo "Accidents are updated once a day.\n";
+		} else {
+			echo "Accidents are updated once a day.\n";
+		}
 	}
   
 }
@@ -99,7 +116,9 @@ 
 		if ($METAR->check_last_update()) {
 			$METAR->addMETARCycle();
 			$METAR->insert_last_update();
-		} else echo "METAR are only updated every 30 minutes.\n";
+		} else {
+			echo "METAR are only updated every 30 minutes.\n";
+		}
 	}
 
 	if ((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft)) && (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS))) {
@@ -107,8 +126,10 @@ 
 		//$update_db->update_oneworld();
 		$update_db->update_skyteam();
 		$update_db->insert_last_schedules_update();
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
-}
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+		echo "Schedules are only updated every 15 days.\n";
+	}
+	}
 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
 	echo "Updating statistics and archive old data...\n";