View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( ea0043...0ea864 )
by Yannick
32:23
created
Status
Category
Toggle Patches
js/map-marine.3d.js.php 1 patch
Braces   +12 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -47,7 +47,12 @@  discard block
 
 block discarded – undo
47 47 
 			<?php
48 48 
 			    } else {
49 49 
 			?>
50 
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
50 
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
51 
+	print $globalMapRefresh*2000;
52 
+} else {
53 
+	print '60000';
54 
+}
55 
+?>)) {
51 56 
 				viewer.dataSources.get(dsn).entities.remove(entity);
52 57 
 			}
53 58 
 			<?php
 
@@ -129,7 +134,12 @@  discard block
 
 block discarded – undo
129 134 
 		function(){
130 135 
 			updateMarineData();
131 136 
 		}
132 
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
137 
+	,<?php if (isset($globalMapRefresh)) {
138 
+	print $globalMapRefresh*1000;
139 
+} else {
140 
+	print '30000';
141 
+}
142 
+?>);
133 143 
 } else {
134 144 
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
135 145 
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);
Please login to merge, or discard this patch.
js/map-tracker.3d.js.php 1 patch
Braces   +12 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -90,7 +90,12 @@  discard block
 
 block discarded – undo
90 90 
 			<?php
91 91 
 			    } else {
92 92 
 			?>
93 
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
93 
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
94 
+	print $globalMapRefresh*2000;
95 
+} else {
96 
+	print '60000';
97 
+}
98 
+?>)) {
94 99 
 				viewer.dataSources.get(dsn).entities.remove(entity);
95 100 
 				czmldstracker.entities.removeById(entityid);
96 101 
 			}
 
@@ -173,7 +178,12 @@  discard block
 
 block discarded – undo
173 178 
 		function(){
174 179 
 			updateTrackerData();
175 180 
 		}
176 
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
181 
+	,<?php if (isset($globalMapRefresh)) {
182 
+	print $globalMapRefresh*1000;
183 
+} else {
184 
+	print '30000';
185 
+}
186 
+?>);
177 187 
 } else {
178 188 
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
179 189 
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);
Please login to merge, or discard this patch.
location-geojson.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -79,7 +79,9 @@
 
 block discarded – undo
79 79 
 		$output .= '"type": "'.$spotter_item['type'].'",';
80 80 
 		if ($spotter_item['type'] == 'wx') {
81 81 
 			$weather = json_decode($spotter_item['description'],true);
82 
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
82 
+			if (isset($weather['temp'])) {
83 
+				$output.= '"temp": "'.$weather['temp'].'",';
84 
+			}
83 85 
 		}
84 86 
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
85 87 
 		$output .= '},';
Please login to merge, or discard this patch.
live-czml.php 1 patch
Braces   +113 added lines, -41 removed lines patch added patch discarded remove patch 
@@ -8,8 +8,12 @@  discard block
 
 block discarded – undo
8 8 
 }
9 9 
 $tracker = false;
10 10 
 $marine = false;
11 
-if (isset($_GET['tracker'])) $tracker = true;
12 
-if (isset($_GET['marine'])) $marine = true;
11 
+if (isset($_GET['tracker'])) {
12 
+	$tracker = true;
13 
+}
14 
+if (isset($_GET['marine'])) {
15 
+	$marine = true;
16 
+}
13 17 
 if ($tracker) {
14 18 
 	require_once('require/class.Tracker.php');
15 19 
 	require_once('require/class.TrackerLive.php');
 
@@ -66,23 +70,46 @@  discard block
 
 block discarded – undo
66 70 
 }
67 71 
 header('Content-Type: text/javascript');
68 72
69 
-if (!isset($globalJsonCompress)) $compress = true;
70 
-else $compress = $globalJsonCompress;
73 
+if (!isset($globalJsonCompress)) {
74 
+	$compress = true;
75 
+} else {
76 
+	$compress = $globalJsonCompress;
77 
+}
71 78
72 79 
 $from_archive = false;
73 80 
 $min = false;
74 81 
 $allhistory = false;
75 82 
 $filter['source'] = array();
76 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
77 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
78 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
79 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
80 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
81 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
82 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
83 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
84 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
85 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
83 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
84 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
85 
+}
86 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
87 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
88 
+}
89 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
90 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
91 
+}
92 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
93 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
94 
+}
95 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
96 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
97 
+}
98 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
99 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
100 
+}
101 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
102 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
103 
+}
104 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
105 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
106 
+}
107 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
108 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
109 
+}
110 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
111 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
112 
+}
86 113 
 /*
87 114 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
88 115 
 	$min = true;
 
@@ -179,8 +206,12 @@  discard block
 
 block discarded – undo
179 206 
 	} else {
180 207 
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
181 208 
 	}
182 
-	if ($flightcnt == '') $flightcnt = 0;
183 
-} else $flightcnt = 0;
209 
+	if ($flightcnt == '') {
210 
+		$flightcnt = 0;
211 
+	}
212 
+	} else {
213 
+	$flightcnt = 0;
214 
+}
184 215
185 216 
 $sqltime = round(microtime(true)-$begintime,2);
186 217 
 $minitime = time();
 
@@ -203,7 +234,9 @@  discard block
 
 block discarded – undo
203 234 
 $j = 0;
204 235 
 $prev_flightaware_id = '';
205 236 
 $speed = 1;
206 
-if (isset($archivespeed)) $speed = $archivespeed;
237 
+if (isset($archivespeed)) {
238 
+	$speed = $archivespeed;
239 
+}
207 240 
 $output = '[';
208 241 
 if ($tracker) {
209 242 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -239,17 +272,24 @@  discard block
 
 block discarded – undo
239 272 
 			$image = "images/placeholder_thumb.png";
240 273 
 		}
241 274
242 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
243 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
244 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
275 
+                if (isset($spotter_item['flightaware_id'])) {
276 
+                	$id = $spotter_item['flightaware_id'];
277 
+                } elseif (isset($spotter_item['famtrackid'])) {
278 
+                	$id = $spotter_item['famtrackid'];
279 
+                } elseif (isset($spotter_item['fammarine_id'])) {
280 
+                	$id = $spotter_item['fammarine_id'];
281 
+                }
245 282 
                 if ($prev_flightaware_id != $id) {
246 283 
 			if ($prev_flightaware_id != '') {
247 284 
 				if ($nblatlong == 1) {
248 285 
 					$output .= ',"'.date("c").'", ';
249 286 
 					$output .= $prevlong.', ';
250 287 
 					$output .= $prevlat;
251 
-					if (!$marine) $output .= ', '.$prevalt;
252 
-					else $output .= ', 0';
288 
+					if (!$marine) {
289 
+						$output .= ', '.$prevalt;
290 
+					} else {
291 
+						$output .= ', 0';
292 
+					}
253 293 
 				}
254 294 
 				$output .= ']';
255 295 
 				$output .= '}';
 
@@ -300,7 +340,9 @@  discard block
 
 block discarded – undo
300 340 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
301 341 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
302 342 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
303 
-						} else $aircraft_shadow = '';
343 
+						} else {
344 
+							$aircraft_shadow = '';
345 
+						}
304 346 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
305 347 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) {
306 348 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -308,7 +350,9 @@  discard block
 
 block discarded – undo
308 350 
 						}
309 351 
 						$output .= '},';
310 352 
 					}
311 
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
353 
+				} else {
354 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
355 
+				}
312 356 
 			} elseif ($one3dmodel) {
313 357 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
314 358 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -339,7 +383,9 @@  discard block
 
 block discarded – undo
339 383 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
340 384 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
341 385 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
342 
-						} else $aircraft_shadow = '';
386 
+						} else {
387 
+							$aircraft_shadow = '';
388 
+						}
343 389 
 						if ($aircraft_shadow != '') {
344 390 
 							if (isset($modelsdb[$aircraft_shadow])) {
345 391 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -476,7 +522,9 @@  discard block
 
 block discarded – undo
476 522 
 								}
477 523 
 								$output .= '},';
478 524 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
479 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
525 
+								if ($spotter_item['aircraft_icao'] != '') {
526 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
527 
+								}
480 528 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
481 529 
 							}
482 530 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -498,7 +546,9 @@  discard block
 
 block discarded – undo
498 546 
 							}
499 547 
 							$output .= '},';
500 548 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
501 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
549 
+							if ($spotter_item['aircraft_icao'] != '') {
550 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
551 
+							}
502 552 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
503 553 
 						}
504 554 
 					} else {
 
@@ -511,7 +561,9 @@  discard block
 
 block discarded – undo
511 561 
 						}
512 562 
 						$output .= '},';
513 563 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
514 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
564 
+						if ($spotter_item['aircraft_icao'] != '') {
565 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
566 
+						}
515 567 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
516 568 
 					}
517 569 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -615,8 +667,11 @@  discard block
 
 block discarded – undo
615 667 
 					$output .= '},';
616 668 
 				}
617 669 
 			}
618 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
619 
-			else $output = str_replace('%onground%','false',$output);
670 
+			if (isset($onground) && $onground) {
671 
+				$output = str_replace('%onground%','true',$output);
672 
+			} else {
673 
+				$output = str_replace('%onground%','false',$output);
674 
+			}
620 675
621 676 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
622 677 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -629,8 +684,12 @@  discard block
 
 block discarded – undo
629 684 
 	//		$output .= '"interpolationDegree" : 5,';
630 685 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
631 686 
 			$output .= '"cartographicDegrees": [';
632 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
633 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
687 
+			if ($minitime > strtotime($spotter_item['date'])) {
688 
+				$minitime = strtotime($spotter_item['date']);
689 
+			}
690 
+			if ($maxitime < strtotime($spotter_item['date'])) {
691 
+				$maxitime = strtotime($spotter_item['date']);
692 
+			}
634 693 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
635 694 
 			$output .= $spotter_item['longitude'].', ';
636 695 
 			$output .= $spotter_item['latitude'];
 
@@ -653,7 +712,9 @@  discard block
 
 block discarded – undo
653 712 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
654 713 
 					$prevalt = round($spotter_item['altitude']*30.48);
655 714 
 				}
656 
-			} else $output .= ', 0';
715 
+			} else {
716 
+				$output .= ', 0';
717 
+			}
657 718 
 			//$orientation = '"orientation" : { ';
658 719 
 			//$orientation .= '"unitQuaternion": [';
659 720 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -661,13 +722,18 @@  discard block
 
 block discarded – undo
661 722 
 		} else {
662 723 
 			$nblatlong = $nblatlong+1;
663 724 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
664 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
725 
+			if ($maxitime < strtotime($spotter_item['date'])) {
726 
+				$maxitime = strtotime($spotter_item['date']);
727 
+			}
665 728 
 			if ($spotter_item['ground_speed'] == 0) {
666 729 
 				$output .= $prevlong.', ';
667 730 
 				$output .= $prevlat;
668 731 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
669 
-				if (!$marine) $output .= ', '.$prevalt;
670 
-				else $output .= ', 0';
732 
+				if (!$marine) {
733 
+					$output .= ', '.$prevalt;
734 
+				} else {
735 
+					$output .= ', 0';
736 
+				}
671 737 
 			} else {
672 738 
 				$output .= $spotter_item['longitude'].', ';
673 739 
 				$output .= $spotter_item['latitude'];
 
@@ -680,14 +746,17 @@  discard block
 
 block discarded – undo
680 746 
 							$output .= ', 0';
681 747 
 						}
682 748 
 					} else {
683 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
684 
-						elseif ($tracker) {
749 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
750 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
751 
+						} elseif ($tracker) {
685 752 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
686 753 
 						} else {
687 754 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
688 755 
 						}
689 756 
 					}
690 
-				} else $output .= ', 0';
757 
+				} else {
758 
+					$output .= ', 0';
759 
+				}
691 760 
 			}
692 761 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
693 762 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -706,9 +775,12 @@  discard block
 
 block discarded – undo
706 775 
 		} else {
707 776 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
708 777 
 		}
778 
+	} else {
779 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
709 780 
 	}
710 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
711 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
781 
+	} else {
782 
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
783 
+}
712 784 
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
713 785 
 print $output;
714 786 
 ?>
Please login to merge, or discard this patch.
js/map.3d.js.php 1 patch
Braces   +35 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -5,21 +5,30 @@  discard block
 
 block discarded – undo
5 5
6 6 
 document.cookie =  'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
7 7 
 <?php
8 
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
9 
-	else $MapType = $globalMapProvider;
8 
+	if (isset($_COOKIE['MapType'])) {
9 
+		$MapType = $_COOKIE['MapType'];
10 
+	} else {
11 
+		$MapType = $globalMapProvider;
12 
+	}
10 13
11 14 
 //	unset($_COOKIE['MapType']);
12 15 
 	if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road') {
13 
-		if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial';
14 
-		else $MapType = 'OpenStreetMap';
16 
+		if (isset($globalBingMapKey) && $globalBingMapKey != '') {
17 
+			$MapType = 'Bing-Aerial';
18 
+		} else {
19 
+			$MapType = 'OpenStreetMap';
20 
+		}
15 21 
 	}
16 22 
 	if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) {
17 23 
 		$MapType = 'OpenStreetMap';
18 24 
 	}
19 25 
 	if ($MapType == 'Mapbox') {
20 
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
21 
-		else $MapBoxId = $_COOKIE['MapTypeId'];
22 
-?>
26 
+		if ($_COOKIE['MapTypeId'] == 'default') {
27 
+			$MapBoxId = $globalMapboxId;
28 
+		} else {
29 
+			$MapBoxId = $_COOKIE['MapTypeId'];
30 
+		}
31 
+		?>
23 32 
 	var imProv = Cesium.MapboxImageryProvider({
24 33 
 		credit: 'Map data © OpenStreetMap contributors, ' +
25 34 
 	      'CC-BY-SA, ' +
 
@@ -124,13 +133,23 @@  discard block
 
 block discarded – undo
124 133 
 */
125 134 
 ?>
126 135 
 <?php
127 
-	}  elseif (isset($globalMapCustomLayer[$MapType])) {
136 
+	} elseif (isset($globalMapCustomLayer[$MapType])) {
128 137 
 		$customid = $MapType;
129 138 
 ?>
130 139 
 	var imProv = Cesium.createOpenStreetMapImageryProvider({
131 140 
 		url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>',
132 
-		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>,
133 
-		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
141 
+		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
142 
+	print $globalMapCustomLayer[$customid]['maxZoom'];
143 
+} else {
144 
+	print '99';
145 
+}
146 
+?>,
147 
+		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
148 
+	print $globalMapCustomLayer[$customid]['minZoom'];
149 
+} else {
150 
+	print '0';
151 
+}
152 
+?>,
134 153 
 		credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
135 154 
 	});
136 155 
 <?php
 
@@ -507,7 +526,12 @@  discard block
 
 block discarded – undo
507 526 
 }
508 527
509 528 
 update_locationsLayer();
510 
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
529 
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
530 
+	print $globalMapRefresh*1000*2;
531 
+} else {
532 
+	print '60000';
533 
+}
534 
+?>);
511 535 
 /*
512 536 
 var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false);
513 537 
 handlera.setInputAction(
Please login to merge, or discard this patch.
location-data.php 1 patch
Braces   +40 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -17,12 +17,19 @@  discard block
 
 block discarded – undo
17 17 
 date_default_timezone_set('UTC');
18 18
19 19 
 print '<div class="top">';
20 
-if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
21 
-elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
22 
-elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
23 
-elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
24 
-elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
25 
-else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
20 
+if ($spotter_item['name'] != '') {
21 
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
22 
+} elseif ($spotter_item['location_id'] != 0) {
23 
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
24 
+} elseif ($spotter_item['type'] == 'lightning') {
25 
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
26 
+} elseif ($spotter_item['type'] == 'wx') {
27 
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
28 
+} elseif ($spotter_item['type'] == 'fires') {
29 
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
30 
+} else {
31 
+	print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
32 
+}
26 33 
 print '</div>';
27 34
28 35 
 print '</div></div>';
 
@@ -40,8 +47,12 @@  discard block
 
 block discarded – undo
40 47 
 print $spotter_item['last_seen'].' UTC';
41 48 
 print '</div>';
42 49
43 
-if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
44 
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
50 
+if ($spotter_item['city'] != '') {
51 
+	print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
52 
+}
53 
+if ($spotter_item['country'] !='') {
54 
+	print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
55 
+}
45 56 
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
46 57 
 /*
47 58 
 if ($spotter_item['atc_range'] > 0) {
 
@@ -53,13 +64,27 @@  discard block
 
 block discarded – undo
53 64 
 if ($spotter_item['type'] == 'wx') {
54 65 
 	$weather = json_decode($spotter_item['description'],true);
55 66 
 	//print_r($weather);
56 
-	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
57 
-	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
58 
-	if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
59 
-	if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
60 
-	if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
61 
-	if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
62 
-	if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
67 
+	if (isset($weather['temp'])) {
68 
+		print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
69 
+	}
70 
+	if (isset($weather['pressure'])) {
71 
+		print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
72 
+	}
73 
+	if (isset($weather['wind_gust'])) {
74 
+		print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
75 
+	}
76 
+	if (isset($weather['humidity'])) {
77 
+		print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
78 
+	}
79 
+	if (isset($weather['rain'])) {
80 
+		print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
81 
+	}
82 
+	if (isset($weather['precipitation'])) {
83 
+		print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
84 
+	}
85 
+	if (isset($weather['precipitation24h'])) {
86 
+		print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
87 
+	}
63 88 
 	$spotter_item['description'] = $weather['comment'];
64 89 
 } elseif ($spotter_item['type'] == 'fires') {
65 90 
 	//print_r(json_decode($spotter_item['description'],true));
Please login to merge, or discard this patch.
install/class.update_db.php 1 patch
Braces   +1121 added lines, -389 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,9 @@  discard block
 
 block discarded – undo
26 26 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
27 27 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
28 28 
 		curl_setopt($ch, CURLOPT_TIMEOUT, 20);
29 
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
29 
+		if ($referer != '') {
30 
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
31 
+		}
30 32 
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
31 33 
 		curl_setopt($ch, CURLOPT_FILE, $fp);
32 34 
 		curl_exec($ch);
 
@@ -37,12 +39,16 @@  discard block
 
 block discarded – undo
37 39 
 	public static function gunzip($in_file,$out_file_name = '') {
38 40 
 		//echo $in_file.' -> '.$out_file_name."\n";
39 41 
 		$buffer_size = 4096; // read 4kb at a time
40 
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
42 
+		if ($out_file_name == '') {
43 
+			$out_file_name = str_replace('.gz', '', $in_file);
44 
+		}
41 45 
 		if ($in_file != '' && file_exists($in_file)) {
42 46 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
43 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
44 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
45 
-			else {
47 
+			if (function_exists('gzopen')) {
48 
+				$file = gzopen($in_file,'rb');
49 
+			} elseif (function_exists('gzopen64')) {
50 
+				$file = gzopen64($in_file,'rb');
51 
+			} else {
46 52 
 				echo 'gzopen not available';
47 53 
 				die;
48 54 
 			}
 
@@ -63,8 +69,12 @@  discard block
 
 block discarded – undo
63 69 
 			if ($res === TRUE) {
64 70 
 				$zip->extractTo($path);
65 71 
 				$zip->close();
66 
-			} else return false;
67 
-		} else return false;
72 
+			} else {
73 
+				return false;
74 
+			}
75 
+		} else {
76 
+			return false;
77 
+		}
68 78 
 	}
69 79
70 80 
 	public static function connect_sqlite($database) {
 
@@ -79,7 +89,9 @@  discard block
 
 block discarded – undo
79 89 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
80 90 
 		global $globalDebug, $globalTransaction;
81 91 
 		//$query = 'TRUNCATE TABLE routes';
82 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
92 
+		if ($globalDebug) {
93 
+			echo " - Delete previous routes from DB -";
94 
+		}
83 95 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
84 96 
 		$Connection = new Connection();
85 97 
 		try {
 
@@ -90,7 +102,9 @@  discard block
 
 block discarded – undo
90 102 
                         return "error : ".$e->getMessage();
91 103 
                 }
92 104
93 
-    		if ($globalDebug) echo " - Add routes to DB -";
105 
+    		if ($globalDebug) {
106 
+    			echo " - Add routes to DB -";
107 
+    		}
94 108 
     		update_db::connect_sqlite($database_file);
95 109 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
96 110 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 
@@ -105,15 +119,21 @@  discard block
 
 block discarded – undo
105 119 
 		$Connection = new Connection();
106 120 
 		$sth_dest = $Connection->db->prepare($query_dest);
107 121 
 		try {
108 
-			if ($globalTransaction) $Connection->db->beginTransaction();
122 
+			if ($globalTransaction) {
123 
+				$Connection->db->beginTransaction();
124 
+			}
109 125 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 126 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 127 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
112 128 
 				$sth_dest->execute($query_dest_values);
113 129 
             		}
114 
-			if ($globalTransaction) $Connection->db->commit();
130 
+			if ($globalTransaction) {
131 
+				$Connection->db->commit();
132 
+			}
115 133 
 		} catch(PDOException $e) {
116 
-			if ($globalTransaction) $Connection->db->rollBack();
134 
+			if ($globalTransaction) {
135 
+				$Connection->db->rollBack();
136 
+			}
117 137 
 			return "error : ".$e->getMessage();
118 138 
 		}
119 139 
                 return '';
 
@@ -121,7 +141,9 @@  discard block
 
 block discarded – undo
121 141 
 	public static function retrieve_route_oneworld($database_file) {
122 142 
 		global $globalDebug, $globalTransaction;
123 143 
 		//$query = 'TRUNCATE TABLE routes';
124 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
144 
+		if ($globalDebug) {
145 
+			echo " - Delete previous routes from DB -";
146 
+		}
125 147 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
126 148 
 		$Connection = new Connection();
127 149 
 		try {
 
@@ -132,14 +154,18 @@  discard block
 
 block discarded – undo
132 154 
                         return "error : ".$e->getMessage();
133 155 
                 }
134 156
135 
-    		if ($globalDebug) echo " - Add routes to DB -";
157 
+    		if ($globalDebug) {
158 
+    			echo " - Add routes to DB -";
159 
+    		}
136 160 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 161 
 		$Spotter = new Spotter();
138 162 
 		if ($fh = fopen($database_file,"r")) {
139 163 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
140 164 
 			$Connection = new Connection();
141 165 
 			$sth_dest = $Connection->db->prepare($query_dest);
142 
-			if ($globalTransaction) $Connection->db->beginTransaction();
166 
+			if ($globalTransaction) {
167 
+				$Connection->db->beginTransaction();
168 
+			}
143 169 
 			while (!feof($fh)) {
144 170 
 				$line = fgetcsv($fh,9999,',');
145 171 
 				if ($line[0] != '') {
 
@@ -148,13 +174,17 @@  discard block
 
 block discarded – undo
148 174 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
149 175 
 							$sth_dest->execute($query_dest_values);
150 176 
 						} catch(PDOException $e) {
151 
-							if ($globalTransaction) $Connection->db->rollBack();
177 
+							if ($globalTransaction) {
178 
+								$Connection->db->rollBack();
179 
+							}
152 180 
 							return "error : ".$e->getMessage();
153 181 
 						}
154 182 
 					}
155 183 
 				}
156 184 
 			}
157 
-			if ($globalTransaction) $Connection->db->commit();
185 
+			if ($globalTransaction) {
186 
+				$Connection->db->commit();
187 
+			}
158 188 
 		}
159 189 
                 return '';
160 190 
 	}
 
@@ -162,7 +192,9 @@  discard block
 
 block discarded – undo
162 192 
 	public static function retrieve_route_skyteam($database_file) {
163 193 
 		global $globalDebug, $globalTransaction;
164 194 
 		//$query = 'TRUNCATE TABLE routes';
165 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
195 
+		if ($globalDebug) {
196 
+			echo " - Delete previous routes from DB -";
197 
+		}
166 198 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
167 199 
 		$Connection = new Connection();
168 200 
 		try {
 
@@ -173,7 +205,9 @@  discard block
 
 block discarded – undo
173 205 
                         return "error : ".$e->getMessage();
174 206 
                 }
175 207
176 
-    		if ($globalDebug) echo " - Add routes to DB -";
208 
+    		if ($globalDebug) {
209 
+    			echo " - Add routes to DB -";
210 
+    		}
177 211
178 212 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 213 
 		$Spotter = new Spotter();
 
@@ -182,7 +216,9 @@  discard block
 
 block discarded – undo
182 216 
 			$Connection = new Connection();
183 217 
 			$sth_dest = $Connection->db->prepare($query_dest);
184 218 
 			try {
185 
-				if ($globalTransaction) $Connection->db->beginTransaction();
219 
+				if ($globalTransaction) {
220 
+					$Connection->db->beginTransaction();
221 
+				}
186 222 
 				while (!feof($fh)) {
187 223 
 					$line = fgetcsv($fh,9999,',');
188 224 
 					if ($line[0] != '') {
 
@@ -193,9 +229,13 @@  discard block
 
 block discarded – undo
193 229 
 						}
194 230 
 					}
195 231 
 				}
196 
-				if ($globalTransaction) $Connection->db->commit();
232 
+				if ($globalTransaction) {
233 
+					$Connection->db->commit();
234 
+				}
197 235 
 			} catch(PDOException $e) {
198 
-				if ($globalTransaction) $Connection->db->rollBack();
236 
+				if ($globalTransaction) {
237 
+					$Connection->db->rollBack();
238 
+				}
199 239 
 				return "error : ".$e->getMessage();
200 240 
 			}
201 241 
 		}
 
@@ -238,11 +278,16 @@  discard block
 
 block discarded – undo
238 278 
 		$sth_dest = $Connection->db->prepare($query_dest);
239 279 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
240 280 
 		try {
241 
-			if ($globalTransaction) $Connection->db->beginTransaction();
281 
+			if ($globalTransaction) {
282 
+				$Connection->db->beginTransaction();
283 
+			}
242 284 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
243 285 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244 
-				if ($values['UserString4'] == 'M') $type = 'military';
245 
-				else $type = null;
286 
+				if ($values['UserString4'] == 'M') {
287 
+					$type = 'military';
288 
+				} else {
289 
+					$type = null;
290 
+				}
246 291 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
247 292 
 				$sth_dest->execute($query_dest_values);
248 293 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
 
@@ -250,7 +295,9 @@  discard block
 
 block discarded – undo
250 295 
 				    $sth_dest_owner->execute($query_dest_owner_values);
251 296 
 				}
252 297 
             		}
253 
-			if ($globalTransaction) $Connection->db->commit();
298 
+			if ($globalTransaction) {
299 
+				$Connection->db->commit();
300 
+			}
254 301 
 		} catch(PDOException $e) {
255 302 
 			return "error : ".$e->getMessage();
256 303 
 		}
 
@@ -287,7 +334,9 @@  discard block
 
 block discarded – undo
287 334 
 			$Connection = new Connection();
288 335 
 			$sth_dest = $Connection->db->prepare($query_dest);
289 336 
 			try {
290 
-				if ($globalTransaction) $Connection->db->beginTransaction();
337 
+				if ($globalTransaction) {
338 
+					$Connection->db->beginTransaction();
339 
+				}
291 340 
             			while (!feof($fh)) {
292 341 
             				$values = array();
293 342 
             				$line = $Common->hex2str(fgets($fh,9999));
 
@@ -298,7 +347,9 @@  discard block
 
 block discarded – undo
298 347 
             				// Check if we can find ICAO, else set it to GLID
299 348 
             				$aircraft_name_split = explode(' ',$aircraft_name);
300 349 
             				$search_more = '';
301 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
350 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
351 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
352 
+            				}
302 353 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 354 
             				$sth_search = $Connection->db->prepare($query_search);
304 355 
 					try {
 
@@ -311,7 +362,9 @@  discard block
 
 block discarded – undo
311 362 
 					} catch(PDOException $e) {
312 363 
 						return "error : ".$e->getMessage();
313 364 
 					}
314 
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
365 
+					if (!isset($values['ICAOTypeCode'])) {
366 
+						$values['ICAOTypeCode'] = 'GLID';
367 
+					}
315 368 
 					// Add data to db
316 369 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
317 370 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 
@@ -320,7 +373,9 @@  discard block
 
 block discarded – undo
320 373 
 						$sth_dest->execute($query_dest_values);
321 374 
 					}
322 375 
 				}
323 
-				if ($globalTransaction) $Connection->db->commit();
376 
+				if ($globalTransaction) {
377 
+					$Connection->db->commit();
378 
+				}
324 379 
 			} catch(PDOException $e) {
325 380 
 				return "error : ".$e->getMessage();
326 381 
 			}
 
@@ -356,7 +411,9 @@  discard block
 
 block discarded – undo
356 411 
 			$Connection = new Connection();
357 412 
 			$sth_dest = $Connection->db->prepare($query_dest);
358 413 
 			try {
359 
-				if ($globalTransaction) $Connection->db->beginTransaction();
414 
+				if ($globalTransaction) {
415 
+					$Connection->db->beginTransaction();
416 
+				}
360 417 
 				$tmp = fgetcsv($fh,9999,',',"'");
361 418 
             			while (!feof($fh)) {
362 419 
             				$line = fgetcsv($fh,9999,',',"'");
 
@@ -370,13 +427,17 @@  discard block
 
 block discarded – undo
370 427 
             				// Check if we can find ICAO, else set it to GLID
371 428 
             				$aircraft_name_split = explode(' ',$aircraft_name);
372 429 
             				$search_more = '';
373 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
430 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
431 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
432 
+            				}
374 433 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 434 
             				$sth_search = $Connection->db->prepare($query_search);
376 435 
 					try {
377 436 
                                     		$sth_search->execute();
378 437 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
438 
+	            				if (isset($result['icao']) && $result['icao'] != '') {
439 
+	            					$values['ICAOTypeCode'] = $result['icao'];
440 
+	            				}
380 441 
 					} catch(PDOException $e) {
381 442 
 						return "error : ".$e->getMessage();
382 443 
 					}
 
@@ -389,7 +450,9 @@  discard block
 
 block discarded – undo
389 450 
 						$sth_dest->execute($query_dest_values);
390 451 
 					}
391 452 
 				}
392 
-				if ($globalTransaction) $Connection->db->commit();
453 
+				if ($globalTransaction) {
454 
+					$Connection->db->commit();
455 
+				}
393 456 
 			} catch(PDOException $e) {
394 457 
 				return "error : ".$e->getMessage();
395 458 
 			}
 
@@ -428,7 +491,9 @@  discard block
 
 block discarded – undo
428 491 
 			$sth_dest = $Connection->db->prepare($query_dest);
429 492 
 			$sth_modes = $Connection->db->prepare($query_modes);
430 493 
 			try {
431 
-				if ($globalTransaction) $Connection->db->beginTransaction();
494 
+				if ($globalTransaction) {
495 
+					$Connection->db->beginTransaction();
496 
+				}
432 497 
 				$tmp = fgetcsv($fh,9999,',','"');
433 498 
             			while (!feof($fh)) {
434 499 
             				$line = fgetcsv($fh,9999,',','"');
 
@@ -438,16 +503,22 @@  discard block
 
 block discarded – undo
438 503 
             				    $values['registration'] = $line[0];
439 504 
             				    $values['base'] = $line[4];
440 505 
             				    $values['owner'] = $line[5];
441 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
442 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506 
+            				    if ($line[6] == '') {
507 
+            				    	$values['date_first_reg'] = null;
508 
+            				    } else {
509 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
510 
+					    }
443 511 
 					    $values['cancel'] = $line[7];
444 512 
 					} elseif ($country == 'EI') {
445 513 
 					    // TODO : add modeS & reg to aircraft_modes
446 514 
             				    $values['registration'] = $line[0];
447 515 
             				    $values['base'] = $line[3];
448 516 
             				    $values['owner'] = $line[2];
449 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
450 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
517 
+            				    if ($line[1] == '') {
518 
+            				    	$values['date_first_reg'] = null;
519 
+            				    } else {
520 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
521 
+					    }
451 522 
 					    $values['cancel'] = '';
452 523 
 					    $values['modes'] = $line[7];
453 524 
 					    $values['icao'] = $line[8];
 
@@ -466,16 +537,22 @@  discard block
 
 block discarded – undo
466 537 
             				    $values['registration'] = $line[3];
467 538 
             				    $values['base'] = null;
468 539 
             				    $values['owner'] = $line[5];
469 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
470 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
540 
+            				    if ($line[18] == '') {
541 
+            				    	$values['date_first_reg'] = null;
542 
+            				    } else {
543 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
544 
+					    }
471 545 
 					    $values['cancel'] = '';
472 546 
 					} elseif ($country == 'VH') {
473 547 
 					    // TODO : add modeS & reg to aircraft_modes
474 548 
             				    $values['registration'] = $line[0];
475 549 
             				    $values['base'] = null;
476 550 
             				    $values['owner'] = $line[12];
477 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
478 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
551 
+            				    if ($line[28] == '') {
552 
+            				    	$values['date_first_reg'] = null;
553 
+            				    } else {
554 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
555 
+					    }
479 556
480 557 
 					    $values['cancel'] = $line[39];
481 558 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -494,29 +571,41 @@  discard block
 
 block discarded – undo
494 571 
             				    $values['registration'] = $line[0];
495 572 
             				    $values['base'] = null;
496 573 
             				    $values['owner'] = $line[8];
497 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
498 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
574 
+            				    if ($line[7] == '') {
575 
+            				    	$values['date_first_reg'] = null;
576 
+            				    } else {
577 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
578 
+					    }
499 579 
 					    $values['cancel'] = '';
500 580 
 					} elseif ($country == 'PP') {
501 581 
             				    $values['registration'] = $line[0];
502 582 
             				    $values['base'] = null;
503 583 
             				    $values['owner'] = $line[4];
504 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
505 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
584 
+            				    if ($line[6] == '') {
585 
+            				    	$values['date_first_reg'] = null;
586 
+            				    } else {
587 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
588 
+					    }
506 589 
 					    $values['cancel'] = $line[7];
507 590 
 					} elseif ($country == 'E7') {
508 591 
             				    $values['registration'] = $line[0];
509 592 
             				    $values['base'] = null;
510 593 
             				    $values['owner'] = $line[4];
511 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
512 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
594 
+            				    if ($line[5] == '') {
595 
+            				    	$values['date_first_reg'] = null;
596 
+            				    } else {
597 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
598 
+					    }
513 599 
 					    $values['cancel'] = '';
514 600 
 					} elseif ($country == '8Q') {
515 601 
             				    $values['registration'] = $line[0];
516 602 
             				    $values['base'] = null;
517 603 
             				    $values['owner'] = $line[3];
518 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
519 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
604 
+            				    if ($line[7] == '') {
605 
+            				    	$values['date_first_reg'] = null;
606 
+            				    } else {
607 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
608 
+					    }
520 609 
 					    $values['cancel'] = '';
521 610 
 					} elseif ($country == 'ZK') {
522 611 
             				    $values['registration'] = $line[0];
 
@@ -561,7 +650,9 @@  discard block
 
 block discarded – undo
561 650 
 						$sth_modes->execute($query_modes_values);
562 651 
 					}
563 652 
 				}
564 
-				if ($globalTransaction) $Connection->db->commit();
653 
+				if ($globalTransaction) {
654 
+					$Connection->db->commit();
655 
+				}
565 656 
 			} catch(PDOException $e) {
566 657 
 				return "error : ".$e->getMessage();
567 658 
 			}
 
@@ -697,25 +788,45 @@  discard block
 
 block discarded – undo
697 788 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
698 789 
 		$Connection = new Connection();
699 790 
 		$sth_dest = $Connection->db->prepare($query_dest);
700 
-		if ($globalTransaction) $Connection->db->beginTransaction();
791 
+		if ($globalTransaction) {
792 
+			$Connection->db->beginTransaction();
793 
+		}
701 794
702 795 
 		$i = 0;
703 796 
 		while($row = sparql_fetch_array($result))
704 797 
 		{
705 798 
 			if ($i >= 1) {
706 799 
 			//print_r($row);
707 
-			if (!isset($row['iata'])) $row['iata'] = '';
708 
-			if (!isset($row['icao'])) $row['icao'] = '';
709 
-			if (!isset($row['type'])) $row['type'] = '';
710 
-			if (!isset($row['altitude'])) $row['altitude'] = '';
800 
+			if (!isset($row['iata'])) {
801 
+				$row['iata'] = '';
802 
+			}
803 
+			if (!isset($row['icao'])) {
804 
+				$row['icao'] = '';
805 
+			}
806 
+			if (!isset($row['type'])) {
807 
+				$row['type'] = '';
808 
+			}
809 
+			if (!isset($row['altitude'])) {
810 
+				$row['altitude'] = '';
811 
+			}
711 812 
 			if (isset($row['city_bis'])) {
712 813 
 				$row['city'] = $row['city_bis'];
713 814 
 			}
714 
-			if (!isset($row['city'])) $row['city'] = '';
715 
-			if (!isset($row['country'])) $row['country'] = '';
716 
-			if (!isset($row['homepage'])) $row['homepage'] = '';
717 
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
718 
-			if (!isset($row['name'])) continue;
815 
+			if (!isset($row['city'])) {
816 
+				$row['city'] = '';
817 
+			}
818 
+			if (!isset($row['country'])) {
819 
+				$row['country'] = '';
820 
+			}
821 
+			if (!isset($row['homepage'])) {
822 
+				$row['homepage'] = '';
823 
+			}
824 
+			if (!isset($row['wikipedia_page'])) {
825 
+				$row['wikipedia_page'] = '';
826 
+			}
827 
+			if (!isset($row['name'])) {
828 
+				continue;
829 
+			}
719 830 
 			if (!isset($row['image'])) {
720 831 
 				$row['image'] = '';
721 832 
 				$row['image_thumb'] = '';
 
@@ -771,7 +882,9 @@  discard block
 
 block discarded – undo
771 882
772 883 
 			$i++;
773 884 
 		}
774 
-		if ($globalTransaction) $Connection->db->commit();
885 
+		if ($globalTransaction) {
886 
+			$Connection->db->commit();
887 
+		}
775 888 
 		/*
776 889 
 		echo "Delete duplicate rows...\n";
777 890 
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
 
@@ -814,7 +927,9 @@  discard block
 
 block discarded – undo
814 927 
 		$delimiter = ',';
815 928 
 		$out_file = $tmp_dir.'airports.csv';
816 929 
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
817 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
930 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
931 
+			return FALSE;
932 
+		}
818 933 
 		echo "Add data from ourairports.com...\n";
819 934
820 935 
 		$header = NULL;
 
@@ -824,8 +939,9 @@  discard block
 
 block discarded – undo
824 939 
 			//$Connection->db->beginTransaction();
825 940 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
826 941 
 			{
827 
-				if(!$header) $header = $row;
828 
-				else {
942 
+				if(!$header) {
943 
+					$header = $row;
944 
+				} else {
829 945 
 					$data = array();
830 946 
 					$data = array_combine($header, $row);
831 947 
 					try {
 
@@ -866,7 +982,9 @@  discard block
 
 block discarded – undo
866 982 
 		echo "Download data from another free database...\n";
867 983 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
868 984 
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
869 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
985 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
986 
+			return FALSE;
987 
+		}
870 988 
 		update_db::unzip($out_file);
871 989 
 		$header = NULL;
872 990 
 		echo "Add data from another free database...\n";
 
@@ -877,8 +995,9 @@  discard block
 
 block discarded – undo
877 995 
 			//$Connection->db->beginTransaction();
878 996 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
879 997 
 			{
880 
-				if(!$header) $header = $row;
881 
-				else {
998 
+				if(!$header) {
999 
+					$header = $row;
1000 
+				} else {
882 1001 
 					$data = $row;
883 1002
884 1003 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
 
@@ -1047,7 +1166,9 @@  discard block
 
 block discarded – undo
1047 1166 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1048 1167 
 		{
1049 1168 
 			$i = 0;
1050 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1169 
+			if ($globalTransaction) {
1170 
+				$Connection->db->beginTransaction();
1171 
+			}
1051 1172 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1052 1173 
 			{
1053 1174 
 				if ($i > 0) {
 
@@ -1060,7 +1181,9 @@  discard block
 
 block discarded – undo
1060 1181 
 					}
1061 1182 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1062 1183 
 					if (!empty($result_search)) {
1063 
-						if ($globalDebug) echo '.';
1184 
+						if ($globalDebug) {
1185 
+							echo '.';
1186 
+						}
1064 1187 
 							//if ($globalDBdriver == 'mysql') {
1065 1188 
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1066 1189 
 							//} else {
 
@@ -1082,8 +1205,12 @@  discard block
 
 block discarded – undo
1082 1205 
 						}
1083 1206 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1084 1207 
 						if (!empty($result_search_mfr)) {
1085 
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1086 
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1208 
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1209 
+								$data[16] = $data[23];
1210 
+							}
1211 
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1212 
+								$data[16] = $data[15];
1213 
+							}
1087 1214 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1088 1215 
 							try {
1089 1216 
 								$sthf = $Connection->db->prepare($queryf);
 
@@ -1094,7 +1221,9 @@  discard block
 
 block discarded – undo
1094 1221 
 						}
1095 1222 
 					}
1096 1223 
 					if (strtotime($data[29]) > time()) {
1097 
-						if ($globalDebug) echo 'i';
1224 
+						if ($globalDebug) {
1225 
+							echo 'i';
1226 
+						}
1098 1227 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1099 1228 
 						try {
1100 1229 
 							$sth = $Connection->db->prepare($query);
 
@@ -1105,13 +1234,19 @@  discard block
 
 block discarded – undo
1105 1234 
 					}
1106 1235 
 				}
1107 1236 
 				if ($i % 90 == 0) {
1108 
-					if ($globalTransaction) $Connection->db->commit();
1109 
-					if ($globalTransaction) $Connection->db->beginTransaction();
1237 
+					if ($globalTransaction) {
1238 
+						$Connection->db->commit();
1239 
+					}
1240 
+					if ($globalTransaction) {
1241 
+						$Connection->db->beginTransaction();
1242 
+					}
1110 1243 
 				}
1111 1244 
 				$i++;
1112 1245 
 			}
1113 1246 
 			fclose($handle);
1114 
-			if ($globalTransaction) $Connection->db->commit();
1247 
+			if ($globalTransaction) {
1248 
+				$Connection->db->commit();
1249 
+			}
1115 1250 
 		}
1116 1251 
 		return '';
1117 1252 
 	}
 
@@ -1131,11 +1266,15 @@  discard block
 
 block discarded – undo
1131 1266 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
1132 1267 
 		{
1133 1268 
 			$i = 0;
1134 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1269 
+			if ($globalTransaction) {
1270 
+				$Connection->db->beginTransaction();
1271 
+			}
1135 1272 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1136 1273 
 			{
1137 1274 
 				if ($i > 0) {
1138 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1275 
+					if ($data[1] == 'NULL') {
1276 
+						$data[1] = $data[0];
1277 
+					}
1139 1278 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1140 1279 
 					try {
1141 1280 
 						$sth = $Connection->db->prepare($query);
 
@@ -1147,7 +1286,9 @@  discard block
 
 block discarded – undo
1147 1286 
 				$i++;
1148 1287 
 			}
1149 1288 
 			fclose($handle);
1150 
-			if ($globalTransaction) $Connection->db->commit();
1289 
+			if ($globalTransaction) {
1290 
+				$Connection->db->commit();
1291 
+			}
1151 1292 
 		}
1152 1293 
 		return '';
1153 1294 
 	}
 
@@ -1179,11 +1320,15 @@  discard block
 
 block discarded – undo
1179 1320 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
1180 1321 
 		{
1181 1322 
 			$i = 0;
1182 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1323 
+			if ($globalTransaction) {
1324 
+				$Connection->db->beginTransaction();
1325 
+			}
1183 1326 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1184 1327 
 			{
1185 1328 
 				if ($i > 0) {
1186 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1329 
+					if ($data[1] == 'NULL') {
1330 
+						$data[1] = $data[0];
1331 
+					}
1187 1332 
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
1188 1333 
 					try {
1189 1334 
 						$sth = $Connection->db->prepare($query);
 
@@ -1195,7 +1340,9 @@  discard block
 
 block discarded – undo
1195 1340 
 				$i++;
1196 1341 
 			}
1197 1342 
 			fclose($handle);
1198 
-			if ($globalTransaction) $Connection->db->commit();
1343 
+			if ($globalTransaction) {
1344 
+				$Connection->db->commit();
1345 
+			}
1199 1346 
 		}
1200 1347 
 		/*
1201 1348 
 		$query = "UNLOCK TABLES";
 
@@ -1225,7 +1372,9 @@  discard block
 
 block discarded – undo
1225 1372 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1226 1373 
 		{
1227 1374 
 			$i = 0;
1228 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1375 
+			if ($globalTransaction) {
1376 
+				$Connection->db->beginTransaction();
1377 
+			}
1229 1378 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1230 1379 
 			{
1231 1380 
 				if ($i > 0) {
 
@@ -1241,7 +1390,9 @@  discard block
 
 block discarded – undo
1241 1390 
 				$i++;
1242 1391 
 			}
1243 1392 
 			fclose($handle);
1244 
-			if ($globalTransaction) $Connection->db->commit();
1393 
+			if ($globalTransaction) {
1394 
+				$Connection->db->commit();
1395 
+			}
1245 1396 
 		}
1246 1397 
 		return '';
1247 1398 
         }
 
@@ -1261,7 +1412,9 @@  discard block
 
 block discarded – undo
1261 1412 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
1262 1413 
 		{
1263 1414 
 			$i = 0;
1264 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1415 
+			if ($globalTransaction) {
1416 
+				$Connection->db->beginTransaction();
1417 
+			}
1265 1418 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1266 1419 
 			{
1267 1420 
 				if ($i > 0) {
 
@@ -1270,13 +1423,17 @@  discard block
 
 block discarded – undo
1270 1423 
 						$sth = $Connection->db->prepare($query);
1271 1424 
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1272 1425 
 					} catch(PDOException $e) {
1273 
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1426 
+						if ($globalDebug) {
1427 
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1428 
+						}
1274 1429 
 					}
1275 1430 
 				}
1276 1431 
 				$i++;
1277 1432 
 			}
1278 1433 
 			fclose($handle);
1279 
-			if ($globalTransaction) $Connection->db->commit();
1434 
+			if ($globalTransaction) {
1435 
+				$Connection->db->commit();
1436 
+			}
1280 1437 
 		}
1281 1438 
 		return '';
1282 1439 
         }
 
@@ -1301,7 +1458,9 @@  discard block
 
 block discarded – undo
1301 1458 
 			$i = 0;
1302 1459 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1303 1460 
 			//$Connection->db->beginTransaction();
1304 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1461 
+			if ($globalTransaction) {
1462 
+				$Connection->db->beginTransaction();
1463 
+			}
1305 1464 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1306 1465 
 			{
1307 1466 
 				if ($i > 0) {
 
@@ -1317,7 +1476,9 @@  discard block
 
 block discarded – undo
1317 1476 
 				$i++;
1318 1477 
 			}
1319 1478 
 			fclose($handle);
1320 
-			if ($globalTransaction) $Connection->db->commit();
1479 
+			if ($globalTransaction) {
1480 
+				$Connection->db->commit();
1481 
+			}
1321 1482 
 		}
1322 1483 
 		return '';
1323 1484 
         }
 
@@ -1337,7 +1498,9 @@  discard block
 
 block discarded – undo
1337 1498 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
1338 1499 
 		{
1339 1500 
 			$i = 0;
1340 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1501 
+			if ($globalTransaction) {
1502 
+				$Connection->db->beginTransaction();
1503 
+			}
1341 1504 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1342 1505 
 			{
1343 1506 
 				if ($i > 0) {
 
@@ -1354,7 +1517,9 @@  discard block
 
 block discarded – undo
1354 1517 
 				$i++;
1355 1518 
 			}
1356 1519 
 			fclose($handle);
1357 
-			if ($globalTransaction) $Connection->db->commit();
1520 
+			if ($globalTransaction) {
1521 
+				$Connection->db->commit();
1522 
+			}
1358 1523 
 		}
1359 1524 
 		return '';
1360 1525 
 	}
 
@@ -1373,7 +1538,9 @@  discard block
 
 block discarded – undo
1373 1538 
 		$Connection = new Connection();
1374 1539 
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1375 1540 
 		{
1376 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1541 
+			if ($globalTransaction) {
1542 
+				$Connection->db->beginTransaction();
1543 
+			}
1377 1544 
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1378 1545 
 			{
1379 1546 
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
 
@@ -1388,7 +1555,9 @@  discard block
 
 block discarded – undo
1388 1555 
 				}
1389 1556 
 			}
1390 1557 
 			fclose($handle);
1391 
-			if ($globalTransaction) $Connection->db->commit();
1558 
+			if ($globalTransaction) {
1559 
+				$Connection->db->commit();
1560 
+			}
1392 1561 
 		}
1393 1562 
 		return '';
1394 1563 
         }
 
@@ -1464,9 +1633,14 @@  discard block
 
 block discarded – undo
1464 1633 
 				if ($i > 0 && $data[0] != '') {
1465 1634 
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
1466 1635 
 					$period = str_replace(',','',$data[14]);
1467 
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
1468 
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
1469 
-					else $launch_date = NULL;
1636 
+					if (!empty($period) && strpos($period,'days')) {
1637 
+						$period = str_replace(' days','',$period)*24*60;
1638 
+					}
1639 
+					if ($data[18] != '') {
1640 
+						$launch_date = date('Y-m-d',strtotime($data[18]));
1641 
+					} else {
1642 
+						$launch_date = NULL;
1643 
+					}
1470 1644 
 					$data = array_map(function($value) {
1471 1645 
 						return trim($value) === '' ? null : $value;
1472 1646 
 					}, $data);
 
@@ -1829,7 +2003,9 @@  discard block
 
 block discarded – undo
1829 2003 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1830 2004 
 		{
1831 2005 
 			$i = 0;
1832 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2006 
+			if ($globalTransaction) {
2007 
+				$Connection->db->beginTransaction();
2008 
+			}
1833 2009 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1834 2010 
 			{
1835 2011 
 				$i++;
 
@@ -1857,7 +2033,9 @@  discard block
 
 block discarded – undo
1857 2033 
 				}
1858 2034 
 			}
1859 2035 
 			fclose($handle);
1860 
-			if ($globalTransaction) $Connection->db->commit();
2036 
+			if ($globalTransaction) {
2037 
+				$Connection->db->commit();
2038 
+			}
1861 2039 
 		}
1862 2040 
 		return '';
1863 2041 
 	}
 
@@ -1900,7 +2078,9 @@  discard block
 
 block discarded – undo
1900 2078 
 		$Connection = new Connection();
1901 2079 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1902 2080 
 		{
1903 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2081 
+			if ($globalTransaction) {
2082 
+				$Connection->db->beginTransaction();
2083 
+			}
1904 2084 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1905 2085 
 			{
1906 2086 
 				if(count($row) > 1) {
 
@@ -1914,7 +2094,9 @@  discard block
 
 block discarded – undo
1914 2094 
 				}
1915 2095 
 			}
1916 2096 
 			fclose($handle);
1917 
-			if ($globalTransaction) $Connection->db->commit();
2097 
+			if ($globalTransaction) {
2098 
+				$Connection->db->commit();
2099 
+			}
1918 2100 
 		}
1919 2101 
 		return '';
1920 2102 
         }
 
@@ -1934,8 +2116,9 @@  discard block
 
 block discarded – undo
1934 2116 
 	        }
1935 2117
1936 2118
1937 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1938 
-		else {
2119 
+		if ($globalDBdriver == 'mysql') {
2120 
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
2121 
+		} else {
1939 2122 
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1940 2123 
 			$query = "CREATE EXTENSION postgis";
1941 2124 
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
 
@@ -1954,7 +2137,9 @@  discard block
 
 block discarded – undo
1954 2137 
 		global $tmp_dir, $globalDebug;
1955 2138 
 		include_once('class.create_db.php');
1956 2139 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1957 
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
2140 
+		if ($globalDebug) {
2141 
+			echo "NOTAM from FlightAirMap website : Download...";
2142 
+		}
1958 2143 
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
1959 2144 
 		$error = '';
1960 2145 
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
 
@@ -1964,20 +2149,34 @@  discard block
 
 block discarded – undo
1964 2149 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1965 2150 
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
1966 2151 
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
1967 
-						if ($globalDebug) echo "Gunzip...";
2152 
+						if ($globalDebug) {
2153 
+							echo "Gunzip...";
2154 
+						}
1968 2155 
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
1969 
-						if ($globalDebug) echo "Add to DB...";
2156 
+						if ($globalDebug) {
2157 
+							echo "Add to DB...";
2158 
+						}
1970 2159 
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
1971 2160 
 						$NOTAM = new NOTAM();
1972 2161 
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1973 2162 
 						update_db::insert_notam_version($notam_md5);
1974 
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
1975 
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1976 
-			} elseif ($globalDebug) echo "No new version.";
1977 
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2163 
+					} else {
2164 
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
2165 
+					}
2166 
+				} else {
2167 
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
2168 
+				}
2169 
+			} elseif ($globalDebug) {
2170 
+				echo "No new version.";
2171 
+			}
2172 
+		} else {
2173 
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2174 
+		}
1978 2175 
 		if ($error != '') {
1979 2176 
 			return $error;
1980 
-		} elseif ($globalDebug) echo "Done\n";
2177 
+		} elseif ($globalDebug) {
2178 
+			echo "Done\n";
2179 
+		}
1981 2180 
 		return '';
1982 2181 
 	}
1983 2182 
 
@@ -2032,68 +2231,114 @@  discard block
 
 block discarded – undo
2032 2231 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
2033 2232 
 		if (extension_loaded('zip')) {
2034 2233 
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
2035 
-				if ($globalDebug) echo "Unzip...";
2234 
+				if ($globalDebug) {
2235 
+					echo "Unzip...";
2236 
+				}
2036 2237 
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
2037 
-				if ($globalDebug) echo "Add to DB...";
2238 
+				if ($globalDebug) {
2239 
+					echo "Add to DB...";
2240 
+				}
2038 2241 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
2039 
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
2242 
+				if ($globalDebug) {
2243 
+					echo "Copy airlines logos to airlines images directory...";
2244 
+				}
2040 2245 
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
2041 
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2042 
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2043 
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2044 
-		} else $error = "ZIP module not loaded but required for IVAO.";
2246 
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
2247 
+						$error = "Failed to copy airlines logo.";
2248 
+					}
2249 
+				} else {
2250 
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2251 
+				}
2252 
+			} else {
2253 
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2254 
+			}
2255 
+		} else {
2256 
+			$error = "ZIP module not loaded but required for IVAO.";
2257 
+		}
2045 2258 
 		if ($error != '') {
2046 2259 
 			return $error;
2047 
-		} elseif ($globalDebug) echo "Done\n";
2260 
+		} elseif ($globalDebug) {
2261 
+			echo "Done\n";
2262 
+		}
2048 2263 
 		return '';
2049 2264 
 	}
2050 2265
2051 2266 
 	public static function update_routes() {
2052 2267 
 		global $tmp_dir, $globalDebug;
2053 2268 
 		$error = '';
2054 
-		if ($globalDebug) echo "Routes : Download...";
2269 
+		if ($globalDebug) {
2270 
+			echo "Routes : Download...";
2271 
+		}
2055 2272 
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
2056 2273 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
2057 
-			if ($globalDebug) echo "Gunzip...";
2274 
+			if ($globalDebug) {
2275 
+				echo "Gunzip...";
2276 
+			}
2058 2277 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
2059 
-			if ($globalDebug) echo "Add to DB...";
2278 
+			if ($globalDebug) {
2279 
+				echo "Add to DB...";
2280 
+			}
2060 2281 
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
2061 
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2282 
+		} else {
2283 
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2284 
+		}
2062 2285 
 		if ($error != '') {
2063 2286 
 			return $error;
2064 
-		} elseif ($globalDebug) echo "Done\n";
2287 
+		} elseif ($globalDebug) {
2288 
+			echo "Done\n";
2289 
+		}
2065 2290 
 		return '';
2066 2291 
 	}
2067 2292 
 	public static function update_oneworld() {
2068 2293 
 		global $tmp_dir, $globalDebug;
2069 2294 
 		$error = '';
2070 
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
2295 
+		if ($globalDebug) {
2296 
+			echo "Schedules Oneworld : Download...";
2297 
+		}
2071 2298 
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
2072 2299 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
2073 
-			if ($globalDebug) echo "Gunzip...";
2300 
+			if ($globalDebug) {
2301 
+				echo "Gunzip...";
2302 
+			}
2074 2303 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
2075 
-			if ($globalDebug) echo "Add to DB...";
2304 
+			if ($globalDebug) {
2305 
+				echo "Add to DB...";
2306 
+			}
2076 2307 
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
2077 
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2308 
+		} else {
2309 
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2310 
+		}
2078 2311 
 		if ($error != '') {
2079 2312 
 			return $error;
2080 
-		} elseif ($globalDebug) echo "Done\n";
2313 
+		} elseif ($globalDebug) {
2314 
+			echo "Done\n";
2315 
+		}
2081 2316 
 		return '';
2082 2317 
 	}
2083 2318 
 	public static function update_skyteam() {
2084 2319 
 		global $tmp_dir, $globalDebug;
2085 2320 
 		$error = '';
2086 
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
2321 
+		if ($globalDebug) {
2322 
+			echo "Schedules Skyteam : Download...";
2323 
+		}
2087 2324 
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
2088 2325 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
2089 
-			if ($globalDebug) echo "Gunzip...";
2326 
+			if ($globalDebug) {
2327 
+				echo "Gunzip...";
2328 
+			}
2090 2329 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
2091 
-			if ($globalDebug) echo "Add to DB...";
2330 
+			if ($globalDebug) {
2331 
+				echo "Add to DB...";
2332 
+			}
2092 2333 
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
2093 
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2334 
+		} else {
2335 
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2336 
+		}
2094 2337 
 		if ($error != '') {
2095 2338 
 			return $error;
2096 
-		} elseif ($globalDebug) echo "Done\n";
2339 
+		} elseif ($globalDebug) {
2340 
+			echo "Done\n";
2341 
+		}
2097 2342 
 		return '';
2098 2343 
 	}
2099 2344 
 	public static function update_ModeS() {
 
@@ -2110,340 +2355,590 @@  discard block
 
 block discarded – undo
2110 2355 
 			exit;
2111 2356 
 		} elseif ($globalDebug) echo "Done\n";
2112 2357 
 */
2113 
-		if ($globalDebug) echo "Modes : Download...";
2114 
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2358 
+		if ($globalDebug) {
2359 
+			echo "Modes : Download...";
2360 
+		}
2361 
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2115 2362 
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
2116 2363
2117 2364 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
2118 2365 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
2119 
-			if ($globalDebug) echo "Unzip...";
2120 
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2366 
+			if ($globalDebug) {
2367 
+				echo "Unzip...";
2368 
+			}
2369 
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2121 2370 
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
2122 
-			if ($globalDebug) echo "Add to DB...";
2371 
+			if ($globalDebug) {
2372 
+				echo "Add to DB...";
2373 
+			}
2123 2374 
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
2124 2375 
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
2125 
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2376 
+		} else {
2377 
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2378 
+		}
2126 2379 
 		if ($error != '') {
2127 2380 
 			return $error;
2128 
-		} elseif ($globalDebug) echo "Done\n";
2381 
+		} elseif ($globalDebug) {
2382 
+			echo "Done\n";
2383 
+		}
2129 2384 
 		return '';
2130 2385 
 	}
2131 2386
2132 2387 
 	public static function update_ModeS_faa() {
2133 2388 
 		global $tmp_dir, $globalDebug;
2134 
-		if ($globalDebug) echo "Modes FAA: Download...";
2389 
+		if ($globalDebug) {
2390 
+			echo "Modes FAA: Download...";
2391 
+		}
2135 2392 
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
2136 2393 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
2137 
-			if ($globalDebug) echo "Unzip...";
2394 
+			if ($globalDebug) {
2395 
+				echo "Unzip...";
2396 
+			}
2138 2397 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
2139 
-			if ($globalDebug) echo "Add to DB...";
2398 
+			if ($globalDebug) {
2399 
+				echo "Add to DB...";
2400 
+			}
2140 2401 
 			$error = update_db::modes_faa();
2141 
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2402 
+		} else {
2403 
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2404 
+		}
2142 2405 
 		if ($error != '') {
2143 2406 
 			return $error;
2144 
-		} elseif ($globalDebug) echo "Done\n";
2407 
+		} elseif ($globalDebug) {
2408 
+			echo "Done\n";
2409 
+		}
2145 2410 
 		return '';
2146 2411 
 	}
2147 2412
2148 2413 
 	public static function update_ModeS_flarm() {
2149 2414 
 		global $tmp_dir, $globalDebug;
2150 
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
2415 
+		if ($globalDebug) {
2416 
+			echo "Modes Flarmnet: Download...";
2417 
+		}
2151 2418 
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
2152 2419 
 		if (file_exists($tmp_dir.'data.fln')) {
2153 
-			if ($globalDebug) echo "Add to DB...";
2420 
+			if ($globalDebug) {
2421 
+				echo "Add to DB...";
2422 
+			}
2154 2423 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
2155 
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2424 
+		} else {
2425 
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2426 
+		}
2156 2427 
 		if ($error != '') {
2157 2428 
 			return $error;
2158 
-		} elseif ($globalDebug) echo "Done\n";
2429 
+		} elseif ($globalDebug) {
2430 
+			echo "Done\n";
2431 
+		}
2159 2432 
 		return '';
2160 2433 
 	}
2161 2434
2162 2435 
 	public static function update_ModeS_ogn() {
2163 2436 
 		global $tmp_dir, $globalDebug;
2164 
-		if ($globalDebug) echo "Modes OGN: Download...";
2437 
+		if ($globalDebug) {
2438 
+			echo "Modes OGN: Download...";
2439 
+		}
2165 2440 
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
2166 2441 
 		if (file_exists($tmp_dir.'ogn.csv')) {
2167 
-			if ($globalDebug) echo "Add to DB...";
2442 
+			if ($globalDebug) {
2443 
+				echo "Add to DB...";
2444 
+			}
2168 2445 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
2169 
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2446 
+		} else {
2447 
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2448 
+		}
2170 2449 
 		if ($error != '') {
2171 2450 
 			return $error;
2172 
-		} elseif ($globalDebug) echo "Done\n";
2451 
+		} elseif ($globalDebug) {
2452 
+			echo "Done\n";
2453 
+		}
2173 2454 
 		return '';
2174 2455 
 	}
2175 2456
2176 2457 
 	public static function update_owner() {
2177 2458 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
2178 2459
2179 
-		if ($globalDebug) echo "Owner France: Download...";
2460 
+		if ($globalDebug) {
2461 
+			echo "Owner France: Download...";
2462 
+		}
2180 2463 
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
2181 2464 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
2182 
-			if ($globalDebug) echo "Add to DB...";
2465 
+			if ($globalDebug) {
2466 
+				echo "Add to DB...";
2467 
+			}
2183 2468 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
2184 
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2469 
+		} else {
2470 
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2471 
+		}
2185 2472 
 		if ($error != '') {
2186 2473 
 			return $error;
2187 
-		} elseif ($globalDebug) echo "Done\n";
2474 
+		} elseif ($globalDebug) {
2475 
+			echo "Done\n";
2476 
+		}
2188 2477
2189 
-		if ($globalDebug) echo "Owner Ireland: Download...";
2478 
+		if ($globalDebug) {
2479 
+			echo "Owner Ireland: Download...";
2480 
+		}
2190 2481 
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
2191 2482 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
2192 
-			if ($globalDebug) echo "Add to DB...";
2483 
+			if ($globalDebug) {
2484 
+				echo "Add to DB...";
2485 
+			}
2193 2486 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
2194 
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2487 
+		} else {
2488 
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2489 
+		}
2195 2490 
 		if ($error != '') {
2196 2491 
 			return $error;
2197 
-		} elseif ($globalDebug) echo "Done\n";
2198 
-		if ($globalDebug) echo "Owner Switzerland: Download...";
2492 
+		} elseif ($globalDebug) {
2493 
+			echo "Done\n";
2494 
+		}
2495 
+		if ($globalDebug) {
2496 
+			echo "Owner Switzerland: Download...";
2497 
+		}
2199 2498 
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
2200 2499 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
2201 
-			if ($globalDebug) echo "Add to DB...";
2500 
+			if ($globalDebug) {
2501 
+				echo "Add to DB...";
2502 
+			}
2202 2503 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
2203 
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2504 
+		} else {
2505 
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2506 
+		}
2204 2507 
 		if ($error != '') {
2205 2508 
 			return $error;
2206 
-		} elseif ($globalDebug) echo "Done\n";
2207 
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2509 
+		} elseif ($globalDebug) {
2510 
+			echo "Done\n";
2511 
+		}
2512 
+		if ($globalDebug) {
2513 
+			echo "Owner Czech Republic: Download...";
2514 
+		}
2208 2515 
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
2209 2516 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
2210 
-			if ($globalDebug) echo "Add to DB...";
2517 
+			if ($globalDebug) {
2518 
+				echo "Add to DB...";
2519 
+			}
2211 2520 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
2212 
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2521 
+		} else {
2522 
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2523 
+		}
2213 2524 
 		if ($error != '') {
2214 2525 
 			return $error;
2215 
-		} elseif ($globalDebug) echo "Done\n";
2216 
-		if ($globalDebug) echo "Owner Australia: Download...";
2526 
+		} elseif ($globalDebug) {
2527 
+			echo "Done\n";
2528 
+		}
2529 
+		if ($globalDebug) {
2530 
+			echo "Owner Australia: Download...";
2531 
+		}
2217 2532 
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
2218 2533 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
2219 
-			if ($globalDebug) echo "Add to DB...";
2534 
+			if ($globalDebug) {
2535 
+				echo "Add to DB...";
2536 
+			}
2220 2537 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
2221 
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2538 
+		} else {
2539 
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2540 
+		}
2222 2541 
 		if ($error != '') {
2223 2542 
 			return $error;
2224 
-		} elseif ($globalDebug) echo "Done\n";
2225 
-		if ($globalDebug) echo "Owner Austria: Download...";
2543 
+		} elseif ($globalDebug) {
2544 
+			echo "Done\n";
2545 
+		}
2546 
+		if ($globalDebug) {
2547 
+			echo "Owner Austria: Download...";
2548 
+		}
2226 2549 
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
2227 2550 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
2228 
-			if ($globalDebug) echo "Add to DB...";
2551 
+			if ($globalDebug) {
2552 
+				echo "Add to DB...";
2553 
+			}
2229 2554 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
2230 
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2555 
+		} else {
2556 
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2557 
+		}
2231 2558 
 		if ($error != '') {
2232 2559 
 			return $error;
2233 
-		} elseif ($globalDebug) echo "Done\n";
2234 
-		if ($globalDebug) echo "Owner Chile: Download...";
2560 
+		} elseif ($globalDebug) {
2561 
+			echo "Done\n";
2562 
+		}
2563 
+		if ($globalDebug) {
2564 
+			echo "Owner Chile: Download...";
2565 
+		}
2235 2566 
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
2236 2567 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
2237 
-			if ($globalDebug) echo "Add to DB...";
2568 
+			if ($globalDebug) {
2569 
+				echo "Add to DB...";
2570 
+			}
2238 2571 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
2239 
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2572 
+		} else {
2573 
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2574 
+		}
2240 2575 
 		if ($error != '') {
2241 2576 
 			return $error;
2242 
-		} elseif ($globalDebug) echo "Done\n";
2243 
-		if ($globalDebug) echo "Owner Colombia: Download...";
2577 
+		} elseif ($globalDebug) {
2578 
+			echo "Done\n";
2579 
+		}
2580 
+		if ($globalDebug) {
2581 
+			echo "Owner Colombia: Download...";
2582 
+		}
2244 2583 
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
2245 2584 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
2246 
-			if ($globalDebug) echo "Add to DB...";
2585 
+			if ($globalDebug) {
2586 
+				echo "Add to DB...";
2587 
+			}
2247 2588 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
2248 
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2589 
+		} else {
2590 
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2591 
+		}
2249 2592 
 		if ($error != '') {
2250 2593 
 			return $error;
2251 
-		} elseif ($globalDebug) echo "Done\n";
2252 
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2594 
+		} elseif ($globalDebug) {
2595 
+			echo "Done\n";
2596 
+		}
2597 
+		if ($globalDebug) {
2598 
+			echo "Owner Bosnia Herzegobina: Download...";
2599 
+		}
2253 2600 
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
2254 2601 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
2255 
-			if ($globalDebug) echo "Add to DB...";
2602 
+			if ($globalDebug) {
2603 
+				echo "Add to DB...";
2604 
+			}
2256 2605 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
2257 
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2606 
+		} else {
2607 
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2608 
+		}
2258 2609 
 		if ($error != '') {
2259 2610 
 			return $error;
2260 
-		} elseif ($globalDebug) echo "Done\n";
2261 
-		if ($globalDebug) echo "Owner Brazil: Download...";
2611 
+		} elseif ($globalDebug) {
2612 
+			echo "Done\n";
2613 
+		}
2614 
+		if ($globalDebug) {
2615 
+			echo "Owner Brazil: Download...";
2616 
+		}
2262 2617 
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
2263 2618 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
2264 
-			if ($globalDebug) echo "Add to DB...";
2619 
+			if ($globalDebug) {
2620 
+				echo "Add to DB...";
2621 
+			}
2265 2622 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
2266 
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2623 
+		} else {
2624 
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2625 
+		}
2267 2626 
 		if ($error != '') {
2268 2627 
 			return $error;
2269 
-		} elseif ($globalDebug) echo "Done\n";
2270 
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2628 
+		} elseif ($globalDebug) {
2629 
+			echo "Done\n";
2630 
+		}
2631 
+		if ($globalDebug) {
2632 
+			echo "Owner Cayman Islands: Download...";
2633 
+		}
2271 2634 
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
2272 2635 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
2273 
-			if ($globalDebug) echo "Add to DB...";
2636 
+			if ($globalDebug) {
2637 
+				echo "Add to DB...";
2638 
+			}
2274 2639 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
2275 
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2640 
+		} else {
2641 
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2642 
+		}
2276 2643 
 		if ($error != '') {
2277 2644 
 			return $error;
2278 
-		} elseif ($globalDebug) echo "Done\n";
2279 
-		if ($globalDebug) echo "Owner Croatia: Download...";
2645 
+		} elseif ($globalDebug) {
2646 
+			echo "Done\n";
2647 
+		}
2648 
+		if ($globalDebug) {
2649 
+			echo "Owner Croatia: Download...";
2650 
+		}
2280 2651 
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
2281 2652 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
2282 
-			if ($globalDebug) echo "Add to DB...";
2653 
+			if ($globalDebug) {
2654 
+				echo "Add to DB...";
2655 
+			}
2283 2656 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
2284 
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2657 
+		} else {
2658 
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2659 
+		}
2285 2660 
 		if ($error != '') {
2286 2661 
 			return $error;
2287 
-		} elseif ($globalDebug) echo "Done\n";
2288 
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2662 
+		} elseif ($globalDebug) {
2663 
+			echo "Done\n";
2664 
+		}
2665 
+		if ($globalDebug) {
2666 
+			echo "Owner Luxembourg: Download...";
2667 
+		}
2289 2668 
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
2290 2669 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
2291 
-			if ($globalDebug) echo "Add to DB...";
2670 
+			if ($globalDebug) {
2671 
+				echo "Add to DB...";
2672 
+			}
2292 2673 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
2293 
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2674 
+		} else {
2675 
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2676 
+		}
2294 2677 
 		if ($error != '') {
2295 2678 
 			return $error;
2296 
-		} elseif ($globalDebug) echo "Done\n";
2297 
-		if ($globalDebug) echo "Owner Maldives: Download...";
2679 
+		} elseif ($globalDebug) {
2680 
+			echo "Done\n";
2681 
+		}
2682 
+		if ($globalDebug) {
2683 
+			echo "Owner Maldives: Download...";
2684 
+		}
2298 2685 
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
2299 2686 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
2300 
-			if ($globalDebug) echo "Add to DB...";
2687 
+			if ($globalDebug) {
2688 
+				echo "Add to DB...";
2689 
+			}
2301 2690 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
2302 
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2691 
+		} else {
2692 
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2693 
+		}
2303 2694 
 		if ($error != '') {
2304 2695 
 			return $error;
2305 
-		} elseif ($globalDebug) echo "Done\n";
2306 
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2696 
+		} elseif ($globalDebug) {
2697 
+			echo "Done\n";
2698 
+		}
2699 
+		if ($globalDebug) {
2700 
+			echo "Owner New Zealand: Download...";
2701 
+		}
2307 2702 
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
2308 2703 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
2309 
-			if ($globalDebug) echo "Add to DB...";
2704 
+			if ($globalDebug) {
2705 
+				echo "Add to DB...";
2706 
+			}
2310 2707 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
2311 
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2708 
+		} else {
2709 
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2710 
+		}
2312 2711 
 		if ($error != '') {
2313 2712 
 			return $error;
2314 
-		} elseif ($globalDebug) echo "Done\n";
2315 
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2713 
+		} elseif ($globalDebug) {
2714 
+			echo "Done\n";
2715 
+		}
2716 
+		if ($globalDebug) {
2717 
+			echo "Owner Papua New Guinea: Download...";
2718 
+		}
2316 2719 
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
2317 2720 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
2318 
-			if ($globalDebug) echo "Add to DB...";
2721 
+			if ($globalDebug) {
2722 
+				echo "Add to DB...";
2723 
+			}
2319 2724 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
2320 
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2725 
+		} else {
2726 
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2727 
+		}
2321 2728 
 		if ($error != '') {
2322 2729 
 			return $error;
2323 
-		} elseif ($globalDebug) echo "Done\n";
2324 
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2730 
+		} elseif ($globalDebug) {
2731 
+			echo "Done\n";
2732 
+		}
2733 
+		if ($globalDebug) {
2734 
+			echo "Owner Slovakia: Download...";
2735 
+		}
2325 2736 
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
2326 2737 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
2327 
-			if ($globalDebug) echo "Add to DB...";
2738 
+			if ($globalDebug) {
2739 
+				echo "Add to DB...";
2740 
+			}
2328 2741 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
2329 
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2742 
+		} else {
2743 
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2744 
+		}
2330 2745 
 		if ($error != '') {
2331 2746 
 			return $error;
2332 
-		} elseif ($globalDebug) echo "Done\n";
2333 
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2747 
+		} elseif ($globalDebug) {
2748 
+			echo "Done\n";
2749 
+		}
2750 
+		if ($globalDebug) {
2751 
+			echo "Owner Ecuador: Download...";
2752 
+		}
2334 2753 
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
2335 2754 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
2336 
-			if ($globalDebug) echo "Add to DB...";
2755 
+			if ($globalDebug) {
2756 
+				echo "Add to DB...";
2757 
+			}
2337 2758 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
2338 
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2759 
+		} else {
2760 
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2761 
+		}
2339 2762 
 		if ($error != '') {
2340 2763 
 			return $error;
2341 
-		} elseif ($globalDebug) echo "Done\n";
2342 
-		if ($globalDebug) echo "Owner Iceland: Download...";
2764 
+		} elseif ($globalDebug) {
2765 
+			echo "Done\n";
2766 
+		}
2767 
+		if ($globalDebug) {
2768 
+			echo "Owner Iceland: Download...";
2769 
+		}
2343 2770 
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
2344 2771 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
2345 
-			if ($globalDebug) echo "Add to DB...";
2772 
+			if ($globalDebug) {
2773 
+				echo "Add to DB...";
2774 
+			}
2346 2775 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
2347 
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2776 
+		} else {
2777 
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2778 
+		}
2348 2779 
 		if ($error != '') {
2349 2780 
 			return $error;
2350 
-		} elseif ($globalDebug) echo "Done\n";
2351 
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2781 
+		} elseif ($globalDebug) {
2782 
+			echo "Done\n";
2783 
+		}
2784 
+		if ($globalDebug) {
2785 
+			echo "Owner Isle of Man: Download...";
2786 
+		}
2352 2787 
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
2353 2788 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
2354 
-			if ($globalDebug) echo "Add to DB...";
2789 
+			if ($globalDebug) {
2790 
+				echo "Add to DB...";
2791 
+			}
2355 2792 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
2356 
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2793 
+		} else {
2794 
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2795 
+		}
2357 2796 
 		if ($error != '') {
2358 2797 
 			return $error;
2359 
-		} elseif ($globalDebug) echo "Done\n";
2798 
+		} elseif ($globalDebug) {
2799 
+			echo "Done\n";
2800 
+		}
2360 2801 
 		if ($globalMasterSource) {
2361 
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2802 
+			if ($globalDebug) {
2803 
+				echo "ModeS Netherlands: Download...";
2804 
+			}
2362 2805 
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
2363 2806 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
2364 
-				if ($globalDebug) echo "Add to DB...";
2807 
+				if ($globalDebug) {
2808 
+					echo "Add to DB...";
2809 
+				}
2365 2810 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
2366 
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2811 
+			} else {
2812 
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2813 
+			}
2367 2814 
 			if ($error != '') {
2368 2815 
 				return $error;
2369 
-			} elseif ($globalDebug) echo "Done\n";
2370 
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2816 
+			} elseif ($globalDebug) {
2817 
+				echo "Done\n";
2818 
+			}
2819 
+			if ($globalDebug) {
2820 
+				echo "ModeS Denmark: Download...";
2821 
+			}
2371 2822 
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
2372 2823 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
2373 
-				if ($globalDebug) echo "Add to DB...";
2824 
+				if ($globalDebug) {
2825 
+					echo "Add to DB...";
2826 
+				}
2374 2827 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
2375 
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2828 
+			} else {
2829 
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2830 
+			}
2376 2831 
 			if ($error != '') {
2377 2832 
 				return $error;
2378 
-			} elseif ($globalDebug) echo "Done\n";
2379 
-		} elseif ($globalDebug) echo "Done\n";
2833 
+			} elseif ($globalDebug) {
2834 
+				echo "Done\n";
2835 
+			}
2836 
+		} elseif ($globalDebug) {
2837 
+			echo "Done\n";
2838 
+		}
2380 2839 
 		return '';
2381 2840 
 	}
2382 2841
2383 2842 
 	public static function update_translation() {
2384 2843 
 		global $tmp_dir, $globalDebug;
2385 2844 
 		$error = '';
2386 
-		if ($globalDebug) echo "Translation : Download...";
2845 
+		if ($globalDebug) {
2846 
+			echo "Translation : Download...";
2847 
+		}
2387 2848 
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
2388 2849 
 		if (file_exists($tmp_dir.'translation.zip')) {
2389 
-			if ($globalDebug) echo "Unzip...";
2850 
+			if ($globalDebug) {
2851 
+				echo "Unzip...";
2852 
+			}
2390 2853 
 			update_db::unzip($tmp_dir.'translation.zip');
2391 
-			if ($globalDebug) echo "Add to DB...";
2854 
+			if ($globalDebug) {
2855 
+				echo "Add to DB...";
2856 
+			}
2392 2857 
 			$error = update_db::translation();
2393 
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2858 
+		} else {
2859 
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2860 
+		}
2394 2861 
 		if ($error != '') {
2395 2862 
 			return $error;
2396 
-		} elseif ($globalDebug) echo "Done\n";
2863 
+		} elseif ($globalDebug) {
2864 
+			echo "Done\n";
2865 
+		}
2397 2866 
 		return '';
2398 2867 
 	}
2399 2868
2400 2869 
 	public static function update_translation_fam() {
2401 2870 
 		global $tmp_dir, $globalDebug;
2402 2871 
 		$error = '';
2403 
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2872 
+		if ($globalDebug) {
2873 
+			echo "Translation from FlightAirMap website : Download...";
2874 
+		}
2404 2875 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
2405 2876 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
2406 2877 
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
2407 2878 
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2408 2879 
 			$translation_md5 = $translation_md5_file[0];
2409 2880 
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
2410 
-				if ($globalDebug) echo "Gunzip...";
2881 
+				if ($globalDebug) {
2882 
+					echo "Gunzip...";
2883 
+				}
2411 2884 
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
2412 
-				if ($globalDebug) echo "Add to DB...";
2885 
+				if ($globalDebug) {
2886 
+					echo "Add to DB...";
2887 
+				}
2413 2888 
 				$error = update_db::translation_fam();
2414 
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2415 
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2889 
+			} else {
2890 
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2891 
+			}
2892 
+		} else {
2893 
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2894 
+		}
2416 2895 
 		if ($error != '') {
2417 2896 
 			return $error;
2418 
-		} elseif ($globalDebug) echo "Done\n";
2897 
+		} elseif ($globalDebug) {
2898 
+			echo "Done\n";
2899 
+		}
2419 2900 
 		return '';
2420 2901 
 	}
2421 2902 
 	public static function update_ModeS_fam() {
2422 2903 
 		global $tmp_dir, $globalDebug;
2423 2904 
 		$error = '';
2424 
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2905 
+		if ($globalDebug) {
2906 
+			echo "ModeS from FlightAirMap website : Download...";
2907 
+		}
2425 2908 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
2426 2909 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
2427 2910 
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
2428 2911 
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2429 2912 
 			$modes_md5 = $modes_md5_file[0];
2430 2913 
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
2431 
-				if ($globalDebug) echo "Gunzip...";
2914 
+				if ($globalDebug) {
2915 
+					echo "Gunzip...";
2916 
+				}
2432 2917 
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
2433 
-				if ($globalDebug) echo "Add to DB...";
2918 
+				if ($globalDebug) {
2919 
+					echo "Add to DB...";
2920 
+				}
2434 2921 
 				$error = update_db::modes_fam();
2435 
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2436 
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2922 
+			} else {
2923 
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2924 
+			}
2925 
+		} else {
2926 
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2927 
+		}
2437 2928 
 		if ($error != '') {
2438 2929 
 			return $error;
2439 
-		} elseif ($globalDebug) echo "Done\n";
2930 
+		} elseif ($globalDebug) {
2931 
+			echo "Done\n";
2932 
+		}
2440 2933 
 		return '';
2441 2934 
 	}
2442 2935
2443 2936 
 	public static function update_airlines_fam() {
2444 2937 
 		global $tmp_dir, $globalDebug;
2445 2938 
 		$error = '';
2446 
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
2939 
+		if ($globalDebug) {
2940 
+			echo "Airlines from FlightAirMap website : Download...";
2941 
+		}
2447 2942 
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
2448 2943 
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
2449 2944 
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
 
@@ -2452,26 +2947,42 @@  discard block
 
 block discarded – undo
2452 2947 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
2453 2948 
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
2454 2949 
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
2455 
-						if ($globalDebug) echo "Gunzip...";
2950 
+						if ($globalDebug) {
2951 
+							echo "Gunzip...";
2952 
+						}
2456 2953 
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
2457 
-						if ($globalDebug) echo "Add to DB...";
2954 
+						if ($globalDebug) {
2955 
+							echo "Add to DB...";
2956 
+						}
2458 2957 
 						$error = update_db::airlines_fam();
2459 2958 
 						update_db::insert_airlines_version($airlines_md5);
2460 
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2461 
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2462 
-			} elseif ($globalDebug) echo "No update.";
2463 
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2959 
+					} else {
2960 
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2961 
+					}
2962 
+			    } else {
2963 
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2964 
+			    }
2965 
+			} elseif ($globalDebug) {
2966 
+				echo "No update.";
2967 
+			}
2968 
+		} else {
2969 
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2970 
+		}
2464 2971 
 		if ($error != '') {
2465 2972 
 			return $error;
2466 2973 
 		} else {
2467 
-			if ($globalDebug) echo "Done\n";
2974 
+			if ($globalDebug) {
2975 
+				echo "Done\n";
2976 
+			}
2468 2977 
 		}
2469 2978 
 		return '';
2470 2979 
 	}
2471 2980
2472 2981 
 	public static function update_owner_fam() {
2473 2982 
 		global $tmp_dir, $globalDebug, $globalOwner;
2474 
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2983 
+		if ($globalDebug) {
2984 
+			echo "owner from FlightAirMap website : Download...";
2985 
+		}
2475 2986 
 		$error = '';
2476 2987 
 		if ($globalOwner === TRUE) {
2477 2988 
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
 
@@ -2484,35 +2995,57 @@  discard block
 
 block discarded – undo
2484 2995 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2485 2996 
 			$owners_md5 = $owners_md5_file[0];
2486 2997 
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
2487 
-				if ($globalDebug) echo "Gunzip...";
2998 
+				if ($globalDebug) {
2999 
+					echo "Gunzip...";
3000 
+				}
2488 3001 
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
2489 
-				if ($globalDebug) echo "Add to DB...";
3002 
+				if ($globalDebug) {
3003 
+					echo "Add to DB...";
3004 
+				}
2490 3005 
 				$error = update_db::owner_fam();
2491 
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
2492 
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3006 
+			} else {
3007 
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
3008 
+			}
3009 
+		} else {
3010 
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3011 
+		}
2493 3012 
 		if ($error != '') {
2494 3013 
 			return $error;
2495 
-		} elseif ($globalDebug) echo "Done\n";
3014 
+		} elseif ($globalDebug) {
3015 
+			echo "Done\n";
3016 
+		}
2496 3017 
 		return '';
2497 3018 
 	}
2498 3019 
 	public static function update_routes_fam() {
2499 3020 
 		global $tmp_dir, $globalDebug;
2500 
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
3021 
+		if ($globalDebug) {
3022 
+			echo "Routes from FlightAirMap website : Download...";
3023 
+		}
2501 3024 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2502 3025 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
2503 3026 
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
2504 3027 
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2505 3028 
 			$routes_md5 = $routes_md5_file[0];
2506 3029 
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
2507 
-				if ($globalDebug) echo "Gunzip...";
3030 
+				if ($globalDebug) {
3031 
+					echo "Gunzip...";
3032 
+				}
2508 3033 
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
2509 
-				if ($globalDebug) echo "Add to DB...";
3034 
+				if ($globalDebug) {
3035 
+					echo "Add to DB...";
3036 
+				}
2510 3037 
 				$error = update_db::routes_fam();
2511 
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
2512 
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3038 
+			} else {
3039 
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
3040 
+			}
3041 
+		} else {
3042 
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3043 
+		}
2513 3044 
 		if ($error != '') {
2514 3045 
 			return $error;
2515 
-		} elseif ($globalDebug) echo "Done\n";
3046 
+		} elseif ($globalDebug) {
3047 
+			echo "Done\n";
3048 
+		}
2516 3049 
 		return '';
2517 3050 
 	}
2518 3051 
 	public static function update_marine_identity_fam() {
 
@@ -2522,21 +3055,33 @@  discard block
 
 block discarded – undo
2522 3055 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2523 3056 
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2524 3057 
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2525 
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
3058 
+				if ($globalDebug) {
3059 
+					echo "Marine identity from FlightAirMap website : Download...";
3060 
+				}
2526 3061 
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2527 3062 
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2528 3063 
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
2529 
-						if ($globalDebug) echo "Gunzip...";
3064 
+						if ($globalDebug) {
3065 
+							echo "Gunzip...";
3066 
+						}
2530 3067 
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
2531 
-						if ($globalDebug) echo "Add to DB...";
3068 
+						if ($globalDebug) {
3069 
+							echo "Add to DB...";
3070 
+						}
2532 3071 
 						$error = update_db::marine_identity_fam();
2533 
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
2534 
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3072 
+					} else {
3073 
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
3074 
+					}
3075 
+				} else {
3076 
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3077 
+				}
2535 3078 
 				if ($error != '') {
2536 3079 
 					return $error;
2537 3080 
 				} else {
2538 3081 
 					update_db::insert_marine_identity_version($marine_identity_md5);
2539 
-					if ($globalDebug) echo "Done\n";
3082 
+					if ($globalDebug) {
3083 
+						echo "Done\n";
3084 
+					}
2540 3085 
 				}
2541 3086 
 			}
2542 3087 
 		}
 
@@ -2550,21 +3095,33 @@  discard block
 
 block discarded – undo
2550 3095 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2551 3096 
 			$satellite_md5 = $satellite_md5_file[0];
2552 3097 
 			if (!update_db::check_satellite_version($satellite_md5)) {
2553 
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
3098 
+				if ($globalDebug) {
3099 
+					echo "Satellite from FlightAirMap website : Download...";
3100 
+				}
2554 3101 
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
2555 3102 
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
2556 3103 
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
2557 
-						if ($globalDebug) echo "Gunzip...";
3104 
+						if ($globalDebug) {
3105 
+							echo "Gunzip...";
3106 
+						}
2558 3107 
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
2559 
-						if ($globalDebug) echo "Add to DB...";
3108 
+						if ($globalDebug) {
3109 
+							echo "Add to DB...";
3110 
+						}
2560 3111 
 						$error = update_db::satellite_fam();
2561 
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
2562 
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3112 
+					} else {
3113 
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
3114 
+					}
3115 
+				} else {
3116 
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3117 
+				}
2563 3118 
 				if ($error != '') {
2564 3119 
 					return $error;
2565 3120 
 				} else {
2566 3121 
 					update_db::insert_satellite_version($satellite_md5);
2567 
-					if ($globalDebug) echo "Done\n";
3122 
+					if ($globalDebug) {
3123 
+						echo "Done\n";
3124 
+					}
2568 3125 
 				}
2569 3126 
 			}
2570 3127 
 		}
 
@@ -2572,17 +3129,25 @@  discard block
 
 block discarded – undo
2572 3129 
 	}
2573 3130 
 	public static function update_banned_fam() {
2574 3131 
 		global $tmp_dir, $globalDebug;
2575 
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
3132 
+		if ($globalDebug) {
3133 
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
3134 
+		}
2576 3135 
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2577 3136 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2578 3137 
 			//if ($globalDebug) echo "Gunzip...";
2579 3138 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
2580 
-			if ($globalDebug) echo "Add to DB...";
3139 
+			if ($globalDebug) {
3140 
+				echo "Add to DB...";
3141 
+			}
2581 3142 
 			$error = update_db::banned_fam();
2582 
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3143 
+		} else {
3144 
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3145 
+		}
2583 3146 
 		if ($error != '') {
2584 3147 
 			return $error;
2585 
-		} elseif ($globalDebug) echo "Done\n";
3148 
+		} elseif ($globalDebug) {
3149 
+			echo "Done\n";
3150 
+		}
2586 3151 
 		return '';
2587 3152 
 	}
2588 3153 
 
@@ -2590,7 +3155,9 @@  discard block
 
 block discarded – undo
2590 3155 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2591 3156 
 		include_once('class.create_db.php');
2592 3157 
 		$error = '';
2593 
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
3158 
+		if ($globalDebug) {
3159 
+			echo "Airspace from FlightAirMap website : Download...";
3160 
+		}
2594 3161 
 		if ($globalDBdriver == 'mysql') {
2595 3162 
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2596 3163 
 		} else {
 
@@ -2607,9 +3174,13 @@  discard block
 
 block discarded – undo
2607 3174 
 				}
2608 3175 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2609 3176 
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
2610 
-						if ($globalDebug) echo "Gunzip...";
3177 
+						if ($globalDebug) {
3178 
+							echo "Gunzip...";
3179 
+						}
2611 3180 
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
2612 
-						if ($globalDebug) echo "Add to DB...";
3181 
+						if ($globalDebug) {
3182 
+							echo "Add to DB...";
3183 
+						}
2613 3184 
 						$Connection = new Connection();
2614 3185 
 						if ($Connection->tableExists('airspace')) {
2615 3186 
 							$query = 'DROP TABLE airspace';
 
@@ -2622,20 +3193,30 @@  discard block
 
 block discarded – undo
2622 3193 
 						}
2623 3194 
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
2624 3195 
 						update_db::insert_airspace_version($airspace_md5);
2625 
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
2626 
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3196 
+					} else {
3197 
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
3198 
+					}
3199 
+				} else {
3200 
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3201 
+				}
2627 3202 
 			}
2628 
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3203 
+		} else {
3204 
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3205 
+		}
2629 3206 
 		if ($error != '') {
2630 3207 
 			return $error;
2631 
-		} elseif ($globalDebug) echo "Done\n";
3208 
+		} elseif ($globalDebug) {
3209 
+			echo "Done\n";
3210 
+		}
2632 3211 
 		return '';
2633 3212 
 	}
2634 3213
2635 3214 
 	public static function update_geoid_fam() {
2636 3215 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
2637 3216 
 		$error = '';
2638 
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
3217 
+		if ($globalDebug) {
3218 
+			echo "Geoid from FlightAirMap website : Download...";
3219 
+		}
2639 3220 
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2640 3221 
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
2641 3222 
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
 
@@ -2644,76 +3225,116 @@  discard block
 
 block discarded – undo
2644 3225 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
2645 3226 
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
2646 3227 
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
2647 
-						if ($globalDebug) echo "Gunzip...";
3228 
+						if ($globalDebug) {
3229 
+							echo "Gunzip...";
3230 
+						}
2648 3231 
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2649 3232 
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
2650 3233 
 							update_db::insert_geoid_version($geoid_md5);
2651 3234 
 						}
2652 
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
2653 
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3235 
+					} else {
3236 
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
3237 
+					}
3238 
+				} else {
3239 
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3240 
+				}
2654 3241 
 			}
2655 
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3242 
+		} else {
3243 
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3244 
+		}
2656 3245 
 		if ($error != '') {
2657 3246 
 			return $error;
2658 
-		} elseif ($globalDebug) echo "Done\n";
3247 
+		} elseif ($globalDebug) {
3248 
+			echo "Done\n";
3249 
+		}
2659 3250 
 		return '';
2660 3251 
 	}
2661 3252
2662 3253 
 	public static function update_tle() {
2663 3254 
 		global $tmp_dir, $globalDebug;
2664 
-		if ($globalDebug) echo "Download TLE : Download...";
3255 
+		if ($globalDebug) {
3256 
+			echo "Download TLE : Download...";
3257 
+		}
2665 3258 
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2666 3259 
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2667 3260 
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
2668 3261 
 		foreach ($alltle as $filename) {
2669 
-			if ($globalDebug) echo "downloading ".$filename.'...';
3262 
+			if ($globalDebug) {
3263 
+				echo "downloading ".$filename.'...';
3264 
+			}
2670 3265 
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2671 3266 
 			if (file_exists($tmp_dir.$filename)) {
2672 
-				if ($globalDebug) echo "Add to DB ".$filename."...";
3267 
+				if ($globalDebug) {
3268 
+					echo "Add to DB ".$filename."...";
3269 
+				}
2673 3270 
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2674 
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3271 
+			} else {
3272 
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3273 
+			}
2675 3274 
 			if ($error != '') {
2676 3275 
 				echo $error."\n";
2677 
-			} elseif ($globalDebug) echo "Done\n";
3276 
+			} elseif ($globalDebug) {
3277 
+				echo "Done\n";
3278 
+			}
2678 3279 
 		}
2679 3280 
 		return '';
2680 3281 
 	}
2681 3282
2682 3283 
 	public static function update_ucsdb() {
2683 3284 
 		global $tmp_dir, $globalDebug;
2684 
-		if ($globalDebug) echo "Download UCS DB : Download...";
3285 
+		if ($globalDebug) {
3286 
+			echo "Download UCS DB : Download...";
3287 
+		}
2685 3288 
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2686 3289 
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
2687 
-			if ($globalDebug) echo "Add to DB...";
3290 
+			if ($globalDebug) {
3291 
+				echo "Add to DB...";
3292 
+			}
2688 3293 
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2689 
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3294 
+		} else {
3295 
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3296 
+		}
2690 3297 
 		if ($error != '') {
2691 3298 
 			echo $error."\n";
2692 
-		} elseif ($globalDebug) echo "Done\n";
3299 
+		} elseif ($globalDebug) {
3300 
+			echo "Done\n";
3301 
+		}
2693 3302 
 		return '';
2694 3303 
 	}
2695 3304
2696 3305 
 	public static function update_celestrak() {
2697 3306 
 		global $tmp_dir, $globalDebug;
2698 
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
3307 
+		if ($globalDebug) {
3308 
+			echo "Download Celestrak DB : Download...";
3309 
+		}
2699 3310 
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
2700 3311 
 		if (file_exists($tmp_dir.'satcat.txt')) {
2701 
-			if ($globalDebug) echo "Add to DB...";
3312 
+			if ($globalDebug) {
3313 
+				echo "Add to DB...";
3314 
+			}
2702 3315 
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
2703 
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3316 
+		} else {
3317 
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3318 
+		}
2704 3319 
 		if ($error != '') {
2705 3320 
 			echo $error."\n";
2706 
-		} elseif ($globalDebug) echo "Done\n";
3321 
+		} elseif ($globalDebug) {
3322 
+			echo "Done\n";
3323 
+		}
2707 3324 
 		return '';
2708 3325 
 	}
2709 3326
2710 3327 
 	public static function update_models() {
2711 3328 
 		global $tmp_dir, $globalDebug;
2712 3329 
 		$error = '';
2713 
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
3330 
+		if ($globalDebug) {
3331 
+			echo "Models from FlightAirMap website : Download...";
3332 
+		}
2714 3333 
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2715 3334 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2716 
-			if ($globalDebug) echo "Check files...\n";
3335 
+			if ($globalDebug) {
3336 
+				echo "Check files...\n";
3337 
+			}
2717 3338 
 			$newmodelsdb = array();
2718 3339 
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2719 3340 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2732,25 +3353,35 @@  discard block
 
 block discarded – undo
2732 3353 
 			}
2733 3354 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2734 3355 
 			foreach ($diff as $key => $value) {
2735 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3356 
+				if ($globalDebug) {
3357 
+					echo 'Downloading model '.$key.' ...'."\n";
3358 
+				}
2736 3359 
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2737 3360
2738 3361 
 			}
2739 3362 
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2740 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3363 
+		} else {
3364 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3365 
+		}
2741 3366 
 		if ($error != '') {
2742 3367 
 			return $error;
2743 
-		} elseif ($globalDebug) echo "Done\n";
3368 
+		} elseif ($globalDebug) {
3369 
+			echo "Done\n";
3370 
+		}
2744 3371 
 		return '';
2745 3372 
 	}
2746 3373
2747 3374 
 	public static function update_space_models() {
2748 3375 
 		global $tmp_dir, $globalDebug;
2749 3376 
 		$error = '';
2750 
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
3377 
+		if ($globalDebug) {
3378 
+			echo "Space models from FlightAirMap website : Download...";
3379 
+		}
2751 3380 
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2752 3381 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2753 
-			if ($globalDebug) echo "Check files...\n";
3382 
+			if ($globalDebug) {
3383 
+				echo "Check files...\n";
3384 
+			}
2754 3385 
 			$newmodelsdb = array();
2755 3386 
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2756 3387 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2769,25 +3400,35 @@  discard block
 
 block discarded – undo
2769 3400 
 			}
2770 3401 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2771 3402 
 			foreach ($diff as $key => $value) {
2772 
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
3403 
+				if ($globalDebug) {
3404 
+					echo 'Downloading space model '.$key.' ...'."\n";
3405 
+				}
2773 3406 
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2774 3407
2775 3408 
 			}
2776 3409 
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2777 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3410 
+		} else {
3411 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3412 
+		}
2778 3413 
 		if ($error != '') {
2779 3414 
 			return $error;
2780 
-		} elseif ($globalDebug) echo "Done\n";
3415 
+		} elseif ($globalDebug) {
3416 
+			echo "Done\n";
3417 
+		}
2781 3418 
 		return '';
2782 3419 
 	}
2783 3420
2784 3421 
 	public static function update_vehicules_models() {
2785 3422 
 		global $tmp_dir, $globalDebug;
2786 3423 
 		$error = '';
2787 
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
3424 
+		if ($globalDebug) {
3425 
+			echo "Vehicules models from FlightAirMap website : Download...";
3426 
+		}
2788 3427 
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2789 3428 
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2790 
-			if ($globalDebug) echo "Check files...\n";
3429 
+			if ($globalDebug) {
3430 
+				echo "Check files...\n";
3431 
+			}
2791 3432 
 			$newmodelsdb = array();
2792 3433 
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2793 3434 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2806,15 +3447,21 @@  discard block
 
 block discarded – undo
2806 3447 
 			}
2807 3448 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2808 3449 
 			foreach ($diff as $key => $value) {
2809 
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
3450 
+				if ($globalDebug) {
3451 
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
3452 
+				}
2810 3453 
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2811 3454
2812 3455 
 			}
2813 3456 
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2814 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3457 
+		} else {
3458 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3459 
+		}
2815 3460 
 		if ($error != '') {
2816 3461 
 			return $error;
2817 
-		} elseif ($globalDebug) echo "Done\n";
3462 
+		} elseif ($globalDebug) {
3463 
+			echo "Done\n";
3464 
+		}
2818 3465 
 		return '';
2819 3466 
 	}
2820 3467 
 
@@ -2857,7 +3504,9 @@  discard block
 
 block discarded – undo
2857 3504 
                 }
2858 3505
2859 3506 
 		$error = '';
2860 
-		if ($globalDebug) echo "Notam : Download...";
3507 
+		if ($globalDebug) {
3508 
+			echo "Notam : Download...";
3509 
+		}
2861 3510 
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2862 3511 
 		if (file_exists($tmp_dir.'notam.rss')) {
2863 3512 
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
 
@@ -2872,14 +3521,30 @@  discard block
 
 block discarded – undo
2872 3521 
 				$data['fir'] = $q[0];
2873 3522 
 				$data['code'] = $q[1];
2874 3523 
 				$ifrvfr = $q[2];
2875 
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2876 
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2877 
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2878 
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2879 
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2880 
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2881 
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2882 
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
3524 
+				if ($ifrvfr == 'IV') {
3525 
+					$data['rules'] = 'IFR/VFR';
3526 
+				}
3527 
+				if ($ifrvfr == 'I') {
3528 
+					$data['rules'] = 'IFR';
3529 
+				}
3530 
+				if ($ifrvfr == 'V') {
3531 
+					$data['rules'] = 'VFR';
3532 
+				}
3533 
+				if ($q[4] == 'A') {
3534 
+					$data['scope'] = 'Airport warning';
3535 
+				}
3536 
+				if ($q[4] == 'E') {
3537 
+					$data['scope'] = 'Enroute warning';
3538 
+				}
3539 
+				if ($q[4] == 'W') {
3540 
+					$data['scope'] = 'Navigation warning';
3541 
+				}
3542 
+				if ($q[4] == 'AE') {
3543 
+					$data['scope'] = 'Airport/Enroute warning';
3544 
+				}
3545 
+				if ($q[4] == 'AW') {
3546 
+					$data['scope'] = 'Airport/Navigation warning';
3547 
+				}
2883 3548 
 				//$data['scope'] = $q[4];
2884 3549 
 				$data['lower_limit'] = $q[5];
2885 3550 
 				$data['upper_limit'] = $q[6];
 
@@ -2887,8 +3552,12 @@  discard block
 
 block discarded – undo
2887 3552 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2888 3553 
 				$latitude = $Common->convertDec($las,'latitude');
2889 3554 
 				$longitude = $Common->convertDec($lns,'longitude');
2890 
-				if ($lac == 'S') $latitude = '-'.$latitude;
2891 
-				if ($lnc == 'W') $longitude = '-'.$longitude;
3555 
+				if ($lac == 'S') {
3556 
+					$latitude = '-'.$latitude;
3557 
+				}
3558 
+				if ($lnc == 'W') {
3559 
+					$longitude = '-'.$longitude;
3560 
+				}
2892 3561 
 				$data['center_latitude'] = $latitude;
2893 3562 
 				$data['center_longitude'] = $longitude;
2894 3563 
 				$data['radius'] = intval($radius);
 
@@ -2918,10 +3587,14 @@  discard block
 
 block discarded – undo
2918 3587 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2919 3588 
 				unset($data);
2920 3589 
 			}
2921 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3590 
+		} else {
3591 
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3592 
+		}
2922 3593 
 		if ($error != '') {
2923 3594 
 			return $error;
2924 
-		} elseif ($globalDebug) echo "Done\n";
3595 
+		} elseif ($globalDebug) {
3596 
+			echo "Done\n";
3597 
+		}
2925 3598 
 		return '';
2926 3599 
 	}
2927 3600 
 	
@@ -2946,7 +3619,9 @@  discard block
 
 block discarded – undo
2946 3619 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2947 3620 
 		$airspace_json = json_decode($airspace_lst,true);
2948 3621 
 		foreach ($airspace_json['records'] as $airspace) {
2949 
-			if ($globalDebug) echo $airspace['name']."...\n";
3622 
+			if ($globalDebug) {
3623 
+				echo $airspace['name']."...\n";
3624 
+			}
2950 3625 
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2951 3626 
 			if (file_exists($tmp_dir.$airspace['name'])) {
2952 3627 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 
@@ -2990,8 +3665,11 @@  discard block
 
 block discarded – undo
2990 3665 
                         return "error : ".$e->getMessage();
2991 3666 
                 }
2992 3667 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2993 
-                if ($row['nb'] > 0) return false;
2994 
-                else return true;
3668 
+                if ($row['nb'] > 0) {
3669 
+                	return false;
3670 
+                } else {
3671 
+                	return true;
3672 
+                }
2995 3673 
 	}
2996 3674
2997 3675 
 	public static function insert_last_update() {
 
@@ -3016,8 +3694,11 @@  discard block
 
 block discarded – undo
3016 3694 
                         return "error : ".$e->getMessage();
3017 3695 
                 }
3018 3696 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3019 
-                if ($row['nb'] > 0) return true;
3020 
-                else return false;
3697 
+                if ($row['nb'] > 0) {
3698 
+                	return true;
3699 
+                } else {
3700 
+                	return false;
3701 
+                }
3021 3702 
 	}
3022 3703
3023 3704 
 	public static function check_geoid_version($version) {
 
@@ -3030,8 +3711,11 @@  discard block
 
 block discarded – undo
3030 3711 
                         return "error : ".$e->getMessage();
3031 3712 
                 }
3032 3713 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3033 
-                if ($row['nb'] > 0) return true;
3034 
-                else return false;
3714 
+                if ($row['nb'] > 0) {
3715 
+                	return true;
3716 
+                } else {
3717 
+                	return false;
3718 
+                }
3035 3719 
 	}
3036 3720
3037 3721 
 	public static function check_marine_identity_version($version) {
 
@@ -3044,8 +3728,11 @@  discard block
 
 block discarded – undo
3044 3728 
 			return "error : ".$e->getMessage();
3045 3729 
 		}
3046 3730 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3047 
-		if ($row['nb'] > 0) return true;
3048 
-		else return false;
3731 
+		if ($row['nb'] > 0) {
3732 
+			return true;
3733 
+		} else {
3734 
+			return false;
3735 
+		}
3049 3736 
 	}
3050 3737
3051 3738 
 	public static function check_satellite_version($version) {
 
@@ -3058,8 +3745,11 @@  discard block
 
 block discarded – undo
3058 3745 
 			return "error : ".$e->getMessage();
3059 3746 
 		}
3060 3747 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3061 
-		if ($row['nb'] > 0) return true;
3062 
-		else return false;
3748 
+		if ($row['nb'] > 0) {
3749 
+			return true;
3750 
+		} else {
3751 
+			return false;
3752 
+		}
3063 3753 
 	}
3064 3754
3065 3755 
 	public static function check_airlines_version($version) {
 
@@ -3072,8 +3762,11 @@  discard block
 
 block discarded – undo
3072 3762 
 			return "error : ".$e->getMessage();
3073 3763 
 		}
3074 3764 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3075 
-		if ($row['nb'] > 0) return true;
3076 
-		else return false;
3765 
+		if ($row['nb'] > 0) {
3766 
+			return true;
3767 
+		} else {
3768 
+			return false;
3769 
+		}
3077 3770 
 	}
3078 3771
3079 3772 
 	public static function check_notam_version($version) {
 
@@ -3086,8 +3779,11 @@  discard block
 
 block discarded – undo
3086 3779 
 			return "error : ".$e->getMessage();
3087 3780 
 		}
3088 3781 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3089 
-		if ($row['nb'] > 0) return true;
3090 
-		else return false;
3782 
+		if ($row['nb'] > 0) {
3783 
+			return true;
3784 
+		} else {
3785 
+			return false;
3786 
+		}
3091 3787 
 	}
3092 3788
3093 3789 
 	public static function insert_airlines_version($version) {
 
@@ -3177,8 +3873,11 @@  discard block
 
 block discarded – undo
3177 3873 
                         return "error : ".$e->getMessage();
3178 3874 
                 }
3179 3875 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3180 
-                if ($row['nb'] > 0) return false;
3181 
-                else return true;
3876 
+                if ($row['nb'] > 0) {
3877 
+                	return false;
3878 
+                } else {
3879 
+                	return true;
3880 
+                }
3182 3881 
 	}
3183 3882
3184 3883 
 	public static function insert_last_notam_update() {
 
@@ -3208,8 +3907,11 @@  discard block
 
 block discarded – undo
3208 3907 
                         return "error : ".$e->getMessage();
3209 3908 
                 }
3210 3909 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3211 
-                if ($row['nb'] > 0) return false;
3212 
-                else return true;
3910 
+                if ($row['nb'] > 0) {
3911 
+                	return false;
3912 
+                } else {
3913 
+                	return true;
3914 
+                }
3213 3915 
 	}
3214 3916
3215 3917 
 	public static function insert_last_airspace_update() {
 
@@ -3239,8 +3941,11 @@  discard block
 
 block discarded – undo
3239 3941 
                         return "error : ".$e->getMessage();
3240 3942 
                 }
3241 3943 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3242 
-                if ($row['nb'] > 0) return false;
3243 
-                else return true;
3944 
+                if ($row['nb'] > 0) {
3945 
+                	return false;
3946 
+                } else {
3947 
+                	return true;
3948 
+                }
3244 3949 
 	}
3245 3950
3246 3951 
 	public static function insert_last_geoid_update() {
 
@@ -3270,8 +3975,11 @@  discard block
 
 block discarded – undo
3270 3975 
 			return "error : ".$e->getMessage();
3271 3976 
 		}
3272 3977 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3273 
-		if ($row['nb'] > 0) return false;
3274 
-		else return true;
3978 
+		if ($row['nb'] > 0) {
3979 
+			return false;
3980 
+		} else {
3981 
+			return true;
3982 
+		}
3275 3983 
 	}
3276 3984
3277 3985 
 	public static function insert_last_owner_update() {
 
@@ -3301,8 +4009,11 @@  discard block
 
 block discarded – undo
3301 4009 
 			return "error : ".$e->getMessage();
3302 4010 
 		}
3303 4011 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3304 
-		if ($row['nb'] > 0) return false;
3305 
-		else return true;
4012 
+		if ($row['nb'] > 0) {
4013 
+			return false;
4014 
+		} else {
4015 
+			return true;
4016 
+		}
3306 4017 
 	}
3307 4018
3308 4019 
 	public static function insert_last_fires_update() {
 
@@ -3332,8 +4043,11 @@  discard block
 
 block discarded – undo
3332 4043 
 			return "error : ".$e->getMessage();
3333 4044 
 		}
3334 4045 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3335 
-		if ($row['nb'] > 0) return false;
3336 
-		else return true;
4046 
+		if ($row['nb'] > 0) {
4047 
+			return false;
4048 
+		} else {
4049 
+			return true;
4050 
+		}
3337 4051 
 	}
3338 4052
3339 4053 
 	public static function insert_last_airlines_update() {
 
@@ -3363,8 +4077,11 @@  discard block
 
 block discarded – undo
3363 4077 
                         return "error : ".$e->getMessage();
3364 4078 
                 }
3365 4079 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3366 
-                if ($row['nb'] > 0) return false;
3367 
-                else return true;
4080 
+                if ($row['nb'] > 0) {
4081 
+                	return false;
4082 
+                } else {
4083 
+                	return true;
4084 
+                }
3368 4085 
 	}
3369 4086
3370 4087 
 	public static function insert_last_schedules_update() {
 
@@ -3394,8 +4111,11 @@  discard block
 
 block discarded – undo
3394 4111 
 			return "error : ".$e->getMessage();
3395 4112 
 		}
3396 4113 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3397 
-		if ($row['nb'] > 0) return false;
3398 
-		else return true;
4114 
+		if ($row['nb'] > 0) {
4115 
+			return false;
4116 
+		} else {
4117 
+			return true;
4118 
+		}
3399 4119 
 	}
3400 4120
3401 4121 
 	public static function insert_last_tle_update() {
 
@@ -3425,8 +4145,11 @@  discard block
 
 block discarded – undo
3425 4145 
 			return "error : ".$e->getMessage();
3426 4146 
 		}
3427 4147 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3428 
-		if ($row['nb'] > 0) return false;
3429 
-		else return true;
4148 
+		if ($row['nb'] > 0) {
4149 
+			return false;
4150 
+		} else {
4151 
+			return true;
4152 
+		}
3430 4153 
 	}
3431 4154
3432 4155 
 	public static function insert_last_ucsdb_update() {
 
@@ -3456,8 +4179,11 @@  discard block
 
 block discarded – undo
3456 4179 
 			return "error : ".$e->getMessage();
3457 4180 
 		}
3458 4181 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3459 
-		if ($row['nb'] > 0) return false;
3460 
-		else return true;
4182 
+		if ($row['nb'] > 0) {
4183 
+			return false;
4184 
+		} else {
4185 
+			return true;
4186 
+		}
3461 4187 
 	}
3462 4188
3463 4189 
 	public static function insert_last_celestrak_update() {
 
@@ -3487,8 +4213,11 @@  discard block
 
 block discarded – undo
3487 4213 
 			return "error : ".$e->getMessage();
3488 4214 
 		}
3489 4215 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3490 
-		if ($row['nb'] > 0) return false;
3491 
-		else return true;
4216 
+		if ($row['nb'] > 0) {
4217 
+			return false;
4218 
+		} else {
4219 
+			return true;
4220 
+		}
3492 4221 
 	}
3493 4222
3494 4223 
 	public static function check_last_satellite_update() {
 
@@ -3506,8 +4235,11 @@  discard block
 
 block discarded – undo
3506 4235 
 			return "error : ".$e->getMessage();
3507 4236 
 		}
3508 4237 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3509 
-		if ($row['nb'] > 0) return false;
3510 
-		else return true;
4238 
+		if ($row['nb'] > 0) {
4239 
+			return false;
4240 
+		} else {
4241 
+			return true;
4242 
+		}
3511 4243 
 	}
3512 4244
3513 4245 
 	public static function insert_last_marine_identity_update() {
Please login to merge, or discard this patch.
index.php 1 patch
Braces   +441 added lines, -111 removed lines patch added patch discarded remove patch 
@@ -163,11 +163,26 @@  discard block
 
 block discarded – undo
163 163 
 				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li>
164 164 
 				<li><?php echo _("NOTAM scope:"); ?>
165 165 
 					<select class="selectpicker" onchange="notamscope(this);">
166 
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
167 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
168 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
169 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
170 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
166 
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
167 
+	print ' selected';
168 
+}
169 
+?>>All</option>
170 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
171 
+	print ' selected';
172 
+}
173 
+?>>Airport/Enroute warning</option>
174 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
175 
+	print ' selected';
176 
+}
177 
+?>>Airport warning</option>
178 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
179 
+	print ' selected';
180 
+}
181 
+?>>Navigation warning</option>
182 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
183 
+	print ' selected';
184 
+}
185 
+?>>Enroute warning</option>
171 186 
 					</select
172 187 
 				</li>
173 188 
 			</ul>
 
@@ -195,7 +210,12 @@  discard block
 
 block discarded – undo
195 210 
 		        <div class="form-group">
196 211 
 			    <label>From (UTC):</label>
197 212 
 		            <div class='input-group date' id='datetimepicker1'>
198 
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
213 
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) {
214 
+	print $_POST['start_date'];
215 
+} elseif (isset($_COOKIE['archive_begin'])) {
216 
+	print date("m/d/Y h:i a",$_COOKIE['archive_begin']);
217 
+}
218 
+?>" required />
199 219 
 		                <span class="input-group-addon">
200 220 
             			    <span class="glyphicon glyphicon-calendar"></span>
201 221 
 		                </span>
 
@@ -204,7 +224,12 @@  discard block
 
 block discarded – undo
204 224 
 		        <div class="form-group">
205 225 
 			    <label>To (UTC):</label>
206 226 
 		            <div class='input-group date' id='datetimepicker2'>
207 
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
227 
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) {
228 
+	print $_POST['end_date'];
229 
+} elseif (isset($_COOKIE['archive_end'])) {
230 
+	print date("m/d/Y h:i a",$_COOKIE['archive_end']);
231 
+}
232 
+?>" />
208 233 
             			<span class="input-group-addon">
209 234 
 		                    <span class="glyphicon glyphicon-calendar"></span>
210 235 
             			</span>
 
@@ -229,8 +254,20 @@  discard block
 
 block discarded – undo
229 254 
 			</script>
230 255 
 		    <li><?php echo _("Playback speed:"); ?>
231 256 
 			<div class="range">
232 
-			    <input type="range" min="0" max="50" step="1" 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'; ?>">
233 
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
257 
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
258 
+	print $_POST['archivespeed'];
259 
+} elseif (isset($_COOKIE['archive_speed'])) {
260 
+	print $_COOKIE['archive_speed'];
261 
+} else {
262 
+	print '1';
263 
+}
264 
+?>">
265 
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
266 
+	print $_COOKIE['archive_speed'];
267 
+} else {
268 
+	print '1';
269 
+}
270 
+?></output>
234 271 
 			</div>
235 272 
 		    </li>
236 273 
 		    <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li>
 
@@ -252,15 +289,27 @@  discard block
 
 block discarded – undo
252 289 
 		    <li><?php echo _("Type of Map:"); ?>
253 290 
 			<select  class="selectpicker" onchange="mapType(this);">
254 291 
 			    <?php
255 
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
256 
-				else $MapType = $_COOKIE['MapType'];
292 
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
293 
+					$MapType = $globalMapProvider;
294 
+				} else {
295 
+					$MapType = $_COOKIE['MapType'];
296 
+				}
257 297 
 			    ?>
258 298 
 			    <?php
259 299 
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
260 300 
 			    ?>
261 
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
262 
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
263 
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
301 
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
302 
+	print ' selected';
303 
+}
304 
+?>>Bing-Aerial</option>
305 
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
306 
+	print ' selected';
307 
+}
308 
+?>>Bing-Hybrid</option>
309 
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
310 
+	print ' selected';
311 
+}
312 
+?>>Bing-Road</option>
264 313 
 			    <?php
265 314 
 				}
266 315 
 			    ?>
 
@@ -270,56 +319,131 @@  discard block
 
 block discarded – undo
270 319 
 			    <?php
271 320 
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
272 321 
 			    ?>
273 
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
274 
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
275 
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
322 
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
323 
+	print ' selected';
324 
+}
325 
+?>>Here-Aerial</option>
326 
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
327 
+	print ' selected';
328 
+}
329 
+?>>Here-Hybrid</option>
330 
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
331 
+	print ' selected';
332 
+}
333 
+?>>Here-Road</option>
276 334 
 			    <?php
277 335 
 				    }
278 336 
 			    ?>
279 337 
 			    <?php
280 338 
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
281 339 
 			    ?>
282 
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
283 
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
284 
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
285 
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
340 
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
341 
+	print ' selected';
342 
+}
343 
+?>>Google Roadmap</option>
344 
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
345 
+	print ' selected';
346 
+}
347 
+?>>Google Satellite</option>
348 
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
349 
+	print ' selected';
350 
+}
351 
+?>>Google Hybrid</option>
352 
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
353 
+	print ' selected';
354 
+}
355 
+?>>Google Terrain</option>
286 356 
 			    <?php
287 357 
 				    }
288 358 
 			    ?>
289 359 
 			    <?php
290 360 
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
291 361 
 			    ?>
292 
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
293 
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
294 
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
362 
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
363 
+	print ' selected';
364 
+}
365 
+?>>MapQuest-OSM</option>
366 
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
367 
+	print ' selected';
368 
+}
369 
+?>>MapQuest-Aerial</option>
370 
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
371 
+	print ' selected';
372 
+}
373 
+?>>MapQuest-Hybrid</option>
295 374 
 			    <?php
296 375 
 				    }
297 376 
 			    ?>
298 
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
377 
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
378 
+	print ' selected';
379 
+}
380 
+?>>Yandex</option>
299 381 
 			    <?php
300 382 
 				}
301 383 
 			    ?>
302 384 
 			    <?php
303 385 
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
304 
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
305 
-					else $MapBoxId = $_COOKIE['MapTypeId'];
386 
+					if (!isset($_COOKIE['MapTypeId'])) {
387 
+						$MapBoxId = 'default';
388 
+					} else {
389 
+						$MapBoxId = $_COOKIE['MapTypeId'];
390 
+					}
306 391 
 			    ?>
307 
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
308 
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
309 
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
310 
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
311 
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
312 
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
313 
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
314 
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
315 
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
316 
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
317 
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
318 
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
392 
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
393 
+	print ' selected';
394 
+}
395 
+?>>Mapbox default</option>
396 
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
397 
+	print ' selected';
398 
+}
399 
+?>>Mapbox streets</option>
400 
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
401 
+	print ' selected';
402 
+}
403 
+?>>Mapbox light</option>
404 
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
405 
+	print ' selected';
406 
+}
407 
+?>>Mapbox dark</option>
408 
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
409 
+	print ' selected';
410 
+}
411 
+?>>Mapbox satellite</option>
412 
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
413 
+	print ' selected';
414 
+}
415 
+?>>Mapbox streets-satellite</option>
416 
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
417 
+	print ' selected';
418 
+}
419 
+?>>Mapbox streets-basic</option>
420 
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
421 
+	print ' selected';
422 
+}
423 
+?>>Mapbox comic</option>
424 
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
425 
+	print ' selected';
426 
+}
427 
+?>>Mapbox outdoors</option>
428 
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
429 
+	print ' selected';
430 
+}
431 
+?>>Mapbox pencil</option>
432 
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
433 
+	print ' selected';
434 
+}
435 
+?>>Mapbox pirates</option>
436 
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
437 
+	print ' selected';
438 
+}
439 
+?>>Mapbox emerald</option>
319 440 
 			    <?php
320 441 
 				    }
321 442 
 			    ?>
322 
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
443 
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
444 
+	print ' selected';
445 
+}
446 
+?>>OpenStreetMap</option>
323 447 
 			</select>
324 448 
 		    </li>
325 449 
 <?php
 
@@ -327,10 +451,22 @@  discard block
 
 block discarded – undo
327 451 
 ?>
328 452 
 		    <li><?php echo _("Type of Terrain:"); ?>
329 453 
 			<select  class="selectpicker" onchange="terrainType(this);">
330 
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
331 
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
332 
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
333 
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
454 
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
455 
+	print ' selected';
456 
+}
457 
+?>>stk terrain</option>
458 
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
459 
+	print ' selected';
460 
+}
461 
+?>>ellipsoid</option>
462 
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
463 
+	print ' selected';
464 
+}
465 
+?>>vr terrain</option>
466 
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') {
467 
+	print ' selected';
468 
+}
469 
+?>>ArticDEM</option>
334 470 
 			</select>
335 471 
 		    </li>
336 472 
 <?php
 
@@ -342,33 +478,69 @@  discard block
 
 block discarded – undo
342 478 
 <?php
343 479 
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
344 480 
 ?>
345 
-		    <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>
346 
-		    <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>
347 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
348 
-		    <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>
349 
-		    <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>
481 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
482 
+	print 'checked';
483 
+}
484 
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
485 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) {
486 
+	print 'checked';
487 
+}
488 
+?> ><?php echo _("Display flight path"); ?></label></div></li>
489 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) {
490 
+	print 'checked';
491 
+}
492 
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
493 
+		    <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)) {
494 
+	print 'checked';
495 
+}
496 
+?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
497 
+		    <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)) {
498 
+	print 'checked';
499 
+}
500 
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
350 501 
 <?php
351 502 
 	}
352 503 
 	if (isset($globalSatellite) && $globalSatellite === TRUE) {
353 504 
 ?>
354 
-		    <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>
505 
+		    <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)) {
506 
+	print 'checked';
507 
+}
508 
+?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
355 509 
 <?php
356 510 
 	}
357 511 
     }
358 512 
 ?>
359 
-		    <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>
360 
-		    <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>
361 
-		    <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>
362 
-		    <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>
513 
+		    <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'])) {
514 
+	print 'checked';
515 
+}
516 
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
517 
+		    <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))) {
518 
+	print 'checked';
519 
+}
520 
+?> ><?php echo _("Display ground station on map"); ?></label></div></li>
521 
+		    <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))) {
522 
+	print 'checked';
523 
+}
524 
+?> ><?php echo _("Display weather station on map"); ?></label></div></li>
525 
+		    <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))) {
526 
+	print 'checked';
527 
+}
528 
+?> ><?php echo _("Display lightning on map"); ?></label></div></li>
363 529 
 <?php
364 530 
 	if (isset($globalFires)) {
365 531 
 ?>
366 
-		    <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>
532 
+		    <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))) {
533 
+	print 'checked';
534 
+}
535 
+?> ><?php echo _("Display fires on map"); ?></label></div></li>
367 536 
 <?php
368 537 
 	}
369 538 
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
370 539 
 ?>
371 
-		    <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>
540 
+		    <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')) {
541 
+	print 'checked';
542 
+}
543 
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
372 544 
 <?php
373 545 
     }
374 546 
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 
@@ -381,17 +553,25 @@  discard block
 
 block discarded – undo
381 553 
 			if (function_exists('array_column')) {
382 554 
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
383 555 
 		    ?>
384 
-		    <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>
556 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
557 
+	print 'checked';
558 
+}
559 
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
385 560 
 		    <?php
386 561 
 			    }
387 562 
 			} elseif (isset($globalSources)) {
388 563 
 			    $dispolar = false;
389 564 
 			    foreach ($globalSources as $testsource) {
390 
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
565 
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
566 
+			        	$dispolar = true;
567 
+			        }
391 568 
 			    }
392 569 
 			    if ($dispolar) {
393 570 
 		    ?>
394 
-		    <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>
571 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
572 
+	print 'checked';
573 
+}
574 
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
395 575 
 		    <?php
396 576 
 			    }
397 577 
 		        }
 
@@ -404,12 +584,22 @@  discard block
 
 block discarded – undo
404 584 
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
405 585 
 		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
406 586 
 		    ?>
407 
-		    <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>
587 
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
588 
+	print 'checked';
589 
+}
590 
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
408 591 
 		    <?php
409 592 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
410 593 
 		    ?>
411 594 
 		    <li><?php echo _("Aircraft icon color:"); ?>
412 
-			<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 '1a3151'; ?>">
595 
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
596 
+	print $_COOKIE['IconColor'];
597 
+} elseif (isset($globalAircraftIconColor)) {
598 
+	print $globalAircraftIconColor;
599 
+} else {
600 
+	print '1a3151';
601 
+}
602 
+?>">
413 603 
 		    </li>
414 604 
 		    <?php
415 605 
 				}
 
@@ -421,7 +611,14 @@  discard block
 
 block discarded – undo
421 611 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
422 612 
 		    ?>
423 613 
 		    <li><?php echo _("Marine icon color:"); ?>
424 
-			<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'; ?>">
614 
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
615 
+	print $_COOKIE['MarineIconColor'];
616 
+} elseif (isset($globalMarineIconColor)) {
617 
+	print $globalMarineIconColor;
618 
+} else {
619 
+	print '1a3151';
620 
+}
621 
+?>">
425 622 
 		    </li>
426 623 
 		    <?php
427 624 
 			    }
 
@@ -432,7 +629,14 @@  discard block
 
 block discarded – undo
432 629 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
433 630 
 		    ?>
434 631 
 		    <li><?php echo _("Tracker icon color:"); ?>
435 
-			<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'; ?>">
632 
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
633 
+	print $_COOKIE['TrackerIconColor'];
634 
+} elseif (isset($globalTrackerIconColor)) {
635 
+	print $globalTrackerIconColor;
636 
+} else {
637 
+	print '1a3151';
638 
+}
639 
+?>">
436 640 
 		    </li>
437 641 
 		    <?php
438 642 
 			    }
 
@@ -443,8 +647,22 @@  discard block
 
 block discarded – undo
443 647 
 		    ?>
444 648 
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
445 649 
 			<div class="range">
446 
-			    <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'; ?>">
447 
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
650 
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
651 
+	print $_COOKIE['AirportZoom'];
652 
+} elseif (isset($globalAirportZoom)) {
653 
+	print $globalAirportZoom;
654 
+} else {
655 
+	print '7';
656 
+}
657 
+?>">
658 
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
659 
+	print $_COOKIE['AirportZoom'];
660 
+} elseif (isset($globalAirportZoom)) {
661 
+	print $globalAirportZoom;
662 
+} else {
663 
+	print '7';
664 
+}
665 
+?></output>
448 666 
 			</div>
449 667 
 		    </li>
450 668 
 		    <?php
 
@@ -456,9 +674,19 @@  discard block
 
 block discarded – undo
456 674 
 <?php
457 675 
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
458 676 
 ?>
459 
-		    <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"); ?></li>
677 
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
678 
+	print 'checked';
679 
+}
680 
+?> ><?php echo _("Force Aircraft color"); ?></li>
460 681 
 		    <li><?php echo _("Aircraft icon color:"); ?>
461 
-			<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'; ?>">
682 
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
683 
+	print $_COOKIE['IconColor'];
684 
+} elseif (isset($globalAircraftIconColor)) {
685 
+	print $globalAircraftIconColor;
686 
+} else {
687 
+	print 'ff0000';
688 
+}
689 
+?>">
462 690 
 		    </li>
463 691 
 <?php
464 692 
 	}
 
@@ -466,9 +694,19 @@  discard block
 
 block discarded – undo
466 694 
 <?php
467 695 
 	if (isset($globalMarine) && $globalMarine === TRUE) {
468 696 
 ?>
469 
-		    <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"); ?></li>
697 
+		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') {
698 
+	print 'checked';
699 
+}
700 
+?> ><?php echo _("Force Marine color"); ?></li>
470 701 
 		    <li><?php echo _("Marine icon color:"); ?>
471 
-			<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'; ?>">
702 
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
703 
+	print $_COOKIE['MarineIconColor'];
704 
+} elseif (isset($globalMarineIconColor)) {
705 
+	print $globalMarineIconColor;
706 
+} else {
707 
+	print 'ff0000';
708 
+}
709 
+?>">
472 710 
 		    </li>
473 711 
 <?php
474 712 
 	}
 
@@ -476,9 +714,19 @@  discard block
 
 block discarded – undo
476 714 
 <?php
477 715 
 	if (isset($globalTracker) && $globalTracker === TRUE) {
478 716 
 ?>
479 
-		    <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"); ?></li>
717 
+		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') {
718 
+	print 'checked';
719 
+}
720 
+?> ><?php echo _("Force Tracker color"); ?></li>
480 721 
 		    <li><?php echo _("Tracker icon color:"); ?>
481 
-			<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'; ?>">
722 
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
723 
+	print $_COOKIE['TrackerIconColor'];
724 
+} elseif (isset($globalTrackerIconColor)) {
725 
+	print $globalTrackerIconColor;
726 
+} else {
727 
+	print 'ff0000';
728 
+}
729 
+?>">
482 730 
 		    </li>
483 731 
 <?php
484 732 
 	}
 
@@ -486,22 +734,46 @@  discard block
 
 block discarded – undo
486 734 
 ?>
487 735 
 		    <li><?php echo _("Distance unit:"); ?>
488 736 
 			<select class="selectpicker" onchange="unitdistance(this);">
489 
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
490 
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
491 
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
737 
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
738 
+	echo ' selected';
739 
+}
740 
+?>>km</option>
741 
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
742 
+	echo ' selected';
743 
+}
744 
+?>>nm</option>
745 
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
746 
+	echo ' selected';
747 
+}
748 
+?>>mi</option>
492 749 
 		        </select>
493 750 
 		    </li>
494 751 
 		    <li><?php echo _("Altitude unit:"); ?>
495 752 
 			<select class="selectpicker" onchange="unitaltitude(this);">
496 
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
497 
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
753 
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
754 
+	echo ' selected';
755 
+}
756 
+?>>m</option>
757 
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
758 
+	echo ' selected';
759 
+}
760 
+?>>feet</option>
498 761 
 		        </select>
499 762 
 		    </li>
500 763 
 		    <li><?php echo _("Speed unit:"); ?>
501 764 
 			<select class="selectpicker" onchange="unitspeed(this);">
502 
-			    <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>
503 
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
504 
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
765 
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
766 
+	echo ' selected';
767 
+}
768 
+?>>km/h</option>
769 
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
770 
+	echo ' selected';
771 
+}
772 
+?>>mph</option>
773 
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
774 
+	echo ' selected';
775 
+}
776 
+?>>knots</option>
505 777 
 		        </select>
506 778 
 		    </li>
507 779 
 
@@ -519,9 +791,18 @@  discard block
 
 block discarded – undo
519 791 
 		    <?php
520 792 
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
521 793 
 		    ?>
522 
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
523 
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
524 
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
794 
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
795 
+	print 'checked';
796 
+}
797 
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
798 
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
799 
+	print 'checked';
800 
+}
801 
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
802 
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
803 
+	print 'checked';
804 
+}
805 
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
525 806 
 		    <?php
526 807 
 			}
527 808 
 		    ?>
 
@@ -529,10 +810,16 @@  discard block
 
 block discarded – undo
529 810 
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
530 811 
 		    ?>
531 812 
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
532 
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
813 
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
814 
+	print 'checked';
815 
+}
816 
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
533 817 
 			<?php } ?>
534 818 
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
535 
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
819 
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
820 
+	print 'checked';
821 
+}
822 
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
536 823 
 			<?php } ?>
537 824 
 		    <?php
538 825 
 			}
 
@@ -549,7 +836,9 @@  discard block
 
 block discarded – undo
549 836 
 				}
550 837 
 				foreach($allairlinenames as $airline) {
551 838 
 					$airline_name = $airline['airline_name'];
552 
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
839 
+					if (strlen($airline_name) > 30) {
840 
+						$airline_name = substr($airline_name,0,30).'...';
841 
+					}
553 842 
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
554 843 
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
555 844 
 					} else {
 
@@ -567,7 +856,10 @@  discard block
 
 block discarded – undo
567 856 
 		    <li><?php echo _("Display alliance:"); ?>
568 857 
 		    <br/>
569 858 
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
570 
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
859 
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
860 
+	echo ' selected';
861 
+}
862 
+?>><?php echo _("All"); ?></option>
571 863 
 			    <?php
572 864 
 				foreach($allalliancenames as $alliance) {
573 865 
 					$alliance_name = $alliance['alliance'];
 
@@ -626,10 +918,22 @@  discard block
 
 block discarded – undo
626 918 
 		    ?>
627 919 
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
628 920 
 			<select class="selectpicker" onchange="airlinestype(this);">
629 
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
630 
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
631 
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
632 
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
921 
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
922 
+	echo ' selected';
923 
+}
924 
+?>><?php echo _("All"); ?></option>
925 
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
926 
+	echo ' selected';
927 
+}
928 
+?>><?php echo _("Passenger"); ?></option>
929 
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
930 
+	echo ' selected';
931 
+}
932 
+?>><?php echo _("Cargo"); ?></option>
933 
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
934 
+	echo ' selected';
935 
+}
936 
+?>><?php echo _("Military"); ?></option>
633 937 
 			</select>
634 938 
 		    </li>
635 939 
 		    <?php
 
@@ -637,7 +941,10 @@  discard block
 
 block discarded – undo
637 941 
 		    ?>
638 942 
 		    <li>
639 943 
 			<?php echo _("Display flight with ident:"); ?>
640 
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
944 
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
945 
+	print $_COOKIE['filter_ident'];
946 
+}
947 
+?>" />
641 948 
 		    </li>
642 949 
 		    <?php
643 950 
 			}
 
@@ -656,7 +963,10 @@  discard block
 
 block discarded – undo
656 963 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
657 964 
 	    <form>
658 965 
 		<ul>
659 
-		    <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>
966 
+		    <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'])) {
967 
+	print 'checked';
968 
+}
969 
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
660 970 
 		    <li><?php echo _("Type:"); ?>
661 971 
 			<select class="selectpicker" multiple onchange="sattypes(this);">
662 972 
 			    <?php
 
@@ -664,25 +974,45 @@  discard block
 
 block discarded – undo
664 974 
 				$types = $Satellite->get_tle_types();
665 975 
 				foreach ($types as $type) {
666 976 
 					$type_name = $type['tle_type'];
667 
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
668 
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
669 
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
670 
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
671 
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
672 
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
673 
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
674 
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
675 
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
676 
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
677 
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
678 
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
679 
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
680 
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
681 
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
682 
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
683 
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
684 
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
685 
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
977 
+					if ($type_name == 'musson') {
978 
+						$type_name = 'Russian LEO Navigation';
979 
+					} else if ($type_name == 'nnss') {
980 
+						$type_name = 'Navi Navigation Satellite System';
981 
+					} else if ($type_name == 'sbas') {
982 
+						$type_name = 'Satellite-Based Augmentation System';
983 
+					} else if ($type_name == 'glo-ops') {
984 
+						$type_name = 'Glonass Operational';
985 
+					} else if ($type_name == 'gps-ops') {
986 
+						$type_name = 'GPS Operational';
987 
+					} else if ($type_name == 'argos') {
988 
+						$type_name = 'ARGOS Data Collection System';
989 
+					} else if ($type_name == 'tdrss') {
990 
+						$type_name = 'Tracking and Data Relay Satellite System';
991 
+					} else if ($type_name == 'sarsat') {
992 
+						$type_name = 'Search & Rescue';
993 
+					} else if ($type_name == 'dmc') {
994 
+						$type_name = 'Disaster Monitoring';
995 
+					} else if ($type_name == 'resource') {
996 
+						$type_name = 'Earth Resources';
997 
+					} else if ($type_name == 'stations') {
998 
+						$type_name = 'Space Stations';
999 
+					} else if ($type_name == 'geo') {
1000 
+						$type_name = 'Geostationary';
1001 
+					} else if ($type_name == 'amateur') {
1002 
+						$type_name = 'Amateur Radio';
1003 
+					} else if ($type_name == 'x-comm') {
1004 
+						$type_name = 'Experimental';
1005 
+					} else if ($type_name == 'other-comm') {
1006 
+						$type_name = 'Other Comm';
1007 
+					} else if ($type_name == 'science') {
1008 
+						$type_name = 'Space & Earth Science';
1009 
+					} else if ($type_name == 'military') {
1010 
+						$type_name = 'Miscellaneous Military';
1011 
+					} else if ($type_name == 'radar') {
1012 
+						$type_name = 'Radar Calibration';
1013 
+					} else if ($type_name == 'tle-new') {
1014 
+						$type_name = 'Last 30 days launches';
1015 
+					}
686 1016
687 1017 
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
688 1018 
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
Please login to merge, or discard this patch.
require/class.ACARS.php 1 patch
Braces   +415 added lines, -263 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,9 @@  discard block
 
 block discarded – undo
13 13 
 	public function __construct($dbc = null,$fromACARSscript = false) {
14 14 
 		$Connection = new Connection($dbc);
15 15 
 		$this->db = $Connection->db();
16 
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
16 
+		if ($this->db === null) {
17 
+			die('Error: No DB connection. (ACARS)');
18 
+		}
17 19 
 		if ($fromACARSscript) {
18 20 
 			$this->fromACARSscript = true;
19 21 
 			$this->SI = new SpotterImport($this->db);
 
@@ -27,14 +29,19 @@  discard block
 
 block discarded – undo
27 29 
 	*/
28 30 
 	public function ident2icao($ident) {
29 31 
 		if (substr($ident,0,2) == 'AF') {
30 
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31 
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
32 
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
33 
+				$icao = $ident;
34 
+			} else {
35 
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
36 
+			}
32 37 
 		} else {
33 38 
 			$Spotter = new Spotter($this->db);
34 39 
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
35 40 
 			if (isset($identicao[0])) {
36 41 
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
37 
-			} else $icao = $ident;
42 
+			} else {
43 
+				$icao = $ident;
44 
+			}
38 45 
 		}
39 46 
 		return $icao;
40 47 
 	}
 
@@ -107,14 +114,24 @@  discard block
 
 block discarded – undo
107 114 
 		$message = '';
108 115 
 		$result = array();
109 116 
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
110 
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
111 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
112 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
117 
+		if ($n == 0) {
118 
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
119 
+		}
120 
+		if ($n == 0) {
121 
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
122 
+		}
123 
+		if ($n == 0) {
124 
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
125 
+		}
113 126 
 		if ($n != 0) {
114 127 
 			$registration = str_replace('.','',$registration);
115 128 
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
116 
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
117 
-		} else $message = $data;
129 
+			if ($globalDebug) {
130 
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
131 
+			}
132 
+		} else {
133 
+			$message = $data;
134 
+		}
118 135 
 		$decode = array();
119 136 
 		$found = false;
120 137 
 //		if ($registration != '' && $ident != '' && $registration != '!') {
 
@@ -134,12 +151,21 @@  discard block
 
 block discarded – undo
134 151 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
135 152 
 					$latitude = $la / 10000.0;
136 153 
 					$longitude = $ln / 10000.0;
137 
-					if ($lac == 'S') $latitude = '-'.$latitude;
138 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
154 
+					if ($lac == 'S') {
155 
+						$latitude = '-'.$latitude;
156 
+					}
157 
+					if ($lnc == 'W') {
158 
+						$longitude = '-'.$longitude;
159 
+					}
139 160 
 					// Temp not always available
140 
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
141 
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
142 
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
161 
+					if ($globalDebug) {
162 
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
163 
+					}
164 
+					if ($temp == '') {
165 
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
166 
+					} else {
167 
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
168 
+					}
143 169
144 170 
 					//$icao = $Translation->checkTranslation($ident);
145 171 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -153,25 +179,35 @@  discard block
 
 block discarded – undo
153 179 
 				$ahour = '';
154 180 
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
155 181 
 				if ($n == 4 && strlen($darr) == 4) {
156 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
157 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
158 
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
182 
+					if ($dhour != '') {
183 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
184 
+					}
185 
+					if ($ahour != '') {
186 
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
187 
+					}
188 
+					if ($globalDebug) {
189 
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
190 
+					}
159 191 
 					//$icao = ACARS->ident2icao($ident);
160 192 
 					//$icao = $Translation->checkTranslation($ident);
161 193 
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
162 194 
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
163 195 
 					$found = true;
164 
-				}
165 
-				elseif ($n == 2 || $n  == 4) {
166 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
167 
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
196 
+				} elseif ($n == 2 || $n  == 4) {
197 
+					if ($dhour != '') {
198 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
199 
+					}
200 
+					if ($globalDebug) {
201 
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
202 
+					}
168 203 
 					//$icao = ACARS->ident2icao($ident);
169 204 
 					//$icao = $Translation->checkTranslation($ident);
170 205 
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
171 206 
 					$found = true;
172 
-				}
173 
-				elseif ($n == 1) {
174 
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
207 
+				} elseif ($n == 1) {
208 
+					if ($globalDebug) {
209 
+						echo 'airport arrival : '.$darr."\n";
210 
+					}
175 211 
 					//$icao = ACARS->ident2icao($ident);
176 212 
 					//$icao = $Translation->checkTranslation($ident);
177 213 
 					$decode = array('Arrival airport' => $darr);
 
@@ -189,7 +225,9 @@  discard block
 
 block discarded – undo
189 225 
 				$darr = '';
190 226 
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
191 227 
 				if ($n == 4) {
192 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
228 
+					if ($globalDebug) {
229 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
230 
+					}
193 231 
 					//$icao = ACARS->ident2icao($ident);
194 232 
 					//$icao = $Translation->checkTranslation($ident);
195 233 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -223,14 +261,23 @@  discard block
 
 block discarded – undo
223 261 
 				$apiste = '';
224 262 
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
225 263 
 				if ($n > 8) {
226 
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
228 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
264 
+					if ($globalDebug) {
265 
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
266 
+					}
267 
+					if ($dhour != '') {
268 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
269 
+					}
270 
+					if ($ahour != '') {
271 
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
272 
+					}
229 273 
 					$icao = trim($aident);
230 274
231 275 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
232 
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
233 
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
276 
+					if ($ahour == '') {
277 
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
278 
+					} else {
279 
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
280 
+					}
234 281 
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
235 282 
 					$decode['icao'] = $icao;
236 283 
 					$found = true;
 
@@ -252,9 +299,15 @@  discard block
 
 block discarded – undo
252 299 
 					$lns = $lns.'.'.$lns;
253 300 
 					$latitude = $las / 1000.0;
254 301 
 					$longitude = $lns / 1000.0;
255 
-					if ($lac == 'S') $latitude = '-'.$latitude;
256 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
257 
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
302 
+					if ($lac == 'S') {
303 
+						$latitude = '-'.$latitude;
304 
+					}
305 
+					if ($lnc == 'W') {
306 
+						$longitude = '-'.$longitude;
307 
+					}
308 
+					if ($globalDebug) {
309 
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
310 
+					}
258 311 
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
259 312 
 					$found = true;
260 313 
 				}
 
@@ -272,7 +325,9 @@  discard block
 
 block discarded – undo
272 325 
 				$darr = '';
273 326 
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
274 327 
 				if ($n == 4) {
275 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
328 
+					if ($globalDebug) {
329 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
330 
+					}
276 331 
 					//$icao = $Translation->checkTranslation($ident);
277 332 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
278 333 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -285,7 +340,9 @@  discard block
 
 block discarded – undo
285 340 
 				$darr = '';
286 341 
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
287 342 
 				if ($n == 4) {
288 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
343 
+					if ($globalDebug) {
344 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
345 
+					}
289 346 
 					//$icao = $Translation->checkTranslation($ident);
290 347 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
291 348 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -298,7 +355,9 @@  discard block
 
 block discarded – undo
298 355 
 				$darr = '';
299 356 
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
300 357 
 				if ($n == 2) {
301 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
358 
+					if ($globalDebug) {
359 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
360 
+					}
302 361 
 					//$icao = $Translation->checkTranslation($ident);
303 362 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
304 363 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -312,7 +371,9 @@  discard block
 
 block discarded – undo
312 371 
 				$darr = '';
313 372 
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
314 373 
 				if ($n == 6) {
315 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
374 
+					if ($globalDebug) {
375 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
376 
+					}
316 377 
 					//$icao = $Translation->checkTranslation($ident);
317 378 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
318 379 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -325,7 +386,9 @@  discard block
 
 block discarded – undo
325 386 
 				$darr = '';
326 387 
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
327 388 
 				if ($n == 7) {
328 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
389 
+					if ($globalDebug) {
390 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
391 
+					}
329 392 
 					//$icao = $Translation->checkTranslation($ident);
330 393 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
331 394 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -353,8 +416,12 @@  discard block
 
 block discarded – undo
353 416 
 					$decode['icao'] = $icao;
354 417 
 					$latitude = $las / 100.0;
355 418 
 					$longitude = $lns / 100.0;
356 
-					if ($lac == 'S') $latitude = '-'.$latitude;
357 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
419 
+					if ($lac == 'S') {
420 
+						$latitude = '-'.$latitude;
421 
+					}
422 
+					if ($lnc == 'W') {
423 
+						$longitude = '-'.$longitude;
424 
+					}
358 425
359 426 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
360 427 
 					$found = true;
 
@@ -372,8 +439,12 @@  discard block
 
 block discarded – undo
372 439 
 				if ($n == 4) {
373 440 
 					$latitude = $las;
374 441 
 					$longitude = $lns;
375 
-					if ($lac == 'S') $latitude = '-'.$latitude;
376 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
442 
+					if ($lac == 'S') {
443 
+						$latitude = '-'.$latitude;
444 
+					}
445 
+					if ($lnc == 'W') {
446 
+						$longitude = '-'.$longitude;
447 
+					}
377 448
378 449 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
379 450 
 					$found = true;
 
@@ -389,7 +460,9 @@  discard block
 
 block discarded – undo
389 460 
 				$darr = '';
390 461 
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
391 462 
 				if ($n == 5) {
392 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
463 
+					if ($globalDebug) {
464 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
465 
+					}
393 466 
 					//$icao = $Translation->checkTranslation($ident);
394 467 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
395 468 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -410,7 +483,9 @@  discard block
 
 block discarded – undo
410 483 
 				$aident = '';
411 484 
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
412 485 
 				if ($n == 8) {
413 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
486 
+					if ($globalDebug) {
487 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
488 
+					}
414 489 
 					$icao = trim($aident);
415 490 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
416 491 
 					$decode['icao'] = $icao;
 
@@ -427,7 +502,9 @@  discard block
 
 block discarded – undo
427 502 
 				$darr = '';
428 503 
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
429 504 
 				if ($n == 5) {
430 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
505 
+					if ($globalDebug) {
506 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
507 
+					}
431 508 
 					//$icao = $Translation->checkTranslation($ident);
432 509 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
433 510 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -442,7 +519,9 @@  discard block
 
 block discarded – undo
442 519 
 				$darr = '';
443 520 
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
444 521 
 				if ($n == 3) {
445 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
522 
+					if ($globalDebug) {
523 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
524 
+					}
446 525 
 					//$icao = $Translation->checkTranslation($ident);
447 526 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
448 527 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -457,7 +536,9 @@  discard block
 
 block discarded – undo
457 536 
 				$darr = '';
458 537 
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
459 538 
 				if ($n == 3) {
460 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
539 
+					if ($globalDebug) {
540 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
541 
+					}
461 542 
 					//$icao = $Translation->checkTranslation($ident);
462 543 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
463 544 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -467,7 +548,9 @@  discard block
 
 block discarded – undo
467 548 
 			if (!$found) {
468 549 
 				$n = sscanf($message,'MET01%4c',$airport);
469 550 
 				if ($n == 1) {
470 
-					if ($globalDebug) echo 'airport name : '.$airport;
551 
+					if ($globalDebug) {
552 
+						echo 'airport name : '.$airport;
553 
+					}
471 554 
 					$decode = array('Airport/Waypoint name' => $airport);
472 555 
 					$found = true;
473 556 
 				}
 
@@ -475,184 +558,126 @@  discard block
 
 block discarded – undo
475 558 
 			if ($label == 'H1') {
476 559 
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
477 560 
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
478 
-				}
479 
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
561 
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
480 562 
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
481 
-				}
482 
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
563 
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
483 564 
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
484 
-				}
485 
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
565 
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
486 566 
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
487 
-				}
488 
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
567 
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
489 568 
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
490 
-				}
491 
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
569 
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
492 570 
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
493 
-				}
494 
-				elseif (preg_match(':^#M1AAEP:',$message)) {
571 
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
495 572 
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
496 
-				}
497 
-				elseif (preg_match(':^#M2APWD:',$message)) {
573 
+				} elseif (preg_match(':^#M2APWD:',$message)) {
498 574 
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
499 
-				}
500 
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
575 
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
501 576 
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
502 
-				}
503 
-				elseif (preg_match(':^#CF:',$message)) {
577 
+				} elseif (preg_match(':^#CF:',$message)) {
504 578 
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
505 
-				}
506 
-				elseif (preg_match(':^#DF:',$message)) {
579 
+				} elseif (preg_match(':^#DF:',$message)) {
507 580 
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
508 
-				}
509 
-				elseif (preg_match(':^#EC:',$message)) {
581 
+				} elseif (preg_match(':^#EC:',$message)) {
510 582 
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
511 
-				}
512 
-				elseif (preg_match(':^#EI:',$message)) {
583 
+				} elseif (preg_match(':^#EI:',$message)) {
513 584 
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
514 
-				}
515 
-				elseif (preg_match(':^#H1:',$message)) {
585 
+				} elseif (preg_match(':^#H1:',$message)) {
516 586 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
517 
-				}
518 
-				elseif (preg_match(':^#H2:',$message)) {
587 
+				} elseif (preg_match(':^#H2:',$message)) {
519 588 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
520 
-				}
521 
-				elseif (preg_match(':^#HD:',$message)) {
589 
+				} elseif (preg_match(':^#HD:',$message)) {
522 590 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
523 
-				}
524 
-				elseif (preg_match(':^#M1:',$message)) {
591 
+				} elseif (preg_match(':^#M1:',$message)) {
525 592 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
526 
-				}
527 
-				elseif (preg_match(':^#M2:',$message)) {
593 
+				} elseif (preg_match(':^#M2:',$message)) {
528 594 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
529 
-				}
530 
-				elseif (preg_match(':^#M3:',$message)) {
595 
+				} elseif (preg_match(':^#M3:',$message)) {
531 596 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
532 
-				}
533 
-				elseif (preg_match(':^#MD:',$message)) {
597 
+				} elseif (preg_match(':^#MD:',$message)) {
534 598 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
535 
-				}
536 
-				elseif (preg_match(':^#PS:',$message)) {
599 
+				} elseif (preg_match(':^#PS:',$message)) {
537 600 
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
538 
-				}
539 
-				elseif (preg_match(':^#S1:',$message)) {
601 
+				} elseif (preg_match(':^#S1:',$message)) {
540 602 
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
541 
-				}
542 
-				elseif (preg_match(':^#S2:',$message)) {
603 
+				} elseif (preg_match(':^#S2:',$message)) {
543 604 
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
544 
-				}
545 
-				elseif (preg_match(':^#SD:',$message)) {
605 
+				} elseif (preg_match(':^#SD:',$message)) {
546 606 
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
547 
-				}
548 
-				elseif (preg_match(':^#T[0-8]:',$message)) {
607 
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
549 608 
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
550 
-				}
551 
-				elseif (preg_match(':^#WO:',$message)) {
609 
+				} elseif (preg_match(':^#WO:',$message)) {
552 610 
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
553 
-				}
554 
-				elseif (preg_match(':^#A1:',$message)) {
611 
+				} elseif (preg_match(':^#A1:',$message)) {
555 612 
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
556 
-				}
557 
-				elseif (preg_match(':^#A3:',$message)) {
613 
+				} elseif (preg_match(':^#A3:',$message)) {
558 614 
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
559 
-				}
560 
-				elseif (preg_match(':^#A4:',$message)) {
615 
+				} elseif (preg_match(':^#A4:',$message)) {
561 616 
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
562 
-				}
563 
-				elseif (preg_match(':^#A6:',$message)) {
617 
+				} elseif (preg_match(':^#A6:',$message)) {
564 618 
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
565 
-				}
566 
-				elseif (preg_match(':^#A8:',$message)) {
619 
+				} elseif (preg_match(':^#A8:',$message)) {
567 620 
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
568 
-				}
569 
-				elseif (preg_match(':^#A9:',$message)) {
621 
+				} elseif (preg_match(':^#A9:',$message)) {
570 622 
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
571 
-				}
572 
-				elseif (preg_match(':^#A0:',$message)) {
623 
+				} elseif (preg_match(':^#A0:',$message)) {
573 624 
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
574 
-				}
575 
-				elseif (preg_match(':^#AA:',$message)) {
625 
+				} elseif (preg_match(':^#AA:',$message)) {
576 626 
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
577 
-				}
578 
-				elseif (preg_match(':^#AB:',$message)) {
627 
+				} elseif (preg_match(':^#AB:',$message)) {
579 628 
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
580 
-				}
581 
-				elseif (preg_match(':^#AC:',$message)) {
629 
+				} elseif (preg_match(':^#AC:',$message)) {
582 630 
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
583 
-				}
584 
-				elseif (preg_match(':^#AD:',$message)) {
631 
+				} elseif (preg_match(':^#AD:',$message)) {
585 632 
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
586 
-				}
587 
-				elseif (preg_match(':^#AF:',$message)) {
633 
+				} elseif (preg_match(':^#AF:',$message)) {
588 634 
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
589 
-				}
590 
-				elseif (preg_match(':^#B1:',$message)) {
635 
+				} elseif (preg_match(':^#B1:',$message)) {
591 636 
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
592 
-				}
593 
-				elseif (preg_match(':^#B2:',$message)) {
637 
+				} elseif (preg_match(':^#B2:',$message)) {
594 638 
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
595 
-				}
596 
-				elseif (preg_match(':^#B3:',$message)) {
639 
+				} elseif (preg_match(':^#B3:',$message)) {
597 640 
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
598 
-				}
599 
-				elseif (preg_match(':^#B4:',$message)) {
641 
+				} elseif (preg_match(':^#B4:',$message)) {
600 642 
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
601 
-				}
602 
-				elseif (preg_match(':^#B6:',$message)) {
643 
+				} elseif (preg_match(':^#B6:',$message)) {
603 644 
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
604 
-				}
605 
-				elseif (preg_match(':^#B8:',$message)) {
645 
+				} elseif (preg_match(':^#B8:',$message)) {
606 646 
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
607 
-				}
608 
-				elseif (preg_match(':^#B9:',$message)) {
647 
+				} elseif (preg_match(':^#B9:',$message)) {
609 648 
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
610 
-				}
611 
-				elseif (preg_match(':^#B0:',$message)) {
649 
+				} elseif (preg_match(':^#B0:',$message)) {
612 650 
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
613 
-				}
614 
-				elseif (preg_match(':^#BA:',$message)) {
651 
+				} elseif (preg_match(':^#BA:',$message)) {
615 652 
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
616 
-				}
617 
-				elseif (preg_match(':^#BB:',$message)) {
653 
+				} elseif (preg_match(':^#BB:',$message)) {
618 654 
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
619 
-				}
620 
-				elseif (preg_match(':^#BC:',$message)) {
655 
+				} elseif (preg_match(':^#BC:',$message)) {
621 656 
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
622 
-				}
623 
-				elseif (preg_match(':^#BD:',$message)) {
657 
+				} elseif (preg_match(':^#BD:',$message)) {
624 658 
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
625 
-				}
626 
-				elseif (preg_match(':^#BE:',$message)) {
659 
+				} elseif (preg_match(':^#BE:',$message)) {
627 660 
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
628 
-				}
629 
-				elseif (preg_match(':^#BF:',$message)) {
661 
+				} elseif (preg_match(':^#BF:',$message)) {
630 662 
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
631 
-				}
632 
-				elseif (preg_match(':^#H3:',$message)) {
663 
+				} elseif (preg_match(':^#H3:',$message)) {
633 664 
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
634 665 
 				}
635 666 
 			}
636 667 
 			if ($label == '10') {
637 668 
 				if (preg_match(':^DTO01:',$message)) {
638 669 
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
639 
-				}
640 
-				elseif (preg_match(':^AIS01:',$message)) {
670 
+				} elseif (preg_match(':^AIS01:',$message)) {
641 671 
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
642 
-				}
643 
-				elseif (preg_match(':^FTX01:',$message)) {
672 
+				} elseif (preg_match(':^FTX01:',$message)) {
644 673 
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
645 
-				}
646 
-				elseif (preg_match(':^FPL01:',$message)) {
674 
+				} elseif (preg_match(':^FPL01:',$message)) {
647 675 
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
648 
-				}
649 
-				elseif (preg_match(':^WAB01:',$message)) {
676 
+				} elseif (preg_match(':^WAB01:',$message)) {
650 677 
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
651 
-				}
652 
-				elseif (preg_match(':^MET01:',$message)) {
678 
+				} elseif (preg_match(':^MET01:',$message)) {
653 679 
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
654 
-				}
655 
-				elseif (preg_match(':^WAB02:',$message)) {
680 
+				} elseif (preg_match(':^WAB02:',$message)) {
656 681 
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
657 682 
 				}
658 683 
 			}
 
@@ -667,38 +692,28 @@  discard block
 
 block discarded – undo
667 692 
 					$vsta = array('Version' => $version);
668 693 
 					if ($state == 'E') {
669 694 
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
670 
-					}
671 
-					elseif ($state == 'L') {
695 
+					} elseif ($state == 'L') {
672 696 
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
673 
-					}
674 
-					else {
697 
+					} else {
675 698 
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
676 699 
 					}
677 700 
 					if ($type == 'V') {
678 701 
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
679 
-					}
680 
-					elseif ($type == 'S') {
702 
+					} elseif ($type == 'S') {
681 703 
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
682 
-					}
683 
-					elseif ($type == 'H') {
704 
+					} elseif ($type == 'H') {
684 705 
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
685 
-					}
686 
-					elseif ($type == 'G') {
706 
+					} elseif ($type == 'G') {
687 707 
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
688 
-					}
689 
-					elseif ($type == 'C') {
708 
+					} elseif ($type == 'C') {
690 709 
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
691 
-					}
692 
-					elseif ($type == '2') {
710 
+					} elseif ($type == '2') {
693 711 
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
694 
-					}
695 
-					elseif ($type == 'X') {
712 
+					} elseif ($type == 'X') {
696 713 
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
697 
-					}
698 
-					elseif ($type == 'I') {
714 
+					} elseif ($type == 'I') {
699 715 
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
700 
-					}
701 
-					else {
716 
+					} else {
702 717 
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
703 718 
 					}
704 719 
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
 
@@ -707,7 +722,9 @@  discard block
 
 block discarded – undo
707 722 
 			}
708 723
709 724 
 			$title = $this->getTitlefromLabel($label);
710 
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
725 
+			if ($title != '') {
726 
+				$decode = array_merge(array('Message title' => $title),$decode);
727 
+			}
711 728 
 			/*
712 729 
 			// Business jets always use GS0001
713 730 
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
 
@@ -742,31 +759,54 @@  discard block
 
 block discarded – undo
742 759 
 			$msg = $message['message'];
743 760 
 			$decode = $message['decode'];
744 761 
 			$registration = (string)$message['registration'];
745 
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
746 
-			else $latitude = '';
747 
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
748 
-			else $longitude = '';
749 
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
750 
-			else $airicao = '';
751 
-			if (isset($decode['icao'])) $icao = $decode['icao'];
752 
-			else $icao = $Translation->checkTranslation($ident);
762 
+			if (isset($decode['latitude'])) {
763 
+				$latitude = $decode['latitude'];
764 
+			} else {
765 
+				$latitude = '';
766 
+			}
767 
+			if (isset($decode['longitude'])) {
768 
+				$longitude = $decode['longitude'];
769 
+			} else {
770 
+				$longitude = '';
771 
+			}
772 
+			if (isset($decode['airicao'])) {
773 
+				$airicao = $decode['airicao'];
774 
+			} else {
775 
+				$airicao = '';
776 
+			}
777 
+			if (isset($decode['icao'])) {
778 
+				$icao = $decode['icao'];
779 
+			} else {
780 
+				$icao = $Translation->checkTranslation($ident);
781 
+			}
753 782 
 			$image_array = $Image->getSpotterImage($registration);
754 783 
 			if (!isset($image_array[0]['registration'])) {
755 784 
 				$Image->addSpotterImage($registration);
756 785 
 			}
757 786 
 			// Business jets always use GS0001
758 
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
759 
-			if ($globalDebug && isset($info) && $info != '') echo $info;
760 
-			if (count($decode) > 0) $decode_json = json_encode($decode);
761 
-			else $decode_json = '';
787 
+			if ($ident != 'GS0001') {
788 
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
789 
+			}
790 
+			if ($globalDebug && isset($info) && $info != '') {
791 
+				echo $info;
792 
+			}
793 
+			if (count($decode) > 0) {
794 
+				$decode_json = json_encode($decode);
795 
+			} else {
796 
+				$decode_json = '';
797 
+			}
762 798 
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
763 799 
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
764 800 
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
765 801 
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
766 802 
 			}
767 803 
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
768 
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
769 
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
804 
+			if (!isset($globalACARSArchive)) {
805 
+				$globalACARSArchive = array('10','80','81','82','3F');
806 
+			}
807 
+			if ($result && in_array($label,$globalACARSArchive)) {
808 
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
809 
+			}
770 810 
 			if ($globalDebug && count($decode) > 0) {
771 811 
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
772 812 
 			}
 
@@ -789,7 +829,9 @@  discard block
 
 block discarded – undo
789 829 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
790 830 
 			$Connection = new Connection($this->db);
791 831 
 			$this->db = $Connection->db;
792 
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
832 
+			if ($globalDebug) {
833 
+				echo "Test if not already in Live ACARS table...";
834 
+			}
793 835 
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
794 836 
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
795 837 
 			try {
 
@@ -799,7 +841,9 @@  discard block
 
 block discarded – undo
799 841 
 				return "error : ".$e->getMessage();
800 842 
 			}
801 843 
 			if ($stht->fetchColumn() == 0) {
802 
-				if ($globalDebug) echo "Add Live ACARS data...";
844 
+				if ($globalDebug) {
845 
+					echo "Add Live ACARS data...";
846 
+				}
803 847 
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
804 848 
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
805 849 
 				try {
 
@@ -809,10 +853,14 @@  discard block
 
 block discarded – undo
809 853 
 					return "error : ".$e->getMessage();
810 854 
 				}
811 855 
 			} else {
812 
-				if ($globalDebug) echo "Data already in DB...\n";
856 
+				if ($globalDebug) {
857 
+					echo "Data already in DB...\n";
858 
+				}
813 859 
 				return false;
814 860 
 			}
815 
-			if ($globalDebug) echo "Done\n";
861 
+			if ($globalDebug) {
862 
+				echo "Done\n";
863 
+			}
816 864 
 			return true;
817 865 
 		}
818 866 
 	}
 
@@ -843,7 +891,9 @@  discard block
 
 block discarded – undo
843 891 
 			    	    }
844 892 
 				    if ($stht->fetchColumn() == 0) {
845 893 
 			*/
846 
-			if ($globalDebug) echo "Add Live ACARS data...";
894 
+			if ($globalDebug) {
895 
+				echo "Add Live ACARS data...";
896 
+			}
847 897 
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
848 898 
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
849 899 
 			try {
 
@@ -852,7 +902,9 @@  discard block
 
 block discarded – undo
852 902 
 			} catch(PDOException $e) {
853 903 
 				return "error : ".$e->getMessage();
854 904 
 			}
855 
-			if ($globalDebug) echo "Done\n";
905 
+			if ($globalDebug) {
906 
+				echo "Done\n";
907 
+			}
856 908 
 		}
857 909 
 	}
858 910 
 
@@ -875,8 +927,11 @@  discard block
 
 block discarded – undo
875 927 
 			return '';
876 928 
 		}
877 929 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
878 
-		if (count($row) > 0) return $row[0]['title'];
879 
-		else return '';
930 
+		if (count($row) > 0) {
931 
+			return $row[0]['title'];
932 
+		} else {
933 
+			return '';
934 
+		}
880 935 
 	}
881 936
882 937 
 	/**
 
@@ -895,8 +950,11 @@  discard block
 
 block discarded – undo
895 950 
 			return array();
896 951 
 		}
897 952 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
898 
-		if (count($row) > 0) return $row;
899 
-		else return array();
953 
+		if (count($row) > 0) {
954 
+			return $row;
955 
+		} else {
956 
+			return array();
957 
+		}
900 958 
 	}
901 959
902 960 
 	/**
 
@@ -916,8 +974,11 @@  discard block
 
 block discarded – undo
916 974 
 			return array();
917 975 
 		}
918 976 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
919 
-		if (count($row) > 0) return $row[0];
920 
-		else return array();
977 
+		if (count($row) > 0) {
978 
+			return $row[0];
979 
+		} else {
980 
+			return array();
981 
+		}
921 982 
 	}
922 983
923 984 
 	/**
 
@@ -962,19 +1023,35 @@  discard block
 
 block discarded – undo
962 1023 
 			if ($row['registration'] != '') {
963 1024 
 				$row['registration'] = str_replace('.','',$row['registration']);
964 1025 
 				$image_array = $Image->getSpotterImage($row['registration']);
965 
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
966 
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
967 
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
968 
-			if ($row['registration'] == '') $row['registration'] = 'NA';
969 
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1026 
+				if (count($image_array) > 0) {
1027 
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1028 
+				} else {
1029 
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1030 
+				}
1031 
+			} else {
1032 
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1033 
+			}
1034 
+			if ($row['registration'] == '') {
1035 
+				$row['registration'] = 'NA';
1036 
+			}
1037 
+			if ($row['ident'] == '') {
1038 
+				$row['ident'] = 'NA';
1039 
+			}
970 1040 
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
971 1041 
 			if (isset($identicao[0])) {
972 1042 
 				if (substr($row['ident'],0,2) == 'AF') {
973 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
975 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1043 
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1044 
+						$icao = $row['ident'];
1045 
+					} else {
1046 
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1047 
+					}
1048 
+				} else {
1049 
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1050 
+				}
976 1051 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
977 
-			} else $icao = $row['ident'];
1052 
+			} else {
1053 
+				$icao = $row['ident'];
1054 
+			}
978 1055 
 			$icao = $Translation->checkTranslation($icao,false);
979 1056 
 			$decode = json_decode($row['decode'],true);
980 1057 
 			$found = false;
 
@@ -999,7 +1076,9 @@  discard block
 
 block discarded – undo
999 1076 
 					$found = true;
1000 1077 
 				}
1001 1078 
 			}
1002 
-			if ($found) $row['decode'] = json_encode($decode);
1079 
+			if ($found) {
1080 
+				$row['decode'] = json_encode($decode);
1081 
+			}
1003 1082 
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1004 1083 
 			$result[] = $data;
1005 1084 
 			$i++;
 
@@ -1007,8 +1086,9 @@  discard block
 
 block discarded – undo
1007 1086 
 		if (isset($result)) {
1008 1087 
 			$result[0]['query_number_rows'] = $i;
1009 1088 
 			return $result;
1089 
+		} else {
1090 
+			return array();
1010 1091 
 		}
1011 
-		else return array();
1012 1092 
 	}
1013 1093
1014 1094 
 	/**
 
@@ -1057,31 +1137,51 @@  discard block
 
 block discarded – undo
1057 1137 
 			if ($row['registration'] != '') {
1058 1138 
 				$row['registration'] = str_replace('.','',$row['registration']);
1059 1139 
 				$image_array = $Image->getSpotterImage($row['registration']);
1060 
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1061 
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1062 
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1140 
+				if (count($image_array) > 0) {
1141 
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1142 
+				} else {
1143 
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1144 
+				}
1145 
+			} else {
1146 
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1147 
+			}
1063 1148 
 			$icao = '';
1064 
-			if ($row['registration'] == '') $row['registration'] = 'NA';
1065 
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1149 
+			if ($row['registration'] == '') {
1150 
+				$row['registration'] = 'NA';
1151 
+			}
1152 
+			if ($row['ident'] == '') {
1153 
+				$row['ident'] = 'NA';
1154 
+			}
1066 1155 
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1067 1156 
 			if (isset($identicao[0])) {
1068 1157 
 				if (substr($row['ident'],0,2) == 'AF') {
1069 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1071 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1158 
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1159 
+						$icao = $row['ident'];
1160 
+					} else {
1161 
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1162 
+					}
1163 
+				} else {
1164 
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1165 
+				}
1072 1166 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1073 
-			} else $icao = $row['ident'];
1167 
+			} else {
1168 
+				$icao = $row['ident'];
1169 
+			}
1074 1170 
 			$icao = $Translation->checkTranslation($icao);
1075 1171 
 			$decode = json_decode($row['decode'],true);
1076 1172 
 			$found = false;
1077 1173 
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1078 1174 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1079 
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1175 
+				if (isset($airport_info[0]['icao'])) {
1176 
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1177 
+				}
1080 1178 
 				$found = true;
1081 1179 
 			}
1082 1180 
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1083 1181 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1084 
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1182 
+				if (isset($airport_info[0]['icao'])) {
1183 
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1184 
+				}
1085 1185 
 				$found = true;
1086 1186 
 			}
1087 1187 
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
 
@@ -1091,7 +1191,9 @@  discard block
 
 block discarded – undo
1091 1191 
 					$found = true;
1092 1192 
 				}
1093 1193 
 			}
1094 
-			if ($found) $row['decode'] = json_encode($decode);
1194 
+			if ($found) {
1195 
+				$row['decode'] = json_encode($decode);
1196 
+			}
1095 1197 
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1096 1198 
 			$result[] = $data;
1097 1199 
 			$i++;
 
@@ -1099,7 +1201,9 @@  discard block
 
 block discarded – undo
1099 1201 
 		if (isset($result)) {
1100 1202 
 			$result[0]['query_number_rows'] = $i;
1101 1203 
 			return $result;
1102 
-		} else return array();
1204 
+		} else {
1205 
+			return array();
1206 
+		}
1103 1207 
 	}
1104 1208
1105 1209 
 	/**
 
@@ -1115,25 +1219,37 @@  discard block
 
 block discarded – undo
1115 1219 
 		$ident = trim($ident);
1116 1220 
 		$Translation = new Translation($this->db);
1117 1221 
 		$Spotter = new Spotter($this->db);
1118 
-		if ($globalDebug) echo "Test if we add ModeS data...";
1222 
+		if ($globalDebug) {
1223 
+			echo "Test if we add ModeS data...";
1224 
+		}
1119 1225 
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
1120 
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
1121 
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
1226 
+		if ($icao == '') {
1227 
+			$icao = $Translation->checkTranslation($ident);
1228 
+		}
1229 
+		if ($globalDebug) {
1230 
+			echo '- Ident : '.$icao.' - ';
1231 
+		}
1122 1232 
 		if ($ident == '' || $registration == '') {
1123 
-			if ($globalDebug) echo "Ident or registration null, exit\n";
1233 
+			if ($globalDebug) {
1234 
+				echo "Ident or registration null, exit\n";
1235 
+			}
1124 1236 
 			return '';
1125 1237 
 		}
1126 1238 
 		$registration = str_replace('.','',$registration);
1127 1239 
 		$ident = $Translation->ident2icao($ident);
1128 1240 
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1129 
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
1241 
+		if ($globalDebug) {
1242 
+			echo "Check if needed to add translation ".$ident.'... ';
1243 
+		}
1130 1244 
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
1131 1245 
 		$querysi_values = array(':registration' => $registration);
1132 1246 
 		try {
1133 1247 
 			$sthsi = $this->db->prepare($querysi);
1134 1248 
 			$sthsi->execute($querysi_values);
1135 1249 
 		} catch(PDOException $e) {
1136 
-			if ($globalDebug) echo $e->getMessage();
1250 
+			if ($globalDebug) {
1251 
+				echo $e->getMessage();
1252 
+			}
1137 1253 
 			return "error : ".$e->getMessage();
1138 1254 
 		}
1139 1255 
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
 
@@ -1141,9 +1257,14 @@  discard block
 
 block discarded – undo
1141 1257 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
1142 1258 
 			$Translation = new Translation($this->db);
1143 1259 
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1144 
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1145 
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1146 
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1260 
+			if ($globalDebug) {
1261 
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1262 
+			}
1263 
+			if ($ident != $trans_ident) {
1264 
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1265 
+			} elseif ($trans_ident == $ident) {
1266 
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1267 
+			}
1147 1268 
 		} else {
1148 1269 
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1149 1270 
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
 
@@ -1152,32 +1273,46 @@  discard block
 
 block discarded – undo
1152 1273 
 					$sth = $this->db->prepare($query);
1153 1274 
 					$sth->execute($query_values);
1154 1275 
 				} catch(PDOException $e) {
1155 
-					if ($globalDebug) echo $e->getMessage();
1276 
+					if ($globalDebug) {
1277 
+						echo $e->getMessage();
1278 
+					}
1156 1279 
 					return "error : ".$e->getMessage();
1157 1280 
 				}
1158 1281 
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
1159 1282 
 				$sth->closeCursor();
1160 
-				if (isset($result['modes'])) $hex = $result['modes'];
1161 
-				else $hex = '';
1283 
+				if (isset($result['modes'])) {
1284 
+					$hex = $result['modes'];
1285 
+				} else {
1286 
+					$hex = '';
1287 
+				}
1162 1288 
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1163 
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
1289 
+				if ($this->fromACARSscript) {
1290 
+					$this->SI->add($SI_data);
1291 
+				}
1164 1292 
 			}
1165 1293 
 		}
1166 
-		if ($globalDebug) echo 'Done'."\n";
1294 
+		if ($globalDebug) {
1295 
+			echo 'Done'."\n";
1296 
+		}
1167 1297 
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
1168 1298 
 		$query_values = array(':ident' => $icao);
1169 1299 
 		try {
1170 1300 
 			$sth = $this->db->prepare($query);
1171 1301 
 			$sth->execute($query_values);
1172 1302 
 		} catch(PDOException $e) {
1173 
-			if ($globalDebug) echo $e->getMessage();
1303 
+			if ($globalDebug) {
1304 
+				echo $e->getMessage();
1305 
+			}
1174 1306 
 			return "error : ".$e->getMessage();
1175 1307 
 		}
1176 1308 
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
1177 1309 
 		$sth->closeCursor();
1178 1310 
 		if (isset($result['flightaware_id'])) {
1179 
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1180 
-			else $ModeS = '';
1311 
+			if (isset($result['ModeS'])) {
1312 
+				$ModeS = $result['ModeS'];
1313 
+			} else {
1314 
+				$ModeS = '';
1315 
+			}
1181 1316 
 			if ($ModeS == '') {
1182 1317 
 				$id = explode('-',$result['flightaware_id']);
1183 1318 
 				$ModeS = $id[0];
 
@@ -1190,24 +1325,32 @@  discard block
 
 block discarded – undo
1190 1325 
 					$sthc = $this->db->prepare($queryc);
1191 1326 
 					$sthc->execute($queryc_values);
1192 1327 
 				} catch(PDOException $e) {
1193 
-					if ($globalDebug) echo $e->getMessage();
1328 
+					if ($globalDebug) {
1329 
+						echo $e->getMessage();
1330 
+					}
1194 1331 
 					return "error : ".$e->getMessage();
1195 1332 
 				}
1196 1333 
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1197 1334 
 				$sthc->closeCursor();
1198 1335 
 				if (count($row) ==  0) {
1199 
-					if ($globalDebug) echo " Add to ModeS table - ";
1336 
+					if ($globalDebug) {
1337 
+						echo " Add to ModeS table - ";
1338 
+					}
1200 1339 
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1201 1340 
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1202 1341 
 					try {
1203 1342 
 						$sthi = $this->db->prepare($queryi);
1204 1343 
 						$sthi->execute($queryi_values);
1205 1344 
 					} catch(PDOException $e) {
1206 
-						if ($globalDebug) echo $e->getMessage();
1345 
+						if ($globalDebug) {
1346 
+							echo $e->getMessage();
1347 
+						}
1207 1348 
 						return "error : ".$e->getMessage();
1208 1349 
 					}
1209 1350 
 				} else {
1210 
-					if ($globalDebug) echo " Update ModeS table - ";
1351 
+					if ($globalDebug) {
1352 
+						echo " Update ModeS table - ";
1353 
+					}
1211 1354 
 					if ($ICAOTypeCode != '') {
1212 1355 
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1213 1356 
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 
@@ -1219,7 +1362,9 @@  discard block
 
 block discarded – undo
1219 1362 
 						$sthi = $this->db->prepare($queryi);
1220 1363 
 						$sthi->execute($queryi_values);
1221 1364 
 					} catch(PDOException $e) {
1222 
-						if ($globalDebug) echo $e->getMessage();
1365 
+						if ($globalDebug) {
1366 
+							echo $e->getMessage();
1367 
+						}
1223 1368 
 						return "error : ".$e->getMessage();
1224 1369 
 					}
1225 1370 
 				}
 
@@ -1240,7 +1385,9 @@  discard block
 
 block discarded – undo
1240 1385 
 					    return "error : ".$e->getMessage();
1241 1386 
 				}
1242 1387 
 				*/
1243 
-				if ($globalDebug) echo " Update Spotter_output table - ";
1388 
+				if ($globalDebug) {
1389 
+					echo " Update Spotter_output table - ";
1390 
+				}
1244 1391 
 				if ($ICAOTypeCode != '') {
1245 1392 
 					if ($globalDBdriver == 'mysql') {
1246 1393 
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
 
@@ -1251,8 +1398,7 @@  discard block
 
 block discarded – undo
1251 1398 
 				} else {
1252 1399 
 					if ($globalDBdriver == 'mysql') {
1253 1400 
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
1254 
-					}
1255 
-					elseif ($globalDBdriver == 'pgsql') {
1401 
+					} elseif ($globalDBdriver == 'pgsql') {
1256 1402 
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1257 1403 
 					}
1258 1404 
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
 
@@ -1261,14 +1407,20 @@  discard block
 
 block discarded – undo
1261 1407 
 					$sthi = $this->db->prepare($queryi);
1262 1408 
 					$sthi->execute($queryi_values);
1263 1409 
 				} catch(PDOException $e) {
1264 
-					if ($globalDebug) echo $e->getMessage();
1410 
+					if ($globalDebug) {
1411 
+						echo $e->getMessage();
1412 
+					}
1265 1413 
 					return "error : ".$e->getMessage();
1266 1414 
 				}
1267 1415 
 			}
1268 1416 
 		} else {
1269 
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
1417 
+			if ($globalDebug) {
1418 
+				echo " Can't find ModeS in spotter_output - ";
1419 
+			}
1420 
+		}
1421 
+		if ($globalDebug) {
1422 
+			echo "Done\n";
1270 1423 
 		}
1271 
-		if ($globalDebug) echo "Done\n";
1272 1424 
 	}
1273 1425 
 }
1274 1426 
 ?>
Please login to merge, or discard this patch.