View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 0179ab...235564 )
by Yannick
26:03
created
Status
Category
Toggle Patches
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.
scripts/update_db.php 1 patch
Braces   +30 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,9 @@  discard block
 
 block discarded – undo
9 9 
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
10 10 
 	exec("ps ux", $output, $result);
11 11 
 	$j = 0;
12 
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
12 
+	foreach ($output as $line) {
13 
+		if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
14 
+	}
13 15 
 	if ($j > 1) {
14 16 
 		echo "Script is already runnning...";
15 17 
 		die();
 
@@ -29,14 +31,18 @@  discard block
 
 block discarded – undo
29 31 
 			$update_db->update_notam();
30 32 
 		}
31 33 
 		$update_db->insert_last_notam_update();
32 
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
34 
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
35 
+		echo "NOTAM are only updated once a day.\n";
36 
+	}
33 37 
 	if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
34 38 
 		$update_db->update_all();
35 39 
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
36 40 
 	//	$Spotter = new Spotter();
37 41 
 	//	$Spotter->updateFieldsFromOtherTables();
38 42 
 		$update_db->insert_last_update();
39 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
43 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
44 
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
45 
+	}
40 46 
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
41 47 
 		echo "Check if new airspace version exist...";
42 48 
 		echo $update_db->update_airspace_fam();
 
@@ -45,8 +51,11 @@  discard block
 
 block discarded – undo
45 51 
 	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) {
46 52 
 		echo "Check if new geoid version exist...";
47 53 
 		$error = $update_db->update_geoid_fam();
48 
-		if ($error == '') $update_db->insert_last_geoid_update();
49 
-		else echo $error;
54 
+		if ($error == '') {
55 
+			$update_db->insert_last_geoid_update();
56 
+		} else {
57 
+			echo $error;
58 
+		}
50 59 
 	}
51 60 
 	if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) {
52 61 
 		echo "Check if new marine identity version exist...";
 
@@ -64,13 +73,17 @@  discard block
 
 block discarded – undo
64 73 
 			//echo "Done";
65 74 
 		}
66 75 
 		$update_db->insert_last_owner_update();
67 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
76 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
77 
+		echo "Owner are only updated every 15 days.\n";
78 
+	}
68 79
69 80 
 	if ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
70 81 
 		echo "Updating airlines...\n";
71 82 
 		echo $update_db->update_airlines_fam();
72 83 
 		$update_db->insert_last_airlines_update();
73 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n";
84 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
85 
+		echo "Airlines are only updated every 15 days.\n";
86 
+	}
74 87
75 88 
 	if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
76 89 
 		require_once(dirname(__FILE__).'/../require/class.Accident.php');
 
@@ -79,7 +92,9 @@  discard block
 
 block discarded – undo
79 92 
 		if ($Accident->check_last_accidents_update()) {
80 93 
 			$Accident->download_update();
81 94 
 			$Accident->insert_last_accidents_update();
82 
-		} else echo "Accidents are updated once a day.\n";
95 
+		} else {
96 
+			echo "Accidents are updated once a day.\n";
97 
+		}
83 98 
 	}
84 99
85 100 
 }
 
@@ -92,15 +107,19 @@  discard block
 
 block discarded – undo
92 107 
 	if ($METAR->check_last_update()) {
93 108 
 		$METAR->addMETARCycle();
94 109 
 		$METAR->insert_last_update();
95 
-	} else echo "METAR are only updated every 30 minutes.\n";
96 
-}
110 
+	} else {
111 
+		echo "METAR are only updated every 30 minutes.\n";
112 
+	}
113 
+	}
97 114
98 115 
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
99 116 
 	echo "Updating schedules...";
100 117 
 	//$update_db->update_oneworld();
101 118 
 	$update_db->update_skyteam();
102 119 
 	$update_db->insert_last_schedules_update();
103 
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
120 
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
121 
+	echo "Schedules are only updated every 15 days.\n";
122 
+}
104 123
105 124 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
106 125 
 	echo "Updating statistics and archive old data...";
Please login to merge, or discard this patch.
scripts/daemon-spotter.php 1 patch
Braces   +1049 added lines, -358 removed lines patch added patch discarded remove patch 
@@ -14,13 +14,17 @@  discard block
 
 block discarded – undo
14 14 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
15 15 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
16 16 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
17 
+if (isset($globalTracker) && $globalTracker) {
18 
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
19 
+}
18 20 
 if (isset($globalMarine) && $globalMarine) {
19 21 
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
20 22 
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21 23 
 }
22 24
23 
-if (!isset($globalDebug)) $globalDebug = FALSE;
25 
+if (!isset($globalDebug)) {
26 
+	$globalDebug = FALSE;
27 
+}
24 28
25 29 
 // Check if schema is at latest version
26 30 
 $Connection = new Connection();
 
@@ -59,66 +63,107 @@  discard block
 
 block discarded – undo
59 63 
 //elseif (isset($options['source'])) $hosts = array($options['source']);
60 64 
 if (isset($options['s'])) {
61 65 
     $globalSources = array();
62 
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
63 
-    else $globalSources[] = array('host' => $options['s']);
64 
-} elseif (isset($options['source'])) {
66 
+    if (isset($options['format'])) {
67 
+    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']);
68 
+    } else {
69 
+    	$globalSources[] = array('host' => $options['s']);
70 
+    }
71 
+    } elseif (isset($options['source'])) {
65 72 
     $globalSources = array();
66 
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
67 
-    else $globalSources[] = array('host' => $options['source']);
68 
-}
73 
+    if (isset($options['format'])) {
74 
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
75 
+    } else {
76 
+    	$globalSources[] = array('host' => $options['source']);
77 
+    }
78 
+    }
69 79 
 if (isset($options['aprsserverhost'])) {
70 80 
 	$globalServerAPRS = TRUE;
71 81 
 	$globalServerAPRShost = $options['aprsserverhost'];
72 82 
 }
73 
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
74 
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
75 
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
76 
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE;
83 
+if (isset($options['aprsserverport'])) {
84 
+	$globalServerAPRSport = $options['aprsserverport'];
85 
+}
86 
+if (isset($options['aprsserverssid'])) {
87 
+	$globalServerAPRSssid = $options['aprsserverssid'];
88 
+}
89 
+if (isset($options['aprsserverpass'])) {
90 
+	$globalServerAPRSpass = $options['aprsserverpass'];
91 
+}
92 
+if (isset($options['noaprsserver'])) {
93 
+	$globalServerAPRS = FALSE;
94 
+}
77 95 
 if (isset($options['enable-aircraft'])) {
78 
-	if ($globalDebug) echo 'Enable Aircraft mode'."\n";
96 
+	if ($globalDebug) {
97 
+		echo 'Enable Aircraft mode'."\n";
98 
+	}
79 99 
 	$globalAircraft = TRUE;
80 100 
 }
81 101 
 if (isset($options['disable-aircraft'])) {
82 
-	if ($globalDebug) echo 'Disable Aircraft mode'."\n";
102 
+	if ($globalDebug) {
103 
+		echo 'Disable Aircraft mode'."\n";
104 
+	}
83 105 
 	$globalAircraft = FALSE;
84 106 
 }
85 107 
 if (isset($options['enable-tracker'])) {
86 
-	if ($globalDebug) echo 'Enable Tracker mode'."\n";
108 
+	if ($globalDebug) {
109 
+		echo 'Enable Tracker mode'."\n";
110 
+	}
87 111 
 	$globalTracker = TRUE;
88 112 
 }
89 113 
 if (isset($options['disable-tracker'])) {
90 
-	if ($globalDebug) echo 'Disable Tracker mode'."\n";
114 
+	if ($globalDebug) {
115 
+		echo 'Disable Tracker mode'."\n";
116 
+	}
91 117 
 	$globalTracker = FALSE;
92 118 
 }
93 119 
 if (isset($options['enable-marine'])) {
94 
-	if ($globalDebug) echo 'Enable Marine mode'."\n";
120 
+	if ($globalDebug) {
121 
+		echo 'Enable Marine mode'."\n";
122 
+	}
95 123 
 	$globalMarine = TRUE;
96 124 
 }
97 125 
 if (isset($options['disable-marine'])) {
98 
-	if ($globalDebug) echo 'Disable Marine mode'."\n";
126 
+	if ($globalDebug) {
127 
+		echo 'Disable Marine mode'."\n";
128 
+	}
99 129 
 	$globalMarine = FALSE;
100 130 
 }
101 
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
102 
-if (isset($options['server'])) $globalServer = TRUE;
103 
-if (isset($options['idsource'])) $id_source = $options['idsource'];
104 
-else $id_source = 1;
131 
+if (isset($options['nodaemon'])) {
132 
+	$globalDaemon = FALSE;
133 
+}
134 
+if (isset($options['server'])) {
135 
+	$globalServer = TRUE;
136 
+}
137 
+if (isset($options['idsource'])) {
138 
+	$id_source = $options['idsource'];
139 
+} else {
140 
+	$id_source = 1;
141 
+}
105 142 
 if (isset($globalServer) && $globalServer) {
106 
-    if ($globalDebug) echo "Using Server Mode\n";
143 
+    if ($globalDebug) {
144 
+    	echo "Using Server Mode\n";
145 
+    }
107 146 
     $SI=new SpotterServer();
108 147 
 /*
109 148 
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
110 149 
     $SI = new adsb2aprs();
111 150 
     $SI->connect();
112 151 
 */
113 
-} else $SI=new SpotterImport($Connection->db);
152 
+} else {
153 
+	$SI=new SpotterImport($Connection->db);
154 
+}
114 155
115 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
156 
+if (isset($globalTracker) && $globalTracker) {
157 
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
158 
+}
116 159 
 if (isset($globalMarine) && $globalMarine) {
117 160 
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
118 161 
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
119 162 
 }
120 163
121 
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
164 
+if (isset($globalTracker) && $globalTracker) {
165 
+	$TI = new TrackerImport($Connection->db);
166 
+}
122 167 
 if (isset($globalMarine) && $globalMarine) {
123 168 
     $AIS = new AIS();
124 169 
     $MI = new MarineImport($Connection->db);
 
@@ -141,7 +186,9 @@  discard block
 
 block discarded – undo
141 186 
 }
142 187
143 188 
 // let's try and connect
144 
-if ($globalDebug) echo "Connecting...\n";
189 
+if ($globalDebug) {
190 
+	echo "Connecting...\n";
191 
+}
145 192 
 $use_aprs = false;
146 193 
 $aprs_full = false;
147 194 
 $reset = 0;
 
@@ -150,7 +197,9 @@  discard block
 
 block discarded – undo
150 197 
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
151 198 
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
152 199 
     $reset++;
153 
-    if ($globalDebug) echo 'Connect to all...'."\n";
200 
+    if ($globalDebug) {
201 
+    	echo 'Connect to all...'."\n";
202 
+    }
154 203 
     foreach ($hosts as $id => $value) {
155 204 
 	$host = $value['host'];
156 205 
 	$globalSources[$id]['last_exec'] = 0;
 
@@ -160,22 +209,30 @@  discard block
 
 block discarded – undo
160 209 
         	//$formats[$id] = 'deltadbtxt';
161 210 
         	$globalSources[$id]['format'] = 'deltadbtxt';
162 211 
         	//$last_exec['deltadbtxt'] = 0;
163 
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
212 
+        	if ($globalDebug) {
213 
+        		echo "Connect to deltadb source (".$host.")...\n";
214 
+        	}
164 215 
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
165 216 
         	//$formats[$id] = 'vatsimtxt';
166 217 
         	$globalSources[$id]['format'] = 'vatsimtxt';
167 218 
         	//$last_exec['vatsimtxt'] = 0;
168 
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
219 
+        	if ($globalDebug) {
220 
+        		echo "Connect to vatsim source (".$host.")...\n";
221 
+        	}
169 222 
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
170 223 
         	//$formats[$id] = 'aircraftlistjson';
171 224 
         	$globalSources[$id]['format'] = 'aircraftlistjson';
172 225 
         	//$last_exec['aircraftlistjson'] = 0;
173 
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
226 
+        	if ($globalDebug) {
227 
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
228 
+        	}
174 229 
     	    } else if (preg_match('/opensky/i',$host)) {
175 230 
         	//$formats[$id] = 'aircraftlistjson';
176 231 
         	$globalSources[$id]['format'] = 'opensky';
177 232 
         	//$last_exec['aircraftlistjson'] = 0;
178 
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
233 
+        	if ($globalDebug) {
234 
+        		echo "Connect to opensky source (".$host.")...\n";
235 
+        	}
179 236 
     	    /*
180 237 
     	    // Disabled for now, site change source format
181 238 
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
 
@@ -192,7 +249,9 @@  discard block
 
 block discarded – undo
192 249 
         	//$formats[$id] = 'planeupdatefaa';
193 250 
         	$globalSources[$id]['format'] = 'planeupdatefaa';
194 251 
         	//$last_exec['planeupdatefaa'] = 0;
195 
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
252 
+        	if ($globalDebug) {
253 
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
254 
+        	}
196 255 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
197 256 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
198 257 
         	    exit(0);
 
@@ -201,32 +260,46 @@  discard block
 
 block discarded – undo
201 260 
         	//$formats[$id] = 'phpvmacars';
202 261 
         	$globalSources[$id]['format'] = 'phpvmacars';
203 262 
         	//$last_exec['phpvmacars'] = 0;
204 
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
263 
+        	if ($globalDebug) {
264 
+        		echo "Connect to phpvmacars source (".$host.")...\n";
265 
+        	}
205 266 
             } else if (preg_match('/VAM-json.php$/i',$host)) {
206 267 
         	//$formats[$id] = 'phpvmacars';
207 268 
         	$globalSources[$id]['format'] = 'vam';
208 
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
269 
+        	if ($globalDebug) {
270 
+        		echo "Connect to Vam source (".$host.")...\n";
271 
+        	}
209 272 
             } else if (preg_match('/whazzup/i',$host)) {
210 273 
         	//$formats[$id] = 'whazzup';
211 274 
         	$globalSources[$id]['format'] = 'whazzup';
212 275 
         	//$last_exec['whazzup'] = 0;
213 
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
276 
+        	if ($globalDebug) {
277 
+        		echo "Connect to whazzup source (".$host.")...\n";
278 
+        	}
214 279 
             } else if (preg_match('/blitzortung/i',$host)) {
215 280 
         	$globalSources[$id]['format'] = 'blitzortung';
216 
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
281 
+        	if ($globalDebug) {
282 
+        		echo "Connect to blitzortung source (".$host.")...\n";
283 
+        	}
217 284 
             } else if (preg_match('/airwhere/i',$host)) {
218 285 
         	$globalSources[$id]['format'] = 'airwhere';
219 
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
286 
+        	if ($globalDebug) {
287 
+        		echo "Connect to airwhere source (".$host.")...\n";
288 
+        	}
220 289 
             } else if (preg_match('/recentpireps/i',$host)) {
221 290 
         	//$formats[$id] = 'pirepsjson';
222 291 
         	$globalSources[$id]['format'] = 'pirepsjson';
223 292 
         	//$last_exec['pirepsjson'] = 0;
224 
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
293 
+        	if ($globalDebug) {
294 
+        		echo "Connect to pirepsjson source (".$host.")...\n";
295 
+        	}
225 296 
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
226 297 
         	//$formats[$id] = 'fr24json';
227 298 
         	$globalSources[$id]['format'] = 'fr24json';
228 299 
         	//$last_exec['fr24json'] = 0;
229 
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
300 
+        	if ($globalDebug) {
301 
+        		echo "Connect to fr24 source (".$host.")...\n";
302 
+        	}
230 303 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
231 304 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
232 305 
         	    exit(0);
 
@@ -235,7 +308,9 @@  discard block
 
 block discarded – undo
235 308 
         	//$formats[$id] = 'fr24json';
236 309 
         	$globalSources[$id]['format'] = 'myshiptracking';
237 310 
         	//$last_exec['fr24json'] = 0;
238 
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
311 
+        	if ($globalDebug) {
312 
+        		echo "Connect to myshiptracking source (".$host.")...\n";
313 
+        	}
239 314 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
240 315 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
241 316 
         	    exit(0);
 
@@ -244,17 +319,24 @@  discard block
 
 block discarded – undo
244 319 
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
245 320 
         	//$formats[$id] = 'tsv';
246 321 
         	$globalSources[$id]['format'] = 'tsv';
247 
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
322 
+        	if ($globalDebug) {
323 
+        		echo "Connect to tsv source (".$host.")...\n";
324 
+        	}
248 325 
             }
249 326 
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
250 327 
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
251 328 
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
252 329 
     		    if ($idf !== false) {
253 330 
     			$httpfeeds[$id] = $idf;
254 
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
331 
+        		if ($globalDebug) {
332 
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
333 
+        		}
334 
+    		    } elseif ($globalDebug) {
335 
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
255 336 
     		    }
256 
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
257 
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
337 
+    		} elseif ($globalDebug) {
338 
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
339 
+    		}
258 340 
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
259 341 
 	    $hostport = explode(':',$host);
260 342 
 	    if (isset($hostport[1])) {
 
@@ -294,17 +376,25 @@  discard block
 
 block discarded – undo
294 376 
         		//$formats[$id] = 'beast';
295 377 
         		$globalSources[$id]['format'] = 'beast';
296 378 
 		    //} else $formats[$id] = 'sbs';
297 
-		    } else $globalSources[$id]['format'] = 'sbs';
379 
+		    } else {
380 
+		    	$globalSources[$id]['format'] = 'sbs';
381 
+		    }
298 382 
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
299 383 
 		}
300 
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
384 
+		if ($globalDebug) {
385 
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
386 
+		}
301 387 
             } else {
302 
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
388 
+		if ($globalDebug) {
389 
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
390 
+		}
303 391 
     	    }
304 392 
         }
305 393 
     }
306 394 
 }
307 
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
395 
+if (!isset($globalMinFetch)) {
396 
+	$globalMinFetch = 15;
397 
+}
308 398
309 399 
 // Initialize all
310 400 
 $status = array();
 
@@ -313,13 +403,19 @@  discard block
 
 block discarded – undo
313 403 
 $formats = array();
314 404 
 $last_exec = array();
315 405 
 $time = time();
316 
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
317 
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
318 
-else $timeout = 20;
406 
+if (isset($globalSourcesTimeout)) {
407 
+	$timeout = $globalSourcesTimeOut;
408 
+} else if (isset($globalSBS1TimeOut)) {
409 
+	$timeout = $globalSBS1TimeOut;
410 
+} else {
411 
+	$timeout = 20;
412 
+}
319 413 
 $errno = '';
320 414 
 $errstr='';
321 415
322 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
416 
+if (!isset($globalDaemon)) {
417 
+	$globalDaemon = TRUE;
418 
+}
323 419 
 /* Initiate connections to all the hosts simultaneously */
324 420 
 //connect_all($hosts);
325 421 
 //connect_all($globalSources);
 
@@ -348,7 +444,9 @@  discard block
 
 block discarded – undo
348 444 
     if (isset($source['format']) && $source['format'] == 'aprs') {
349 445 
 	$aprs_connect = 0;
350 446 
 	$use_aprs = true;
351 
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
447 
+	if (isset($source['port']) && $source['port'] == '10152') {
448 
+		$aprs_full = true;
449 
+	}
352 450 
 	break;
353 451 
     }
354 452 
 }
 
@@ -359,25 +457,48 @@  discard block
 
 block discarded – undo
359 457 
 	$aprs_connect = 0;
360 458 
 	$aprs_keep = 120;
361 459 
 	$aprs_last_tx = time();
362 
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
363 
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
364 
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
365 
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
366 
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
367 
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
368 
-	if ($aprs_full) $aprs_filter = '';
369 
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
370 
-	else $aprs_pass = '-1';
460 
+	if (isset($globalAPRSversion)) {
461 
+		$aprs_version = $globalAPRSversion;
462 
+	} else {
463 
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
464 
+	}
465 
+	if (isset($globalAPRSssid)) {
466 
+		$aprs_ssid = $globalAPRSssid;
467 
+	} else {
468 
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
469 
+	}
470 
+	if (isset($globalAPRSfilter)) {
471 
+		$aprs_filter = $globalAPRSfilter;
472 
+	} else {
473 
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
474 
+	}
475 
+	if ($aprs_full) {
476 
+		$aprs_filter = '';
477 
+	}
478 
+	if (isset($globalAPRSpass)) {
479 
+		$aprs_pass = $globalAPRSpass;
480 
+	} else {
481 
+		$aprs_pass = '-1';
482 
+	}
371 483
372 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
373 
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
374 
-}
484 
+	if ($aprs_filter != '') {
485 
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
486 
+	} else {
487 
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
488 
+	}
489 
+	}
375 490
376 491 
 // connected - lets do some work
377 
-if ($globalDebug) echo "Connected!\n";
492 
+if ($globalDebug) {
493 
+	echo "Connected!\n";
494 
+}
378 495 
 sleep(1);
379 
-if ($globalDebug) echo "SCAN MODE \n\n";
380 
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
496 
+if ($globalDebug) {
497 
+	echo "SCAN MODE \n\n";
498 
+}
499 
+if (!isset($globalCronEnd)) {
500 
+	$globalCronEnd = 60;
501 
+}
381 502 
 $endtime = time()+$globalCronEnd;
382 503 
 $i = 1;
383 504 
 $tt = array();
 
@@ -391,20 +512,28 @@  discard block
 
 block discarded – undo
391 512
392 513 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
393 514 
 while ($i > 0) {
394 
-    if (!$globalDaemon) $i = $endtime-time();
515 
+    if (!$globalDaemon) {
516 
+    	$i = $endtime-time();
517 
+    }
395 518 
     // Delete old ATC
396 519 
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
397 
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
520 
+	if ($globalDebug) {
521 
+		echo 'Delete old ATC...'."\n";
522 
+	}
398 523 
         $ATC->deleteOldATC();
399 524 
     }
400 525
401 526 
     if (count($last_exec) == count($globalSources)) {
402 527 
 	$max = $globalMinFetch;
403 528 
 	foreach ($last_exec as $last) {
404 
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
529 
+	    if ((time() - $last['last']) < $max) {
530 
+	    	$max = time() - $last['last'];
531 
+	    }
405 532 
 	}
406 533 
 	if ($max != $globalMinFetch) {
407 
-	    if ($globalDebug) echo 'Sleeping...'."\n";
534 
+	    if ($globalDebug) {
535 
+	    	echo 'Sleeping...'."\n";
536 
+	    }
408 537 
 	    sleep($globalMinFetch-$max+2);
409 538 
 	}
410 539 
     }
 
@@ -414,7 +543,9 @@  discard block
 
 block discarded – undo
414 543 
     foreach ($globalSources as $id => $value) {
415 544 
 	date_default_timezone_set('UTC');
416 545 
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
417 
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
546 
+	if (!isset($last_exec[$id]['last'])) {
547 
+		$last_exec[$id]['last'] = 0;
548 
+	}
418 549 
 	if ($value['format'] == 'deltadbtxt' &&
419 550 
 	    (
420 551 
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
@@ -423,7 +554,9 @@  discard block
 
 block discarded – undo
423 554 
 	) {
424 555 
 	    //$buffer = $Common->getData($hosts[$id]);
425 556 
 	    $buffer = $Common->getData($value['host']);
426 
-	    if ($buffer != '') $reset = 0;
557 
+	    if ($buffer != '') {
558 
+	    	$reset = 0;
559 
+	    }
427 560 
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
428 561 
 	    $buffer = explode('\n',$buffer);
429 562 
 	    foreach ($buffer as $line) {
 
@@ -432,20 +565,41 @@  discard block
 
 block discarded – undo
432 565 
 	            $data = array();
433 566 
 	            $data['hex'] = $line[1]; // hex
434 567 
 	            $data['ident'] = $line[2]; // ident
435 
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
436 
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
437 
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
438 
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
439 
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
568 
+	            if (isset($line[3])) {
569 
+	            	$data['altitude'] = $line[3];
570 
+	            }
571 
+	            // altitude
572 
+	            if (isset($line[4])) {
573 
+	            	$data['speed'] = $line[4];
574 
+	            }
575 
+	            // speed
576 
+	            if (isset($line[5])) {
577 
+	            	$data['heading'] = $line[5];
578 
+	            }
579 
+	            // heading
580 
+	            if (isset($line[6])) {
581 
+	            	$data['latitude'] = $line[6];
582 
+	            }
583 
+	            // lat
584 
+	            if (isset($line[7])) {
585 
+	            	$data['longitude'] = $line[7];
586 
+	            }
587 
+	            // long
440 588 
 	            $data['verticalrate'] = ''; // vertical rate
441 589 
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
442 590 
 	            $data['emergency'] = ''; // emergency
443 591 
 		    $data['datetime'] = date('Y-m-d H:i:s');
444 592 
 		    $data['format_source'] = 'deltadbtxt';
445 593 
     		    $data['id_source'] = $id_source;
446 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
447 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
448 
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
594 
+		    if (isset($value['name']) && $value['name'] != '') {
595 
+		    	$data['source_name'] = $value['name'];
596 
+		    }
597 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
598 
+		    	$data['noarchive'] = true;
599 
+		    }
600 
+		    if (isset($value['sourcestats'])) {
601 
+		    	$data['sourcestats'] = $value['sourcestats'];
602 
+		    }
449 603 
     		    $SI->add($data);
450 604 
 		    unset($data);
451 605 
     		}
 
@@ -460,7 +614,9 @@  discard block
 
 block discarded – undo
460 614 
 	    date_default_timezone_set('CET');
461 615 
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
462 616 
 	    date_default_timezone_set('UTC');
463 
-	    if ($buffer != '') $reset = 0;
617 
+	    if ($buffer != '') {
618 
+	    	$reset = 0;
619 
+	    }
464 620 
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
465 621 
 	    $buffer = explode('\n',$buffer);
466 622 
 	    foreach ($buffer as $line) {
 
@@ -469,16 +625,36 @@  discard block
 
 block discarded – undo
469 625 
 		    $add = false;
470 626 
 		    $ais_data = $AIS->parse_line(trim($line));
471 627 
 		    $data = array();
472 
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
473 
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
474 
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
475 
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
476 
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
477 
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
478 
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
479 
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
480 
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
481 
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
628 
+		    if (isset($ais_data['ident'])) {
629 
+		    	$data['ident'] = $ais_data['ident'];
630 
+		    }
631 
+		    if (isset($ais_data['mmsi'])) {
632 
+		    	$data['mmsi'] = $ais_data['mmsi'];
633 
+		    }
634 
+		    if (isset($ais_data['speed'])) {
635 
+		    	$data['speed'] = $ais_data['speed'];
636 
+		    }
637 
+		    if (isset($ais_data['heading'])) {
638 
+		    	$data['heading'] = $ais_data['heading'];
639 
+		    }
640 
+		    if (isset($ais_data['latitude'])) {
641 
+		    	$data['latitude'] = $ais_data['latitude'];
642 
+		    }
643 
+		    if (isset($ais_data['longitude'])) {
644 
+		    	$data['longitude'] = $ais_data['longitude'];
645 
+		    }
646 
+		    if (isset($ais_data['status'])) {
647 
+		    	$data['status'] = $ais_data['status'];
648 
+		    }
649 
+		    if (isset($ais_data['type'])) {
650 
+		    	$data['type'] = $ais_data['type'];
651 
+		    }
652 
+		    if (isset($ais_data['imo'])) {
653 
+		    	$data['imo'] = $ais_data['imo'];
654 
+		    }
655 
+		    if (isset($ais_data['callsign'])) {
656 
+		    	$data['callsign'] = $ais_data['callsign'];
657 
+		    }
482 658 
 		    if (isset($ais_data['timestamp'])) {
483 659 
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
484 660 
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
 
@@ -492,8 +668,12 @@  discard block
 
 block discarded – undo
492 668 
 		    $data['format_source'] = 'aisnmeatxt';
493 669 
     		    $data['id_source'] = $id_source;
494 670 
 		    //print_r($data);
495 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
496 
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
671 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
672 
+		    	$data['noarchive'] = true;
673 
+		    }
674 
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
675 
+		    	$MI->add($data);
676 
+		    }
497 677 
 		    unset($data);
498 678 
 		}
499 679 
     	    }
 
@@ -513,20 +693,48 @@  discard block
 
 block discarded – undo
513 693 
 			    if ($line != '') {
514 694 
 				$ais_data = $AIS->parse_line(trim($line));
515 695 
 				$data = array();
516 
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
517 
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
518 
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
519 
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
520 
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
521 
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
522 
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
523 
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
524 
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
525 
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
526 
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
527 
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
528 
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
529 
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
696 
+				if (isset($ais_data['ident'])) {
697 
+					$data['ident'] = $ais_data['ident'];
698 
+				}
699 
+				if (isset($ais_data['mmsi'])) {
700 
+					$data['mmsi'] = $ais_data['mmsi'];
701 
+				}
702 
+				if (isset($ais_data['speed'])) {
703 
+					$data['speed'] = $ais_data['speed'];
704 
+				}
705 
+				if (isset($ais_data['heading'])) {
706 
+					$data['heading'] = $ais_data['heading'];
707 
+				}
708 
+				if (isset($ais_data['latitude'])) {
709 
+					$data['latitude'] = $ais_data['latitude'];
710 
+				}
711 
+				if (isset($ais_data['longitude'])) {
712 
+					$data['longitude'] = $ais_data['longitude'];
713 
+				}
714 
+				if (isset($ais_data['status'])) {
715 
+					$data['status'] = $ais_data['status'];
716 
+				}
717 
+				if (isset($ais_data['statusid'])) {
718 
+					$data['status_id'] = $ais_data['statusid'];
719 
+				}
720 
+				if (isset($ais_data['type'])) {
721 
+					$data['type'] = $ais_data['type'];
722 
+				}
723 
+				if (isset($ais_data['typeid'])) {
724 
+					$data['type_id'] = $ais_data['typeid'];
725 
+				}
726 
+				if (isset($ais_data['imo'])) {
727 
+					$data['imo'] = $ais_data['imo'];
728 
+				}
729 
+				if (isset($ais_data['callsign'])) {
730 
+					$data['callsign'] = $ais_data['callsign'];
731 
+				}
732 
+				if (isset($ais_data['destination'])) {
733 
+					$data['arrival_code'] = $ais_data['destination'];
734 
+				}
735 
+				if (isset($ais_data['eta_ts'])) {
736 
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
737 
+				}
530 738 
 				if (isset($ais_data['timestamp'])) {
531 739 
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
532 740 
 				} else {
 
@@ -534,18 +742,27 @@  discard block
 
 block discarded – undo
534 742 
 				}
535 743 
 				$data['format_source'] = 'aisnmeahttp';
536 744 
 				$data['id_source'] = $id_source;
537 
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
538 
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
745 
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
746 
+					$data['noarchive'] = true;
747 
+				}
748 
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
749 
+					$MI->add($data);
750 
+				}
539 751 
 				unset($data);
540 752 
 			    }
541 753 
 			}
542 754 
 		    }
543 755 
 		} else {
544 756 
 		    $format = $value['format'];
545 
-		    if (isset($tt[$format])) $tt[$format]++;
546 
-		    else $tt[$format] = 0;
757 
+		    if (isset($tt[$format])) {
758 
+		    	$tt[$format]++;
759 
+		    } else {
760 
+		    	$tt[$format] = 0;
761 
+		    }
547 762 
 		    if ($tt[$format] > 30) {
548 
-			if ($globalDebug) echo 'Reconnect...'."\n";
763 
+			if ($globalDebug) {
764 
+				echo 'Reconnect...'."\n";
765 
+			}
549 766 
 			sleep(2);
550 767 
 			$sourceeen[] = $value;
551 768 
 			connect_all($sourceeen);
 
@@ -583,7 +800,9 @@  discard block
 
 block discarded – undo
583 800 
 			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
584 801 
 			    $data['format_source'] = 'myshiptracking';
585 802 
 			    $data['id_source'] = $id_source;
586 
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
803 
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
804 
+			    	$data['noarchive'] = true;
805 
+			    }
587 806 
 			    $MI->add($data);
588 807 
 			    unset($data);
589 808 
 			}
 
@@ -608,7 +827,9 @@  discard block
 
 block discarded – undo
608 827 
 			    $data['callsign'] = $line['callsign'];
609 828 
 			    $data['mmsi'] = $line['mmsi'];
610 829 
 			    $data['speed'] = $line['sog'];
611 
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
830 
+			    if ($line['heading'] != '511') {
831 
+			    	$data['heading'] = $line['heading'];
832 
+			    }
612 833 
 			    $data['latitude'] = $line['latitude'];
613 834 
 			    $data['longitude'] = $line['longitude'];
614 835 
 			    $data['type_id'] = $line['shiptype'];
 
@@ -616,7 +837,9 @@  discard block
 
 block discarded – undo
616 837 
 			    $data['datetime'] = $line['time'];
617 838 
 			    $data['format_source'] = 'boatbeaconapp';
618 839 
 			    $data['id_source'] = $id_source;
619 
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
840 
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
841 
+			    	$data['noarchive'] = true;
842 
+			    }
620 843 
 			    $MI->add($data);
621 844 
 			    unset($data);
622 845 
 			}
 
@@ -637,22 +860,44 @@  discard block
 
 block discarded – undo
637 860 
 		if (isset($all_data['features'][0]['id'])) {
638 861 
 		    foreach ($all_data['features'] as $line) {
639 862 
 			$data = array();
640 
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
641 
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
642 
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = $line['properties']['mmsi'];
643 
-			if (isset($line['properties']['imo'])) $data['mmsi'] = $line['properties']['imo'];
644 
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
645 
-			if (isset($line['properties']['heading'])) $data['heading'] = $line['properties']['heading'];
863 
+			if (isset($line['properties']['name'])) {
864 
+				$data['ident'] = $line['properties']['name'];
865 
+			}
866 
+			if (isset($line['properties']['callsign'])) {
867 
+				$data['callsign'] = $line['properties']['callsign'];
868 
+			}
869 
+			if (isset($line['properties']['mmsi'])) {
870 
+				$data['mmsi'] = $line['properties']['mmsi'];
871 
+			}
872 
+			if (isset($line['properties']['imo'])) {
873 
+				$data['mmsi'] = $line['properties']['imo'];
874 
+			}
875 
+			if (isset($line['properties']['speed'])) {
876 
+				$data['speed'] = $line['properties']['speed'];
877 
+			}
878 
+			if (isset($line['properties']['heading'])) {
879 
+				$data['heading'] = $line['properties']['heading'];
880 
+			}
646 881 
 			$data['latitude'] = $line['geometry']['coordinates'][1];
647 882 
 			$data['longitude'] = $line['geometry']['coordinates'][0];
648 
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
649 
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
650 
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
883 
+			if (isset($line['properties']['vesselType'])) {
884 
+				$data['type'] = $line['properties']['vesselType'];
885 
+			}
886 
+			if (isset($line['properties']['destination'])) {
887 
+				$data['arrival_code'] = $line['properties']['destination'];
888 
+			}
889 
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
890 
+				$data['arrival_date'] = $line['properties']['eta'];
891 
+			}
651 892 
 			$data['format_source'] = 'boatnerd';
652 893 
 			$data['id_source'] = $id_source;
653 894 
 			$data['datetime'] = date('Y-m-d H:i:s');
654 
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
655 
-			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
895 
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
896 
+				$data['noarchive'] = true;
897 
+			}
898 
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
899 
+				$MI->add($data);
900 
+			}
656 901 
 			unset($data);
657 902 
 		    }
658 903 
 		}
 
@@ -668,7 +913,9 @@  discard block
 
 block discarded – undo
668 913 
 	    echo 'download...';
669 914 
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
670 915 
 	    echo 'done !'."\n";
671 
-	    if ($buffer != '') $reset = 0;
916 
+	    if ($buffer != '') {
917 
+	    	$reset = 0;
918 
+	    }
672 919 
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
673 920 
 	    $buffer = explode('\n',$buffer);
674 921 
 	    foreach ($buffer as $line) {
 
@@ -693,7 +940,9 @@  discard block
 
 block discarded – undo
693 940 
 		    //$data['etaTime'] = substr($line,135,5);
694 941 
 		    $data['format_source'] = 'shipplotter';
695 942 
     		    $data['id_source'] = $id_source;
696 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
943 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
944 
+		    	$data['noarchive'] = true;
945 
+		    }
697 946 
 		    //print_r($data);
698 947 
 		    echo 'Add...'."\n";
699 948 
 		    $MI->add($data);
 
@@ -727,16 +976,28 @@  discard block
 
 block discarded – undo
727 976 
     		    $line = explode(':', $line);
728 977 
     		    if (count($line) > 30 && $line[0] != 'callsign') {
729 978 
 			$data = array();
730 
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
731 
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
979 
+			if (isset($line[37]) && $line[37] != '') {
980 
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
981 
+			} else {
982 
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
983 
+			}
732 984 
 			$data['pilot_id'] = $line[1];
733 985 
 			$data['pilot_name'] = $line[2];
734 986 
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
735 987 
 			$data['ident'] = $line[0]; // ident
736 
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
988 
+			if ($line[7] != '' && $line[7] != 0) {
989 
+				$data['altitude'] = $line[7];
990 
+			}
991 
+			// altitude
737 992 
 			$data['speed'] = $line[8]; // speed
738 
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
739 
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
993 
+			if (isset($line[45])) {
994 
+				$data['heading'] = $line[45];
995 
+			}
996 
+			// heading
997 
+			elseif (isset($line[38])) {
998 
+				$data['heading'] = $line[38];
999 
+			}
1000 
+			// heading
740 1001 
 			$data['latitude'] = $line[5]; // lat
741 1002 
 	        	$data['longitude'] = $line[6]; // long
742 1003 
 	        	$data['verticalrate'] = ''; // vertical rate
 
@@ -752,7 +1013,9 @@  discard block
 
 block discarded – undo
752 1013 
 			$data['frequency'] = $line[4];
753 1014 
 			$data['type'] = $line[18];
754 1015 
 			$data['range'] = $line[19];
755 
-			if (isset($line[35])) $data['info'] = $line[35];
1016 
+			if (isset($line[35])) {
1017 
+				$data['info'] = $line[35];
1018 
+			}
756 1019 
     			$data['id_source'] = $id_source;
757 1020 
 	    		//$data['arrival_airport_time'] = ;
758 1021 
 	    		if ($line[9] != '') {
 
@@ -766,27 +1029,47 @@  discard block
 
 block discarded – undo
766 1029 
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
767 1030 
 	    		*/
768 1031 
 	    		$data['format_source'] = $value['format'];
769 
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
770 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
771 
-    			if ($line[3] == 'PILOT') $SI->add($data);
772 
-			elseif ($line[3] == 'ATC') {
1032 
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1033 
+				$data['noarchive'] = true;
1034 
+			}
1035 
+			if (isset($value['name']) && $value['name'] != '') {
1036 
+				$data['source_name'] = $value['name'];
1037 
+			}
1038 
+    			if ($line[3] == 'PILOT') {
1039 
+    				$SI->add($data);
1040 
+    			} elseif ($line[3] == 'ATC') {
773 1041 
 				//print_r($data);
774 1042 
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
775 1043 
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
776 1044 
 				$typec = substr($data['ident'],-3);
777 
-				if ($typec == 'APP') $data['type'] = 'Approach';
778 
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
779 
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
780 
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
781 
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
782 
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
783 
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
784 
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
785 
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
786 
-				if (!isset($data['source_name'])) $data['source_name'] = '';
1045 
+				if ($typec == 'APP') {
1046 
+					$data['type'] = 'Approach';
1047 
+				} elseif ($typec == 'TWR') {
1048 
+					$data['type'] = 'Tower';
1049 
+				} elseif ($typec == 'OBS') {
1050 
+					$data['type'] = 'Observer';
1051 
+				} elseif ($typec == 'GND') {
1052 
+					$data['type'] = 'Ground';
1053 
+				} elseif ($typec == 'DEL') {
1054 
+					$data['type'] = 'Delivery';
1055 
+				} elseif ($typec == 'DEP') {
1056 
+					$data['type'] = 'Departure';
1057 
+				} elseif ($typec == 'FSS') {
1058 
+					$data['type'] = 'Flight Service Station';
1059 
+				} elseif ($typec == 'CTR') {
1060 
+					$data['type'] = 'Control Radar or Centre';
1061 
+				} elseif ($data['type'] == '') {
1062 
+					$data['type'] = 'Observer';
1063 
+				}
1064 
+				if (!isset($data['source_name'])) {
1065 
+					$data['source_name'] = '';
1066 
+				}
787 1067 
 				if (isset($ATC)) {
788 
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
789 
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1068 
+					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) {
1069 
+						echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1070 
+					} else {
1071 
+						echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1072 
+					}
790 1073 
 				}
791 1074 
 			}
792 1075 
     			unset($data);
 
@@ -813,14 +1096,20 @@  discard block
 
 block discarded – undo
813 1096 
 			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
814 1097 
 			$data['latitude'] = (float)$line['pktLatitude'];
815 1098 
 			$data['longitude'] = (float)$line['pktLongitude'];
816 
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
817 
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
1099 
+			if ((float)$line['pktTrack'] != 0) {
1100 
+				$data['heading'] = (float)$line['pktTrack'];
1101 
+			}
1102 
+			if ((int)$line['pktSpeed'] != 0) {
1103 
+				$data['speed'] = (int)$line['pktSpeed'];
1104 
+			}
818 1105 
 			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
819 1106 
 			$data['altitude_relative'] = 'AMSL';
820 1107 
 			$data['pilot_id'] = (int)$line['pktPilotID'];
821 1108 
 			$data['aircraft_icao'] = 'PARAGLIDER';
822 1109 
 			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
823 
-			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
1110 
+			if (isset($pilot_data[4])) {
1111 
+				$data['pilot_name'] = $pilot_data[4];
1112 
+			}
824 1113 
 			$data['format_source'] = $value['format'];
825 1114 
 			$SI->add($data);
826 1115 
 			unset($data);
 
@@ -868,25 +1157,59 @@  discard block
 
 block discarded – undo
868 1157 
 		    foreach ($all_data['acList'] as $line) {
869 1158 
 			$data = array();
870 1159 
 			$data['hex'] = $line['Icao']; // hex
871 
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
872 
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
873 
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
874 
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
875 
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
876 
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1160 
+			if (isset($line['Call'])) {
1161 
+				$data['ident'] = $line['Call'];
1162 
+			}
1163 
+			// ident
1164 
+			if (isset($line['Alt'])) {
1165 
+				$data['altitude'] = $line['Alt'];
1166 
+			}
1167 
+			// altitude
1168 
+			if (isset($line['Spd'])) {
1169 
+				$data['speed'] = $line['Spd'];
1170 
+			}
1171 
+			// speed
1172 
+			if (isset($line['Trak'])) {
1173 
+				$data['heading'] = $line['Trak'];
1174 
+			}
1175 
+			// heading
1176 
+			if (isset($line['Lat'])) {
1177 
+				$data['latitude'] = $line['Lat'];
1178 
+			}
1179 
+			// lat
1180 
+			if (isset($line['Long'])) {
1181 
+				$data['longitude'] = $line['Long'];
1182 
+			}
1183 
+			// long
877 1184 
 			//$data['verticalrate'] = $line['']; // verticale rate
878 
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1185 
+			if (isset($line['Sqk'])) {
1186 
+				$data['squawk'] = $line['Sqk'];
1187 
+			}
1188 
+			// squawk
879 1189 
 			$data['emergency'] = ''; // emergency
880 
-			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
881 
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
882 
-			else $data['datetime'] = date('Y-m-d H:i:s');
1190 
+			if (isset($line['Reg'])) {
1191 
+				$data['registration'] = $line['Reg'];
1192 
+			}
1193 
+			if (isset($line['PosTime'])) {
1194 
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1195 
+			} else {
1196 
+				$data['datetime'] = date('Y-m-d H:i:s');
1197 
+			}
883 1198 
 			//$data['datetime'] = date('Y-m-d H:i:s');
884 
-			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1199 
+			if (isset($line['Type'])) {
1200 
+				$data['aircraft_icao'] = $line['Type'];
1201 
+			}
885 1202 
 			$data['format_source'] = 'aircraftlistjson';
886 1203 
 			$data['id_source'] = $id_source;
887 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
888 
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
889 
-			if (isset($data['latitude'])) $SI->add($data);
1204 
+			if (isset($value['name']) && $value['name'] != '') {
1205 
+				$data['source_name'] = $value['name'];
1206 
+			}
1207 
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1208 
+				$data['noarchive'] = true;
1209 
+			}
1210 
+			if (isset($data['latitude'])) {
1211 
+				$SI->add($data);
1212 
+			}
890 1213 
 			unset($data);
891 1214 
 		    }
892 1215 
 		} elseif (is_array($all_data)) {
 
@@ -903,17 +1226,26 @@  discard block
 
 block discarded – undo
903 1226 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
904 1227 
 			$data['squawk'] = $line['squawk']; // squawk
905 1228 
 			$data['emergency'] = ''; // emergency
906 
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
907 
-			else $data['datetime'] = date('Y-m-d H:i:s');
1229 
+			if (isset($line['PosTime'])) {
1230 
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1231 
+			} else {
1232 
+				$data['datetime'] = date('Y-m-d H:i:s');
1233 
+			}
908 1234 
 			$data['format_source'] = 'aircraftlistjson';
909 1235 
 			$data['id_source'] = $id_source;
910 
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
911 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1236 
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1237 
+				$data['noarchive'] = true;
1238 
+			}
1239 
+			if (isset($value['name']) && $value['name'] != '') {
1240 
+				$data['source_name'] = $value['name'];
1241 
+			}
912 1242 
 			$SI->add($data);
913 1243 
 			unset($data);
914 1244 
 		    }
915 1245 
 		}
916 
-	    } elseif ($globalDebug) echo 'No data'."\n";
1246 
+	    } elseif ($globalDebug) {
1247 
+	    	echo 'No data'."\n";
1248 
+	    }
917 1249 
     	    //$last_exec['aircraftlistjson'] = time();
918 1250 
     	    $last_exec[$id]['last'] = time();
919 1251 
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
 
@@ -949,8 +1281,12 @@  discard block
 
 block discarded – undo
949 1281 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
950 1282 
 	    	    $data['format_source'] = 'planeupdatefaa';
951 1283 
     		    $data['id_source'] = $id_source;
952 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
953 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1284 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1285 
+		    	$data['noarchive'] = true;
1286 
+		    }
1287 
+		    if (isset($value['name']) && $value['name'] != '') {
1288 
+		    	$data['source_name'] = $value['name'];
1289 
+		    }
954 1290 
 		    $SI->add($data);
955 1291 
 		    unset($data);
956 1292 
 		}
 
@@ -984,7 +1320,9 @@  discard block
 
 block discarded – undo
984 1320 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
985 1321 
 		    $data['format_source'] = 'opensky';
986 1322 
 		    $data['id_source'] = $id_source;
987 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1323 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1324 
+		    	$data['noarchive'] = true;
1325 
+		    }
988 1326 
 		    $SI->add($data);
989 1327 
 		    unset($data);
990 1328 
 		}
 
@@ -1001,7 +1339,9 @@  discard block
 
 block discarded – undo
1001 1339 
 	    //$buffer = $Common->getData($hosts[$id]);
1002 1340 
 	    $buffer = $Common->getData($value['host']);
1003 1341 
 	    $all_data = json_decode($buffer,true);
1004 
-	    if (!empty($all_data)) $reset = 0;
1342 
+	    if (!empty($all_data)) {
1343 
+	    	$reset = 0;
1344 
+	    }
1005 1345 
 	    foreach ($all_data as $key => $line) {
1006 1346 
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
1007 1347 
 		    $data = array();
 
@@ -1022,8 +1362,12 @@  discard block
 
 block discarded – undo
1022 1362 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1023 1363 
 	    	    $data['format_source'] = 'fr24json';
1024 1364 
     		    $data['id_source'] = $id_source;
1025 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1026 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1365 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1366 
+		    	$data['noarchive'] = true;
1367 
+		    }
1368 
+		    if (isset($value['name']) && $value['name'] != '') {
1369 
+		    	$data['source_name'] = $value['name'];
1370 
+		    }
1027 1371 
 		    $SI->add($data);
1028 1372 
 		    unset($data);
1029 1373 
 		}
 
@@ -1052,24 +1396,42 @@  discard block
 
 block discarded – undo
1052 1396 
 		    if (isset($line['inf'])) {
1053 1397 
 			$data = array();
1054 1398 
 			$data['hex'] = $line['inf']['ia'];
1055 
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1399 
+			if (isset($line['inf']['cs'])) {
1400 
+				$data['ident'] = $line['inf']['cs'];
1401 
+			}
1402 
+			//$line[13]
1056 1403 
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1057 
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1058 
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1404 
+	    		if (isset($line['inf']['gs'])) {
1405 
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
1406 
+	    		}
1407 
+	    		// speed
1408 
+	    		if (isset($line['inf']['tr'])) {
1409 
+	    			$data['heading'] = $line['inf']['tr'];
1410 
+	    		}
1411 
+	    		// heading
1059 1412 
 	    		$data['latitude'] = $line['pt'][0]; // lat
1060 1413 
 	    		$data['longitude'] = $line['pt'][1]; // long
1061 1414 
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1062 
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1415 
+	    		if (isset($line['inf']['sq'])) {
1416 
+	    			$data['squawk'] = $line['inf']['sq'];
1417 
+	    		}
1418 
+	    		// squawk
1063 1419 
 	    		//$data['aircraft_icao'] = $line[8];
1064 
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1420 
+	    		if (isset($line['inf']['rc'])) {
1421 
+	    			$data['registration'] = $line['inf']['rc'];
1422 
+	    		}
1065 1423 
 			//$data['departure_airport_iata'] = $line[11];
1066 1424 
 			//$data['arrival_airport_iata'] = $line[12];
1067 1425 
 	    		//$data['emergency'] = ''; // emergency
1068 1426 
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1069 1427 
 	    		$data['format_source'] = 'radarvirtueljson';
1070 1428 
     			$data['id_source'] = $id_source;
1071 
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1072 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1429 
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1430 
+				$data['noarchive'] = true;
1431 
+			}
1432 
+			if (isset($value['name']) && $value['name'] != '') {
1433 
+				$data['source_name'] = $value['name'];
1434 
+			}
1073 1435 
 			$SI->add($data);
1074 1436 
 			unset($data);
1075 1437 
 		    }
 
@@ -1095,30 +1457,65 @@  discard block
 
 block discarded – undo
1095 1457 
 		    $data['id'] = $line['id'];
1096 1458 
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1097 1459 
 		    $data['ident'] = $line['callsign']; // ident
1098 
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1099 
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1100 
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1101 
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1102 
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1103 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1460 
+		    if (isset($line['pilotid'])) {
1461 
+		    	$data['pilot_id'] = $line['pilotid'];
1462 
+		    }
1463 
+		    // pilot id
1464 
+		    if (isset($line['name'])) {
1465 
+		    	$data['pilot_name'] = $line['name'];
1466 
+		    }
1467 
+		    // pilot name
1468 
+		    if (isset($line['alt'])) {
1469 
+		    	$data['altitude'] = $line['alt'];
1470 
+		    }
1471 
+		    // altitude
1472 
+		    if (isset($line['gs'])) {
1473 
+		    	$data['speed'] = $line['gs'];
1474 
+		    }
1475 
+		    // speed
1476 
+		    if (isset($line['heading'])) {
1477 
+		    	$data['heading'] = $line['heading'];
1478 
+		    }
1479 
+		    // heading
1480 
+		    if (isset($line['route'])) {
1481 
+		    	$data['waypoints'] = $line['route'];
1482 
+		    }
1483 
+		    // route
1104 1484 
 		    $data['latitude'] = $line['lat']; // lat
1105 1485 
 		    $data['longitude'] = $line['lon']; // long
1106 1486 
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
1107 1487 
 		    //$data['squawk'] = $line['squawk']; // squawk
1108 1488 
 		    //$data['emergency'] = ''; // emergency
1109 
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1110 
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1111 
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1489 
+		    if (isset($line['depicao'])) {
1490 
+		    	$data['departure_airport_icao'] = $line['depicao'];
1491 
+		    }
1492 
+		    if (isset($line['deptime'])) {
1493 
+		    	$data['departure_airport_time'] = $line['deptime'];
1494 
+		    }
1495 
+		    if (isset($line['arricao'])) {
1496 
+		    	$data['arrival_airport_icao'] = $line['arricao'];
1497 
+		    }
1112 1498 
 		    //$data['arrival_airport_time'] = $line['arrtime'];
1113 
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1114 
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1115 
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
1116 
-		    else $data['info'] = '';
1499 
+		    if (isset($line['aircraft'])) {
1500 
+		    	$data['aircraft_icao'] = $line['aircraft'];
1501 
+		    }
1502 
+		    if (isset($line['transponder'])) {
1503 
+		    	$data['squawk'] = $line['transponder'];
1504 
+		    }
1505 
+		    if (isset($line['atis'])) {
1506 
+		    	$data['info'] = $line['atis'];
1507 
+		    } else {
1508 
+		    	$data['info'] = '';
1509 
+		    }
1117 1510 
 		    $data['format_source'] = 'pireps';
1118 1511 
     		    $data['id_source'] = $id_source;
1119 1512 
 		    $data['datetime'] = date('Y-m-d H:i:s');
1120 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1121 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1513 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1514 
+		    	$data['noarchive'] = true;
1515 
+		    }
1516 
+		    if (isset($value['name']) && $value['name'] != '') {
1517 
+		    	$data['source_name'] = $value['name'];
1518 
+		    }
1122 1519 
 		    if ($line['icon'] == 'plane') {
1123 1520 
 			$SI->add($data);
1124 1521 
 		    //    print_r($data);
 
@@ -1127,16 +1524,28 @@  discard block
 
 block discarded – undo
1127 1524 
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1128 1525 
 			$typec = substr($data['ident'],-3);
1129 1526 
 			$data['type'] = '';
1130 
-			if ($typec == 'APP') $data['type'] = 'Approach';
1131 
-			elseif ($typec == 'TWR') $data['type'] = 'Tower';
1132 
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
1133 
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
1134 
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
1135 
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
1136 
-			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
1137 
-			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
1138 
-			else $data['type'] = 'Observer';
1139 
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1527 
+			if ($typec == 'APP') {
1528 
+				$data['type'] = 'Approach';
1529 
+			} elseif ($typec == 'TWR') {
1530 
+				$data['type'] = 'Tower';
1531 
+			} elseif ($typec == 'OBS') {
1532 
+				$data['type'] = 'Observer';
1533 
+			} elseif ($typec == 'GND') {
1534 
+				$data['type'] = 'Ground';
1535 
+			} elseif ($typec == 'DEL') {
1536 
+				$data['type'] = 'Delivery';
1537 
+			} elseif ($typec == 'DEP') {
1538 
+				$data['type'] = 'Departure';
1539 
+			} elseif ($typec == 'FSS') {
1540 
+				$data['type'] = 'Flight Service Station';
1541 
+			} elseif ($typec == 'CTR') {
1542 
+				$data['type'] = 'Control Radar or Centre';
1543 
+			} else {
1544 
+				$data['type'] = 'Observer';
1545 
+			}
1546 
+			if (isset($ATC)) {
1547 
+				echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1548 
+			}
1140 1549 
 		    }
1141 1550 
 		    unset($data);
1142 1551 
 		}
 
@@ -1151,7 +1560,9 @@  discard block
 
 block discarded – undo
1151 1560 
 	    )
1152 1561 
 	) {
1153 1562 
 	    //$buffer = $Common->getData($hosts[$id]);
1154 
-	    if ($globalDebug) echo 'Get Data...'."\n";
1563 
+	    if ($globalDebug) {
1564 
+	    	echo 'Get Data...'."\n";
1565 
+	    }
1155 1566 
 	    $buffer = $Common->getData($value['host']);
1156 1567 
 	    $all_data = json_decode($buffer,true);
1157 1568 
 	    if ($buffer != '' && is_array($all_data)) {
 
@@ -1159,10 +1570,16 @@  discard block
 
 block discarded – undo
1159 1570 
 		foreach ($all_data as $line) {
1160 1571 
 	    	    $data = array();
1161 1572 
 	    	    //$data['id'] = $line['id']; // id not usable
1162 
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1573 
+	    	    if (isset($line['pilotid'])) {
1574 
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
1575 
+	    	    }
1163 1576 
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1164 
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1165 
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1577 
+	    	    if (isset($line['pilotname'])) {
1578 
+	    	    	$data['pilot_name'] = $line['pilotname'];
1579 
+	    	    }
1580 
+	    	    if (isset($line['pilotid'])) {
1581 
+	    	    	$data['pilot_id'] = $line['pilotid'];
1582 
+	    	    }
1166 1583 
 	    	    $data['ident'] = $line['flightnum']; // ident
1167 1584 
 	    	    $data['altitude'] = $line['alt']; // altitude
1168 1585 
 	    	    $data['speed'] = $line['gs']; // speed
 
@@ -1178,34 +1595,52 @@  discard block
 
 block discarded – undo
1178 1595 
 	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1179 1596 
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1180 1597 
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1181 
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1598 
+	    	    } else {
1599 
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
1600 
+	    	    }
1182 1601 
 	    	    $data['departure_airport_icao'] = $line['depicao'];
1183 1602 
 	    	    $data['departure_airport_time'] = $line['deptime'];
1184 1603 
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
1185 1604 
     		    $data['arrival_airport_time'] = $line['arrtime'];
1186 1605 
     		    $data['registration'] = $line['aircraft'];
1187 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1188 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1606 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1607 
+		    	$data['noarchive'] = true;
1608 
+		    }
1609 
+		    if (isset($line['route'])) {
1610 
+		    	$data['waypoints'] = $line['route'];
1611 
+		    }
1612 
+		    // route
1189 1613 
 		    if (isset($line['aircraftname'])) {
1190 1614 
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1191 1615 
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1192 1616 
 	    		$aircraft_data = explode('-',$line['aircraftname']);
1193 
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1194 
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1195 
-	    		else {
1617 
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
1618 
+	    			$data['aircraft_icao'] = $aircraft_data[0];
1619 
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
1620 
+	    			$data['aircraft_icao'] = $aircraft_data[1];
1621 
+	    		} else {
1196 1622 
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1197 
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1198 
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1623 
+	    		    if (isset($aircraft_data[1])) {
1624 
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1625 
+	    		    } else {
1626 
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1627 
+	    		    }
1199 1628 
 	    		}
1200 1629 
 	    	    }
1201 
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1630 
+    		    if (isset($line['route'])) {
1631 
+    		    	$data['waypoints'] = $line['route'];
1632 
+    		    }
1202 1633 
     		    $data['id_source'] = $id_source;
1203 1634 
 	    	    $data['format_source'] = 'phpvmacars';
1204 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1635 
+		    if (isset($value['name']) && $value['name'] != '') {
1636 
+		    	$data['source_name'] = $value['name'];
1637 
+		    }
1205 1638 
 		    $SI->add($data);
1206 1639 
 		    unset($data);
1207 1640 
 		}
1208 
-		if ($globalDebug) echo 'No more data...'."\n";
1641 
+		if ($globalDebug) {
1642 
+			echo 'No more data...'."\n";
1643 
+		}
1209 1644 
 		unset($buffer);
1210 1645 
 		unset($all_data);
1211 1646 
 	    }
 
@@ -1218,7 +1653,9 @@  discard block
 
 block discarded – undo
1218 1653 
 	    )
1219 1654 
 	) {
1220 1655 
 	    //$buffer = $Common->getData($hosts[$id]);
1221 
-	    if ($globalDebug) echo 'Get Data...'."\n";
1656 
+	    if ($globalDebug) {
1657 
+	    	echo 'Get Data...'."\n";
1658 
+	    }
1222 1659 
 	    $buffer = $Common->getData($value['host']);
1223 1660 
 	    $all_data = json_decode($buffer,true);
1224 1661 
 	    if ($buffer != '' && is_array($all_data)) {
 
@@ -1247,16 +1684,25 @@  discard block
 
 block discarded – undo
1247 1684 
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
1248 1685 
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
1249 1686 
     		    //$data['registration'] = $line['aircraft'];
1250 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1687 
+		    if (isset($line['route'])) {
1688 
+		    	$data['waypoints'] = $line['route'];
1689 
+		    }
1690 
+		    // route
1251 1691 
 	    	    $data['aircraft_icao'] = $line['plane_type'];
1252 1692 
     		    $data['id_source'] = $id_source;
1253 1693 
 	    	    $data['format_source'] = 'vam';
1254 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1255 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1694 
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1695 
+		    	$data['noarchive'] = true;
1696 
+		    }
1697 
+		    if (isset($value['name']) && $value['name'] != '') {
1698 
+		    	$data['source_name'] = $value['name'];
1699 
+		    }
1256 1700 
 		    $SI->add($data);
1257 1701 
 		    unset($data);
1258 1702 
 		}
1259 
-		if ($globalDebug) echo 'No more data...'."\n";
1703 
+		if ($globalDebug) {
1704 
+			echo 'No more data...'."\n";
1705 
+		}
1260 1706 
 		unset($buffer);
1261 1707 
 		unset($all_data);
1262 1708 
 	    }
 
@@ -1269,7 +1715,9 @@  discard block
 
 block discarded – undo
1269 1715 
 	    )
1270 1716 
 	) {
1271 1717 
 	    //$buffer = $Common->getData($hosts[$id]);
1272 
-	    if ($globalDebug) echo 'Get Data...'."\n";
1718 
+	    if ($globalDebug) {
1719 
+	    	echo 'Get Data...'."\n";
1720 
+	    }
1273 1721 
 	    $buffer = $Common->getData($value['host']);
1274 1722 
 	    $all_data = json_decode($buffer,true);
1275 1723 
 	    if ($buffer != '') {
 
@@ -1287,18 +1735,24 @@  discard block
 
 block discarded – undo
1287 1735 
 			$data['id_source'] = $id_source;
1288 1736 
 			$data['format_source'] = 'blitzortung';
1289 1737 
 			$SI->add($data);
1290 
-			if ($globalDebug) echo '☈ Lightning added'."\n";
1738 
+			if ($globalDebug) {
1739 
+				echo '☈ Lightning added'."\n";
1740 
+			}
1291 1741 
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1292 1742 
 			unset($data);
1293 1743 
 		    }
1294 1744 
 		}
1295 
-		if ($globalDebug) echo 'No more data...'."\n";
1745 
+		if ($globalDebug) {
1746 
+			echo 'No more data...'."\n";
1747 
+		}
1296 1748 
 		unset($buffer);
1297 1749 
 	    }
1298 1750 
 	    $last_exec[$id]['last'] = time();
1299 1751 
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1300 1752 
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1301 
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1753 
+	    if (function_exists('pcntl_fork')) {
1754 
+	    	pcntl_signal_dispatch();
1755 
+	    }
1302 1756 
     	    //$last_exec[$id]['last'] = time();
1303 1757
1304 1758 
 	    //$read = array( $sockets[$id] );
 
@@ -1306,7 +1760,9 @@  discard block
 
 block discarded – undo
1306 1760 
 	    $write = NULL;
1307 1761 
 	    $e = NULL;
1308 1762 
 	    $n = socket_select($read, $write, $e, $timeout);
1309 
-	    if ($e != NULL) var_dump($e);
1763 
+	    if ($e != NULL) {
1764 
+	    	var_dump($e);
1765 
+	    }
1310 1766 
 	    if ($n > 0) {
1311 1767 
 		$reset = 0;
1312 1768 
 		foreach ($read as $nb => $r) {
 
@@ -1327,12 +1783,16 @@  discard block
 
 block discarded – undo
1327 1783 
 		    //$SI::del();
1328 1784 
 		    if ($format == 'vrstcp') {
1329 1785 
 			$buffer = explode('},{',$buffer);
1330 
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1786 
+		    } else {
1787 
+		    	$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1788 
+		    }
1331 1789 
 		    // SBS format is CSV format
1332 1790 
 		    if ($buffer !== FALSE && $buffer != '') {
1333 1791 
 			$tt[$format] = 0;
1334 1792 
 			if ($format == 'acarssbs3') {
1335 
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1793 
+			    if ($globalDebug) {
1794 
+			    	echo 'ACARS : '.$buffer."\n";
1795 
+			    }
1336 1796 
 			    $ACARS->add(trim($buffer));
1337 1797 
 			    $ACARS->deleteLiveAcarsData();
1338 1798 
 			} elseif ($format == 'raw') {
 
@@ -1341,30 +1801,70 @@  discard block
 
 block discarded – undo
1341 1801 
 			    if (is_array($data)) {
1342 1802 
 				$data['datetime'] = date('Y-m-d H:i:s');
1343 1803 
 				$data['format_source'] = 'raw';
1344 
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1345 
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1346 
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1347 
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1804 
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1805 
+					$data['source_name'] = $globalSources[$nb]['name'];
1806 
+				}
1807 
+				if (isset($globalSources[$nb]['sourcestats'])) {
1808 
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1809 
+				}
1810 
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1811 
+					$data['noarchive'] = true;
1812 
+				}
1813 
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1814 
+					$SI->add($data);
1815 
+				}
1348 1816 
 			    }
1349 1817 
 			} elseif ($format == 'ais') {
1350 1818 
 			    $ais_data = $AIS->parse_line(trim($buffer));
1351 1819 
 			    $data = array();
1352 
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1353 
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1354 
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1355 
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1356 
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1357 
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1358 
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1359 
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1360 
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1361 
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1362 
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1363 
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1364 
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1365 
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1366 
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1367 
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1820 
+			    if (isset($ais_data['ident'])) {
1821 
+			    	$data['ident'] = $ais_data['ident'];
1822 
+			    }
1823 
+			    if (isset($ais_data['mmsi'])) {
1824 
+			    	$data['mmsi'] = $ais_data['mmsi'];
1825 
+			    }
1826 
+			    if (isset($ais_data['speed'])) {
1827 
+			    	$data['speed'] = $ais_data['speed'];
1828 
+			    }
1829 
+			    if (isset($ais_data['heading'])) {
1830 
+			    	$data['heading'] = $ais_data['heading'];
1831 
+			    }
1832 
+			    if (isset($ais_data['latitude'])) {
1833 
+			    	$data['latitude'] = $ais_data['latitude'];
1834 
+			    }
1835 
+			    if (isset($ais_data['longitude'])) {
1836 
+			    	$data['longitude'] = $ais_data['longitude'];
1837 
+			    }
1838 
+			    if (isset($ais_data['status'])) {
1839 
+			    	$data['status'] = $ais_data['status'];
1840 
+			    }
1841 
+			    if (isset($ais_data['statusid'])) {
1842 
+			    	$data['status_id'] = $ais_data['statusid'];
1843 
+			    }
1844 
+			    if (isset($ais_data['type'])) {
1845 
+			    	$data['type'] = $ais_data['type'];
1846 
+			    }
1847 
+			    if (isset($ais_data['imo'])) {
1848 
+			    	$data['imo'] = $ais_data['imo'];
1849 
+			    }
1850 
+			    if (isset($ais_data['callsign'])) {
1851 
+			    	$data['callsign'] = $ais_data['callsign'];
1852 
+			    }
1853 
+			    if (isset($ais_data['destination'])) {
1854 
+			    	$data['arrival_code'] = $ais_data['destination'];
1855 
+			    }
1856 
+			    if (isset($ais_data['eta_ts'])) {
1857 
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1858 
+			    }
1859 
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1860 
+			    	$data['noarchive'] = true;
1861 
+			    }
1862 
+			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1863 
+			    	$data['source_name'] = $globalSources[$nb]['name'];
1864 
+			    }
1865 
+			    if (isset($globalSources[$nb]['sourcestats'])) {
1866 
+			    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1867 
+			    }
1368 1868
1369 1869 
 			    if (isset($ais_data['timestamp'])) {
1370 1870 
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 
@@ -1373,7 +1873,9 @@  discard block
 
 block discarded – undo
1373 1873 
 			    }
1374 1874 
 			    $data['format_source'] = 'aisnmea';
1375 1875 
     			    $data['id_source'] = $id_source;
1376 
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1876 
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
1877 
+			    	$MI->add($data);
1878 
+			    }
1377 1879 
 			    unset($data);
1378 1880 
                         } elseif ($format == 'flightgearsp') {
1379 1881 
                     	    //echo $buffer."\n";
 
@@ -1391,12 +1893,18 @@  discard block
 
 block discarded – undo
1391 1893 
 				$data['speed'] = round($line[5]*1.94384);
1392 1894 
 				$data['datetime'] = date('Y-m-d H:i:s');
1393 1895 
 				$data['format_source'] = 'flightgearsp';
1394 
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1395 
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1896 
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1897 
+					$data['noarchive'] = true;
1898 
+				}
1899 
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1900 
+					$SI->add($data);
1901 
+				}
1396 1902 
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1397 1903 
 			    }
1398 1904 
                         } elseif ($format == 'acars') {
1399 
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1905 
+                    	    if ($globalDebug) {
1906 
+                    	    	echo 'ACARS : '.$buffer."\n";
1907 
+                    	    }
1400 1908 
 			    $ACARS->add(trim($buffer));
1401 1909 
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1402 1910 
 			    $ACARS->deleteLiveAcarsData();
 
@@ -1417,8 +1925,12 @@  discard block
 
 block discarded – undo
1417 1925 
 				    $aircraft_type = $line[10];
1418 1926 
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
1419 1927 
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1420 
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1421 
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1928 
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1929 
+				    	$data['noarchive'] = true;
1930 
+				    }
1931 
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1932 
+				    	$SI->add($data);
1933 
+				    }
1422 1934 
 				}
1423 1935 
 			    }
1424 1936 
 			} elseif ($format == 'beast') {
 
@@ -1428,28 +1940,62 @@  discard block
 
 block discarded – undo
1428 1940 
 			    foreach($buffer as $all_data) {
1429 1941 
 				$line = json_decode('{'.$all_data.'}',true);
1430 1942 
 				$data = array();
1431 
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1432 
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1433 
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1434 
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1435 
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1436 
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1437 
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1943 
+				if (isset($line['Icao'])) {
1944 
+					$data['hex'] = $line['Icao'];
1945 
+				}
1946 
+				// hex
1947 
+				if (isset($line['Call'])) {
1948 
+					$data['ident'] = $line['Call'];
1949 
+				}
1950 
+				// ident
1951 
+				if (isset($line['Alt'])) {
1952 
+					$data['altitude'] = $line['Alt'];
1953 
+				}
1954 
+				// altitude
1955 
+				if (isset($line['Spd'])) {
1956 
+					$data['speed'] = $line['Spd'];
1957 
+				}
1958 
+				// speed
1959 
+				if (isset($line['Trak'])) {
1960 
+					$data['heading'] = $line['Trak'];
1961 
+				}
1962 
+				// heading
1963 
+				if (isset($line['Lat'])) {
1964 
+					$data['latitude'] = $line['Lat'];
1965 
+				}
1966 
+				// lat
1967 
+				if (isset($line['Long'])) {
1968 
+					$data['longitude'] = $line['Long'];
1969 
+				}
1970 
+				// long
1438 1971 
 				//$data['verticalrate'] = $line['']; // verticale rate
1439 
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1972 
+				if (isset($line['Sqk'])) {
1973 
+					$data['squawk'] = $line['Sqk'];
1974 
+				}
1975 
+				// squawk
1440 1976 
 				$data['emergency'] = ''; // emergency
1441 
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
1977 
+				if (isset($line['Reg'])) {
1978 
+					$data['registration'] = $line['Reg'];
1979 
+				}
1442 1980 
 				/*
1443 1981 
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
1444 1982 
 				else $data['datetime'] = date('Y-m-d H:i:s');
1445 1983 
 				*/
1446 1984 
 				$data['datetime'] = date('Y-m-d H:i:s');
1447 
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1985 
+				if (isset($line['Type'])) {
1986 
+					$data['aircraft_icao'] = $line['Type'];
1987 
+				}
1448 1988 
 		    		$data['format_source'] = 'vrstcp';
1449 1989 
 				$data['id_source'] = $id_source;
1450 
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1451 
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1452 
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1990 
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1991 
+					$data['noarchive'] = true;
1992 
+				}
1993 
+				if (isset($value['name']) && $value['name'] != '') {
1994 
+					$data['source_name'] = $value['name'];
1995 
+				}
1996 
+				if (isset($data['latitude']) && isset($data['hex'])) {
1997 
+					$SI->add($data);
1998 
+				}
1453 1999 
 				unset($data);
1454 2000 
 			    }
1455 2001 
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
 
@@ -1462,22 +2008,46 @@  discard block
 
 block discarded – undo
1462 2008 
     				$data['hex'] = $lined['hexid'];
1463 2009 
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1464 2010 
     				$data['datetime'] = date('Y-m-d H:i:s');;
1465 
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1466 
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1467 
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1468 
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1469 
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1470 
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1471 
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
2011 
+    				if (isset($lined['ident'])) {
2012 
+    					$data['ident'] = $lined['ident'];
2013 
+    				}
2014 
+    				if (isset($lined['lat'])) {
2015 
+    					$data['latitude'] = $lined['lat'];
2016 
+    				}
2017 
+    				if (isset($lined['lon'])) {
2018 
+    					$data['longitude'] = $lined['lon'];
2019 
+    				}
2020 
+    				if (isset($lined['speed'])) {
2021 
+    					$data['speed'] = $lined['speed'];
2022 
+    				}
2023 
+    				if (isset($lined['squawk'])) {
2024 
+    					$data['squawk'] = $lined['squawk'];
2025 
+    				}
2026 
+    				if (isset($lined['alt'])) {
2027 
+    					$data['altitude'] = $lined['alt'];
2028 
+    				}
2029 
+    				if (isset($lined['heading'])) {
2030 
+    					$data['heading'] = $lined['heading'];
2031 
+    				}
1472 2032 
     				$data['id_source'] = $id_source;
1473 2033 
     				$data['format_source'] = 'tsv';
1474 
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1475 
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1476 
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1477 
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2034 
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2035 
+    					$data['source_name'] = $globalSources[$nb]['name'];
2036 
+    				}
2037 
+    				if (isset($globalSources[$nb]['sourcestats'])) {
2038 
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2039 
+    				}
2040 
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2041 
+					$data['noarchive'] = true;
2042 
+				}
2043 
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2044 
+    					$SI->add($data);
2045 
+    				}
1478 2046 
     				unset($lined);
1479 2047 
     				unset($data);
1480 
-    			    } else $error = true;
2048 
+    			    } else {
2049 
+    			    	$error = true;
2050 
+    			    }
1481 2051 
 			} elseif ($format == 'aprs' && $use_aprs) {
1482 2052 
 			    if ($aprs_connect == 0) {
1483 2053 
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 
@@ -1502,62 +2072,120 @@  discard block
 
 block discarded – undo
1502 2072 
 				    $aprs_last_tx = time();
1503 2073 
 				    $data = array();
1504 2074 
 				    //print_r($line);
1505 
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1506 
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1507 
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1508 
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1509 
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1510 
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1511 
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1512 
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1513 
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1514 
-				    else $data['datetime'] = date('Y-m-d H:i:s');
2075 
+				    if (isset($line['address'])) {
2076 
+				    	$data['hex'] = $line['address'];
2077 
+				    }
2078 
+				    if (isset($line['mmsi'])) {
2079 
+				    	$data['mmsi'] = $line['mmsi'];
2080 
+				    }
2081 
+				    if (isset($line['imo'])) {
2082 
+				    	$data['imo'] = $line['imo'];
2083 
+				    }
2084 
+				    if (isset($line['squawk'])) {
2085 
+				    	$data['squawk'] = $line['squawk'];
2086 
+				    }
2087 
+				    if (isset($line['arrival_code'])) {
2088 
+				    	$data['arrical_code'] = $line['arrival_code'];
2089 
+				    }
2090 
+				    if (isset($line['arrival_date'])) {
2091 
+				    	$data['arrical_date'] = $line['arrival_date'];
2092 
+				    }
2093 
+				    if (isset($line['type_id'])) {
2094 
+				    	$data['type_id'] = $line['typeid'];
2095 
+				    }
2096 
+				    if (isset($line['status_id'])) {
2097 
+				    	$data['status_id'] = $line['statusid'];
2098 
+				    }
2099 
+				    if (isset($line['timestamp'])) {
2100 
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
2101 
+				    } else {
2102 
+				    	$data['datetime'] = date('Y-m-d H:i:s');
2103 
+				    }
1515 2104 
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1516 
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
2105 
+				    if (isset($line['ident'])) {
2106 
+				    	$data['ident'] = $line['ident'];
2107 
+				    }
1517 2108 
 				    $data['latitude'] = $line['latitude'];
1518 2109 
 				    $data['longitude'] = $line['longitude'];
1519 2110 
 				    //$data['verticalrate'] = $line[16];
1520 
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
2111 
+				    if (isset($line['speed'])) {
2112 
+				    	$data['speed'] = $line['speed'];
2113 
+				    }
1521 2114 
 				    //else $data['speed'] = 0;
1522 
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1523 
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1524 
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
2115 
+				    if (isset($line['altitude'])) {
2116 
+				    	$data['altitude'] = $line['altitude'];
2117 
+				    }
2118 
+				    if (isset($line['comment'])) {
2119 
+				    	$data['comment'] = $line['comment'];
2120 
+				    }
2121 
+				    if (isset($line['symbol'])) {
2122 
+				    	$data['type'] = $line['symbol'];
2123 
+				    }
1525 2124 
 				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
1526 2125
1527 
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
2126 
+				    if (isset($line['heading']) && isset($line['format_source'])) {
2127 
+				    	$data['heading'] = $line['heading'];
2128 
+				    }
1528 2129 
 				    //else echo 'No heading...'."\n";
1529 2130 
 				    //else $data['heading'] = 0;
1530 
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
2131 
+				    if (isset($line['stealth'])) {
2132 
+				    	$data['aircraft_type'] = $line['stealth'];
2133 
+				    }
1531 2134 
 				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1532 
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1533 
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1534 
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1535 
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
2135 
+				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) {
2136 
+				    	$data['noarchive'] = true;
2137 
+				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) {
2138 
+				    	$data['noarchive'] = false;
2139 
+				    }
2140 
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2141 
+				    	$data['noarchive'] = true;
2142 
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
2143 
+				    	$data['noarchive'] = false;
2144 
+				    }
1536 2145 
     				    $data['id_source'] = $id_source;
1537 
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1538 
-				    else $data['format_source'] = 'aprs';
2146 
+    				    if (isset($line['format_source'])) {
2147 
+    				    	$data['format_source'] = $line['format_source'];
2148 
+    				    } else {
2149 
+				    	$data['format_source'] = 'aprs';
2150 
+				    }
1539 2151 
 				    $data['source_name'] = $line['source'];
1540 
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1541 
-				    else $data['source_type'] = 'flarm';
1542 
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2152 
+				    if (isset($line['source_type'])) {
2153 
+				    	$data['source_type'] = $line['source_type'];
2154 
+				    } else {
2155 
+				    	$data['source_type'] = 'flarm';
2156 
+				    }
2157 
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
2158 
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2159 
+    				    }
1543 2160 
 				    $currentdate = date('Y-m-d H:i:s');
1544 2161 
 				    $aprsdate = strtotime($data['datetime']);
1545 
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
2162 
+				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') {
2163 
+				    	$data['altitude_relative'] = 'AMSL';
2164 
+				    }
1546 2165 
 				    // Accept data if time <= system time + 20s
1547 2166 
 				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1548 2167 
 				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1549 2168 
 					$send = $SI->add($data);
1550 2169 
 				    } elseif ($data['source_type'] == 'ais') {
1551 
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
2170 
+					if (isset($globalMarine) && $globalMarine) {
2171 
+						$send = $MI->add($data);
2172 
+					}
1552 2173 
 				    } elseif (isset($line['stealth'])) {
1553 
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1554 
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
2174 
+					if ($line['stealth'] != 0) {
2175 
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
2176 
+					} else {
2177 
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
2178 
+					}
1555 2179 
 				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1556 2180 
 					    //$line['symbol'] == 'Balloon' ||
1557 2181 
 					    $line['symbol'] == 'Glider' ||
1558 2182 
 					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
1559 
-					    if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';
1560 
-					    if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
2183 
+					    if ($line['symbol'] == 'Ballon') {
2184 
+					    	$data['aircraft_icao'] = 'BALL';
2185 
+					    }
2186 
+					    if ($line['symbol'] == 'Glider') {
2187 
+					    	$data['aircraft_icao'] = 'PARAGLIDER';
2188 
+					    }
1561 2189 
 					    $send = $SI->add($data);
1562 2190 
 				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1563 2191 
 					    $line['symbol'] == 'Yacht (Sail)' || 
@@ -1588,9 +2216,13 @@  discard block
 
 block discarded – undo
1588 2216 
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1589 2217 
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1590 2218 
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1591 
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
2219 
+					if (isset($globalTracker) && $globalTracker) {
2220 
+						$send = $TI->add($data);
2221 
+					}
1592 2222 
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1593 
-					if (!isset($data['altitude'])) $data['altitude'] = 0;
2223 
+					if (!isset($data['altitude'])) {
2224 
+						$data['altitude'] = 0;
2225 
+					}
1594 2226 
 					$Source->deleteOldLocationByType('gs');
1595 2227 
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1596 2228 
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
 
@@ -1599,7 +2231,9 @@  discard block
 
 block discarded – undo
1599 2231 
 					}
1600 2232 
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1601 2233 
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1602 
-					if ($globalDebug) echo '# Weather Station added'."\n";
2234 
+					if ($globalDebug) {
2235 
+						echo '# Weather Station added'."\n";
2236 
+					}
1603 2237 
 					$Source->deleteOldLocationByType('wx');
1604 2238 
 					$weather_data = json_encode($line);
1605 2239 
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
 
@@ -1609,7 +2243,9 @@  discard block
 
 block discarded – undo
1609 2243 
 					}
1610 2244 
 				    } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) {
1611 2245 
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1612 
-					if ($globalDebug) echo '☈ Lightning added'."\n";
2246 
+					if ($globalDebug) {
2247 
+						echo '☈ Lightning added'."\n";
2248 
+					}
1613 2249 
 					$Source->deleteOldLocationByType('lightning');
1614 2250 
 					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
1615 2251 
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
 
@@ -1621,8 +2257,7 @@  discard block
 
 block discarded – undo
1621 2257 
 				    	print_r($line);
1622 2258 
 				    }
1623 2259 
 				    unset($data);
1624 
-				}
1625 
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2260 
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1626 2261 
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
1627 2262 
 				}
1628 2263 
 				/*
 
@@ -1631,7 +2266,9 @@  discard block
 
 block discarded – undo
1631 2266 
 				}
1632 2267 
 				*/
1633 2268 
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1634 
-				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
2269 
+				elseif ($line == true && $globalDebug) {
2270 
+					echo '!! Failed : '.$buffer."!!\n";
2271 
+				}
1635 2272 
 				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
1636 2273 
 					$Source->deleteOldLocationByType('lightning');
1637 2274 
 					$Source->deleteOldLocationByType('wx');
 
@@ -1667,26 +2304,45 @@  discard block
 
 block discarded – undo
1667 2304 
     				$data['ground'] = $line[21];
1668 2305 
     				$data['emergency'] = $line[19];
1669 2306 
     				$data['format_source'] = 'sbs';
1670 
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1671 
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1672 
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
2307 
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2308 
+					$data['source_name'] = $globalSources[$nb]['name'];
2309 
+				}
2310 
+    				if (isset($globalSources[$nb]['sourcestats'])) {
2311 
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2312 
+    				}
2313 
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2314 
+					$data['noarchive'] = true;
2315 
+				}
1673 2316 
     				$data['id_source'] = $id_source;
1674 
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1675 
-    				else $error = true;
2317 
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2318 
+    					$send = $SI->add($data);
2319 
+    				} else {
2320 
+    					$error = true;
2321 
+    				}
1676 2322 
     				unset($data);
1677 
-    			    } else $error = true;
2323 
+    			    } else {
2324 
+    			    	$error = true;
2325 
+    			    }
1678 2326 
 			    if ($error) {
1679 2327 
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) {
1680 
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
2328 
+					if ($globalDebug) {
2329 
+						echo "Not a message. Ignoring... \n";
2330 
+					}
1681 2331 
 				} else {
1682 
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
2332 
+					if ($globalDebug) {
2333 
+						echo "Wrong line format. Ignoring... \n";
2334 
+					}
1683 2335 
 					if ($globalDebug) {
1684 2336 
 						echo $buffer;
1685 2337 
 						//print_r($line);
1686 2338 
 					}
1687 2339 
 					//socket_close($r);
1688 
-					if ($globalDebug) echo "Reconnect after an error...\n";
1689 
-					if ($format == 'aprs') $aprs_connect = 0;
2340 
+					if ($globalDebug) {
2341 
+						echo "Reconnect after an error...\n";
2342 
+					}
2343 
+					if ($format == 'aprs') {
2344 
+						$aprs_connect = 0;
2345 
+					}
1690 2346 
 					$sourceer[$nb] = $globalSources[$nb];
1691 2347 
 					connect_all($sourceer);
1692 2348 
 					$sourceer = array();
 
@@ -1694,10 +2350,14 @@  discard block
 
 block discarded – undo
1694 2350 
 			    }
1695 2351 
 			}
1696 2352 
 			// Sleep for xxx microseconds
1697 
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
2353 
+			if (isset($globalSBSSleep)) {
2354 
+				usleep($globalSBSSleep);
2355 
+			}
1698 2356 
 		    } else {
1699 2357 
 			if ($format == 'flightgearmp') {
1700 
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
2358 
+			    	if ($globalDebug) {
2359 
+			    		echo "Reconnect FlightGear MP...";
2360 
+			    	}
1701 2361 
 				//@socket_close($r);
1702 2362 
 				sleep($globalMinFetch);
1703 2363 
 				$sourcefg[$nb] = $globalSources[$nb];
 
@@ -1706,10 +2366,15 @@  discard block
 
 block discarded – undo
1706 2366 
 				break;
1707 2367
1708 2368 
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1709 
-			    if (isset($tt[$format])) $tt[$format]++;
1710 
-			    else $tt[$format] = 0;
2369 
+			    if (isset($tt[$format])) {
2370 
+			    	$tt[$format]++;
2371 
+			    } else {
2372 
+			    	$tt[$format] = 0;
2373 
+			    }
1711 2374 
 			    if ($tt[$format] > 30) {
1712 
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
2375 
+				if ($globalDebug) {
2376 
+					echo "ERROR : Reconnect ".$format."...";
2377 
+				}
1713 2378 
 				//@socket_close($r);
1714 2379 
 				sleep(2);
1715 2380 
 				$aprs_connect = 0;
 
@@ -1726,11 +2391,17 @@  discard block
 
 block discarded – undo
1726 2391 
 	    } else {
1727 2392 
 		$error = socket_strerror(socket_last_error());
1728 2393 
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1729 
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1730 
-			if (isset($globalDebug)) echo "Restarting...\n";
2394 
+			if ($globalDebug) {
2395 
+				echo "ERROR : socket_select give this error ".$error . "\n";
2396 
+			}
2397 
+			if (isset($globalDebug)) {
2398 
+				echo "Restarting...\n";
2399 
+			}
1731 2400 
 			// Restart the script if possible
1732 2401 
 			if (is_array($sockets)) {
1733 
-			    if ($globalDebug) echo "Shutdown all sockets...";
2402 
+			    if ($globalDebug) {
2403 
+			    	echo "Shutdown all sockets...";
2404 
+			    }
1734 2405
1735 2406 
 			    foreach ($sockets as $sock) {
1736 2407 
 				@socket_shutdown($sock,2);
 
@@ -1738,25 +2409,45 @@  discard block
 
 block discarded – undo
1738 2409 
 			    }
1739 2410
1740 2411 
 			}
1741 
-			if ($globalDebug) echo "Waiting...";
2412 
+			if ($globalDebug) {
2413 
+				echo "Waiting...";
2414 
+			}
1742 2415 
 			sleep(2);
1743 2416 
 			$time = time();
1744 2417 
 			//connect_all($hosts);
1745 2418 
 			$aprs_connect = 0;
1746 
-			if ($reset%5 == 0) sleep(20);
1747 
-			if ($reset%10 == 0) sleep(100);
1748 
-			if ($reset%20 == 0) sleep(200);
1749 
-			if ($reset > 100) exit('Too many attempts...');
1750 
-			if ($globalDebug) echo "Restart all connections...";
2419 
+			if ($reset%5 == 0) {
2420 
+				sleep(20);
2421 
+			}
2422 
+			if ($reset%10 == 0) {
2423 
+				sleep(100);
2424 
+			}
2425 
+			if ($reset%20 == 0) {
2426 
+				sleep(200);
2427 
+			}
2428 
+			if ($reset > 100) {
2429 
+				exit('Too many attempts...');
2430 
+			}
2431 
+			if ($globalDebug) {
2432 
+				echo "Restart all connections...";
2433 
+			}
1751 2434 
 			connect_all($globalSources);
1752 2435 
 		}
1753 2436 
 	    }
1754 2437 
 	}
1755 2438 
 	if ($globalDaemon === false) {
1756 
-	    if ($globalDebug) echo 'Check all...'."\n";
1757 
-	    if (isset($SI)) $SI->checkAll();
1758 
-	    if (isset($TI)) $TI->checkAll();
1759 
-	    if (isset($MI)) $MI->checkAll();
2439 
+	    if ($globalDebug) {
2440 
+	    	echo 'Check all...'."\n";
2441 
+	    }
2442 
+	    if (isset($SI)) {
2443 
+	    	$SI->checkAll();
2444 
+	    }
2445 
+	    if (isset($TI)) {
2446 
+	    	$TI->checkAll();
2447 
+	    }
2448 
+	    if (isset($MI)) {
2449 
+	    	$MI->checkAll();
2450 
+	    }
1760 2451 
 	}
1761 2452 
     }
1762 2453 
 }
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.Stats.php 1 patch
Braces   +625 added lines, -219 removed lines patch added patch discarded remove patch 
@@ -13,10 +13,14 @@  discard block
 
 block discarded – undo
13 13
14 14 
 	public function __construct($dbc = null) {
15 15 
 		global $globalFilterName;
16 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16 
+		if (isset($globalFilterName)) {
17 
+			$this->filter_name = $globalFilterName;
18 
+		}
17 19 
 		$Connection = new Connection($dbc);
18 20 
 		$this->db = $Connection->db();
19 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
21 
+		if ($this->db === null) {
22 
+			die('Error: No DB connection. (Stats)');
23 
+		}
20 24 
 	}
21 25
22 26 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -84,7 +88,9 @@  discard block
 
 block discarded – undo
84 88
85 89 
 	public function getAllAirlineNames($filter_name = '') {
86 90 
 		global $globalStatsFilters;
87 
-		if ($filter_name == '') $filter_name = $this->filter_name;
91 
+		if ($filter_name == '') {
92 
+			$filter_name = $this->filter_name;
93 
+		}
88 94 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
89 95 
 		 try {
90 96 
 			$sth = $this->db->prepare($query);
 
@@ -104,7 +110,9 @@  discard block
 
 block discarded – undo
104 110 
 		return $all;
105 111 
 	}
106 112 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
107 
-		if ($filter_name == '') $filter_name = $this->filter_name;
113 
+		if ($filter_name == '') {
114 
+			$filter_name = $this->filter_name;
115 
+		}
108 116 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 117 
 		try {
110 118 
 			$sth = $this->db->prepare($query);
 
@@ -116,7 +124,9 @@  discard block
 
 block discarded – undo
116 124 
 		return $all;
117 125 
 	}
118 126 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
119 
-		if ($filter_name == '') $filter_name = $this->filter_name;
127 
+		if ($filter_name == '') {
128 
+			$filter_name = $this->filter_name;
129 
+		}
120 130 
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
121 131 
 		try {
122 132 
 			$sth = $this->db->prepare($query);
 
@@ -128,7 +138,9 @@  discard block
 
 block discarded – undo
128 138 
 		return $all;
129 139 
 	}
130 140 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
131 
-		if ($filter_name == '') $filter_name = $this->filter_name;
141 
+		if ($filter_name == '') {
142 
+			$filter_name = $this->filter_name;
143 
+		}
132 144 
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
133 145 
 		try {
134 146 
 			$sth = $this->db->prepare($query);
 
@@ -141,7 +153,9 @@  discard block
 
 block discarded – undo
141 153 
 	}
142 154
143 155 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
144 
-		if ($filter_name == '') $filter_name = $this->filter_name;
156 
+		if ($filter_name == '') {
157 
+			$filter_name = $this->filter_name;
158 
+		}
145 159 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 160 
 		try {
147 161 
 			$sth = $this->db->prepare($query);
 
@@ -154,7 +168,9 @@  discard block
 
 block discarded – undo
154 168 
 	}
155 169
156 170 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
157 
-		if ($filter_name == '') $filter_name = $this->filter_name;
171 
+		if ($filter_name == '') {
172 
+			$filter_name = $this->filter_name;
173 
+		}
158 174 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 175 
 		try {
160 176 
 			$sth = $this->db->prepare($query);
 
@@ -169,7 +185,9 @@  discard block
 
 block discarded – undo
169 185
170 186 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
171 187 
 		global $globalStatsFilters;
172 
-		if ($filter_name == '') $filter_name = $this->filter_name;
188 
+		if ($filter_name == '') {
189 
+			$filter_name = $this->filter_name;
190 
+		}
173 191 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
174 192 
 			$Spotter = new Spotter($this->db);
175 193 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -178,8 +196,11 @@  discard block
 
 block discarded – undo
178 196 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
179 197 
 			}
180 198 
 			if ($year == '' && $month == '') {
181 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
199 
+				if ($limit) {
200 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
201 
+				} else {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
203 
+				}
183 204 
 				try {
184 205 
 					$sth = $this->db->prepare($query);
185 206 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -187,11 +208,16 @@  discard block
 
 block discarded – undo
187 208 
 					echo "error : ".$e->getMessage();
188 209 
 				}
189 210 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
190 
-			} else $all = array();
211 
+			} else {
212 
+				$all = array();
213 
+			}
191 214 
 		} else {
192 215 
 			if ($year == '' && $month == '') {
193 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
194 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
216 
+				if ($limit) {
217 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
218 
+				} else {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
220 
+				}
195 221 
 				try {
196 222 
 					$sth = $this->db->prepare($query);
197 223 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -199,7 +225,9 @@  discard block
 
 block discarded – undo
199 225 
 					echo "error : ".$e->getMessage();
200 226 
 				}
201 227 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 
-			} else $all = array();
228 
+			} else {
229 
+				$all = array();
230 
+			}
203 231 
 		}
204 232 
 		if (empty($all)) {
205 233 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -218,10 +246,15 @@  discard block
 
 block discarded – undo
218 246 
 	}
219 247 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
220 248 
 		global $globalStatsFilters;
221 
-		if ($filter_name == '') $filter_name = $this->filter_name;
249 
+		if ($filter_name == '') {
250 
+			$filter_name = $this->filter_name;
251 
+		}
222 252 
 		if ($year == '' && $month == '') {
223 
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
224 
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
253 
+			if ($limit) {
254 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
255 
+			} else {
256 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
257 
+			}
225 258 
 			try {
226 259 
 				$sth = $this->db->prepare($query);
227 260 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -229,7 +262,9 @@  discard block
 
 block discarded – undo
229 262 
 				echo "error : ".$e->getMessage();
230 263 
 			}
231 264 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
232 
-		} else $all = array();
265 
+		} else {
266 
+			$all = array();
267 
+		}
233 268 
 		if (empty($all)) {
234 269 
 			$Spotter = new Spotter($this->db);
235 270 
 			$filters = array();
 
@@ -244,7 +279,9 @@  discard block
 
 block discarded – undo
244 279 
 	}
245 280 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
246 281 
 		global $globalStatsFilters;
247 
-		if ($filter_name == '') $filter_name = $this->filter_name;
282 
+		if ($filter_name == '') {
283 
+			$filter_name = $this->filter_name;
284 
+		}
248 285 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
249 286 
 			$Spotter = new Spotter($this->db);
250 287 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -253,8 +290,11 @@  discard block
 
 block discarded – undo
253 290 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
254 291 
 			}
255 292 
 			if ($year == '' && $month == '') {
256 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
293 
+				if ($limit) {
294 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
295 
+				} else {
296 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
297 
+				}
258 298 
 				try {
259 299 
 					$sth = $this->db->prepare($query);
260 300 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -262,11 +302,16 @@  discard block
 
 block discarded – undo
262 302 
 					echo "error : ".$e->getMessage();
263 303 
 				}
264 304 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
265 
-			} else $all = array();
305 
+			} else {
306 
+				$all = array();
307 
+			}
266 308 
 		} else {
267 309 
 			if ($year == '' && $month == '') {
268 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
269 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
310 
+				if ($limit) {
311 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
312 
+				} else {
313 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
314 
+				}
270 315 
 				try {
271 316 
 					$sth = $this->db->prepare($query);
272 317 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -274,7 +319,9 @@  discard block
 
 block discarded – undo
274 319 
 					echo "error : ".$e->getMessage();
275 320 
 				}
276 321 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 
-			} else $all = array();
322 
+			} else {
323 
+				$all = array();
324 
+			}
278 325 
 		}
279 326 
 		if (empty($all)) {
280 327 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -294,7 +341,9 @@  discard block
 
 block discarded – undo
294 341
295 342 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
296 343 
 		global $globalStatsFilters;
297 
-		if ($filter_name == '') $filter_name = $this->filter_name;
344 
+		if ($filter_name == '') {
345 
+			$filter_name = $this->filter_name;
346 
+		}
298 347 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
299 348 
 			$Spotter = new Spotter($this->db);
300 349 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -303,8 +352,11 @@  discard block
 
 block discarded – undo
303 352 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
304 353 
 			}
305 354 
 			if ($year == '' && $month == '') {
306 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
355 
+				if ($limit) {
356 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
357 
+				} else {
358 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
359 
+				}
308 360 
 				try {
309 361 
 					$sth = $this->db->prepare($query);
310 362 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -312,11 +364,16 @@  discard block
 
 block discarded – undo
312 364 
 					echo "error : ".$e->getMessage();
313 365 
 				}
314 366 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
315 
-			} else $all = array();
367 
+			} else {
368 
+				$all = array();
369 
+			}
316 370 
 		} else {
317 371 
 			if ($year == '' && $month == '') {
318 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
319 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
372 
+				if ($limit) {
373 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
374 
+				} else {
375 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
376 
+				}
320 377 
 				try {
321 378 
 					$sth = $this->db->prepare($query);
322 379 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -324,7 +381,9 @@  discard block
 
 block discarded – undo
324 381 
 					echo "error : ".$e->getMessage();
325 382 
 				}
326 383 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 
-			} else $all = array();
384 
+			} else {
385 
+				$all = array();
386 
+			}
328 387 
 		}
329 388 
 		if (empty($all)) {
330 389 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -343,7 +402,9 @@  discard block
 
 block discarded – undo
343 402 
 	}
344 403 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 404 
 		global $globalStatsFilters;
346 
-		if ($filter_name == '') $filter_name = $this->filter_name;
405 
+		if ($filter_name == '') {
406 
+			$filter_name = $this->filter_name;
407 
+		}
347 408 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
348 409 
 			$Spotter = new Spotter($this->db);
349 410 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -351,12 +412,18 @@  discard block
 
 block discarded – undo
351 412 
 			foreach ($airlines as $airline) {
352 413 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
353 414 
 			}
354 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
415 
+			if ($limit) {
416 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
417 
+			} else {
418 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
419 
+			}
356 420 
 			$query_values = array(':filter_name' => $filter_name);
357 421 
 		} else {
358 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
359 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
422 
+			if ($limit) {
423 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
424 
+			} else {
425 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
426 
+			}
360 427 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
361 428 
 		}
362 429 
 		try {
 
@@ -384,17 +451,29 @@  discard block
 
 block discarded – undo
384 451
385 452 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
386 453 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 
-		if ($filter_name == '') $filter_name = $this->filter_name;
454 
+		if ($filter_name == '') {
455 
+			$filter_name = $this->filter_name;
456 
+		}
388 457 
 		if ($year == '' && $month == '') {
389 
-			if ($globalVATSIM) $forsource = 'vatsim';
390 
-			if ($globalIVAO) $forsource = 'ivao';
458 
+			if ($globalVATSIM) {
459 
+				$forsource = 'vatsim';
460 
+			}
461 
+			if ($globalIVAO) {
462 
+				$forsource = 'ivao';
463 
+			}
391 464 
 			if (isset($forsource)) {
392 
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
465 
+				if ($limit) {
466 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
467 
+				} else {
468 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
469 
+				}
394 470 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
395 471 
 			} else {
396 
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
472 
+				if ($limit) {
473 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
474 
+				} else {
475 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
476 
+				}
398 477 
 				$query_values = array(':filter_name' => $filter_name);
399 478 
 			}
400 479 
 			try {
 
@@ -404,7 +483,9 @@  discard block
 
 block discarded – undo
404 483 
 				echo "error : ".$e->getMessage();
405 484 
 			}
406 485 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407 
-		} else $all = array();
486 
+		} else {
487 
+			$all = array();
488 
+		}
408 489 
                 if (empty($all)) {
409 490 
 	                $Spotter = new Spotter($this->db);
410 491 
             		$filters = array();
 
@@ -419,7 +500,9 @@  discard block
 
 block discarded – undo
419 500 
 	}
420 501 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 502 
 		global $globalStatsFilters;
422 
-		if ($filter_name == '') $filter_name = $this->filter_name;
503 
+		if ($filter_name == '') {
504 
+			$filter_name = $this->filter_name;
505 
+		}
423 506 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
424 507 
 			$Spotter = new Spotter($this->db);
425 508 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -428,8 +511,11 @@  discard block
 
 block discarded – undo
428 511 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
429 512 
 			}
430 513 
 			if ($year == '' && $month == '') {
431 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
514 
+				if ($limit) {
515 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
516 
+				} else {
517 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
518 
+				}
433 519 
 				try {
434 520 
 					$sth = $this->db->prepare($query);
435 521 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -437,11 +523,16 @@  discard block
 
 block discarded – undo
437 523 
 					echo "error : ".$e->getMessage();
438 524 
 				}
439 525 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
440 
-			} else $all = array();
526 
+			} else {
527 
+				$all = array();
528 
+			}
441 529 
 		} else {
442 530 
 			if ($year == '' && $month == '') {
443 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
444 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
531 
+				if ($limit) {
532 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
533 
+				} else {
534 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
535 
+				}
445 536 
 				try {
446 537 
 					$sth = $this->db->prepare($query);
447 538 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -449,7 +540,9 @@  discard block
 
 block discarded – undo
449 540 
 					echo "error : ".$e->getMessage();
450 541 
 				}
451 542 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 
-			} else $all = array();
543 
+			} else {
544 
+				$all = array();
545 
+			}
453 546 
 		}
454 547 
 		if (empty($all)) {
455 548 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -468,7 +561,9 @@  discard block
 
 block discarded – undo
468 561 
 	}
469 562 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
470 563 
 		global $globalStatsFilters;
471 
-		if ($filter_name == '') $filter_name = $this->filter_name;
564 
+		if ($filter_name == '') {
565 
+			$filter_name = $this->filter_name;
566 
+		}
472 567 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
473 568 
 			$Spotter = new Spotter($this->db);
474 569 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -477,8 +572,11 @@  discard block
 
 block discarded – undo
477 572 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
478 573 
 			}
479 574 
 			if ($year == '' && $month == '') {
480 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
575 
+				if ($limit) {
576 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
577 
+				} else {
578 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
579 
+				}
482 580 
 				 try {
483 581 
 					$sth = $this->db->prepare($query);
484 582 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -486,11 +584,16 @@  discard block
 
 block discarded – undo
486 584 
 					echo "error : ".$e->getMessage();
487 585 
 				}
488 586 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
489 
-			} else $all = array();
587 
+			} else {
588 
+				$all = array();
589 
+			}
490 590 
 		} else {
491 591 
 			if ($year == '' && $month == '') {
492 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
493 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
592 
+				if ($limit) {
593 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
594 
+				} else {
595 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
596 
+				}
494 597 
 				 try {
495 598 
 					$sth = $this->db->prepare($query);
496 599 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -498,7 +601,9 @@  discard block
 
 block discarded – undo
498 601 
 					echo "error : ".$e->getMessage();
499 602 
 				}
500 603 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 
-			} else $all = array();
604 
+			} else {
605 
+				$all = array();
606 
+			}
502 607 
 		}
503 608 
 		if (empty($all)) {
504 609 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -517,7 +622,9 @@  discard block
 
 block discarded – undo
517 622 
 	}
518 623 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
519 624 
 		$Connection = new Connection($this->db);
520 
-		if ($filter_name == '') $filter_name = $this->filter_name;
625 
+		if ($filter_name == '') {
626 
+			$filter_name = $this->filter_name;
627 
+		}
521 628 
 		if ($Connection->tableExists('countries')) {
522 629 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
523 630 
 				$Spotter = new Spotter($this->db);
 
@@ -527,8 +634,11 @@  discard block
 
 block discarded – undo
527 634 
 					foreach ($airlines as $airline) {
528 635 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
529 636 
 					}
530 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
637 
+					if ($limit) {
638 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
639 
+					} else {
640 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
641 
+					}
532 642 
 					 try {
533 643 
 						$sth = $this->db->prepare($query);
534 644 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -537,11 +647,16 @@  discard block
 
 block discarded – undo
537 647 
 					}
538 648 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
539 649 
 					return $all;
540 
-				} else return array();
650 
+				} else {
651 
+					return array();
652 
+				}
541 653 
 			} else {
542 654 
 				if ($year == '' && $month == '') {
543 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
544 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
655 
+					if ($limit) {
656 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
657 
+					} else {
658 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
659 
+					}
545 660 
 					 try {
546 661 
 						$sth = $this->db->prepare($query);
547 662 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -550,7 +665,9 @@  discard block
 
 block discarded – undo
550 665 
 					}
551 666 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
552 667 
 					return $all;
553 
-				} else return array();
668 
+				} else {
669 
+					return array();
670 
+				}
554 671 
 			}
555 672 
 		} else {
556 673 
 			/*
 
@@ -564,10 +681,15 @@  discard block
 
 block discarded – undo
564 681 
 	}
565 682 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
566 683 
 		global $globalStatsFilters;
567 
-		if ($filter_name == '') $filter_name = $this->filter_name;
684 
+		if ($filter_name == '') {
685 
+			$filter_name = $this->filter_name;
686 
+		}
568 687 
 		if ($year == '' && $month == '') {
569 
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
570 
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
688 
+			if ($limit) {
689 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
690 
+			} else {
691 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
692 
+			}
571 693 
 			try {
572 694 
 				$sth = $this->db->prepare($query);
573 695 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -575,7 +697,9 @@  discard block
 
 block discarded – undo
575 697 
 				echo "error : ".$e->getMessage();
576 698 
 			}
577 699 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 
-		} else $all = array();
700 
+		} else {
701 
+			$all = array();
702 
+		}
579 703 
 		if (empty($all)) {
580 704 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
581 705 
 			if ($filter_name != '') {
 
@@ -590,7 +714,9 @@  discard block
 
 block discarded – undo
590 714
591 715 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
592 716 
 		global $globalStatsFilters;
593 
-		if ($filter_name == '') $filter_name = $this->filter_name;
717 
+		if ($filter_name == '') {
718 
+			$filter_name = $this->filter_name;
719 
+		}
594 720 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
595 721 
 			$Spotter = new Spotter($this->db);
596 722 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -599,8 +725,11 @@  discard block
 
 block discarded – undo
599 725 
 				foreach ($airlines as $airline) {
600 726 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
601 727 
 				}
602 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
728 
+				if ($limit) {
729 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
730 
+				} else {
731 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
732 
+				}
604 733 
 				try {
605 734 
 					$sth = $this->db->prepare($query);
606 735 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -608,11 +737,16 @@  discard block
 
 block discarded – undo
608 737 
 					echo "error : ".$e->getMessage();
609 738 
 				}
610 739 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
611 
-			} else $all = array();
740 
+			} else {
741 
+				$all = array();
742 
+			}
612 743 
 		} else {
613 744 
 			if ($year == '' && $month == '') {
614 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
615 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
745 
+				if ($limit) {
746 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
747 
+				} else {
748 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
749 
+				}
616 750 
 				try {
617 751 
 					$sth = $this->db->prepare($query);
618 752 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -620,7 +754,9 @@  discard block
 
 block discarded – undo
620 754 
 					echo "error : ".$e->getMessage();
621 755 
 				}
622 756 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 
-			} else $all = array();
757 
+			} else {
758 
+				$all = array();
759 
+			}
624 760 
 		}
625 761 
 		if (empty($all)) {
626 762 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -639,7 +775,9 @@  discard block
 
 block discarded – undo
639 775 
 	}
640 776 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
641 777 
 		global $globalStatsFilters;
642 
-		if ($filter_name == '') $filter_name = $this->filter_name;
778 
+		if ($filter_name == '') {
779 
+			$filter_name = $this->filter_name;
780 
+		}
643 781 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
644 782 
 			$Spotter = new Spotter($this->db);
645 783 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -648,8 +786,11 @@  discard block
 
 block discarded – undo
648 786 
 				foreach ($airlines as $airline) {
649 787 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
650 788 
 				}
651 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
789 
+				if ($limit) {
790 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
791 
+				} else {
792 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
793 
+				}
653 794 
 				try {
654 795 
 					$sth = $this->db->prepare($query);
655 796 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -657,11 +798,16 @@  discard block
 
 block discarded – undo
657 798 
 					echo "error : ".$e->getMessage();
658 799 
 				}
659 800 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
660 
-			} else $all = array();
801 
+			} else {
802 
+				$all = array();
803 
+			}
661 804 
 		} else {
662 805 
 			if ($year == '' && $month == '') {
663 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
664 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
806 
+				if ($limit) {
807 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
808 
+				} else {
809 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
810 
+				}
665 811 
 				try {
666 812 
 					$sth = $this->db->prepare($query);
667 813 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -669,7 +815,9 @@  discard block
 
 block discarded – undo
669 815 
 					echo "error : ".$e->getMessage();
670 816 
 				}
671 817 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 
-			} else $all = array();
818 
+			} else {
819 
+				$all = array();
820 
+			}
673 821 
 		}
674 822 
 		if (empty($all)) {
675 823 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -694,7 +842,9 @@  discard block
 
 block discarded – undo
694 842 
 				$icao = $value['airport_departure_icao'];
695 843 
 				if (isset($all[$icao])) {
696 844 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
697 
-				} else $all[$icao] = $value;
845 
+				} else {
846 
+					$all[$icao] = $value;
847 
+				}
698 848 
 			}
699 849 
 			$count = array();
700 850 
 			foreach ($all as $key => $row) {
 
@@ -706,7 +856,9 @@  discard block
 
 block discarded – undo
706 856 
 	}
707 857 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
708 858 
 		global $globalStatsFilters;
709 
-		if ($filter_name == '') $filter_name = $this->filter_name;
859 
+		if ($filter_name == '') {
860 
+			$filter_name = $this->filter_name;
861 
+		}
710 862 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
711 863 
 			$Spotter = new Spotter($this->db);
712 864 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -715,8 +867,11 @@  discard block
 
 block discarded – undo
715 867 
 				foreach ($airlines as $airline) {
716 868 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
717 869 
 				}
718 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
870 
+				if ($limit) {
871 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
872 
+				} else {
873 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
874 
+				}
720 875 
 				try {
721 876 
 					$sth = $this->db->prepare($query);
722 877 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -724,11 +879,16 @@  discard block
 
 block discarded – undo
724 879 
 					echo "error : ".$e->getMessage();
725 880 
 				}
726 881 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
727 
-			} else $all = array();
882 
+			} else {
883 
+				$all = array();
884 
+			}
728 885 
 		} else {
729 886 
 			if ($year == '' && $month == '') {
730 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
731 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
887 
+				if ($limit) {
888 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
889 
+				} else {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
891 
+				}
732 892 
 				try {
733 893 
 					$sth = $this->db->prepare($query);
734 894 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -736,7 +896,9 @@  discard block
 
 block discarded – undo
736 896 
 					echo "error : ".$e->getMessage();
737 897 
 				}
738 898 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 
-			} else $all = array();
899 
+			} else {
900 
+				$all = array();
901 
+			}
740 902 
 		}
741 903 
 		if (empty($all)) {
742 904 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -761,7 +923,9 @@  discard block
 
 block discarded – undo
761 923 
 				$icao = $value['airport_arrival_icao'];
762 924 
 				if (isset($all[$icao])) {
763 925 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
764 
-				} else $all[$icao] = $value;
926 
+				} else {
927 
+					$all[$icao] = $value;
928 
+				}
765 929 
 			}
766 930 
 			$count = array();
767 931 
 			foreach ($all as $key => $row) {
 
@@ -773,7 +937,9 @@  discard block
 
 block discarded – undo
773 937 
 	}
774 938 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
775 939 
 		global $globalDBdriver, $globalStatsFilters;
776 
-		if ($filter_name == '') $filter_name = $this->filter_name;
940 
+		if ($filter_name == '') {
941 
+			$filter_name = $this->filter_name;
942 
+		}
777 943 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
778 944 
 			$Spotter = new Spotter($this->db);
779 945 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -782,20 +948,32 @@  discard block
 
 block discarded – undo
782 948 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
783 949 
 			}
784 950 
 			if ($globalDBdriver == 'mysql') {
785 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
951 
+				if ($limit) {
952 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
953 
+				} else {
954 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955 
+				}
787 956 
 			} else {
788 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
957 
+				if ($limit) {
958 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
959 
+				} else {
960 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
961 
+				}
790 962 
 			}
791 963 
 			$query_data = array(':filter_name' => $filter_name);
792 964 
 		} else {
793 965 
 			if ($globalDBdriver == 'mysql') {
794 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
795 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
966 
+				if ($limit) {
967 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
968 
+				} else {
969 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
970 
+				}
796 971 
 			} else {
797 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
972 
+				if ($limit) {
973 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
974 
+				} else {
975 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
976 
+				}
799 977 
 			}
800 978 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
801 979 
 		}
 
@@ -823,7 +1001,9 @@  discard block
 
 block discarded – undo
823 1001
824 1002 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
825 1003 
 		global $globalStatsFilters;
826 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1004 
+		if ($filter_name == '') {
1005 
+			$filter_name = $this->filter_name;
1006 
+		}
827 1007 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
828 1008 
 			$Spotter = new Spotter($this->db);
829 1009 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -860,7 +1040,9 @@  discard block
 
 block discarded – undo
860 1040 
 	}
861 1041 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
862 1042 
 		global $globalDBdriver, $globalStatsFilters;
863 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043 
+		if ($filter_name == '') {
1044 
+			$filter_name = $this->filter_name;
1045 
+		}
864 1046 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
865 1047 
 			$Spotter = new Spotter($this->db);
866 1048 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -905,7 +1087,9 @@  discard block
 
 block discarded – undo
905 1087 
 	}
906 1088 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
907 1089 
 		global $globalStatsFilters;
908 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1090 
+		if ($filter_name == '') {
1091 
+			$filter_name = $this->filter_name;
1092 
+		}
909 1093 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
910 1094 
 			$Spotter = new Spotter($this->db);
911 1095 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -942,7 +1126,9 @@  discard block
 
 block discarded – undo
942 1126 
 	}
943 1127 
 	public function countAllDatesByAirlines($filter_name = '') {
944 1128 
 		global $globalStatsFilters;
945 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1129 
+		if ($filter_name == '') {
1130 
+			$filter_name = $this->filter_name;
1131 
+		}
946 1132 
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
947 1133 
 		$query_data = array('filter_name' => $filter_name);
948 1134 
 		try {
 
@@ -964,7 +1150,9 @@  discard block
 
 block discarded – undo
964 1150 
 	}
965 1151 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
966 1152 
 		global $globalStatsFilters, $globalDBdriver;
967 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1153 
+		if ($filter_name == '') {
1154 
+			$filter_name = $this->filter_name;
1155 
+		}
968 1156 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 1157 
 			$Spotter = new Spotter($this->db);
970 1158 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1049,7 +1237,9 @@  discard block
 
 block discarded – undo
1049 1237 
 	}
1050 1238 
 	public function countAllMilitaryMonths($filter_name = '') {
1051 1239 
 		global $globalStatsFilters;
1052 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1240 
+		if ($filter_name == '') {
1241 
+			$filter_name = $this->filter_name;
1242 
+		}
1053 1243 
 		$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
1054 1244 
 		try {
1055 1245 
 			$sth = $this->db->prepare($query);
 
@@ -1070,7 +1260,9 @@  discard block
 
 block discarded – undo
1070 1260 
 	}
1071 1261 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1072 1262 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1263 
+		if ($filter_name == '') {
1264 
+			$filter_name = $this->filter_name;
1265 
+		}
1074 1266 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1075 1267 
 			$Spotter = new Spotter($this->db);
1076 1268 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1078,12 +1270,18 @@  discard block
 
 block discarded – undo
1078 1270 
 			foreach ($airlines as $airline) {
1079 1271 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1080 1272 
 			}
1081 
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082 
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1273 
+			if ($limit) {
1274 
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1275 
+			} else {
1276 
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1277 
+			}
1083 1278 
 			$query_data = array(':filter_name' => $filter_name);
1084 1279 
 		} else {
1085 
-			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1086 
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1280 
+			if ($limit) {
1281 
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1282 
+			} else {
1283 
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1284 
+			}
1087 1285 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1088 1286 
 		}
1089 1287 
 		if ($orderby == 'hour') {
 
@@ -1093,7 +1291,9 @@  discard block
 
 block discarded – undo
1093 1291 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1094 1292 
 			}
1095 1293 
 		}
1096 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1294 
+		if ($orderby == 'count') {
1295 
+			$query .= " ORDER BY hour_count DESC";
1296 
+		}
1097 1297 
 		try {
1098 1298 
 			$sth = $this->db->prepare($query);
1099 1299 
 			$sth->execute($query_data);
 
@@ -1117,8 +1317,12 @@  discard block
 
 block discarded – undo
1117 1317 
 	}
1118 1318 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1119 1319 
 		global $globalStatsFilters;
1120 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1121 
-		if ($year == '') $year = date('Y');
1320 
+		if ($filter_name == '') {
1321 
+			$filter_name = $this->filter_name;
1322 
+		}
1323 
+		if ($year == '') {
1324 
+			$year = date('Y');
1325 
+		}
1122 1326 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1123 1327 
 		if (empty($all)) {
1124 1328 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1137,8 +1341,12 @@  discard block
 
 block discarded – undo
1137 1341 
 	}
1138 1342 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1139 1343 
 		global $globalStatsFilters;
1140 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1141 
-		if ($year == '') $year = date('Y');
1344 
+		if ($filter_name == '') {
1345 
+			$filter_name = $this->filter_name;
1346 
+		}
1347 
+		if ($year == '') {
1348 
+			$year = date('Y');
1349 
+		}
1142 1350 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1143 1351 
 		if (empty($all)) {
1144 1352 
 			$filters = array();
 
@@ -1154,8 +1362,12 @@  discard block
 
 block discarded – undo
1154 1362 
 	}
1155 1363 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1156 1364 
 		global $globalStatsFilters;
1157 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1158 
-		if ($year == '') $year = date('Y');
1365 
+		if ($filter_name == '') {
1366 
+			$filter_name = $this->filter_name;
1367 
+		}
1368 
+		if ($year == '') {
1369 
+			$year = date('Y');
1370 
+		}
1159 1371 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1160 1372 
 		if (empty($all)) {
1161 1373 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1174,7 +1386,9 @@  discard block
 
 block discarded – undo
1174 1386 
 	}
1175 1387 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1176 1388 
 		global $globalStatsFilters;
1177 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1389 
+		if ($filter_name == '') {
1390 
+			$filter_name = $this->filter_name;
1391 
+		}
1178 1392 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1179 1393 
 			$Spotter = new Spotter($this->db);
1180 1394 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1192,7 +1406,9 @@  discard block
 
 block discarded – undo
1192 1406 
 				}
1193 1407 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1408 
 				$all = $result[0]['nb'];
1195 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1409 
+			} else {
1410 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1411 
+			}
1196 1412 
 		} else {
1197 1413 
 			if ($year == '' && $month == '') {
1198 1414 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1204,7 +1420,9 @@  discard block
 
 block discarded – undo
1204 1420 
 				}
1205 1421 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1422 
 				$all = $result[0]['nb'];
1207 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1423 
+			} else {
1424 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1425 
+			}
1208 1426 
 		}
1209 1427 
 		if (empty($all)) {
1210 1428 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1223,7 +1441,9 @@  discard block
 
 block discarded – undo
1223 1441 
 	}
1224 1442 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1225 1443 
 		global $globalStatsFilters;
1226 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1444 
+		if ($filter_name == '') {
1445 
+			$filter_name = $this->filter_name;
1446 
+		}
1227 1447 
 		if ($year == '' && $month == '') {
1228 1448 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1229 1449 
 			try {
 
@@ -1234,7 +1454,9 @@  discard block
 
 block discarded – undo
1234 1454 
 			}
1235 1455 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1456 
 			$all = $result[0]['nb_airline'];
1237 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1457 
+		} else {
1458 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1459 
+		}
1238 1460 
 		if (empty($all)) {
1239 1461 
 			$filters = array();
1240 1462 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1249,7 +1471,9 @@  discard block
 
 block discarded – undo
1249 1471 
 	}
1250 1472 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1251 1473 
 		global $globalStatsFilters;
1252 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1474 
+		if ($filter_name == '') {
1475 
+			$filter_name = $this->filter_name;
1476 
+		}
1253 1477 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1254 1478 
 			$Spotter = new Spotter($this->db);
1255 1479 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1304,7 +1528,9 @@  discard block
 
 block discarded – undo
1304 1528 
 	}
1305 1529 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1306 1530 
 		global $globalStatsFilters;
1307 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1531 
+		if ($filter_name == '') {
1532 
+			$filter_name = $this->filter_name;
1533 
+		}
1308 1534 
 		//if ($year == '') $year = date('Y');
1309 1535 
 		if ($year == '' && $month == '') {
1310 1536 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1333,7 +1559,9 @@  discard block
 
 block discarded – undo
1333 1559 
 	}
1334 1560
1335 1561 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1336 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1562 
+		if ($filter_name == '') {
1563 
+			$filter_name = $this->filter_name;
1564 
+		}
1337 1565 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1338 1566 
 			$Spotter = new Spotter($this->db);
1339 1567 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1357,7 +1585,9 @@  discard block
 
 block discarded – undo
1357 1585 
 		return $all;
1358 1586 
 	}
1359 1587 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1360 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1588 
+		if ($filter_name == '') {
1589 
+			$filter_name = $this->filter_name;
1590 
+		}
1361 1591 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362 1592 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1363 1593 
 		try {
 
@@ -1370,7 +1600,9 @@  discard block
 
 block discarded – undo
1370 1600 
 		return $all;
1371 1601 
 	}
1372 1602 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1603 
+		if ($filter_name == '') {
1604 
+			$filter_name = $this->filter_name;
1605 
+		}
1374 1606 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375 1607 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1376 1608 
 		try {
 
@@ -1381,7 +1613,9 @@  discard block
 
 block discarded – undo
1381 1613 
 		}
1382 1614 
 	}
1383 1615 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1616 
+		if ($filter_name == '') {
1617 
+			$filter_name = $this->filter_name;
1618 
+		}
1385 1619 
 		global $globalArchiveMonths, $globalDBdriver;
1386 1620 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1387 1621 
 			$Spotter = new Spotter($this->db);
 
@@ -1437,7 +1671,9 @@  discard block
 
 block discarded – undo
1437 1671 
 	}
1438 1672 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1673 
 		global $globalArchiveMonths, $globalDBdriver;
1440 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1674 
+		if ($filter_name == '') {
1675 
+			$filter_name = $this->filter_name;
1676 
+		}
1441 1677 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1442 1678 
 			$Spotter = new Spotter($this->db);
1443 1679 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1470,7 +1706,9 @@  discard block
 
 block discarded – undo
1470 1706 
 	}
1471 1707 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1708 
 		global $globalArchiveMonths, $globalDBdriver;
1473 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1709 
+		if ($filter_name == '') {
1710 
+			$filter_name = $this->filter_name;
1711 
+		}
1474 1712 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1475 1713 
 			$Spotter = new Spotter($this->db);
1476 1714 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1501,7 +1739,9 @@  discard block
 
 block discarded – undo
1501 1739 
 	}
1502 1740 
 	public function getStatsAirlineTotal($filter_name = '') {
1503 1741 
 		global $globalArchiveMonths, $globalDBdriver;
1504 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1742 
+		if ($filter_name == '') {
1743 
+			$filter_name = $this->filter_name;
1744 
+		}
1505 1745 
 		if ($globalDBdriver == 'mysql') {
1506 1746 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1507 1747 
 		} else {
 
@@ -1518,7 +1758,9 @@  discard block
 
 block discarded – undo
1518 1758 
 	}
1519 1759 
 	public function getStatsOwnerTotal($filter_name = '') {
1520 1760 
 		global $globalArchiveMonths, $globalDBdriver;
1521 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1761 
+		if ($filter_name == '') {
1762 
+			$filter_name = $this->filter_name;
1763 
+		}
1522 1764 
 		if ($globalDBdriver == 'mysql') {
1523 1765 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1524 1766 
 		} else {
 
@@ -1535,7 +1777,9 @@  discard block
 
 block discarded – undo
1535 1777 
 	}
1536 1778 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1537 1779 
 		global $globalArchiveMonths, $globalDBdriver;
1538 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1780 
+		if ($filter_name == '') {
1781 
+			$filter_name = $this->filter_name;
1782 
+		}
1539 1783 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1784 
 		try {
1541 1785 
 			$sth = $this->db->prepare($query);
 
@@ -1544,12 +1788,17 @@  discard block
 
 block discarded – undo
1544 1788 
 			echo "error : ".$e->getMessage();
1545 1789 
 		}
1546 1790 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1547 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1548 
-		else return 0;
1791 
+		if (isset($all[0]['cnt'])) {
1792 
+			return $all[0]['cnt'];
1793 
+		} else {
1794 
+			return 0;
1795 
+		}
1549 1796 
 	}
1550 1797 
 	public function getStatsPilotTotal($filter_name = '') {
1551 1798 
 		global $globalArchiveMonths, $globalDBdriver;
1552 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1799 
+		if ($filter_name == '') {
1800 
+			$filter_name = $this->filter_name;
1801 
+		}
1553 1802 
 		if ($globalDBdriver == 'mysql') {
1554 1803 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1555 1804 
 		} else {
 
@@ -1566,7 +1815,9 @@  discard block
 
 block discarded – undo
1566 1815 
 	}
1567 1816 
 	public function getStatsPilot($pilot,$filter_name = '') {
1568 1817 
 		global $globalArchiveMonths, $globalDBdriver;
1569 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1818 
+		if ($filter_name == '') {
1819 
+			$filter_name = $this->filter_name;
1820 
+		}
1570 1821 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1822 
 		try {
1572 1823 
 			$sth = $this->db->prepare($query);
 
@@ -1575,13 +1826,18 @@  discard block
 
 block discarded – undo
1575 1826 
 			echo "error : ".$e->getMessage();
1576 1827 
 		}
1577 1828 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1578 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1579 
-		else return 0;
1829 
+		if (isset($all[0]['cnt'])) {
1830 
+			return $all[0]['cnt'];
1831 
+		} else {
1832 
+			return 0;
1833 
+		}
1580 1834 
 	}
1581 1835
1582 1836 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1837 
 		global $globalDBdriver;
1584 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1838 
+		if ($filter_name == '') {
1839 
+			$filter_name = $this->filter_name;
1840 
+		}
1585 1841 
 		if ($globalDBdriver == 'mysql') {
1586 1842 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1587 1843 
 		} else {
 
@@ -1597,7 +1853,9 @@  discard block
 
 block discarded – undo
1597 1853 
 	}
1598 1854 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1599 1855 
 		global $globalDBdriver;
1600 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1856 
+		if ($filter_name == '') {
1857 
+			$filter_name = $this->filter_name;
1858 
+		}
1601 1859 
 		if ($globalDBdriver == 'mysql') {
1602 1860 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1603 1861 
 		} else {
 
@@ -1983,10 +2241,14 @@  discard block
 
 block discarded – undo
1983 2241 
 		$Connection = new Connection($this->db);
1984 2242 
 		date_default_timezone_set('UTC');
1985 2243 
 		$last_update = $this->getLastStatsUpdate('last_update_stats');
1986 
-			if ($globalDebug) echo 'Update stats !'."\n";
2244 
+			if ($globalDebug) {
2245 
+				echo 'Update stats !'."\n";
2246 
+			}
1987 2247 
 			if (isset($last_update[0]['value'])) {
1988 2248 
 				$last_update_day = $last_update[0]['value'];
1989 
-			} else $last_update_day = '2012-12-12 12:12:12';
2249 
+			} else {
2250 
+				$last_update_day = '2012-12-12 12:12:12';
2251 
+			}
1990 2252 
 			$reset = false;
1991 2253 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1992 2254 
 			if ($globalStatsResetYear) {
 
@@ -1995,43 +2257,63 @@  discard block
 
 block discarded – undo
1995 2257 
 			}
1996 2258 
 			$Spotter = new Spotter($this->db);
1997 2259
1998 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2260 
+			if ($globalDebug) {
2261 
+				echo 'Count all aircraft types...'."\n";
2262 
+			}
1999 2263 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2000 2264 
 			foreach ($alldata as $number) {
2001 2265 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2002 2266 
 			}
2003 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2267 
+			if ($globalDebug) {
2268 
+				echo 'Count all airlines...'."\n";
2269 
+			}
2004 2270 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2005 2271 
 			foreach ($alldata as $number) {
2006 2272 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2007 2273 
 			}
2008 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2274 
+			if ($globalDebug) {
2275 
+				echo 'Count all registrations...'."\n";
2276 
+			}
2009 2277 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2010 2278 
 			foreach ($alldata as $number) {
2011 2279 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2012 2280 
 			}
2013 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2281 
+			if ($globalDebug) {
2282 
+				echo 'Count all callsigns...'."\n";
2283 
+			}
2014 2284 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2015 2285 
 			foreach ($alldata as $number) {
2016 2286 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2017 2287 
 			}
2018 
-			if ($globalDebug) echo 'Count all owners...'."\n";
2288 
+			if ($globalDebug) {
2289 
+				echo 'Count all owners...'."\n";
2290 
+			}
2019 2291 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2020 2292 
 			foreach ($alldata as $number) {
2021 2293 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2022 2294 
 			}
2023 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2295 
+			if ($globalDebug) {
2296 
+				echo 'Count all pilots...'."\n";
2297 
+			}
2024 2298 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2025 2299 
 			foreach ($alldata as $number) {
2026 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2300 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2301 
+					$number['pilot_id'] = $number['pilot_name'];
2302 
+				}
2027 2303 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2028 2304 
 			}
2029 2305
2030 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2306 
+			if ($globalDebug) {
2307 
+				echo 'Count all departure airports...'."\n";
2308 
+			}
2031 2309 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2032 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2310 
+			if ($globalDebug) {
2311 
+				echo 'Count all detected departure airports...'."\n";
2312 
+			}
2033 2313 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2034 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2314 
+			if ($globalDebug) {
2315 
+				echo 'Order departure airports...'."\n";
2316 
+			}
2035 2317 
 			$alldata = array();
2036 2318 
 			foreach ($pall as $value) {
2037 2319 
 				$icao = $value['airport_departure_icao'];
 
@@ -2041,7 +2323,9 @@  discard block
 
 block discarded – undo
2041 2323 
 				$icao = $value['airport_departure_icao'];
2042 2324 
 				if (isset($alldata[$icao])) {
2043 2325 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2044 
-				} else $alldata[$icao] = $value;
2326 
+				} else {
2327 
+					$alldata[$icao] = $value;
2328 
+				}
2045 2329 
 			}
2046 2330 
 			$count = array();
2047 2331 
 			foreach ($alldata as $key => $row) {
 
@@ -2051,11 +2335,17 @@  discard block
 
 block discarded – undo
2051 2335 
 			foreach ($alldata as $number) {
2052 2336 
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2053 2337 
 			}
2054 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2338 
+			if ($globalDebug) {
2339 
+				echo 'Count all arrival airports...'."\n";
2340 
+			}
2055 2341 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2056 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2342 
+			if ($globalDebug) {
2343 
+				echo 'Count all detected arrival airports...'."\n";
2344 
+			}
2057 2345 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2058 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2346 
+			if ($globalDebug) {
2347 
+				echo 'Order arrival airports...'."\n";
2348 
+			}
2059 2349 
 			$alldata = array();
2060 2350 
 			foreach ($pall as $value) {
2061 2351 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2065,7 +2355,9 @@  discard block
 
 block discarded – undo
2065 2355 
 				$icao = $value['airport_arrival_icao'];
2066 2356 
 				if (isset($alldata[$icao])) {
2067 2357 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2068 
-				} else $alldata[$icao] = $value;
2358 
+				} else {
2359 
+					$alldata[$icao] = $value;
2360 
+				}
2069 2361 
 			}
2070 2362 
 			$count = array();
2071 2363 
 			foreach ($alldata as $key => $row) {
 
@@ -2076,7 +2368,9 @@  discard block
 
 block discarded – undo
2076 2368 
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2077 2369 
 			}
2078 2370 
 			if ($Connection->tableExists('countries')) {
2079 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2371 
+				if ($globalDebug) {
2372 
+					echo 'Count all flights by countries...'."\n";
2373 
+				}
2080 2374 
 				//$SpotterArchive = new SpotterArchive();
2081 2375 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2376 
 				$Spotter = new Spotter($this->db);
 
@@ -2087,7 +2381,9 @@  discard block
 
 block discarded – undo
2087 2381 
 			}
2088 2382
2089 2383 
 			if (isset($globalAccidents) && $globalAccidents) {
2090 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2384 
+				if ($globalDebug) {
2385 
+					echo 'Count fatalities stats...'."\n";
2386 
+				}
2091 2387 
 				$Accident = new Accident($this->db);
2092 2388 
 				$this->deleteStatsByType('fatalities_byyear');
2093 2389 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2103,48 +2399,68 @@  discard block
 
 block discarded – undo
2103 2399
2104 2400 
 			// Add by month using getstat if month finish...
2105 2401 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2106 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2402 
+			if ($globalDebug) {
2403 
+				echo 'Count all flights by months...'."\n";
2404 
+			}
2107 2405 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2108 2406 
 			$filter_last_month = array('since_date' => $last_month);
2109 2407 
 			$Spotter = new Spotter($this->db);
2110 2408 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2111 2409 
 			$lastyear = false;
2112 2410 
 			foreach ($alldata as $number) {
2113 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2411 
+				if ($number['year_name'] != date('Y')) {
2412 
+					$lastyear = true;
2413 
+				}
2114 2414 
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2115 2415 
 			}
2116 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2416 
+			if ($globalDebug) {
2417 
+				echo 'Count all military flights by months...'."\n";
2418 
+			}
2117 2419 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2420 
 			foreach ($alldata as $number) {
2119 2421 
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2120 2422 
 			}
2121 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2423 
+			if ($globalDebug) {
2424 
+				echo 'Count all owners by months...'."\n";
2425 
+			}
2122 2426 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2427 
 			foreach ($alldata as $number) {
2124 2428 
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2125 2429 
 			}
2126 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2430 
+			if ($globalDebug) {
2431 
+				echo 'Count all pilots by months...'."\n";
2432 
+			}
2127 2433 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2434 
 			foreach ($alldata as $number) {
2129 2435 
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2130 2436 
 			}
2131 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2437 
+			if ($globalDebug) {
2438 
+				echo 'Count all airlines by months...'."\n";
2439 
+			}
2132 2440 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2441 
 			foreach ($alldata as $number) {
2134 2442 
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2135 2443 
 			}
2136 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2444 
+			if ($globalDebug) {
2445 
+				echo 'Count all aircrafts by months...'."\n";
2446 
+			}
2137 2447 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2448 
 			foreach ($alldata as $number) {
2139 2449 
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2140 2450 
 			}
2141 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2451 
+			if ($globalDebug) {
2452 
+				echo 'Count all real arrivals by months...'."\n";
2453 
+			}
2142 2454 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2455 
 			foreach ($alldata as $number) {
2144 2456 
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2145 2457 
 			}
2146 
-			if ($globalDebug) echo 'Airports data...'."\n";
2147 
-			if ($globalDebug) echo '...Departure'."\n";
2458 
+			if ($globalDebug) {
2459 
+				echo 'Airports data...'."\n";
2460 
+			}
2461 
+			if ($globalDebug) {
2462 
+				echo '...Departure'."\n";
2463 
+			}
2148 2464 
 			$this->deleteStatAirport('daily');
2149 2465 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2150 2466 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2262,7 +2578,9 @@  discard block
 
 block discarded – undo
2262 2578 
 			// Count by airlines
2263 2579 
 			echo '--- Stats by airlines ---'."\n";
2264 2580 
 			if ($Connection->tableExists('countries')) {
2265 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2581 
+				if ($globalDebug) {
2582 
+					echo 'Count all flights by countries by airlines...'."\n";
2583 
+				}
2266 2584 
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2585 
 				//$Spotter = new Spotter($this->db);
2268 2586 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2271,37 +2589,53 @@  discard block
 
 block discarded – undo
2271 2589 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2272 2590 
 				}
2273 2591 
 			}
2274 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2592 
+			if ($globalDebug) {
2593 
+				echo 'Count all aircraft types by airlines...'."\n";
2594 
+			}
2275 2595 
 			$Spotter = new Spotter($this->db);
2276 2596 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2277 2597 
 			foreach ($alldata as $number) {
2278 2598 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2279 2599 
 			}
2280 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2600 
+			if ($globalDebug) {
2601 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2602 
+			}
2281 2603 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2282 2604 
 			foreach ($alldata as $number) {
2283 2605 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2284 2606 
 			}
2285 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2607 
+			if ($globalDebug) {
2608 
+				echo 'Count all callsigns by airlines...'."\n";
2609 
+			}
2286 2610 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2287 2611 
 			foreach ($alldata as $number) {
2288 2612 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2289 2613 
 			}
2290 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2614 
+			if ($globalDebug) {
2615 
+				echo 'Count all owners by airlines...'."\n";
2616 
+			}
2291 2617 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2292 2618 
 			foreach ($alldata as $number) {
2293 2619 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2294 2620 
 			}
2295 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2621 
+			if ($globalDebug) {
2622 
+				echo 'Count all pilots by airlines...'."\n";
2623 
+			}
2296 2624 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2297 2625 
 			foreach ($alldata as $number) {
2298 2626 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2299 2627 
 			}
2300 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2628 
+			if ($globalDebug) {
2629 
+				echo 'Count all departure airports by airlines...'."\n";
2630 
+			}
2301 2631 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2302 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2632 
+			if ($globalDebug) {
2633 
+				echo 'Count all detected departure airports by airlines...'."\n";
2634 
+			}
2303 2635 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2304 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2636 
+			if ($globalDebug) {
2637 
+				echo 'Order detected departure airports by airlines...'."\n";
2638 
+			}
2305 2639 
 			//$alldata = array();
2306 2640 
 			foreach ($dall as $value) {
2307 2641 
 				$icao = $value['airport_departure_icao'];
 
@@ -2322,11 +2656,17 @@  discard block
 
 block discarded – undo
2322 2656 
 			foreach ($alldata as $number) {
2323 2657 
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2324 2658 
 			}
2325 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2659 
+			if ($globalDebug) {
2660 
+				echo 'Count all arrival airports by airlines...'."\n";
2661 
+			}
2326 2662 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2327 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2663 
+			if ($globalDebug) {
2664 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2665 
+			}
2328 2666 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2329 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2667 
+			if ($globalDebug) {
2668 
+				echo 'Order arrival airports by airlines...'."\n";
2669 
+			}
2330 2670 
 			//$alldata = array();
2331 2671 
 			foreach ($dall as $value) {
2332 2672 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2345,37 +2685,53 @@  discard block
 
 block discarded – undo
2345 2685 
 			}
2346 2686 
 			$alldata = $pall;
2347 2687 
 			foreach ($alldata as $number) {
2348 
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2688 
+				if ($number['airline_icao'] != '') {
2689 
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2690 
+				}
2691 
+			}
2692 
+			if ($globalDebug) {
2693 
+				echo 'Count all flights by months by airlines...'."\n";
2349 2694 
 			}
2350 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2695 
 			$Spotter = new Spotter($this->db);
2352 2696 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2353 2697 
 			$lastyear = false;
2354 2698 
 			foreach ($alldata as $number) {
2355 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2699 
+				if ($number['year_name'] != date('Y')) {
2700 
+					$lastyear = true;
2701 
+				}
2356 2702 
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2357 2703 
 			}
2358 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2704 
+			if ($globalDebug) {
2705 
+				echo 'Count all owners by months by airlines...'."\n";
2706 
+			}
2359 2707 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2708 
 			foreach ($alldata as $number) {
2361 2709 
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2362 2710 
 			}
2363 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2711 
+			if ($globalDebug) {
2712 
+				echo 'Count all pilots by months by airlines...'."\n";
2713 
+			}
2364 2714 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2715 
 			foreach ($alldata as $number) {
2366 2716 
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2367 2717 
 			}
2368 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2718 
+			if ($globalDebug) {
2719 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2720 
+			}
2369 2721 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2722 
 			foreach ($alldata as $number) {
2371 2723 
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2372 2724 
 			}
2373 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2725 
+			if ($globalDebug) {
2726 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2727 
+			}
2374 2728 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2729 
 			foreach ($alldata as $number) {
2376 2730 
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2377 2731 
 			}
2378 
-			if ($globalDebug) echo '...Departure'."\n";
2732 
+			if ($globalDebug) {
2733 
+				echo '...Departure'."\n";
2734 
+			}
2379 2735 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2380 2736 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2381 2737 
 			foreach ($dall as $value) {
 
@@ -2398,7 +2754,9 @@  discard block
 
 block discarded – undo
2398 2754 
 			foreach ($alldata as $number) {
2399 2755 
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
2400 2756 
 			}
2401 
-			if ($globalDebug) echo '...Arrival'."\n";
2757 
+			if ($globalDebug) {
2758 
+				echo '...Arrival'."\n";
2759 
+			}
2402 2760 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2403 2761 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2404 2762 
 			foreach ($dall as $value) {
 
@@ -2422,13 +2780,19 @@  discard block
 
 block discarded – undo
2422 2780 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
2423 2781 
 			}
2424 2782
2425 
-			if ($globalDebug) echo 'Flights data...'."\n";
2426 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2783 
+			if ($globalDebug) {
2784 
+				echo 'Flights data...'."\n";
2785 
+			}
2786 
+			if ($globalDebug) {
2787 
+				echo '-> countAllDatesLastMonth...'."\n";
2788 
+			}
2427 2789 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2790 
 			foreach ($alldata as $number) {
2429 2791 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2430 2792 
 			}
2431 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2793 
+			if ($globalDebug) {
2794 
+				echo '-> countAllDates...'."\n";
2795 
+			}
2432 2796 
 			//$previousdata = $this->countAllDatesByAirlines();
2433 2797 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2434 2798 
 			$values = array();
 
@@ -2441,14 +2805,18 @@  discard block
 
 block discarded – undo
2441 2805 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2442 2806 
 			}
2443 2807
2444 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2808 
+			if ($globalDebug) {
2809 
+				echo '-> countAllHours...'."\n";
2810 
+			}
2445 2811 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2446 2812 
 			foreach ($alldata as $number) {
2447 2813 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2448 2814 
 			}
2449 2815
2450 2816 
 			// Stats by filters
2451 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2817 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2818 
+				$globalStatsFilters = array();
2819 
+			}
2452 2820 
 			foreach ($globalStatsFilters as $name => $filter) {
2453 2821 
 				if (!empty($filter)) {
2454 2822 
 					//$filter_name = $filter['name'];
 
@@ -2456,7 +2824,9 @@  discard block
 
 block discarded – undo
2456 2824 
 					$reset = false;
2457 2825 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2458 2826 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2459 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2827 
+						if ($globalDebug) {
2828 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2829 
+						}
2460 2830 
 						$this->deleteOldStats($filter_name);
2461 2831 
 						unset($last_update);
2462 2832 
 					}
 
@@ -2473,39 +2843,55 @@  discard block
 
 block discarded – undo
2473 2843 
 						$reset = true;
2474 2844 
 					}
2475 2845 
 					// Count by filter
2476 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2846 
+					if ($globalDebug) {
2847 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
2848 
+					}
2477 2849 
 					$Spotter = new Spotter($this->db);
2478 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2850 
+					if ($globalDebug) {
2851 
+						echo 'Count all aircraft types...'."\n";
2852 
+					}
2479 2853 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2480 2854 
 					foreach ($alldata as $number) {
2481 2855 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2482 2856 
 					}
2483 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
2857 
+					if ($globalDebug) {
2858 
+						echo 'Count all airlines...'."\n";
2859 
+					}
2484 2860 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2485 2861 
 					foreach ($alldata as $number) {
2486 2862 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2487 2863 
 					}
2488 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2864 
+					if ($globalDebug) {
2865 
+						echo 'Count all aircraft registrations...'."\n";
2866 
+					}
2489 2867 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2490 2868 
 					foreach ($alldata as $number) {
2491 2869 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2492 2870 
 					}
2493 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
2871 
+					if ($globalDebug) {
2872 
+						echo 'Count all callsigns...'."\n";
2873 
+					}
2494 2874 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2495 2875 
 					foreach ($alldata as $number) {
2496 2876 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2497 2877 
 					}
2498 
-					if ($globalDebug) echo 'Count all owners...'."\n";
2878 
+					if ($globalDebug) {
2879 
+						echo 'Count all owners...'."\n";
2880 
+					}
2499 2881 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2500 2882 
 					foreach ($alldata as $number) {
2501 2883 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2502 2884 
 					}
2503 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
2885 
+					if ($globalDebug) {
2886 
+						echo 'Count all pilots...'."\n";
2887 
+					}
2504 2888 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2505 2889 
 					foreach ($alldata as $number) {
2506 2890 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2507 2891 
 					}
2508 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
2892 
+					if ($globalDebug) {
2893 
+						echo 'Count departure airports...'."\n";
2894 
+					}
2509 2895 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2510 2896 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2511 2897 
 					$alldata = array();
 
@@ -2517,7 +2903,9 @@  discard block
 
 block discarded – undo
2517 2903 
 						$icao = $value['airport_departure_icao'];
2518 2904 
 						if (isset($alldata[$icao])) {
2519 2905 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2520 
-						} else $alldata[$icao] = $value;
2906 
+						} else {
2907 
+							$alldata[$icao] = $value;
2908 
+						}
2521 2909 
 					}
2522 2910 
 					$count = array();
2523 2911 
 					foreach ($alldata as $key => $row) {
 
@@ -2527,7 +2915,9 @@  discard block
 
 block discarded – undo
2527 2915 
 					foreach ($alldata as $number) {
2528 2916 
 						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2529 2917 
 					}
2530 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2918 
+					if ($globalDebug) {
2919 
+						echo 'Count all arrival airports...'."\n";
2920 
+					}
2531 2921 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2532 2922 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2533 2923 
 					$alldata = array();
 
@@ -2539,7 +2929,9 @@  discard block
 
 block discarded – undo
2539 2929 
 						$icao = $value['airport_arrival_icao'];
2540 2930 
 						if (isset($alldata[$icao])) {
2541 2931 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2542 
-						} else $alldata[$icao] = $value;
2932 
+						} else {
2933 
+							$alldata[$icao] = $value;
2934 
+						}
2543 2935 
 					}
2544 2936 
 					$count = array();
2545 2937 
 					foreach ($alldata as $key => $row) {
 
@@ -2549,35 +2941,49 @@  discard block
 
 block discarded – undo
2549 2941 
 					foreach ($alldata as $number) {
2550 2942 
 						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2551 2943 
 					}
2552 
-					if ($globalDebug) echo 'Count all months...'."\n";
2944 
+					if ($globalDebug) {
2945 
+						echo 'Count all months...'."\n";
2946 
+					}
2553 2947 
 					$Spotter = new Spotter($this->db);
2554 2948 
 					$alldata = $Spotter->countAllMonths($filter);
2555 2949 
 					$lastyear = false;
2556 2950 
 					foreach ($alldata as $number) {
2557 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
2951 
+						if ($number['year_name'] != date('Y')) {
2952 
+							$lastyear = true;
2953 
+						}
2558 2954 
 						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2559 2955 
 					}
2560 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
2956 
+					if ($globalDebug) {
2957 
+						echo 'Count all owners by months...'."\n";
2958 
+					}
2561 2959 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2562 2960 
 					foreach ($alldata as $number) {
2563 2961 
 						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2564 2962 
 					}
2565 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2963 
+					if ($globalDebug) {
2964 
+						echo 'Count all pilots by months...'."\n";
2965 
+					}
2566 2966 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2567 2967 
 					foreach ($alldata as $number) {
2568 2968 
 						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2569 2969 
 					}
2570 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
2970 
+					if ($globalDebug) {
2971 
+						echo 'Count all military by months...'."\n";
2972 
+					}
2571 2973 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2572 2974 
 					foreach ($alldata as $number) {
2573 2975 
 						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2574 2976 
 					}
2575 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2977 
+					if ($globalDebug) {
2978 
+						echo 'Count all aircrafts by months...'."\n";
2979 
+					}
2576 2980 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 2981 
 				    	foreach ($alldata as $number) {
2578 2982 
 			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2579 2983 
 					}
2580 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2984 
+					if ($globalDebug) {
2985 
+						echo 'Count all real arrivals by months...'."\n";
2986 
+					}
2581 2987 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2582 2988 
 					foreach ($alldata as $number) {
2583 2989 
 						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
Please login to merge, or discard this patch.