Ysurac / FlightAirMap

scripts/daemon-acars.php

Braces +9 added lines, -3 removed lines

@@ -37,7 +37,9 @@ 
 
 
 // let's try and connect
-if ($globalDebug) echo "Listen to acarsdec ... ";
+if ($globalDebug) {
+	echo "Listen to acarsdec ... ";
+}
 // create our socket and set it to non-blocking
 $sock = socket_create(AF_INET, SOCK_DGRAM, 0) or die("Unable to create socket\n");
 
@@ -50,7 +52,9 @@ 
     die("Could not bind socket : [$errorcode] $errormsg \n");
 }
 
-if ($globalDebug) echo "LISTEN UDP MODE \n\n";
+if ($globalDebug) {
+	echo "LISTEN UDP MODE \n\n";
+}
 while(1) {
     $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
 
@@ -58,7 +62,9 @@ 
     pcntl_signal_dispatch();
     $dataFound = false;
     //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
-    if ($globalDebug) echo $buffer."\n";
+    if ($globalDebug) {
+    	echo $buffer."\n";
+    }
     $ACARS->add(trim($buffer));
     socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
     $ACARS->deleteLiveAcarsData();

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

Braces +60 added lines, -16 removed lines

@@ -13,16 +13,27 @@ 
 <?php
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+if (isset($_GET['ident'])) {
+	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+}
+if (isset($_GET['flightaware_id'])) {
+	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+}
 ?>
 <?php
-if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-else $IconColor = '1a3151';
+if (isset($_COOKIE['IconColor'])) {
+	$IconColor = $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	$IconColor = $globalAircraftIconColor;
+} else {
+	$IconColor = '1a3151';
+}
 ?>
 <?php
 if (isset($globalDebug) && $globalDebug === TRUE) {
@@ -99,9 +110,12 @@ 
 
 function update_airportsLayer() {
 <?php
-	if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-	else $getZoom = '7';
-?>
+	if (isset($_COOKIE['AirportZoom'])) {
+		$getZoom = $_COOKIE['AirportZoom'];
+	} else {
+		$getZoom = '7';
+	}
+	?>
 	if (typeof airportsLayer != 'undefined') {
 		if (map.hasLayer(airportsLayer) == true) {
 			map.removeLayer(airportsLayer);
@@ -382,7 +396,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
 		}
@@ -433,7 +452,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
 		}
@@ -481,7 +505,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
 		}
@@ -1000,12 +1029,22 @@ 
 		update_archiveLayer(0);
 	} else {
 		//then load it again every 30 seconds
-		var reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+		var reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 		update_polarLayer();
-		setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+		setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -1018,7 +1057,12 @@ 
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 	update_atcLayer();
-	setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+	setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

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

Braces +39 added lines, -10 removed lines

@@ -13,10 +13,15 @@ 
 <?php
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 $archive = false;
-if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') $archive = true;
+if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') {
+	$archive = true;
+}
 ?>
 
 
@@ -174,9 +179,13 @@ 
 		    if (callsign != ""){ markerTrackerLabel += callsign; }
 		    if (type != ""){ markerTrackerLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['TrackerIconColor'])) $IconColor = $_COOKIE['TrackerIconColor'];
-	elseif (isset($globalTrackerIconColor)) $IconColor = $globalTrackerIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['TrackerIconColor'])) {
+		$IconColor = $_COOKIE['TrackerIconColor'];
+	} elseif (isset($globalTrackerIconColor)) {
+		$IconColor = $globalTrackerIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famtrackid)) {
 ?>
 		    //info_tracker_update(feature.properties.fc);
@@ -210,7 +219,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
 		}
@@ -267,7 +281,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
 		}
@@ -323,7 +342,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
 		}
@@ -780,7 +804,12 @@ 
 getLiveTrackerData(0);
 //then load it again every 30 seconds
 var reloadTrackerPage = setInterval(
-    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

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

Braces +36 added lines, -9 removed lines

@@ -14,11 +14,18 @@ 
 <?php
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
-if (isset($_COOKIE['MarineIconColor'])) $MarineIconColor = $_COOKIE['MarineIconColor'];
-elseif (isset($globalMarineIconColor)) $MarineIconColor = $globalMarineIconColor;
-else $MarineIconColor = '43d1d8';
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
+if (isset($_COOKIE['MarineIconColor'])) {
+	$MarineIconColor = $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	$MarineIconColor = $globalMarineIconColor;
+} else {
+	$MarineIconColor = '43d1d8';
+}
 
 if (isset($globalVM) && $globalVM) {
 ?>
@@ -201,7 +208,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
 		}
@@ -258,7 +270,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
 		}
@@ -314,7 +331,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
 		}
@@ -746,7 +768,12 @@ 
 } else {
 	//then load it again every 30 seconds
 	var reloadMarinePage = setInterval(
-	function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 }
 
 if (getCookie('openseamap') == 'true') loadOpenSeaMap(getCookie('openseamap'));

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

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;
 		/*

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