View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( e6c083...dab432 )
by Yannick
31:25
created
Status
Category
Toggle Patches
live-czml.php 1 patch
Braces   +119 added lines, -43 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,24 +70,49 @@  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_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
83 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
84 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
85 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
86 
-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_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
102 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
103 
+}
104 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
105 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
106 
+}
107 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
108 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
109 
+}
110 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
111 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
112 
+}
113 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
114 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
115 
+}
87 116 
 /*
88 117 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
89 118 
 	$min = true;
 
@@ -180,8 +209,12 @@  discard block
 
 block discarded – undo
180 209 
 	} else {
181 210 
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
182 211 
 	}
183 
-	if ($flightcnt == '') $flightcnt = 0;
184 
-} else $flightcnt = 0;
212 
+	if ($flightcnt == '') {
213 
+		$flightcnt = 0;
214 
+	}
215 
+	} else {
216 
+	$flightcnt = 0;
217 
+}
185 218
186 219 
 $sqltime = round(microtime(true)-$begintime,2);
187 220 
 $minitime = time();
 
@@ -217,7 +250,9 @@  discard block
 
 block discarded – undo
217 250 
 $prev_flightaware_id = '';
218 251 
 $speed = 1;
219 252 
 $gltf2 = false;
220 
-if (isset($archivespeed)) $speed = $archivespeed;
253 
+if (isset($archivespeed)) {
254 
+	$speed = $archivespeed;
255 
+}
221 256 
 $output = '[';
222 257 
 if ($tracker) {
223 258 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -253,9 +288,13 @@  discard block
 
 block discarded – undo
253 288 
 			$image = "images/placeholder_thumb.png";
254 289 
 		}
255 290
256 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
257 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
258 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
291 
+                if (isset($spotter_item['flightaware_id'])) {
292 
+                	$id = $spotter_item['flightaware_id'];
293 
+                } elseif (isset($spotter_item['famtrackid'])) {
294 
+                	$id = $spotter_item['famtrackid'];
295 
+                } elseif (isset($spotter_item['fammarine_id'])) {
296 
+                	$id = $spotter_item['fammarine_id'];
297 
+                }
259 298 
                 if ($prev_flightaware_id != $id) {
260 299 
 			if ($prev_flightaware_id != '') {
261 300 
 				/*
 
@@ -303,7 +342,9 @@  discard block
 
 block discarded – undo
303 342 
 							}
304 343 
 						}
305 344 
 					}
306 
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
345 
+					if ($ident != '') {
346 
+						$output.= '"ident": "'.$ident.'",';
347 
+					}
307 348 
 				}
308 349 
 				$output.= '"gltf2": %gltf2%,';
309 350 
 				$output.= '"type": "flight"';
 
@@ -335,7 +376,9 @@  discard block
 
 block discarded – undo
335 376 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
336 377 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
337 378 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
338 
-						} else $aircraft_shadow = '';
379 
+						} else {
380 
+							$aircraft_shadow = '';
381 
+						}
339 382 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
340 383 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
341 384 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -343,7 +386,9 @@  discard block
 
 block discarded – undo
343 386 
 						}
344 387 
 						$output .= '},';
345 388 
 					}
346 
-				} 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},';
389 
+				} else {
390 
+					$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},';
391 
+				}
347 392 
 			} elseif ($one3dmodel) {
348 393 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
349 394 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -383,7 +428,9 @@  discard block
 
 block discarded – undo
383 428 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
384 429 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
385 430 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
386 
-						} else $aircraft_shadow = '';
431 
+						} else {
432 
+							$aircraft_shadow = '';
433 
+						}
387 434 
 						if ($aircraft_shadow != '') {
388 435 
 							if (isset($modelsdb[$aircraft_shadow])) {
389 436 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -520,7 +567,9 @@  discard block
 
 block discarded – undo
520 567 
 								}
521 568 
 								$output .= '},';
522 569 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
523 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
570 
+								if ($spotter_item['aircraft_icao'] != '') {
571 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
572 
+								}
524 573 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
525 574 
 							}
526 575 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -542,7 +591,9 @@  discard block
 
 block discarded – undo
542 591 
 							}
543 592 
 							$output .= '},';
544 593 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
545 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
594 
+							if ($spotter_item['aircraft_icao'] != '') {
595 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
596 
+							}
546 597 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
547 598 
 						}
548 599 
 					} else {
 
@@ -555,7 +606,9 @@  discard block
 
 block discarded – undo
555 606 
 						}
556 607 
 						$output .= '},';
557 608 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
558 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
609 
+						if ($spotter_item['aircraft_icao'] != '') {
610 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
611 
+						}
559 612 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
560 613 
 					}
561 614 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -659,8 +712,11 @@  discard block
 
 block discarded – undo
659 712 
 					$output .= '},';
660 713 
 				}
661 714 
 			}
662 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
663 
-			else $output = str_replace('%onground%','false',$output);
715 
+			if (isset($onground) && $onground) {
716 
+				$output = str_replace('%onground%','true',$output);
717 
+			} else {
718 
+				$output = str_replace('%onground%','false',$output);
719 
+			}
664 720
665 721 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
666 722 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -673,8 +729,12 @@  discard block
 
 block discarded – undo
673 729 
 	//		$output .= '"interpolationDegree" : 5,';
674 730 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
675 731 
 			$output .= '"cartographicDegrees": [';
676 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
677 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
732 
+			if ($minitime > strtotime($spotter_item['date'])) {
733 
+				$minitime = strtotime($spotter_item['date']);
734 
+			}
735 
+			if ($maxitime < strtotime($spotter_item['date'])) {
736 
+				$maxitime = strtotime($spotter_item['date']);
737 
+			}
678 738 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
679 739 
 			$output .= $spotter_item['longitude'].', ';
680 740 
 			$output .= $spotter_item['latitude'];
 
@@ -697,7 +757,9 @@  discard block
 
 block discarded – undo
697 757 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
698 758 
 					$prevalt = round($spotter_item['altitude']*30.48);
699 759 
 				}
700 
-			} else $output .= ', 0';
760 
+			} else {
761 
+				$output .= ', 0';
762 
+			}
701 763 
 			//$orientation = '"orientation" : { ';
702 764 
 			//$orientation .= '"unitQuaternion": [';
703 765 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -705,13 +767,18 @@  discard block
 
 block discarded – undo
705 767 
 		} else {
706 768 
 			$nblatlong = $nblatlong+1;
707 769 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
708 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
770 
+			if ($maxitime < strtotime($spotter_item['date'])) {
771 
+				$maxitime = strtotime($spotter_item['date']);
772 
+			}
709 773 
 			if ($spotter_item['ground_speed'] == 0) {
710 774 
 				$output .= $prevlong.', ';
711 775 
 				$output .= $prevlat;
712 776 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
713 
-				if (!$marine) $output .= ', '.$prevalt;
714 
-				else $output .= ', 0';
777 
+				if (!$marine) {
778 
+					$output .= ', '.$prevalt;
779 
+				} else {
780 
+					$output .= ', 0';
781 
+				}
715 782 
 			} else {
716 783 
 				$output .= $spotter_item['longitude'].', ';
717 784 
 				$output .= $spotter_item['latitude'];
 
@@ -724,14 +791,17 @@  discard block
 
 block discarded – undo
724 791 
 							$output .= ', 0';
725 792 
 						}
726 793 
 					} else {
727 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
728 
-						elseif ($tracker) {
794 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
795 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
796 
+						} elseif ($tracker) {
729 797 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
730 798 
 						} else {
731 799 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
732 800 
 						}
733 801 
 					}
734 
-				} else $output .= ', 0';
802 
+				} else {
803 
+					$output .= ', 0';
804 
+				}
735 805 
 			}
736 806 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
737 807 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -750,11 +820,17 @@  discard block
 
 block discarded – undo
750 820 
 		} else {
751 821 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
752 822 
 		}
823 
+	} else {
824 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
753 825 
 	}
754 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
755 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
826 
+	} else {
827 
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
828 
+}
756 829 
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
757 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
758 
-else $output = str_replace('%gltf2%','false',$output);
830 
+if ($gltf2) {
831 
+	$output = str_replace('%gltf2%','true',$output);
832 
+} else {
833 
+	$output = str_replace('%gltf2%','false',$output);
834 
+}
759 835 
 print $output;
760 836 
 ?>
Please login to merge, or discard this patch.
js/map.2d.js.php 1 patch
Braces   +103 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -4,10 +4,15 @@  discard block
 
 block discarded – undo
4 4
5 5 
 setcookie("MapFormat",'2d');
6 6
7 
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
7 
+if (!isset($globalOpenWeatherMapKey)) {
8 
+	$globalOpenWeatherMapKey = '';
9 
+}
8 10 
 // Compressed GeoJson is used if true
9 
-if (!isset($globalJsonCompress)) $compress = true;
10 
-else $compress = $globalJsonCompress;
11 
+if (!isset($globalJsonCompress)) {
12 
+	$compress = true;
13 
+} else {
14 
+	$compress = $globalJsonCompress;
15 
+}
11 16 
 if (isset($_GET['archive'])) {
12 17 
 	$archive = true;
13 18 
 	//$archiveupdatetime = 50;
 
@@ -18,8 +23,11 @@  discard block
 
 block discarded – undo
18 23 
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
19 24 
 	//$lastupd = 20;
20 25 
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21 
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22 
-	else $enddate = time();
26 
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
27 
+		$enddate = $_GET['enddate'];
28 
+	} else {
29 
+		$enddate = time();
30 
+	}
23 31 
 	setcookie("archive_begin",$begindate);
24 32 
 	setcookie("archive_end",$enddate);
25 33 
 	setcookie("archive_update",$lastupd);
 
@@ -107,7 +115,17 @@  discard block
 
 block discarded – undo
107 115 
 	}
108 116
109 117 
 	//create the map
110 
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
118 
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
119 
+	print $latitude;
120 
+} else {
121 
+	print $globalCenterLatitude;
122 
+}
123 
+?>,<?php if (isset($longitude)) {
124 
+	print $longitude;
125 
+} else {
126 
+	print $globalCenterLongitude;
127 
+}
128 
+?>], zoom);
111 129 
 <?php
112 130 
 	} else {
113 131 
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
 
@@ -133,9 +151,21 @@  discard block
 
 block discarded – undo
133 151 
 	     || navigator.userAgent.match(/BlackBerry/i)
134 152 
 	     || navigator.userAgent.match(/Windows Phone/i))
135 153 
 	{
136 
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
154 
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) {
155 
+	print $viewzoom-1;
156 
+} elseif (isset($viewzoom)) {
157 
+	print $viewzoom;
158 
+} else {
159 
+	print '8';
160 
+}
161 
+?>;
137 162 
 	} else {
138 
-		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
163 
+		var zoom = <?php if (isset($viewzoom)) {
164 
+	print $viewzoom;
165 
+} else {
166 
+	print '9';
167 
+}
168 
+?>;
139 169 
 	}
140 170
141 171 
 	//create the map
 
@@ -160,16 +190,27 @@  discard block
 
 block discarded – undo
160 190 
 	bounds = L.latLngBounds(southWest,northEast);
161 191 
 	//a few title layers
162 192 
 <?php
163 
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
164 
-	else $MapType = $globalMapProvider;
193 
+	if (isset($_COOKIE['MapType'])) {
194 
+		$MapType = $_COOKIE['MapType'];
195 
+	} else {
196 
+		$MapType = $globalMapProvider;
197 
+	}
165 198
166 199 
 	if ($MapType == 'Mapbox') {
167 
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
168 
-		else $MapBoxId = $_COOKIE['MapTypeId'];
169 
-?>
200 
+		if ($_COOKIE['MapTypeId'] == 'default') {
201 
+			$MapBoxId = $globalMapboxId;
202 
+		} else {
203 
+			$MapBoxId = $_COOKIE['MapTypeId'];
204 
+		}
205 
+		?>
170 206 
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
171 207 
 	    maxZoom: 18,
172 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
208 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
209 
+	print 'false';
210 
+} else {
211 
+	print 'true';
212 
+}
213 
+?>,
173 214 
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
174 215 
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
175 216 
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
 
@@ -181,7 +222,12 @@  discard block
 
 block discarded – undo
181 222 
 ?>
182 223 
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
183 224 
 	    maxZoom: 18,
184 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
225 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
226 
+	print 'false';
227 
+} else {
228 
+	print 'true';
229 
+}
230 
+?>,
185 231 
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
186 232 
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
187 233 
 	}).addTo(map);
 
@@ -227,20 +273,26 @@  discard block
 
 block discarded – undo
227 273 
 	map.addLayer(yandexLayer);
228 274 
 <?php
229 275 
 	} elseif ($MapType == 'Bing-Aerial') {
230 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
231 
-?>
276 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
277 
+			setcookie('MapType','OpenStreetMap');
278 
+		}
279 
+		?>
232 280 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
233 281 
 	map.addLayer(bingLayer);
234 282 
 <?php
235 283 
 	} elseif ($MapType == 'Bing-Hybrid') {
236 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
237 
-?>
284 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
285 
+			setcookie('MapType','OpenStreetMap');
286 
+		}
287 
+		?>
238 288 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
239 289 
 	map.addLayer(bingLayer);
240 290 
 <?php
241 291 
 	} elseif ($MapType == 'Bing-Road') {
242 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
243 
-?>
292 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
293 
+			setcookie('MapType','OpenStreetMap');
294 
+		}
295 
+		?>
244 296 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
245 297 
 	map.addLayer(bingLayer);
246 298 
 <?php
 
@@ -263,9 +315,24 @@  discard block
 
 block discarded – undo
263 315 
 		$customid = $MapType;
264 316 
 ?>
265 317 
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
266 
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
267 
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
268 
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
318 
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
319 
+	print $globalMapCustomLayer[$customid]['maxZoom'];
320 
+} else {
321 
+	print '18';
322 
+}
323 
+?>,
324 
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
325 
+	print $globalMapCustomLayer[$customid]['minZoom'];
326 
+} else {
327 
+	print '0';
328 
+}
329 
+?>,
330 
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
331 
+	print 'false';
332 
+} else {
333 
+	print 'true';
334 
+}
335 
+?>,
269 336 
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
270 337 
 	}).addTo(map);
271 338 
 
@@ -299,7 +366,12 @@  discard block
 
 block discarded – undo
299 366 
 		}
300 367 
 	} elseif ($globalBounding == 'circle') {
301 368 
 ?>
302 
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
369 
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
370 
+	print $globalBoundingCircleSize;
371 
+} else {
372 
+	print '70000';
373 
+}
374 
+?>,{
303 375 
 	    color: '#92C7D1',
304 376 
 	    fillColor: '#92C7D1',
305 377 
 	    fillOpacity: 0.3,
 
@@ -398,7 +470,12 @@  discard block
 
 block discarded – undo
398 470 
 		createCookie('lastcentercoord',map.getCenter().lat+','+map.getCenter().lng+','+map.getZoom(),2);
399 471 
 	});
400 472 
 update_locationsLayer();
401 
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
473 
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
474 
+	print $globalMapRefresh*1000*2;
475 
+} else {
476 
+	print '60000';
477 
+}
478 
+?>);
402 479
403 480 
 <?php
404 481 
     // Add support for custom json via $globalMapJson
Please login to merge, or discard this patch.
js/map.3d.js.php 1 patch
Braces   +40 added lines, -13 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
 
@@ -414,8 +433,11 @@  discard block
 
 block discarded – undo
414 433 
 	if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) {
415 434 
 		if (isset($_COOKIE['lastcentercoord'])) {
416 435 
 			$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
417 
-			if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0;
418 
-			else $zoom = $lastcentercoord[3];
436 
+			if (!isset($lastcentercoord[3])) {
437 
+				$zoom = $lastcentercoord[2]*1000000.0;
438 
+			} else {
439 
+				$zoom = $lastcentercoord[3];
440 
+			}
419 441 
 			$viewcenterlatitude = $lastcentercoord[0];
420 442 
 			$viewcenterlongitude = $lastcentercoord[1];
421 443 
 		} else {
 
@@ -517,7 +539,12 @@  discard block
 
 block discarded – undo
517 539 
 }
518 540
519 541 
 update_locationsLayer();
520 
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
542 
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
543 
+	print $globalMapRefresh*1000*2;
544 
+} else {
545 
+	print '60000';
546 
+}
547 
+?>);
521 548 
 /*
522 549 
 var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false);
523 550 
 handlera.setInputAction(
Please login to merge, or discard this patch.
live-geojson.php 1 patch
Braces   +300 added lines, -117 removed lines patch added patch discarded remove patch 
@@ -48,28 +48,55 @@  discard block
 
 block discarded – undo
48 48 
 }
49 49 
 header('Content-Type: text/javascript');
50 50
51 
-if (!isset($globalJsonCompress)) $compress = true;
52 
-else $compress = $globalJsonCompress;
51 
+if (!isset($globalJsonCompress)) {
52 
+	$compress = true;
53 
+} else {
54 
+	$compress = $globalJsonCompress;
55 
+}
53 56
54 57 
 $from_archive = false;
55 58 
 $min = true;
56 59 
 $allhistory = false;
57 60 
 $filter['source'] = array();
58 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
59 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
60 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
61 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
62 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
63 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
64 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
65 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
66 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
67 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
68 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
61 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
62 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
63 
+}
64 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
65 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
66 
+}
67 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
68 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
69 
+}
70 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
71 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
72 
+}
73 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
74 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
75 
+}
76 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
77 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
78 
+}
79 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
80 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
81 
+}
82 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
83 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
84 
+}
85 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
86 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
87 
+}
88 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
89 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
90 
+}
91 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
92 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
93 
+}
69 94
70 95 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
71 96 
 	$min = true;
72 
-} else $min = false;
97 
+} else {
98 
+	$min = false;
99 
+}
73 100
74 101 
 $spotter_array = array();
75 102 
 
@@ -171,24 +198,38 @@  discard block
 
 block discarded – undo
171 198 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
172 199 
 		}
173 200 
 	}
174 
-	if ($flightcnt == '') $flightcnt = 0;
175 
-} else $flightcnt = 0;
201 
+	if ($flightcnt == '') {
202 
+		$flightcnt = 0;
203 
+	}
204 
+	} else {
205 
+	$flightcnt = 0;
206 
+}
176 207
177 208 
 $sqltime = round(microtime(true)-$begintime,2);
178 209
179 210 
 $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
180 
-if ($currenttime != '') $currenttime = round($currenttime/1000);
211 
+if ($currenttime != '') {
212 
+	$currenttime = round($currenttime/1000);
213 
+}
181 214
182 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
183 
-else $usenextlatlon = true;
184 
-if ($usenextlatlon === false) $currenttime = '';
215 
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
216 
+	$usenextlatlon = false;
217 
+} else {
218 
+	$usenextlatlon = true;
219 
+}
220 
+if ($usenextlatlon === false) {
221 
+	$currenttime = '';
222 
+}
185 223 
 $j = 0;
186 224 
 $prev_flightaware_id = '';
187 225 
 $aircrafts_shadow = array();
188 226 
 $output = '{';
189 227 
 	$output .= '"type": "FeatureCollection",';
190 
-		if ($min) $output .= '"minimal": "true",';
191 
-		else $output .= '"minimal": "false",';
228 
+		if ($min) {
229 
+			$output .= '"minimal": "true",';
230 
+		} else {
231 
+			$output .= '"minimal": "false",';
232 
+		}
192 233 
 		//$output .= '"fc": "'.$flightcnt.'",';
193 234 
 		$output .= '"sqt": "'.$sqltime.'",';
194 235 
 
@@ -232,18 +273,29 @@  discard block
 
 block discarded – undo
232 273 
 						}
233 274 
 						$output .= '"properties": {';
234 275 
 						if (isset($spotter_item['flightaware_id'])) {
235 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
236 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
276 
+							if ($compress) {
277 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
278 
+							} else {
279 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
280 
+							}
237 281 
 						} elseif (isset($spotter_item['famtrackid'])) {
238 
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
239 
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
282 
+							if ($compress) {
283 
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
284 
+							} else {
285 
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
286 
+							}
240 287 
 						} elseif (isset($spotter_item['fammarine_id'])) {
241 
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
242 
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
288 
+							if ($compress) {
289 
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
290 
+							} else {
291 
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
292 
+							}
243 293 
 						}
244 294 
 							$output .= '"fc": "'.$flightcnt.'",';
245 295 
 							$output .= '"sqt": "'.$sqltime.'",';
246 
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
296 
+							if (isset($begindate)) {
297 
+								$output .= '"archive_date": "'.$begindate.'",';
298 
+							}
247 299
248 300 
 /*
249 301 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -251,14 +303,22 @@  discard block
 
 block discarded – undo
251 303 
 */
252 304 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
253 305 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
254 
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
255 
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
306 
+							if ($compress) {
307 
+								$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
308 
+							} else {
309 
+								$output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
310 
+							}
256 311 
 							//"
257 312 
 						} else {
258 
-							if ($compress) $output .= '"c": "NA",';
259 
-							else $output .= '"callsign": "NA",';
313 
+							if ($compress) {
314 
+								$output .= '"c": "NA",';
315 
+							} else {
316 
+								$output .= '"callsign": "NA",';
317 
+							}
318 
+						}
319 
+						if (isset($spotter_item['registration'])) {
320 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
260 321 
 						}
261 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
262 322 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
263 323 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
264 324 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -271,16 +331,23 @@  discard block
 
 block discarded – undo
271 331 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
272 332 
 						}
273 333 
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker) {
274 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
275 
-							else {
334 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
335 
+								$spotter_item['aircraft_shadow'] = '';
336 
+							} else {
276 337 
 								$aircraft_icao = $spotter_item['aircraft_icao'];
277 
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
278 
-								else {
338 
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
339 
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
340 
+								} else {
279 341 
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
280 
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
281 
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
282 
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
283 
-									else $spotter_item['aircraft_shadow'] = '';
342 
+									if (count($aircraft_info) > 0) {
343 
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
344 
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
345 
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
346 
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
347 
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
348 
+									} else {
349 
+										$spotter_item['aircraft_shadow'] = '';
350 
+									}
284 351 
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
285 352 
 								}
286 353 
 							}
 
@@ -288,73 +355,139 @@  discard block
 
 block discarded – undo
288 355 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
289 356 
 							if ($tracker) {
290 357 
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
291 
-									if ($compress) $output .= '"as": "ambulance.png",';
292 
-									else $output .= '"aircraft_shadow": "ambulance.png",';
358 
+									if ($compress) {
359 
+										$output .= '"as": "ambulance.png",';
360 
+									} else {
361 
+										$output .= '"aircraft_shadow": "ambulance.png",';
362 
+									}
293 363 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
294 
-									if ($compress) $output .= '"as": "police.png",';
295 
-									else $output .= '"aircraft_shadow": "police.png",';
364 
+									if ($compress) {
365 
+										$output .= '"as": "police.png",';
366 
+									} else {
367 
+										$output .= '"aircraft_shadow": "police.png",';
368 
+									}
296 369 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
297 
-									if ($compress) $output .= '"as": "ship.png",';
298 
-									else $output .= '"aircraft_shadow": "ship.png",';
370 
+									if ($compress) {
371 
+										$output .= '"as": "ship.png",';
372 
+									} else {
373 
+										$output .= '"aircraft_shadow": "ship.png",';
374 
+									}
299 375 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
300 
-									if ($compress) $output .= '"as": "ship.png",';
301 
-									else $output .= '"aircraft_shadow": "ship.png",';
376 
+									if ($compress) {
377 
+										$output .= '"as": "ship.png",';
378 
+									} else {
379 
+										$output .= '"aircraft_shadow": "ship.png",';
380 
+									}
302 381 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
303 
-									if ($compress) $output .= '"as": "ship.png",';
304 
-									else $output .= '"aircraft_shadow": "ship.png",';
382 
+									if ($compress) {
383 
+										$output .= '"as": "ship.png",';
384 
+									} else {
385 
+										$output .= '"aircraft_shadow": "ship.png",';
386 
+									}
305 387 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
306 
-									if ($compress) $output .= '"as": "truck.png",';
307 
-									else $output .= '"aircraft_shadow": "truck.png",';
388 
+									if ($compress) {
389 
+										$output .= '"as": "truck.png",';
390 
+									} else {
391 
+										$output .= '"aircraft_shadow": "truck.png",';
392 
+									}
308 393 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
309 
-									if ($compress) $output .= '"as": "truck.png",';
310 
-									else $output .= '"aircraft_shadow": "truck.png",';
394 
+									if ($compress) {
395 
+										$output .= '"as": "truck.png",';
396 
+									} else {
397 
+										$output .= '"aircraft_shadow": "truck.png",';
398 
+									}
311 399 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
312 
-									if ($compress) $output .= '"as": "aircraft.png",';
313 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
400 
+									if ($compress) {
401 
+										$output .= '"as": "aircraft.png",';
402 
+									} else {
403 
+										$output .= '"aircraft_shadow": "aircraft.png",';
404 
+									}
314 405 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
315 
-									if ($compress) $output .= '"as": "aircraft.png",';
316 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
406 
+									if ($compress) {
407 
+										$output .= '"as": "aircraft.png",';
408 
+									} else {
409 
+										$output .= '"aircraft_shadow": "aircraft.png",';
410 
+									}
317 411 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
318 
-									if ($compress) $output .= '"as": "helico.png",';
319 
-									else $output .= '"aircraft_shadow": "helico.png",';
412 
+									if ($compress) {
413 
+										$output .= '"as": "helico.png",';
414 
+									} else {
415 
+										$output .= '"aircraft_shadow": "helico.png",';
416 
+									}
320 417 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
321 
-									if ($compress) $output .= '"as": "rail.png",';
322 
-									else $output .= '"aircraft_shadow": "rail.png",';
418 
+									if ($compress) {
419 
+										$output .= '"as": "rail.png",';
420 
+									} else {
421 
+										$output .= '"aircraft_shadow": "rail.png",';
422 
+									}
323 423 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
324 
-									if ($compress) $output .= '"as": "firetruck.png",';
325 
-									else $output .= '"aircraft_shadow": "firetruck.png",';
424 
+									if ($compress) {
425 
+										$output .= '"as": "firetruck.png",';
426 
+									} else {
427 
+										$output .= '"aircraft_shadow": "firetruck.png",';
428 
+									}
326 429 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
327 
-									if ($compress) $output .= '"as": "bus.png",';
328 
-									else $output .= '"aircraft_shadow": "bus.png",';
430 
+									if ($compress) {
431 
+										$output .= '"as": "bus.png",';
432 
+									} else {
433 
+										$output .= '"aircraft_shadow": "bus.png",';
434 
+									}
329 435 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
330 
-									if ($compress) $output .= '"as": "phone.png",';
331 
-									else $output .= '"aircraft_shadow": "phone.png",';
436 
+									if ($compress) {
437 
+										$output .= '"as": "phone.png",';
438 
+									} else {
439 
+										$output .= '"aircraft_shadow": "phone.png",';
440 
+									}
332 441 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
333 
-									if ($compress) $output .= '"as": "jogger.png",';
334 
-									else $output .= '"aircraft_shadow": "jogger.png",';
442 
+									if ($compress) {
443 
+										$output .= '"as": "jogger.png",';
444 
+									} else {
445 
+										$output .= '"aircraft_shadow": "jogger.png",';
446 
+									}
335 447 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
336 
-									if ($compress) $output .= '"as": "bike.png",';
337 
-									else $output .= '"aircraft_shadow": "bike.png",';
448 
+									if ($compress) {
449 
+										$output .= '"as": "bike.png",';
450 
+									} else {
451 
+										$output .= '"aircraft_shadow": "bike.png",';
452 
+									}
338 453 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
339 
-									if ($compress) $output .= '"as": "motorcycle.png",';
340 
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
454 
+									if ($compress) {
455 
+										$output .= '"as": "motorcycle.png",';
456 
+									} else {
457 
+										$output .= '"aircraft_shadow": "motorcycle.png",';
458 
+									}
341 459 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
342 
-									if ($compress) $output .= '"as": "balloon.png",';
343 
-									else $output .= '"aircraft_shadow": "balloon.png",';
460 
+									if ($compress) {
461 
+										$output .= '"as": "balloon.png",';
462 
+									} else {
463 
+										$output .= '"aircraft_shadow": "balloon.png",';
464 
+									}
344 465 
 								} else {
345 
-									if ($compress) $output .= '"as": "car.png",';
346 
-									else $output .= '"aircraft_shadow": "car.png",';
466 
+									if ($compress) {
467 
+										$output .= '"as": "car.png",';
468 
+									} else {
469 
+										$output .= '"aircraft_shadow": "car.png",';
470 
+									}
347 471 
 								}
348 472 
 							} elseif ($marine) {
349 
-								if ($compress) $output .= '"as": "ship.png",';
350 
-								else $output .= '"aircraft_shadow": "ship.png",';
473 
+								if ($compress) {
474 
+									$output .= '"as": "ship.png",';
475 
+								} else {
476 
+									$output .= '"aircraft_shadow": "ship.png",';
477 
+								}
351 478 
 							} else {
352 
-								if ($compress) $output .= '"as": "default.png",';
353 
-								else $output .= '"aircraft_shadow": "default.png",';
479 
+								if ($compress) {
480 
+									$output .= '"as": "default.png",';
481 
+								} else {
482 
+									$output .= '"aircraft_shadow": "default.png",';
483 
+								}
354 484 
 							}
355 485 
 						} else {
356 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
357 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
486 
+							if ($compress) {
487 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
488 
+							} else {
489 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
490 
+							}
358 491 
 						}
359 492 
 						if (isset($spotter_item['airline_name'])) {
360 493 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -362,8 +495,11 @@  discard block
 
 block discarded – undo
362 495 
 							$output .= '"airline_name": "NA",';
363 496 
 						}
364 497 
 						if (isset($spotter_item['departure_airport'])) {
365 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
366 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
498 
+							if ($compress) {
499 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
500 
+							} else {
501 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
502 
+							}
367 503 
 						}
368 504 
 						if (isset($spotter_item['departure_airport_city'])) {
369 505 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -375,8 +511,11 @@  discard block
 
 block discarded – undo
375 511 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
376 512 
 						}
377 513 
 						if (isset($spotter_item['arrival_airport'])) {
378 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
379 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
514 
+							if ($compress) {
515 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
516 
+							} else {
517 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
518 
+							}
380 519 
 						}
381 520 
 						if (isset($spotter_item['arrival_airport_city'])) {
382 521 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -395,11 +534,17 @@  discard block
 
 block discarded – undo
395 534 
 						}
396 535
397 536 
 						if (isset($spotter_item['altitude'])) {
398 
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
399 
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
537 
+							if ($compress) {
538 
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
539 
+							} else {
540 
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
541 
+							}
542 
+						}
543 
+						if ($compress) {
544 
+							$output .= '"h": "'.$spotter_item['heading'].'",';
545 
+						} else {
546 
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
400 547 
 						}
401 
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
402 
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
403 548
404 549 
 						if ($currenttime != '') {
405 550 
 							if (strtotime($spotter_item['date']) < $currenttime) {
 
@@ -421,7 +566,9 @@  discard block
 
 block discarded – undo
421 566 
 							}
422 567 
 						}
423 568
424 
-						if (!$min) $output .= '"image": "'.$image.'",';
569 
+						if (!$min) {
570 
+							$output .= '"image": "'.$image.'",';
571 
+						}
425 572 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
426 573 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
427 574 
 						}
 
@@ -429,8 +576,11 @@  discard block
 
 block discarded – undo
429 576 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
430 577 
 						}
431 578 
 						if (isset($spotter_item['squawk'])) {
432 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
433 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
579 
+							if ($compress) {
580 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
581 
+							} else {
582 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
583 
+							}
434 584 
 						}
435 585 
 						if (isset($spotter_item['squawk_usage'])) {
436 586 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -449,14 +599,23 @@  discard block
 
 block discarded – undo
449 599 
 						}
450 600 
 						// type when not aircraft ?
451 601 
 						if (isset($spotter_item['type'])) {
452 
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
453 
-							else $output .= '"type": "'.$spotter_item['type'].'"';
602 
+							if ($compress) {
603 
+								$output .= '"t": "'.$spotter_item['type'].'"';
604 
+							} else {
605 
+								$output .= '"type": "'.$spotter_item['type'].'"';
606 
+							}
454 607 
 						} elseif ($marine) {
455 
-							if ($compress) $output .= '"t": "ship"';
456 
-							else $output .= '"type": "ship"';
608 
+							if ($compress) {
609 
+								$output .= '"t": "ship"';
610 
+							} else {
611 
+								$output .= '"type": "ship"';
612 
+							}
457 613 
 						} else {
458 
-							if ($compress) $output .= '"t": "aircraft"';
459 
-							else $output .= '"type": "aircraft"';
614 
+							if ($compress) {
615 
+								$output .= '"t": "aircraft"';
616 
+							} else {
617 
+								$output .= '"type": "aircraft"';
618 
+							}
460 619 
 						}
461 620 
 						$output .= '},';
462 621 
 						$output .= '"geometry": {';
 
@@ -464,7 +623,9 @@  discard block
 
 block discarded – undo
464 623 
 								$output .= '"coordinates": [';
465 624 
 								if ($currenttime != '') {
466 625 
 									if (strtotime($spotter_item['date']) < $currenttime) {
467 
-										if (!isset($archivespeed)) $archivespeed = 1;
626 
+										if (!isset($archivespeed)) {
627 
+											$archivespeed = 1;
628 
+										}
468 629 
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed,$currenttime-strtotime($spotter_item['date']));
469 630 
 										$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
470 631 
 									} else {
 
@@ -535,7 +696,9 @@  discard block
 
 block discarded – undo
535 696 
 			}
536 697 
 */
537 698 
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
538 
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
699 
+				if ($history == '' && isset($_COOKIE['history'])) {
700 
+					$history = $_COOKIE['history'];
701 
+				}
539 702
540 703 
 				if (
541 704 
 				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -579,8 +742,11 @@  discard block
 
 block discarded – undo
579 742 
 									$output_history .= ']}},';
580 743 
 									$output .= $output_history;
581 744 
 								}
582 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
583 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
745 
+								if ($compress) {
746 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
747 
+								} else {
748 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
749 
+								}
584 750 
 							}
585 751 
 							$output_history .= '[';
586 752 
 							$output_history .=  $spotter_history['longitude'].', ';
 
@@ -599,9 +765,14 @@  discard block
 
 block discarded – undo
599 765 
 							$prev_alt = $alt;
600 766 
 						} else {
601 767 
 							if ($d == false) {
602 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
603 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
604 
-							} else $d = true;
768 
+								if ($compress) {
769 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
770 
+								} else {
771 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
772 
+								}
773 
+							} else {
774 
+								$d = true;
775 
+							}
605 776 
 							$output_history .= '[';
606 777 
 							$output_history .=  $spotter_history['longitude'].', ';
607 778 
 							$output_history .=  $spotter_history['latitude'];
 
@@ -622,7 +793,9 @@  discard block
 
 block discarded – undo
622 793 
 							$output_historyd = '[';
623 794 
 							$output_historyd .=  $spotter_item['longitude'].', ';
624 795 
 							$output_historyd .=  $spotter_item['latitude'];
625 
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
796 
+							if (isset($spotter_history['altitude'])) {
797 
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
798 
+							}
626 799 
 							$output_historyd .= '],';
627 800 
 							//$output_history = $output_historyd.$output_history;
628 801 
 							$output_history = $output_history.$output_historyd;
 
@@ -644,8 +817,11 @@  discard block
 
 block discarded – undo
644 817 
 				        && $spotter_item['arrival_airport'] != 'NA'
645 818 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
646 819 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
647 
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
648 
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
820 
+				    if ($compress) {
821 
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
822 
+				    } else {
823 
+				    	$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
824 
+				    }
649 825 
 				    if (isset($spotter_item['departure_airport_latitude'])) {
650 826 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
651 827 
 				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 
@@ -678,8 +854,11 @@  discard block
 
 block discarded – undo
678 854 
 				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
679 855 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
680 856 
 				    $havedata = false;
681 
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
682 
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
857 
+				    if ($compress) {
858 
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
859 
+				    } else {
860 
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
861 
+				    }
683 862 
 				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
684 863
685 864 
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
 
@@ -694,7 +873,9 @@  discard block
 
 block discarded – undo
694 873 
 				    }
695 874 
 				    //$output_dest  = substr($output_dest, 0, -1);
696 875 
 				    $output_dest .= ']}},';
697 
-				    if ($havedata) $output .= $output_dest;
876 
+				    if ($havedata) {
877 
+				    	$output .= $output_dest;
878 
+				    }
698 879 
 				    unset($output_dest);
699 880 
 				}
700 881 
 			}
 
@@ -702,7 +883,9 @@  discard block
 
 block discarded – undo
702 883 
 			$output .= ']';
703 884 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
704 885 
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
705 
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
886 
+			if (isset($begindate)) {
887 
+				$output .= '"archive_date": "'.$begindate.'",';
888 
+			}
706 889 
 			$output .= '"fc": "'.$j.'"';
707 890 
 		} else {
708 891 
 			$output .= '"features": ';
Please login to merge, or discard this patch.
install/index.php 1 patch
Braces   +523 added lines, -142 removed lines patch added patch discarded remove patch 
@@ -4,11 +4,19 @@  discard block
 
 block discarded – undo
4 4 
 if (isset($_SESSION['error'])) {
5 5 
 	header('Content-Encoding: none;');
6 6 
 	echo 'Error : '.$_SESSION['error'].' - Resetting install... You need to fix the problem and run install again.';
7 
-	if (isset($_SESSION['error'])) unset($_SESSION['error']);
8 
-	if (isset($_SESSION['errorlst'])) unset($_SESSION['errorlst']);
9 
-	if (isset($_SESSION['next'])) unset($_SESSION['next']);
10 
-	if (isset($_SESSION['install'])) unset($_SESSION['install']);
11 
-}
7 
+	if (isset($_SESSION['error'])) {
8 
+		unset($_SESSION['error']);
9 
+	}
10 
+	if (isset($_SESSION['errorlst'])) {
11 
+		unset($_SESSION['errorlst']);
12 
+	}
13 
+	if (isset($_SESSION['next'])) {
14 
+		unset($_SESSION['next']);
15 
+	}
16 
+	if (isset($_SESSION['install'])) {
17 
+		unset($_SESSION['install']);
18 
+	}
19 
+	}
12 20 
 /*
13 21 
 if (isset($_SESSION['errorlst'])) {
14 22 
 	header('Content-Encoding: none;');
 
@@ -156,45 +164,72 @@  discard block
 
 block discarded – undo
156 164 
 			</div>
157 165 
 			<p>
158 166 
 				<label for="dbhost">Database hostname</label>
159 
-				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" />
167 
+				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) {
168 
+	print $globalDBhost;
169 
+}
170 
+?>" />
160 171 
 			</p>
161 172 
 			<p>
162 173 
 				<label for="dbport">Database port</label>
163 
-				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" />
174 
+				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) {
175 
+	print $globalDBport;
176 
+}
177 
+?>" />
164 178 
 				<p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p>
165 179 
 			</p>
166 180 
 			<p>
167 181 
 				<label for="dbname">Database name</label>
168 
-				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" />
182 
+				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) {
183 
+	print $globalDBname;
184 
+}
185 
+?>" />
169 186 
 			</p>
170 187 
 			<p>
171 188 
 				<label for="dbuser">Database user</label>
172 
-				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" />
189 
+				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) {
190 
+	print $globalDBuser;
191 
+}
192 
+?>" />
173 193 
 			</p>
174 194 
 			<p>
175 195 
 				<label for="dbuserpass">Database user password</label>
176 
-				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" />
196 
+				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) {
197 
+	print $globalDBpass;
198 
+}
199 
+?>" />
177 200 
 			</p>
178 201 
 		</fieldset>
179 202 
 		<fieldset id="site">
180 203 
 			<legend>Site configuration</legend>
181 204 
 			<p>
182 205 
 				<label for="sitename">Site name</label>
183 
-				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" />
206 
+				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) {
207 
+	print $globalName;
208 
+}
209 
+?>" />
184 210 
 			</p>
185 211 
 			<p>
186 212 
 				<label for="siteurl">Site directory</label>
187 
-				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
213 
+				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) {
214 
+	print $globalURL;
215 
+}
216 
+?>" />
188 217 
 				<p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
189 218 
 			</p>
190 219 
 			<p>
191 220 
 				<label for="timezone">Timezone</label>
192 
-				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" />
221 
+				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) {
222 
+	print $globalTimezone;
223 
+}
224 
+?>" />
193 225 
 				<p class="help-block">ex : UTC, Europe/Paris,...</p>
194 226 
 			</p>
195 227 
 			<p>
196 228 
 				<label for="language">Language</label>
197 
-				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" />
229 
+				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) {
230 
+	print $globalLanguage;
231 
+}
232 
+?>" />
198 233 
 				<p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p>
199 234 
 			</p>
200 235 
 		</fieldset>
 
@@ -215,11 +250,17 @@  discard block
 
 block discarded – undo
215 250 
 			<div id="mapbox_data">
216 251 
 				<p>
217 252 
 					<label for="mapboxid">Mapbox id</label>
218 
-					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" />
253 
+					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) {
254 
+	print $globalMapboxId;
255 
+}
256 
+?>" />
219 257 
 				</p>
220 258 
 				<p>
221 259 
 					<label for="mapboxtoken">Mapbox token</label>
222 
-					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" />
260 
+					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) {
261 
+	print $globalMapboxToken;
262 
+}
263 
+?>" />
223 264 
 				</p>
224 265 
 				<p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p>
225 266 
 			</div>
 
@@ -227,7 +268,10 @@  discard block
 
 block discarded – undo
227 268 
 			<div id="google_data">
228 269 
 				<p>
229 270 
 					<label for="googlekey">Google API key</label>
230 
-					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" />
271 
+					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) {
272 
+	print $globalGoogleAPIKey;
273 
+}
274 
+?>" />
231 275 
 					<p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p>
232 276 
 				</p>
233 277 
 			</div>
 
@@ -235,7 +279,10 @@  discard block
 
 block discarded – undo
235 279 
 			<div id="bing_data">
236 280 
 				<p>
237 281 
 					<label for="bingkey">Bing Map key</label>
238 
-					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" />
282 
+					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) {
283 
+	print $globalBingMapKey;
284 
+}
285 
+?>" />
239 286 
 					<p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p>
240 287 
 				</p>
241 288 
 			</div>
 
@@ -243,7 +290,10 @@  discard block
 
 block discarded – undo
243 290 
 			<div id="mapquest_data">
244 291 
 				<p>
245 292 
 					<label for="mapquestkey">MapQuest key</label>
246 
-					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" />
293 
+					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) {
294 
+	print $globalMapQuestKey;
295 
+}
296 
+?>" />
247 297 
 					<p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p>
248 298 
 				</p>
249 299 
 			</div>
 
@@ -251,11 +301,17 @@  discard block
 
 block discarded – undo
251 301 
 			<div id="here_data">
252 302 
 				<p>
253 303 
 					<label for="hereappid">Here App_Id</label>
254 
-					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" />
304 
+					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) {
305 
+	print $globalHereappId;
306 
+}
307 
+?>" />
255 308 
 				</p>
256 309 
 				<p>
257 310 
 					<label for="hereappcode">Here App_Code</label>
258 
-					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" />
311 
+					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) {
312 
+	print $globalHereappCode;
313 
+}
314 
+?>" />
259 315 
 				</p>
260 316 
 				<p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p>
261 317 
 			</div>
 
@@ -263,7 +319,10 @@  discard block
 
 block discarded – undo
263 319 
 			<div id="openweathermap_data">
264 320 
 				<p>
265 321 
 					<label for="openweathermapkey">OpenWeatherMap key (weather layer)</label>
266 
-					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) print $globalOpenWeatherMapKey; ?>" />
322 
+					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) {
323 
+	print $globalOpenWeatherMapKey;
324 
+}
325 
+?>" />
267 326 
 					<p class="help-block">Get a key <a href="https://openweathermap.org/">here</a></p>
268 327 
 				</p>
269 328 
 			</div>
 
@@ -273,42 +332,86 @@  discard block
 
 block discarded – undo
273 332 
 			<legend>Coverage area</legend>
274 333 
 			<p>
275 334 
 				<label for="latitudemax">The maximum latitude (north)</label>
276 
-				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" />
335 
+				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) {
336 
+	print $globalLatitudeMax;
337 
+}
338 
+?>" />
277 339 
 			</p>
278 340 
 			<p>
279 341 
 				<label for="latitudemin">The minimum latitude (south)</label>
280 
-				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" />
342 
+				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) {
343 
+	print $globalLatitudeMin;
344 
+}
345 
+?>" />
281 346 
 			</p>
282 347 
 			<p>
283 348 
 				<label for="longitudemax">The maximum longitude (west)</label>
284 
-				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" />
349 
+				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) {
350 
+	print $globalLongitudeMax;
351 
+}
352 
+?>" />
285 353 
 			</p>
286 354 
 			<p>
287 355 
 				<label for="longitudemin">The minimum longitude (east)</label>
288 
-				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" />
356 
+				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) {
357 
+	print $globalLongitudeMin;
358 
+}
359 
+?>" />
289 360 
 			</p>
290 361 
 			<p>
291 362 
 				<label for="latitudecenter">The latitude center</label>
292 
-				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" />
363 
+				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) {
364 
+	print $globalCenterLatitude;
365 
+}
366 
+?>" />
293 367 
 			</p>
294 368 
 			<p>
295 369 
 				<label for="longitudecenter">The longitude center</label>
296 
-				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" />
370 
+				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) {
371 
+	print $globalCenterLongitude;
372 
+}
373 
+?>" />
297 374 
 			</p>
298 375 
 			<p>
299 376 
 				<label for="livezoom">Default Zoom on live map</label>
300 
-				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" />
377 
+				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) {
378 
+	print $globalLiveZoom;
379 
+} else {
380 
+	print '9';
381 
+}
382 
+?>" />
301 383 
 			</p>
302 384 
 			<p>
303 385 
 				<label for="squawk_country">Country for squawk usage</label>
304 386 
 				<select name="squawk_country" id="squawk_country">
305 
-					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option>
306 
-					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option>
307 
-					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option>
308 
-					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option>
309 
-					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option>
310 
-					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option>
311 
-					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option>
387 
+					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') {
388 
+	print ' selected ';
389 
+}
390 
+?>>UK</option>
391 
+					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') {
392 
+	print ' selected ';
393 
+}
394 
+?>>NZ</option>
395 
+					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') {
396 
+	print ' selected ';
397 
+}
398 
+?>>US</option>
399 
+					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') {
400 
+	print ' selected ';
401 
+}
402 
+?>>AU</option>
403 
+					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') {
404 
+	print ' selected ';
405 
+}
406 
+?>>NL</option>
407 
+					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') {
408 
+	print ' selected ';
409 
+}
410 
+?>>FR</option>
411 
+					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') {
412 
+	print ' selected ';
413 
+}
414 
+?>>TR</option>
312 415 
 				</select>
313 416 
 			</p>
314 417 
 		</fieldset>
 
@@ -317,15 +420,24 @@  discard block
 
 block discarded – undo
317 420 
 			<p><i>Only put in DB flights that are inside a circle</i></p>
318 421 
 			<p>
319 422 
 				<label for="latitude">Center latitude</label>
320 
-				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" />
423 
+				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) {
424 
+	echo $globalDistanceIgnore['latitude'];
425 
+}
426 
+?>" />
321 427 
 			</p>
322 428 
 			<p>
323 429 
 				<label for="longitude">Center longitude</label>
324 
-				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" />
430 
+				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) {
431 
+	echo $globalDistanceIgnore['longitude'];
432 
+}
433 
+?>" />
325 434 
 			</p>
326 435 
 			<p>
327 436 
 				<label for="Distance">Distance (in km)</label>
328 
-				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" />
437 
+				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) {
438 
+	echo $globalDistanceIgnore['distance'];
439 
+}
440 
+?>" />
329 441 
 			</p>
330 442 
 		</fieldset>
331 443 
 		<fieldset id="sourceloc">
 
@@ -438,11 +550,17 @@  discard block
 
 block discarded – undo
438 550 
 			<div id="flightaware_data">
439 551 
 				<p>
440 552 
 					<label for="flightawareusername">FlightAware username</label>
441 
-					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
553 
+					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
554 
+	print $globalFlightAwareUsername;
555 
+}
556 
+?>" />
442 557 
 				</p>
443 558 
 				<p>
444 559 
 					<label for="flightawarepassword">FlightAware password/API key</label>
445 
-					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
560 
+					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
561 
+	print $globalFlightAwarePassword;
562 
+}
563 
+?>" />
446 564 
 				</p>
447 565 
 			</div>
448 566 
 -->
 
@@ -484,7 +602,10 @@  discard block
 
 block discarded – undo
484 602 
 								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
485 603 
 								?>
486 604 
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
487 
-								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
605 
+								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) {
606 
+	print $source['port'];
607 
+}
608 
+?>" /></td>
488 609 
 								<?php
489 610 
 								    } else {
490 611 
 									$hostport = explode(':',$source['host']);
 
@@ -503,34 +624,106 @@  discard block
 
 block discarded – undo
503 624 
 								?>
504 625 
 								<td>
505 626 
 									<select name="format[]" id="format">
506 
-										<option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option>
507 
-										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option>
508 
-										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option>
509 
-										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option>
510 
-										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option>
511 
-										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option>
512 
-										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option>
513 
-										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option>
514 
-										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option>
515 
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
516 
-										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>Virtual Airline Operations System (VAOS)</option>
517 
-										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option>
518 
-										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option>
519 
-										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option>
520 
-										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
521 
-										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
522 
-										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option>
523 
-										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option>
524 
-										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option>
525 
-										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') print 'selected'; ?>>HidnSeek Callback</option>
526 
-										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') print 'selected'; ?>>Blitzortung</option>
627 
+										<option value="auto" <?php if (!isset($source['format'])) {
628 
+	print 'selected';
629 
+}
630 
+?>>Auto</option>
631 
+										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') {
632 
+	print 'selected';
633 
+}
634 
+?>>SBS</option>
635 
+										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') {
636 
+	print 'selected';
637 
+}
638 
+?>>TSV</option>
639 
+										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') {
640 
+	print 'selected';
641 
+}
642 
+?>>Raw</option>
643 
+										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') {
644 
+	print 'selected';
645 
+}
646 
+?>>APRS</option>
647 
+										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') {
648 
+	print 'selected';
649 
+}
650 
+?>>Radarcape deltadb.txt</option>
651 
+										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') {
652 
+	print 'selected';
653 
+}
654 
+?>>Vatsim</option>
655 
+										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') {
656 
+	print 'selected';
657 
+}
658 
+?>>Virtual Radar Server AircraftList.json</option>
659 
+										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') {
660 
+	print 'selected';
661 
+}
662 
+?>>Virtual Radar Server TCP</option>
663 
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
664 
+	print 'selected';
665 
+}
666 
+?>>phpVMS</option>
667 
+										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
668 
+	print 'selected';
669 
+}
670 
+?>>Virtual Airline Operations System (VAOS)</option>
671 
+										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') {
672 
+	print 'selected';
673 
+}
674 
+?>>Virtual Airlines Manager</option>
675 
+										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') {
676 
+	print 'selected';
677 
+}
678 
+?>>IVAO</option>
679 
+										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') {
680 
+	print 'selected';
681 
+}
682 
+?>>FlightGear Multiplayer</option>
683 
+										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') {
684 
+	print 'selected';
685 
+}
686 
+?>>FlightGear Singleplayer</option>
687 
+										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') {
688 
+	print 'selected';
689 
+}
690 
+?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
691 
+										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') {
692 
+	print 'selected';
693 
+}
694 
+?>>ACARS SBS-3 over TCP</option>
695 
+										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') {
696 
+	print 'selected';
697 
+}
698 
+?>>NMEA AIS over TCP</option>
699 
+										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') {
700 
+	print 'selected';
701 
+}
702 
+?>>AirWhere website</option>
703 
+										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') {
704 
+	print 'selected';
705 
+}
706 
+?>>HidnSeek Callback</option>
707 
+										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') {
708 
+	print 'selected';
709 
+}
710 
+?>>Blitzortung</option>
527 711 
 									</select>
528 712 
 								</td>
529 713 
 								<td>
530 
-									<input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" />
714 
+									<input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) {
715 
+	print $source['name'];
716 
+}
717 
+?>" />
531 718 
 								</td>
532 
-								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td>
533 
-								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></td>
719 
+								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) {
720 
+	print 'checked';
721 
+}
722 
+?> /></td>
723 
+								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) {
724 
+	print 'checked';
725 
+}
726 
+?> /></td>
534 727 
 								<td>
535 728 
 									<select name="timezones[]" id="timezones">
536 729 
 								<?php
 
@@ -540,7 +733,9 @@  discard block
 
 block discarded – undo
540 733 
 											print '<option selected>'.$timezones.'</option>';
541 734 
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
542 735 
 											print '<option selected>'.$timezones.'</option>';
543 
-										} else print '<option>'.$timezones.'</option>';
736 
+										} else {
737 
+											print '<option>'.$timezones.'</option>';
738 
+										}
544 739 
 									}
545 740 
 								?>
546 741 
 									</select>
 
@@ -591,7 +786,9 @@  discard block
 
 block discarded – undo
591 786 
 									foreach($timezonelist as $timezones){
592 787 
 										if ($timezones == 'UTC') {
593 788 
 											print '<option selected>'.$timezones.'</option>';
594 
-										} else print '<option>'.$timezones.'</option>';
789 
+										} else {
790 
+											print '<option>'.$timezones.'</option>';
791 
+										}
595 792 
 									}
596 793 
 								?>
597 794 
 									</select>
 
@@ -614,11 +811,17 @@  discard block
 
 block discarded – undo
614 811 
 					<p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p>
615 812 
 					<p>
616 813 
 						<label for="acarshost">ACARS UDP host</label>
617 
-						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" />
814 
+						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) {
815 
+	print $globalACARSHost;
816 
+}
817 
+?>" />
618 818 
 					</p>
619 819 
 					<p>
620 820 
 						<label for="acarsport">ACARS UDP port</label>
621 
-						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" />
821 
+						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) {
822 
+	print $globalACARSPort;
823 
+}
824 
+?>" />
622 825 
 					</p>
623 826 
 				</fieldset>
624 827 
 			</div>
 
@@ -721,13 +924,19 @@  discard block
 
 block discarded – undo
721 924 
 			<div id="schedules_options">
722 925 
 				<p>
723 926 
 					<label for="britishairways">British Airways API Key</label>
724 
-					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" />
927 
+					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) {
928 
+	print $globalBritishAirwaysKey;
929 
+}
930 
+?>" />
725 931 
 					<p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p>
726 932 
 				</p>
727 933 
 				<!--
728 934 
 				<p>
729 935 
 					<label for="transavia">Transavia Test API Consumer Key</label>
730 
-					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" />
936 
+					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) {
937 
+	print $globalTransaviaKey;
938 
+}
939 
+?>" />
731 940 
 					<p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p>
732 941 
 				</p>
733 942 
 				-->
 
@@ -736,10 +945,16 @@  discard block
 
 block discarded – undo
736 945 
 						<b>Lufthansa API Key</b>
737 946 
 						<p>
738 947 
 							<label for="lufthansakey">Key</label>
739 
-							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" />
948 
+							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) {
949 
+	print $globalLufthansaKey['key'];
950 
+}
951 
+?>" />
740 952 
 						</p><p>
741 953 
 							<label for="lufthansasecret">Secret</label>
742 
-							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" />
954 
+							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) {
955 
+	print $globalLufthansaKey['secret'];
956 
+}
957 
+?>" />
743 958 
 						</p>
744 959 
 					</div>
745 960 
 					<p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p>
 
@@ -759,7 +974,10 @@  discard block
 
 block discarded – undo
759 974 
 			</p>
760 975 
 			<p>
761 976 
 				<label for="notamsource">URL of your feed from notaminfo.com</label>
762 
-				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" />
977 
+				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) {
978 
+	print $globalNOTAMSource;
979 
+}
980 
+?>" />
763 981 
 				<p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p>
764 982 
 			</p>
765 983 
 			<br />
 
@@ -775,14 +993,20 @@  discard block
 
 block discarded – undo
775 993 
 			<div id="metarsrc">
776 994 
 				<p>
777 995 
 					<label for="metarsource">URL of your METAR source</label>
778 
-					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" />
996 
+					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) {
997 
+	print $globalMETARurl;
998 
+}
999 
+?>" />
779 1000 
 					<p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p>
780 1001 
 				</p>
781 1002 
 			</div>
782 1003 
 			<br />
783 1004 
 			<p>
784 1005 
 				<label for="bitly">Bit.ly access token api (used in search page)</label>
785 
-				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" />
1006 
+				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) {
1007 
+	print $globalBitlyAccessToken;
1008 
+}
1009 
+?>" />
786 1010 
 			</p>
787 1011 
 			<br />
788 1012 
 			<p>
 
@@ -798,11 +1022,26 @@  discard block
 
 block discarded – undo
798 1022 
 			<p>
799 1023 
 				<label for="geoid_source">Geoid Source</label>
800 1024 
 				<select name="geoid_source" id="geoid_source">
801 
-					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') print ' selected="selected"'; ?>>EGM96 15' (2.1MB)</option>
802 
-					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') print ' selected="selected"'; ?>>EGM96 5' (19MB)</option>
803 
-					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') print ' selected="selected"'; ?>>EGM2008 5' (19MB)</option>
804 
-					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') print ' selected="selected"'; ?>>EGM2008 2.5' (75MB)</option>
805 
-					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') print ' selected="selected"'; ?>>EGM2008 1' (470MB)</option>
1025 
+					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') {
1026 
+	print ' selected="selected"';
1027 
+}
1028 
+?>>EGM96 15' (2.1MB)</option>
1029 
+					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') {
1030 
+	print ' selected="selected"';
1031 
+}
1032 
+?>>EGM96 5' (19MB)</option>
1033 
+					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') {
1034 
+	print ' selected="selected"';
1035 
+}
1036 
+?>>EGM2008 5' (19MB)</option>
1037 
+					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') {
1038 
+	print ' selected="selected"';
1039 
+}
1040 
+?>>EGM2008 2.5' (75MB)</option>
1041 
+					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') {
1042 
+	print ' selected="selected"';
1043 
+}
1044 
+?>>EGM2008 1' (470MB)</option>
806 1045 
 				</select>
807 1046 
 				<p class="help-block">The geoid is approximated by an "earth gravity model" (EGM).</p>
808 1047 
 			</p>
 
@@ -824,7 +1063,12 @@  discard block
 
 block discarded – undo
824 1063 
 			</p>
825 1064 
 			<p>
826 1065 
 				<label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label>
827 
-				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '1'; ?>" />
1066 
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
1067 
+	print $globalArchiveMonths;
1068 
+} else {
1069 
+	echo '1';
1070 
+}
1071 
+?>" />
828 1072 
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
829 1073 
 			</p>
830 1074 
 			<p>
 
@@ -834,12 +1078,22 @@  discard block
 
 block discarded – undo
834 1078 
 			</p>
835 1079 
 			<p>
836 1080 
 				<label for="archivekeepmonths">Keep flights data for xx months in archive</label>
837 
-				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '1'; ?>" />
1081 
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
1082 
+	print $globalArchiveKeepMonths;
1083 
+} else {
1084 
+	echo '1';
1085 
+}
1086 
+?>" />
838 1087 
 				<p class="help-block">0 to disable</p>
839 1088 
 			</p>
840 1089 
 			<p>
841 1090 
 				<label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label>
842 
-				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '1'; ?>" />
1091 
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
1092 
+	print $globalArchiveKeepTrackMonths;
1093 
+} else {
1094 
+	echo '1';
1095 
+}
1096 
+?>" />
843 1097 
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
844 1098 
 			</p>
845 1099 
 			<br />
 
@@ -849,7 +1103,12 @@  discard block
 
 block discarded – undo
849 1103 
 				<p class="help-block">Uncheck if the script is running as cron job</p>
850 1104 
 				<div id="cronends">
851 1105 
 					<label for="cronend">Run script for xx seconds</label>
852 
-					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" />
1106 
+					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) {
1107 
+	print $globalCronEnd;
1108 
+} else {
1109 
+	print '0';
1110 
+}
1111 
+?>" />
853 1112 
 					<p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p>
854 1113 
 				</div>
855 1114 
 			</p>
 
@@ -902,15 +1161,30 @@  discard block
 
 block discarded – undo
902 1161 
 			<br />
903 1162 
 			<p>
904 1163 
 				<label for="refresh">Show flights detected since xxx seconds</label>
905 
-				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" />
1164 
+				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) {
1165 
+	echo $globalLiveInterval;
1166 
+} else {
1167 
+	echo '200';
1168 
+}
1169 
+?>" />
906 1170 
 			</p>
907 1171 
 			<p>
908 1172 
 				<label for="maprefresh">Live map refresh (in seconds)</label>
909 
-				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" />
1173 
+				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) {
1174 
+	echo $globalMapRefresh;
1175 
+} else {
1176 
+	echo '30';
1177 
+}
1178 
+?>" />
910 1179 
 			</p>
911 1180 
 			<p>
912 1181 
 				<label for="mapidle">Map idle timeout (in minutes)</label>
913 
-				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" />
1182 
+				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) {
1183 
+	echo $globalMapIdleTimeout;
1184 
+} else {
1185 
+	echo '30';
1186 
+}
1187 
+?>" />
914 1188 
 				<p class="help-block">0 to disable</p>
915 1189 
 			</p>
916 1190 
 			<p>
 
@@ -925,12 +1199,20 @@  discard block
 
 block discarded – undo
925 1199 
 			<br />
926 1200 
 			<p>
927 1201 
 				<label for="closestmindist">Distance to airport set as arrival (in km)</label>
928 
-				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" />
1202 
+				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) {
1203 
+	echo $globalClosestMinDist;
1204 
+} else {
1205 
+	echo '50';
1206 
+}
1207 
+?>" />
929 1208 
 			</p>
930 1209 
 			<br />
931 1210 
 			<p>
932 1211 
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
933 
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
1212 
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) {
1213 
+	echo $globalAircraftSize;
1214 
+}
1215 
+?>" />
934 1216 
 			</p>
935 1217 
 			<br />
936 1218 
 			<p>
 
@@ -943,7 +1225,12 @@  discard block
 
 block discarded – undo
943 1225 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
944 1226 
 			?>
945 1227 
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
946 
-				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
1228 
+				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) {
1229 
+	echo $globalAircraftIconColor;
1230 
+} else {
1231 
+	echo '1a3151';
1232 
+}
1233 
+?>" />
947 1234 
 			<?php
948 1235 
 				if (!is_writable('../cache')) {
949 1236 
 			?>
 
@@ -961,14 +1248,27 @@  discard block
 
 block discarded – undo
961 1248 
 			<p>
962 1249 
 				<label for="airportzoom">Zoom level minimum to see airports icons</label>
963 1250 
 				<div class="range">
964 
-					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" />
965 
-					<output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output>
1251 
+					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) {
1252 
+	echo $globalAirportZoom;
1253 
+} else {
1254 
+	echo '7';
1255 
+}
1256 
+?>" />
1257 
+					<output id="range"><?php if (isset($globalAirportZoom)) {
1258 
+	echo $globalAirportZoom;
1259 
+} else {
1260 
+	echo '7';
1261 
+}
1262 
+?></output>
966 1263 
 				</div>
967 1264 
 			</p>
968 1265 
 			<br />
969 1266 
 			<p>
970 1267 
 				<label for="customcss">Custom CSS web path</label>
971 
-				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) echo $globalCustomCSS; ?>" />
1268 
+				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) {
1269 
+	echo $globalCustomCSS;
1270 
+}
1271 
+?>" />
972 1272 
 			</p>
973 1273 
 		</fieldset>
974 1274 
 		<input type="submit" name="submit" value="Create/Update database & write setup" />
 
@@ -995,8 +1295,12 @@  discard block
 
 block discarded – undo
995 1295 
 	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
996 1296 
 	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
997 1297
998 
-	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
999 
-	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
1298 
+	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) {
1299 
+		$error .= 'Mysql driver for PDO must be loaded';
1300 
+	}
1301 
+	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) {
1302 
+		$error .= 'PosgreSQL driver for PDO must be loaded';
1303 
+	}
1000 1304
1001 1305 
 	$_SESSION['database_root'] = $dbroot;
1002 1306 
 	$_SESSION['database_rootpass'] = $dbrootpass;
 
@@ -1064,15 +1368,23 @@  discard block
 
 block discarded – undo
1064 1368 
 	$source_city = $_POST['source_city'];
1065 1369 
 	$source_country = $_POST['source_country'];
1066 1370 
 	$source_ref = $_POST['source_ref'];
1067 
-	if (isset($source_id)) $source_id = $_POST['source_id'];
1068 
-	else $source_id = array();
1371 
+	if (isset($source_id)) {
1372 
+		$source_id = $_POST['source_id'];
1373 
+	} else {
1374 
+		$source_id = array();
1375 
+	}
1069 1376
1070 1377 
 	$sources = array();
1071 1378 
 	foreach ($source_name as $keys => $name) {
1072 
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
1073 
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
1379 
+	    if (isset($source_id[$keys])) {
1380 
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
1381 
+	    } else {
1382 
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
1383 
+	    }
1384 
+	}
1385 
+	if (count($sources) > 0) {
1386 
+		$_SESSION['sources'] = $sources;
1074 1387 
 	}
1075 
-	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1076 1388
1077 1389 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
1078 1390 
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
 
@@ -1093,17 +1405,29 @@  discard block
 
 block discarded – undo
1093 1405 
 	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1094 1406
1095 1407 
 	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1096 
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1097 
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1408 
+	if ($globalaircraft == 'aircraft') {
1409 
+		$settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1410 
+	} else {
1411 
+		$settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1412 
+	}
1098 1413 
 	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1099 
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1100 
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1414 
+	if ($globaltracker == 'tracker') {
1415 
+		$settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1416 
+	} else {
1417 
+		$settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1418 
+	}
1101 1419 
 	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1102 
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1103 
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1420 
+	if ($globalmarine == 'marine') {
1421 
+		$settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1422 
+	} else {
1423 
+		$settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1424 
+	}
1104 1425 
 	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1105 
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1106 
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1426 
+	if ($globalsatellite == 'satellite') {
1427 
+		$settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1428 
+	} else {
1429 
+		$settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1430 
+	}
1107 1431
1108 1432 
 /*
1109 1433 
 	$globalSBS1Hosts = array();
 
@@ -1125,23 +1449,37 @@  discard block
 
 block discarded – undo
1125 1449 
 	$name = $_POST['name'];
1126 1450 
 	$format = $_POST['format'];
1127 1451 
 	$timezones = $_POST['timezones'];
1128 
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
1129 
-	else $sourcestats = array();
1130 
-	if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive'];
1131 
-	else $noarchive = array();
1452 
+	if (isset($_POST['sourcestats'])) {
1453 
+		$sourcestats = $_POST['sourcestats'];
1454 
+	} else {
1455 
+		$sourcestats = array();
1456 
+	}
1457 
+	if (isset($_POST['noarchive'])) {
1458 
+		$noarchive = $_POST['noarchive'];
1459 
+	} else {
1460 
+		$noarchive = array();
1461 
+	}
1132 1462 
 	$gSources = array();
1133 1463 
 	$forcepilots = false;
1134 1464 
 	foreach ($host as $key => $h) {
1135 
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
1136 
-		else $cov = 'FALSE';
1137 
-		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1138 
-		else $arch = 'FALSE';
1465 
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
1466 
+			$cov = 'TRUE';
1467 
+		} else {
1468 
+			$cov = 'FALSE';
1469 
+		}
1470 
+		if (isset($noarchive[$key]) && $noarchive[$key] == 1) {
1471 
+			$arch = 'TRUE';
1472 
+		} else {
1473 
+			$arch = 'FALSE';
1474 
+		}
1139 1475 
 		if (strpos($format[$key],'_callback')) {
1140 1476 
 			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1141 1477 
 		} elseif ($h != '' || $name[$key] != '') {
1142 1478 
 			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1143 1479 
 		}
1144 
-		if ($format[$key] == 'airwhere') $forcepilots = true;
1480 
+		if ($format[$key] == 'airwhere') {
1481 
+			$forcepilots = true;
1482 
+		}
1145 1483 
 	}
1146 1484 
 	$settings = array_merge($settings,array('globalSources' => $gSources));
1147 1485 
 
@@ -1172,7 +1510,9 @@  discard block
 
 block discarded – undo
1172 1510 
 	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1173 1511 
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1174 1512 
 		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1175 
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1513 
+	} else {
1514 
+		$settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1515 
+	}
1176 1516
1177 1517 
 	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1178 1518 
 	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
 
@@ -1211,7 +1551,9 @@  discard block
 
 block discarded – undo
1211 1551
1212 1552 
 	// Create in settings.php keys not yet configurable if not already here
1213 1553 
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1214 
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1554 
+	if (!isset($globalDebug)) {
1555 
+		$settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1556 
+	}
1215 1557
1216 1558 
 	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1217 1559 
 	if ($resetyearstats == 'resetyearstats') {
 
@@ -1254,37 +1596,56 @@  discard block
 
 block discarded – undo
1254 1596 
 	}
1255 1597 
 */
1256 1598 
 	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1257 
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1258 
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1259 
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1260 
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1599 
+	if ($globalsbs == 'sbs') {
1600 
+		$settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1601 
+	} else {
1602 
+		$settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1603 
+	}
1604 
+	if ($globalaprs == 'aprs') {
1605 
+		$settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1606 
+	} else {
1607 
+		$settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1608 
+	}
1261 1609 
 	$va = false;
1262 1610 
 	if ($globalivao == 'ivao') {
1263 1611 
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1264 1612 
 		$va = true;
1265 
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1613 
+	} else {
1614 
+		$settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1615 
+	}
1266 1616 
 	if ($globalvatsim == 'vatsim') {
1267 1617 
 		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1268 1618 
 		$va = true;
1269 
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1619 
+	} else {
1620 
+		$settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1621 
+	}
1270 1622 
 	if ($globalphpvms == 'phpvms') {
1271 1623 
 		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1272 1624 
 		$va = true;
1273 
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1625 
+	} else {
1626 
+		$settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1627 
+	}
1274 1628 
 	if ($globalvam == 'vam') {
1275 1629 
 		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1276 1630 
 		$va = true;
1277 
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1631 
+	} else {
1632 
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1633 
+	}
1278 1634 
 	if ($va) {
1279 1635 
 		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1280 
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1636 
+	} else {
1637 
+		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1638 
+	}
1281 1639 
 	if ($globalva == 'va' || $va) {
1282 1640 
 		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1283 1641 
 		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1284 1642 
 	} else {
1285 1643 
 		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1286 
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1287 
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1644 
+		if ($forcepilots) {
1645 
+			$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1646 
+		} else {
1647 
+			$settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1648 
+		}
1288 1649 
 	}
1289 1650
1290 1651 
 	
@@ -1478,7 +1839,9 @@  discard block
 
 block discarded – undo
1478 1839 
 		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1479 1840 
 	}
1480 1841
1481 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1842 
+	if (!isset($globalTransaction)) {
1843 
+		$settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1844 
+	}
1482 1845
1483 1846 
 	// Set some defaults values...
1484 1847 
 	if (!isset($globalAircraftImageSources)) {
 
@@ -1493,15 +1856,23 @@  discard block
 
 block discarded – undo
1493 1856
1494 1857 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1495 1858
1496 
-	if ($error == '') settings::modify_settings($settings);
1497 
-	if ($error == '') settings::comment_settings($settings_comment);
1859 
+	if ($error == '') {
1860 
+		settings::modify_settings($settings);
1861 
+	}
1862 
+	if ($error == '') {
1863 
+		settings::comment_settings($settings_comment);
1864 
+	}
1498 1865 
 	if ($error != '') {
1499 1866 
 		print '<div class="info column">'.$error.'</div>';
1500 1867 
 		require('../footer.php');
1501 1868 
 		exit;
1502 1869 
 	} else {
1503 
-		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1;
1504 
-		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1;
1870 
+		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') {
1871 
+			$_SESSION['waypoints'] = 1;
1872 
+		}
1873 
+		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') {
1874 
+			$_SESSION['owner'] = 1;
1875 
+		}
1505 1876 
 		if (isset($_POST['createdb'])) {
1506 1877 
 			$_SESSION['install'] = 'database_create';
1507 1878 
 		} else {
 
@@ -1538,10 +1909,18 @@  discard block
 
 block discarded – undo
1538 1909 
 	$popw = false;
1539 1910 
 	foreach ($_SESSION['done'] as $done) {
1540 1911 
 	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1541 
-	    if ($done == 'Create database') $pop = true;
1542 
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
1543 
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
1544 
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
1912 
+	    if ($done == 'Create database') {
1913 
+	    	$pop = true;
1914 
+	    }
1915 
+	    if ($_SESSION['install'] == 'database_create') {
1916 
+	    	$pop = true;
1917 
+	    }
1918 
+	    if ($_SESSION['install'] == 'database_import') {
1919 
+	    	$popi = true;
1920 
+	    }
1921 
+	    if ($_SESSION['install'] == 'waypoints') {
1922 
+	    	$popw = true;
1923 
+	    }
1545 1924 
 	}
1546 1925 
 	if ($pop) {
1547 1926 
 	    sleep(5);
 
@@ -1552,7 +1931,9 @@  discard block
 
 block discarded – undo
1552 1931 
 	} else if ($popw) {
1553 1932 
 	    sleep(5);
1554 1933 
 	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
1555 
-	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1934 
+	} else {
1935 
+		print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1936 
+	}
1556 1937 
 	print '</div></ul>';
1557 1938 
 	print '<div id="error"></div>';
1558 1939 
 /*	foreach ($_SESSION['done'] as $done) {
Please login to merge, or discard this patch.
airline-statistics-registration.php 1 patch
Braces   +7 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -43,7 +43,9 @@  discard block
 
 block discarded – undo
43 43 
 	}
44 44 
 	$Stats = new Stats($Spotter->db);
45 45 
 	$airline_names = $Stats->getAllAirlineNames();
46 
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
46 
+	if (empty($airline_names)) {
47 
+		$airline_names = $Spotter->getAllAirlineNames();
48 
+	}
47 49 
 	foreach($airline_names as $airline_name)
48 50 
 	{
49 51 
 		if($airline == $airline_name['airline_icao'])
 
@@ -66,8 +68,7 @@  discard block
 
 block discarded – undo
66 68 
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
67 69 
 			{
68 70 
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
69 
-			}
70 
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
71 
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
71 72 
 			{
72 73 
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
73 74 
 			}
 
@@ -131,7 +132,9 @@  discard block
 
 block discarded – undo
131 132 
 				$images = $Image->getSpotterImage($aircraft_item['registration']);
132 133 
 				if (isset($images['image_thumbnail'])) {
133 134 
 					$aircraft_item['image_thumbnail'] = $images['image_thumbnail'];
134 
-				} else $aircraft_item['image_thumbnail'] = '';
135 
+				} else {
136 
+					$aircraft_item['image_thumbnail'] = '';
137 
+				}
135 138 
 			}
136 139 
 			if ($aircraft_item['image_thumbnail'] != "")
137 140 
 			{
Please login to merge, or discard this patch.
require/class.Image.php 1 patch
Braces   +220 added lines, -81 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,9 @@  discard block
 
 block discarded – undo
9 9 
 	public function __construct($dbc = null) {
10 10 
 		$Connection = new Connection($dbc);
11 11 
 		$this->db = $Connection->db();
12 
-		if ($this->db === null) die('Error: No DB connection. (Image)');
12 
+		if ($this->db === null) {
13 
+			die('Error: No DB connection. (Image)');
14 
+		}
13 15 
 	}
14 16
15 17 
 	/**
 
@@ -24,7 +26,9 @@  discard block
 
 block discarded – undo
24 26 
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
25 27 
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
26 28 
 		$reg = $registration;
27 
-		if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
29 
+		if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') {
30 
+			$reg = $aircraft_icao.$airline_icao;
31 
+		}
28 32 
 		$reg = trim($reg);
29 33 
 		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration
30 34 
 			FROM spotter_image 
@@ -32,9 +36,13 @@  discard block
 
 block discarded – undo
32 36 
 		$sth = $this->db->prepare($query);
33 37 
 		$sth->execute(array(':registration' => $reg));
34 38 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
35 
-		if (!empty($result)) return $result;
36 
-		elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
37 
-		else return array();
39 
+		if (!empty($result)) {
40 
+			return $result;
41 
+		} elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) {
42 
+			return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
43 
+		} else {
44 
+			return array();
45 
+		}
38 46 
 	}
39 47
40 48 
 	/**
 
@@ -77,8 +85,11 @@  discard block
 
 block discarded – undo
77 85 
 	public function getExifCopyright($url) {
78 86 
 		$exif = exif_read_data($url);
79 87 
 		$copyright = '';
80 
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
81 
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
88 
+		if (isset($exif['COMPUTED']['copyright'])) {
89 
+			$copyright = $exif['COMPUTED']['copyright'];
90 
+		} elseif (isset($exif['copyright'])) {
91 
+			$copyright = $exif['copyright'];
92 
+		}
82 93 
 		if ($copyright != '') {
83 94 
 			$copyright = str_replace('Copyright ','',$copyright);
84 95 
 			$copyright = str_replace('© ','',$copyright);
 
@@ -96,17 +107,27 @@  discard block
 
 block discarded – undo
96 107 
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
97 108 
 	{
98 109 
 		global $globalDebug,$globalAircraftImageFetch;
99 
-		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
110 
+		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
111 
+			return '';
112 
+		}
100 113 
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
101 114 
 		$registration = trim($registration);
102 115 
 		//getting the aircraft image
103 
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
104 
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
105 
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
116 
+		if ($globalDebug && $registration != '') {
117 
+			echo 'Try to find an aircraft image for '.$registration.'...';
118 
+		} elseif ($globalDebug && $aircraft_icao != '') {
119 
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
120 
+		} elseif ($globalDebug && $airline_icao != '') {
121 
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
122 
+		}
106 123 
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
107 
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
124 
+		if ($registration == '' && $aircraft_icao != '') {
125 
+			$registration = $aircraft_icao.$airline_icao;
126 
+		}
108 127 
 		if ($image_url['original'] != '') {
109 
-			if ($globalDebug) echo 'Found !'."\n";
128 
+			if ($globalDebug) {
129 
+				echo 'Found !'."\n";
130 
+			}
110 131 
 			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
111 132 
 			try {
112 133 
 				$sth = $this->db->prepare($query);
 
@@ -115,7 +136,9 @@  discard block
 
 block discarded – undo
115 136 
 				echo $e->getMessage()."\n";
116 137 
 				return "error";
117 138 
 			}
118 
-		} elseif ($globalDebug) echo "Not found :'(\n";
139 
+		} elseif ($globalDebug) {
140 
+			echo "Not found :'(\n";
141 
+		}
119 142 
 		return "success";
120 143 
 	}
121 144 
 
@@ -128,7 +151,9 @@  discard block
 
 block discarded – undo
128 151 
 	public function addMarineImage($mmsi,$imo = '',$name = '')
129 152 
 	{
130 153 
 		global $globalDebug,$globalMarineImageFetch;
131 
-		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return '';
154 
+		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) {
155 
+			return '';
156 
+		}
132 157 
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
133 158 
 		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
134 159 
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
 
@@ -138,16 +163,22 @@  discard block
 
 block discarded – undo
138 163 
 			$identity = $Marine->getIdentity($mmsi);
139 164 
 			if (isset($identity[0]['mmsi'])) {
140 165 
 				$imo = $identity[0]['imo'];
141 
-				if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name'];
166 
+				if ($identity[0]['ship_name'] != '') {
167 
+					$name = $identity[0]['ship_name'];
168 
+				}
142 169 
 			}
143 170 
 		}
144 171 
 		unset($Marine);
145 172
146 173 
 		//getting the aircraft image
147 
-		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
174 
+		if ($globalDebug && $name != '') {
175 
+			echo 'Try to find an vessel image for '.$name.'...';
176 
+		}
148 177 
 		$image_url = $this->findMarineImage($mmsi,$imo,$name);
149 178 
 		if ($image_url['original'] != '') {
150 
-			if ($globalDebug) echo 'Found !'."\n";
179 
+			if ($globalDebug) {
180 
+				echo 'Found !'."\n";
181 
+			}
151 182 
 			$query  = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)";
152 183 
 			try {
153 184 
 				$sth = $this->db->prepare($query);
 
@@ -156,7 +187,9 @@  discard block
 
 block discarded – undo
156 187 
 				echo $e->getMessage()."\n";
157 188 
 				return "error";
158 189 
 			}
159 
-		} elseif ($globalDebug) echo "Not found :'(\n";
190 
+		} elseif ($globalDebug) {
191 
+			echo "Not found :'(\n";
192 
+		}
160 193 
 		return "success";
161 194 
 	}
162 195 
 
@@ -171,41 +204,85 @@  discard block
 
 block discarded – undo
171 204 
 	{
172 205 
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
173 206 
 		$Spotter = new Spotter($this->db);
174 
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
207 
+		if (!isset($globalIVAO)) {
208 
+			$globalIVAO = FALSE;
209 
+		}
175 210 
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
176 211 
 		if ($aircraft_registration != '' && $aircraft_registration != 'NA' && (!isset($globalVA) || $globalVA !== TRUE)) {
177 
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
212 
+			if (strpos($aircraft_registration,'/') !== false) {
213 
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
214 
+			}
178 215 
 			$aircraft_registration = urlencode(trim($aircraft_registration));
179 216 
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
180 
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
181 
-			else $aircraft_name = '';
182 
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
183 
-			else $aircraft_icao = '';
184 
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
185 
-			else $airline_icao = '';
217 
+			if (isset($aircraft_info[0]['aircraft_name'])) {
218 
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
219 
+			} else {
220 
+				$aircraft_name = '';
221 
+			}
222 
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
223 
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
224 
+			} else {
225 
+				$aircraft_icao = '';
226 
+			}
227 
+			if (isset($aircraft_info[0]['airline_icao'])) {
228 
+				$airline_icao = $aircraft_info[0]['airline_icao'];
229 
+			} else {
230 
+				$airline_icao = '';
231 
+			}
186 232 
 		} elseif ($aircraft_icao != '') {
187 233 
 			$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
188 
-			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
189 
-			else $aircraft_name = '';
234 
+			if (isset($aircraft_info[0]['type'])) {
235 
+				$aircraft_name = $aircraft_info[0]['type'];
236 
+			} else {
237 
+				$aircraft_name = '';
238 
+			}
190 239 
 			$aircraft_registration = $aircraft_icao;
191 
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
240 
+		} else {
241 
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
242 
+		}
192 243 
 		unset($Spotter);
193 
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
244 
+		if (!isset($globalAircraftImageSources)) {
245 
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
246 
+		}
194 247 
 		foreach ($globalAircraftImageSources as $source) {
195 248 
 			$source = strtolower($source);
196 
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
197 
-			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
198 
-			if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
199 
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
200 
-			if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
201 
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
202 
-			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
203 
-			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
204 
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
205 
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
206 
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
207 
-		}
208 
-		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
249 
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
250 
+				$images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
251 
+			}
252 
+			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) {
253 
+				$images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
254 
+			}
255 
+			if ($source == 'flickr' && extension_loaded('simplexml')) {
256 
+				$images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
257 
+			}
258 
+			if ($source == 'bing') {
259 
+				$images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
260 
+			}
261 
+			if ($source == 'deviantart' && extension_loaded('simplexml')) {
262 
+				$images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
263 
+			}
264 
+			if ($source == 'wikimedia') {
265 
+				$images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
266 
+			}
267 
+			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) {
268 
+				$images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
269 
+			}
270 
+			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) {
271 
+				$images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
272 
+			}
273 
+			if ($source == 'airportdata' && !$globalIVAO) {
274 
+				$images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
275 
+			}
276 
+			if ($source == 'customsources') {
277 
+				$images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
278 
+			}
279 
+			if (isset($images_array) && $images_array['original'] != '') {
280 
+				return $images_array;
281 
+			}
282 
+		}
283 
+		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) {
284 
+			return $this->findAircraftImage($aircraft_icao);
285 
+		}
209 286 
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
210 287 
 	}
211 288 
 
@@ -225,7 +302,9 @@  discard block
 
 block discarded – undo
225 302 
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
226 303 
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
227 304 
 		$name = trim($name);
228 
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
305 
+		if (strlen($name) < 4) {
306 
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
307 
+		}
229 308 
 		/*
230 309 
 		$Marine = new Marine($this->db);
231 310 
 		if ($imo == '' || $name == '') {
 
@@ -237,15 +316,29 @@  discard block
 
 block discarded – undo
237 316 
 		}
238 317 
 		unset($Marine);
239 318 
 		*/
240 
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
319 
+		if (!isset($globalMarineImageSources)) {
320 
+			$globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
321 
+		}
241 322 
 		foreach ($globalMarineImageSources as $source) {
242 323 
 			$source = strtolower($source);
243 
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
244 
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
245 
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
246 
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
247 
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
248 
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
324 
+			if ($source == 'flickr') {
325 
+				$images_array = $this->fromFlickr('marine',$mmsi,$name);
326 
+			}
327 
+			if ($source == 'bing') {
328 
+				$images_array = $this->fromBing('marine',$mmsi,$name);
329 
+			}
330 
+			if ($source == 'deviantart') {
331 
+				$images_array = $this->fromDeviantart('marine',$mmsi,$name);
332 
+			}
333 
+			if ($source == 'wikimedia') {
334 
+				$images_array = $this->fromWikimedia('marine',$mmsi,$name);
335 
+			}
336 
+			if ($source == 'customsources') {
337 
+				$images_array = $this->fromCustomSource('marine',$mmsi,$name);
338 
+			}
339 
+			if (isset($images_array) && $images_array['original'] != '') {
340 
+				return $images_array;
341 
+			}
249 342 
 		}
250 343 
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
251 344 
 	}
 
@@ -268,7 +361,9 @@  discard block
 
 block discarded – undo
268 361 
 			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
269 362 
 		}
270 363 
 		$data = $Common->getData($url);
271 
-		if (substr($data, 0, 5) != "<?xml") return false;
364 
+		if (substr($data, 0, 5) != "<?xml") {
365 
+			return false;
366 
+		}
272 367 
 		if ($xml = simplexml_load_string($data)) {
273 368 
 			if (isset($xml->channel->item)) {
274 369 
 				$image_url = array();
 
@@ -307,7 +402,9 @@  discard block
 
 block discarded – undo
307 402 
 			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
308 403 
 		}
309 404 
 		$data = $Common->getData($url);
310 
-		if (substr($data, 0, 5) != "<?xml") return false;
405 
+		if (substr($data, 0, 5) != "<?xml") {
406 
+			return false;
407 
+		}
311 408 
 		if ($xml = simplexml_load_string($data)) {
312 409 
 			if (isset($xml->channel->item->link)) {
313 410 
 				$image_url = array();
 
@@ -411,14 +508,22 @@  discard block
 
 block discarded – undo
411 508 
 	public function fromFlickr($type,$registration,$name='') {
412 509 
 		$Common = new Common();
413 510 
 		if ($type == 'aircraft') {
414 
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
415 
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
511 
+			if ($name != '') {
512 
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
513 
+			} else {
514 
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
515 
+			}
416 516 
 		} elseif ($type == 'marine') {
417 
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name);
418 
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship';
517 
+			if ($name != '') {
518 
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name);
519 
+			} else {
520 
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship';
521 
+			}
419 522 
 		}
420 523 
 		$data = $Common->getData($url);
421 
-		if (substr($data, 0, 5) != "<?xml") return false;
524 
+		if (substr($data, 0, 5) != "<?xml") {
525 
+			return false;
526 
+		}
422 527 
 		if ($xml = simplexml_load_string($data)) {
423 528 
 			if (isset($xml->channel->item)) {
424 529 
 				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
 
@@ -461,13 +566,21 @@  discard block
 
 block discarded – undo
461 566 
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
462 567 
 		global $globalImageBingKey;
463 568 
 		$Common = new Common();
464 
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
569 
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
570 
+			return false;
571 
+		}
465 572 
 		if ($type == 'aircraft') {
466 
-			if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
467 
-			else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
573 
+			if ($aircraft_name != '') {
574 
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
575 
+			} else {
576 
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
577 
+			}
468 578 
 		} elseif ($type == 'marine') {
469 
-			if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27';
470 
-			else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27';
579 
+			if ($aircraft_name != '') {
580 
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27';
581 
+			} else {
582 
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27';
583 
+			}
471 584 
 		}
472 585 
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
473 586 
 		$data = $Common->getData($url,'get','',$headers);
 
@@ -523,17 +636,25 @@  discard block
 
 block discarded – undo
523 636 
 	public function fromWikimedia($type,$registration,$name='') {
524 637 
 		$Common = new Common();
525 638 
 		if ($type == 'aircraft') {
526 
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
527 
-			else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
639 
+			if ($name != '') {
640 
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
641 
+			} else {
642 
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
643 
+			}
528 644 
 		} elseif ($type == 'marine') {
529 
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"';
530 
-			else return false;
645 
+			if ($name != '') {
646 
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"';
647 
+			} else {
648 
+				return false;
649 
+			}
531 650 
 		}
532 651 
 		$data = $Common->getData($url);
533 652 
 		$result = json_decode($data);
534 653 
 		if (isset($result->query->search[0]->title)) {
535 654 
 			$fileo = $result->query->search[0]->title;
536 
-			if (substr($fileo,-3) == 'pdf') return false;
655 
+			if (substr($fileo,-3) == 'pdf') {
656 
+				return false;
657 
+			}
537 658 
 			$file = urlencode($fileo);
538 659 
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
539 660 
 			$data2 = $Common->getData($url2);
 
@@ -604,18 +725,27 @@  discard block
 
 block discarded – undo
604 725 
 					$image_url = array();
605 726 
 					$image_url['thumbnail'] = $url_thumbnail;
606 727 
 					$image_url['original'] = $url;
607 
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
608 
-					else $exifCopyright = '';
609 
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
610 
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
611 
-					else $image_url['copyright'] = $source['source_website'];
728 
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
729 
+						$exifCopyright = $this->getExifCopyright($url);
730 
+					} else {
731 
+						$exifCopyright = '';
732 
+					}
733 
+					if ($exifCopyright  != '') {
734 
+						$image_url['copyright'] = $exifCopyright;
735 
+					} elseif (isset($source['copyright'])) {
736 
+						$image_url['copyright'] = $source['copyright'];
737 
+					} else {
738 
+						$image_url['copyright'] = $source['source_website'];
739 
+					}
612 740 
 					$image_url['source_website'] = $source['source_website'];
613 741 
 					$image_url['source'] = $source['source'];
614 742 
 					return $image_url;
615 743 
 				}
616 744 
 			}
617 745 
 			return false;
618 
-		} else return false;
746 
+		} else {
747 
+			return false;
748 
+		}
619 749 
 		if (!empty($globalMarineImageCustomSources) && $type == 'marine') {
620 750 
 			$customsources = array();
621 751 
 			if (!isset($globalMarineImageCustomSources[0])) {
 
@@ -640,18 +770,27 @@  discard block
 
 block discarded – undo
640 770 
 					$image_url = array();
641 771 
 					$image_url['thumbnail'] = $url_thumbnail;
642 772 
 					$image_url['original'] = $url;
643 
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
644 
-					else $exifCopyright = '';
645 
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
646 
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
647 
-					else $image_url['copyright'] = $source['source_website'];
773 
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
774 
+						$exifCopyright = $this->getExifCopyright($url);
775 
+					} else {
776 
+						$exifCopyright = '';
777 
+					}
778 
+					if ($exifCopyright  != '') {
779 
+						$image_url['copyright'] = $exifCopyright;
780 
+					} elseif (isset($source['copyright'])) {
781 
+						$image_url['copyright'] = $source['copyright'];
782 
+					} else {
783 
+						$image_url['copyright'] = $source['source_website'];
784 
+					}
648 785 
 					$image_url['source_website'] = $source['source_website'];
649 786 
 					$image_url['source'] = $source['source'];
650 787 
 					return $image_url;
651 788 
 				}
652 789 
 			}
653 790 
 			return false;
654 
-		} else return false;
791 
+		} else {
792 
+			return false;
793 
+		}
655 794 
 	}
656 795 
 }
657 796
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Braces   +661 added lines, -231 removed lines patch added patch discarded remove patch 
@@ -15,10 +15,14 @@  discard block
 
 block discarded – undo
15 15
16 16 
 	public function __construct($dbc = null) {
17 17 
 		global $globalFilterName;
18 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
18 
+		if (isset($globalFilterName)) {
19 
+			$this->filter_name = $globalFilterName;
20 
+		}
19 21 
 		$Connection = new Connection($dbc);
20 22 
 		$this->db = $Connection->db();
21 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
23 
+		if ($this->db === null) {
24 
+			die('Error: No DB connection. (Stats)');
25 
+		}
22 26 
 	}
23 27
24 28 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -86,7 +90,9 @@  discard block
 
 block discarded – undo
86 90
87 91 
 	public function getAllAirlineNames($filter_name = '') {
88 92 
 		global $globalStatsFilters;
89 
-		if ($filter_name == '') $filter_name = $this->filter_name;
93 
+		if ($filter_name == '') {
94 
+			$filter_name = $this->filter_name;
95 
+		}
90 96 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
91 97 
 		 try {
92 98 
 			$sth = $this->db->prepare($query);
 
@@ -106,7 +112,9 @@  discard block
 
 block discarded – undo
106 112 
 		return $all;
107 113 
 	}
108 114 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
109 
-		if ($filter_name == '') $filter_name = $this->filter_name;
115 
+		if ($filter_name == '') {
116 
+			$filter_name = $this->filter_name;
117 
+		}
110 118 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 119 
 		try {
112 120 
 			$sth = $this->db->prepare($query);
 
@@ -118,7 +126,9 @@  discard block
 
 block discarded – undo
118 126 
 		return $all;
119 127 
 	}
120 128 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
121 
-		if ($filter_name == '') $filter_name = $this->filter_name;
129 
+		if ($filter_name == '') {
130 
+			$filter_name = $this->filter_name;
131 
+		}
122 132 
 		$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";
123 133 
 		try {
124 134 
 			$sth = $this->db->prepare($query);
 
@@ -130,7 +140,9 @@  discard block
 
 block discarded – undo
130 140 
 		return $all;
131 141 
 	}
132 142 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
133 
-		if ($filter_name == '') $filter_name = $this->filter_name;
143 
+		if ($filter_name == '') {
144 
+			$filter_name = $this->filter_name;
145 
+		}
134 146 
 		$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";
135 147 
 		try {
136 148 
 			$sth = $this->db->prepare($query);
 
@@ -143,7 +155,9 @@  discard block
 
 block discarded – undo
143 155 
 	}
144 156
145 157 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
158 
+		if ($filter_name == '') {
159 
+			$filter_name = $this->filter_name;
160 
+		}
147 161 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 162 
 		try {
149 163 
 			$sth = $this->db->prepare($query);
 
@@ -156,7 +170,9 @@  discard block
 
 block discarded – undo
156 170 
 	}
157 171
158 172 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
159 
-		if ($filter_name == '') $filter_name = $this->filter_name;
173 
+		if ($filter_name == '') {
174 
+			$filter_name = $this->filter_name;
175 
+		}
160 176 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
161 177 
 		try {
162 178 
 			$sth = $this->db->prepare($query);
 
@@ -171,7 +187,9 @@  discard block
 
 block discarded – undo
171 187
172 188 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
173 189 
 		global $globalStatsFilters;
174 
-		if ($filter_name == '') $filter_name = $this->filter_name;
190 
+		if ($filter_name == '') {
191 
+			$filter_name = $this->filter_name;
192 
+		}
175 193 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
176 194 
 			$Spotter = new Spotter($this->db);
177 195 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -180,8 +198,11 @@  discard block
 
 block discarded – undo
180 198 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
181 199 
 			}
182 200 
 			if ($year == '' && $month == '') {
183 
-				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
201 
+				if ($limit) {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
203 
+				} else {
204 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
205 
+				}
185 206 
 				try {
186 207 
 					$sth = $this->db->prepare($query);
187 208 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -189,11 +210,16 @@  discard block
 
 block discarded – undo
189 210 
 					echo "error : ".$e->getMessage();
190 211 
 				}
191 212 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
192 
-			} else $all = array();
213 
+			} else {
214 
+				$all = array();
215 
+			}
193 216 
 		} else {
194 217 
 			if ($year == '' && $month == '') {
195 
-				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 aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
196 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
218 
+				if ($limit) {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
220 
+				} else {
221 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
222 
+				}
197 223 
 				try {
198 224 
 					$sth = $this->db->prepare($query);
199 225 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -201,7 +227,9 @@  discard block
 
 block discarded – undo
201 227 
 					echo "error : ".$e->getMessage();
202 228 
 				}
203 229 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 
-			} else $all = array();
230 
+			} else {
231 
+				$all = array();
232 
+			}
205 233 
 		}
206 234 
 		if (empty($all)) {
207 235 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -220,10 +248,15 @@  discard block
 
 block discarded – undo
220 248 
 	}
221 249 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
222 250 
 		global $globalStatsFilters;
223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
251 
+		if ($filter_name == '') {
252 
+			$filter_name = $this->filter_name;
253 
+		}
224 254 
 		if ($year == '' && $month == '') {
225 
-			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";
226 
-			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";
255 
+			if ($limit) {
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 LIMIT 10 OFFSET 0";
257 
+			} else {
258 
+				$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";
259 
+			}
227 260 
 			try {
228 261 
 				$sth = $this->db->prepare($query);
229 262 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -231,7 +264,9 @@  discard block
 
 block discarded – undo
231 264 
 				echo "error : ".$e->getMessage();
232 265 
 			}
233 266 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 
-		} else $all = array();
267 
+		} else {
268 
+			$all = array();
269 
+		}
235 270 
 		if (empty($all)) {
236 271 
 			$Spotter = new Spotter($this->db);
237 272 
 			$filters = array();
 
@@ -246,7 +281,9 @@  discard block
 
 block discarded – undo
246 281 
 	}
247 282 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
248 283 
 		global $globalStatsFilters;
249 
-		if ($filter_name == '') $filter_name = $this->filter_name;
284 
+		if ($filter_name == '') {
285 
+			$filter_name = $this->filter_name;
286 
+		}
250 287 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
251 288 
 			$Spotter = new Spotter($this->db);
252 289 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -255,8 +292,11 @@  discard block
 
 block discarded – undo
255 292 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
256 293 
 			}
257 294 
 			if ($year == '' && $month == '') {
258 
-				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";
259 
-				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";
295 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
297 
+				} else {
298 
+					$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";
299 
+				}
260 300 
 				try {
261 301 
 					$sth = $this->db->prepare($query);
262 302 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -264,11 +304,16 @@  discard block
 
 block discarded – undo
264 304 
 					echo "error : ".$e->getMessage();
265 305 
 				}
266 306 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
267 
-			} else $all = array();
307 
+			} else {
308 
+				$all = array();
309 
+			}
268 310 
 		} else {
269 311 
 			if ($year == '' && $month == '') {
270 
-				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";
271 
-				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";
312 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
314 
+				} else {
315 
+					$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";
316 
+				}
272 317 
 				try {
273 318 
 					$sth = $this->db->prepare($query);
274 319 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -276,7 +321,9 @@  discard block
 
 block discarded – undo
276 321 
 					echo "error : ".$e->getMessage();
277 322 
 				}
278 323 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
279 
-			} else $all = array();
324 
+			} else {
325 
+				$all = array();
326 
+			}
280 327 
 		}
281 328 
 		if (empty($all)) {
282 329 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -296,7 +343,9 @@  discard block
 
 block discarded – undo
296 343
297 344 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
298 345 
 		global $globalStatsFilters;
299 
-		if ($filter_name == '') $filter_name = $this->filter_name;
346 
+		if ($filter_name == '') {
347 
+			$filter_name = $this->filter_name;
348 
+		}
300 349 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
301 350 
 			$Spotter = new Spotter($this->db);
302 351 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -305,8 +354,11 @@  discard block
 
 block discarded – undo
305 354 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
306 355 
 			}
307 356 
 			if ($year == '' && $month == '') {
308 
-				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";
309 
-				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";
357 
+				if ($limit) {
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_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";
359 
+				} else {
360 
+					$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";
361 
+				}
310 362 
 				try {
311 363 
 					$sth = $this->db->prepare($query);
312 364 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -314,11 +366,16 @@  discard block
 
 block discarded – undo
314 366 
 					echo "error : ".$e->getMessage();
315 367 
 				}
316 368 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
317 
-			} else $all = array();
369 
+			} else {
370 
+				$all = array();
371 
+			}
318 372 
 		} else {
319 373 
 			if ($year == '' && $month == '') {
320 
-				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";
321 
-				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";
374 
+				if ($limit) {
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_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";
376 
+				} else {
377 
+					$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";
378 
+				}
322 379 
 				try {
323 380 
 					$sth = $this->db->prepare($query);
324 381 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -326,7 +383,9 @@  discard block
 
 block discarded – undo
326 383 
 					echo "error : ".$e->getMessage();
327 384 
 				}
328 385 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
329 
-			} else $all = array();
386 
+			} else {
387 
+				$all = array();
388 
+			}
330 389 
 		}
331 390 
 		if (empty($all)) {
332 391 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -345,7 +404,9 @@  discard block
 
 block discarded – undo
345 404 
 	}
346 405 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
347 406 
 		global $globalStatsFilters;
348 
-		if ($filter_name == '') $filter_name = $this->filter_name;
407 
+		if ($filter_name == '') {
408 
+			$filter_name = $this->filter_name;
409 
+		}
349 410 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
350 411 
 			$Spotter = new Spotter($this->db);
351 412 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -353,12 +414,18 @@  discard block
 
 block discarded – undo
353 414 
 			foreach ($airlines as $airline) {
354 415 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
355 416 
 			}
356 
-			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";
357 
-			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";
417 
+			if ($limit) {
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.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";
419 
+			} else {
420 
+				$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";
421 
+			}
358 422 
 			$query_values = array(':filter_name' => $filter_name);
359 423 
 		} else {
360 
-			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";
361 
-			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";
424 
+			if ($limit) {
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.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";
426 
+			} else {
427 
+				$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";
428 
+			}
362 429 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
363 430 
 		}
364 431 
 		try {
 
@@ -386,17 +453,29 @@  discard block
 
 block discarded – undo
386 453
387 454 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
388 455 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
389 
-		if ($filter_name == '') $filter_name = $this->filter_name;
456 
+		if ($filter_name == '') {
457 
+			$filter_name = $this->filter_name;
458 
+		}
390 459 
 		if ($year == '' && $month == '') {
391 
-			if ($globalVATSIM) $forsource = 'vatsim';
392 
-			if ($globalIVAO) $forsource = 'ivao';
460 
+			if ($globalVATSIM) {
461 
+				$forsource = 'vatsim';
462 
+			}
463 
+			if ($globalIVAO) {
464 
+				$forsource = 'ivao';
465 
+			}
393 466 
 			if (isset($forsource)) {
394 
-				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";
395 
-				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";
467 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
469 
+				} else {
470 
+					$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";
471 
+				}
396 472 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
397 473 
 			} else {
398 
-				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";
399 
-				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";
474 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
476 
+				} else {
477 
+					$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";
478 
+				}
400 479 
 				$query_values = array(':filter_name' => $filter_name);
401 480 
 			}
402 481 
 			try {
 
@@ -406,7 +485,9 @@  discard block
 
 block discarded – undo
406 485 
 				echo "error : ".$e->getMessage();
407 486 
 			}
408 487 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409 
-		} else $all = array();
488 
+		} else {
489 
+			$all = array();
490 
+		}
410 491 
                 if (empty($all)) {
411 492 
 	                $Spotter = new Spotter($this->db);
412 493 
             		$filters = array();
 
@@ -421,7 +502,9 @@  discard block
 
 block discarded – undo
421 502 
 	}
422 503 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
423 504 
 		global $globalStatsFilters;
424 
-		if ($filter_name == '') $filter_name = $this->filter_name;
505 
+		if ($filter_name == '') {
506 
+			$filter_name = $this->filter_name;
507 
+		}
425 508 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
426 509 
 			$Spotter = new Spotter($this->db);
427 510 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -430,8 +513,11 @@  discard block
 
 block discarded – undo
430 513 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
431 514 
 			}
432 515 
 			if ($year == '' && $month == '') {
433 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC LIMIT 10 OFFSET 0";
434 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC";
516 
+				if ($limit) {
517 
+					$query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC LIMIT 10 OFFSET 0";
518 
+				} else {
519 
+					$query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC";
520 
+				}
435 521 
 				try {
436 522 
 					$sth = $this->db->prepare($query);
437 523 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -439,11 +525,16 @@  discard block
 
 block discarded – undo
439 525 
 					echo "error : ".$e->getMessage();
440 526 
 				}
441 527 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
442 
-			} else $all = array();
528 
+			} else {
529 
+				$all = array();
530 
+			}
443 531 
 		} else {
444 532 
 			if ($year == '' && $month == '') {
445 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC LIMIT 10 OFFSET 0";
446 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC";
533 
+				if ($limit) {
534 
+					$query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC LIMIT 10 OFFSET 0";
535 
+				} else {
536 
+					$query = "SELECT s.aircraft_icao, s.cnt AS 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 registration_count DESC";
537 
+				}
447 538 
 				try {
448 539 
 					$sth = $this->db->prepare($query);
449 540 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -451,7 +542,9 @@  discard block
 
 block discarded – undo
451 542 
 					echo "error : ".$e->getMessage();
452 543 
 				}
453 544 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
454 
-			} else $all = array();
545 
+			} else {
546 
+				$all = array();
547 
+			}
455 548 
 		}
456 549 
 		if (empty($all)) {
457 550 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -470,7 +563,9 @@  discard block
 
 block discarded – undo
470 563 
 	}
471 564 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
472 565 
 		global $globalStatsFilters;
473 
-		if ($filter_name == '') $filter_name = $this->filter_name;
566 
+		if ($filter_name == '') {
567 
+			$filter_name = $this->filter_name;
568 
+		}
474 569 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
475 570 
 			$Spotter = new Spotter($this->db);
476 571 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -479,8 +574,11 @@  discard block
 
 block discarded – undo
479 574 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
480 575 
 			}
481 576 
 			if ($year == '' && $month == '') {
482 
-				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";
483 
-				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";
577 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
579 
+				} else {
580 
+					$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";
581 
+				}
484 582 
 				 try {
485 583 
 					$sth = $this->db->prepare($query);
486 584 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -488,11 +586,16 @@  discard block
 
 block discarded – undo
488 586 
 					echo "error : ".$e->getMessage();
489 587 
 				}
490 588 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
491 
-			} else $all = array();
589 
+			} else {
590 
+				$all = array();
591 
+			}
492 592 
 		} else {
493 593 
 			if ($year == '' && $month == '') {
494 
-				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";
495 
-				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";
594 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
596 
+				} else {
597 
+					$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";
598 
+				}
496 599 
 				 try {
497 600 
 					$sth = $this->db->prepare($query);
498 601 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -500,7 +603,9 @@  discard block
 
 block discarded – undo
500 603 
 					echo "error : ".$e->getMessage();
501 604 
 				}
502 605 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
503 
-			} else $all = array();
606 
+			} else {
607 
+				$all = array();
608 
+			}
504 609 
 		}
505 610 
 		if (empty($all)) {
506 611 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -519,7 +624,9 @@  discard block
 
 block discarded – undo
519 624 
 	}
520 625 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
521 626 
 		$Connection = new Connection($this->db);
522 
-		if ($filter_name == '') $filter_name = $this->filter_name;
627 
+		if ($filter_name == '') {
628 
+			$filter_name = $this->filter_name;
629 
+		}
523 630 
 		if ($Connection->tableExists('countries')) {
524 631 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
525 632 
 				$Spotter = new Spotter($this->db);
 
@@ -529,8 +636,11 @@  discard block
 
 block discarded – undo
529 636 
 					foreach ($airlines as $airline) {
530 637 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
531 638 
 					}
532 
-					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";
533 
-					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";
639 
+					if ($limit) {
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 LIMIT 20 OFFSET 0";
641 
+					} else {
642 
+						$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";
643 
+					}
534 644 
 					 try {
535 645 
 						$sth = $this->db->prepare($query);
536 646 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -539,11 +649,16 @@  discard block
 
 block discarded – undo
539 649 
 					}
540 650 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
541 651 
 					return $all;
542 
-				} else return array();
652 
+				} else {
653 
+					return array();
654 
+				}
543 655 
 			} else {
544 656 
 				if ($year == '' && $month == '') {
545 
-					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";
546 
-					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";
657 
+					if ($limit) {
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 LIMIT 20 OFFSET 0";
659 
+					} else {
660 
+						$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";
661 
+					}
547 662 
 					 try {
548 663 
 						$sth = $this->db->prepare($query);
549 664 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -552,7 +667,9 @@  discard block
 
 block discarded – undo
552 667 
 					}
553 668 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 669 
 					return $all;
555 
-				} else return array();
670 
+				} else {
671 
+					return array();
672 
+				}
556 673 
 			}
557 674 
 		} else {
558 675 
 			/*
 
@@ -566,10 +683,15 @@  discard block
 
 block discarded – undo
566 683 
 	}
567 684 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
568 685 
 		global $globalStatsFilters;
569 
-		if ($filter_name == '') $filter_name = $this->filter_name;
686 
+		if ($filter_name == '') {
687 
+			$filter_name = $this->filter_name;
688 
+		}
570 689 
 		if ($year == '' && $month == '') {
571 
-			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";
572 
-			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";
690 
+			if ($limit) {
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 LIMIT 10 OFFSET 0";
692 
+			} else {
693 
+				$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";
694 
+			}
573 695 
 			try {
574 696 
 				$sth = $this->db->prepare($query);
575 697 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -577,7 +699,9 @@  discard block
 
 block discarded – undo
577 699 
 				echo "error : ".$e->getMessage();
578 700 
 			}
579 701 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
580 
-		} else $all = array();
702 
+		} else {
703 
+			$all = array();
704 
+		}
581 705 
 		if (empty($all)) {
582 706 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
583 707 
 			if ($filter_name != '') {
 
@@ -592,7 +716,9 @@  discard block
 
 block discarded – undo
592 716
593 717 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
594 718 
 		global $globalStatsFilters;
595 
-		if ($filter_name == '') $filter_name = $this->filter_name;
719 
+		if ($filter_name == '') {
720 
+			$filter_name = $this->filter_name;
721 
+		}
596 722 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
597 723 
 			$Spotter = new Spotter($this->db);
598 724 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -601,8 +727,11 @@  discard block
 
 block discarded – undo
601 727 
 				foreach ($airlines as $airline) {
602 728 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
603 729 
 				}
604 
-				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";
605 
-				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";
730 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
732 
+				} else {
733 
+					$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";
734 
+				}
606 735 
 				try {
607 736 
 					$sth = $this->db->prepare($query);
608 737 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -610,11 +739,16 @@  discard block
 
 block discarded – undo
610 739 
 					echo "error : ".$e->getMessage();
611 740 
 				}
612 741 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
613 
-			} else $all = array();
742 
+			} else {
743 
+				$all = array();
744 
+			}
614 745 
 		} else {
615 746 
 			if ($year == '' && $month == '') {
616 
-				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";
617 
-				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";
747 
+				if ($limit) {
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 LIMIT 10 OFFSET 0";
749 
+				} else {
750 
+					$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";
751 
+				}
618 752 
 				try {
619 753 
 					$sth = $this->db->prepare($query);
620 754 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -622,7 +756,9 @@  discard block
 
 block discarded – undo
622 756 
 					echo "error : ".$e->getMessage();
623 757 
 				}
624 758 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
625 
-			} else $all = array();
759 
+			} else {
760 
+				$all = array();
761 
+			}
626 762 
 		}
627 763 
 		if (empty($all)) {
628 764 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -641,7 +777,9 @@  discard block
 
 block discarded – undo
641 777 
 	}
642 778 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
643 779 
 		global $globalStatsFilters;
644 
-		if ($filter_name == '') $filter_name = $this->filter_name;
780 
+		if ($filter_name == '') {
781 
+			$filter_name = $this->filter_name;
782 
+		}
645 783 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
646 784 
 			$Spotter = new Spotter($this->db);
647 785 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -650,8 +788,11 @@  discard block
 
 block discarded – undo
650 788 
 				foreach ($airlines as $airline) {
651 789 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
652 790 
 				}
653 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
654 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
791 
+				if ($limit) {
792 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
793 
+				} else {
794 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
795 
+				}
655 796 
 				try {
656 797 
 					$sth = $this->db->prepare($query);
657 798 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -659,11 +800,16 @@  discard block
 
 block discarded – undo
659 800 
 					echo "error : ".$e->getMessage();
660 801 
 				}
661 802 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 
-			} else $all = array();
803 
+			} else {
804 
+				$all = array();
805 
+			}
663 806 
 		} else {
664 807 
 			if ($year == '' && $month == '') {
665 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
666 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
808 
+				if ($limit) {
809 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
810 
+				} else {
811 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
812 
+				}
667 813 
 				try {
668 814 
 					$sth = $this->db->prepare($query);
669 815 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -671,7 +817,9 @@  discard block
 
 block discarded – undo
671 817 
 					echo "error : ".$e->getMessage();
672 818 
 				}
673 819 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
674 
-			} else $all = array();
820 
+			} else {
821 
+				$all = array();
822 
+			}
675 823 
 		}
676 824 
 		if (empty($all)) {
677 825 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -696,7 +844,9 @@  discard block
 
 block discarded – undo
696 844 
 				$icao = $value['airport_departure_icao'];
697 845 
 				if (isset($all[$icao])) {
698 846 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
699 
-				} else $all[$icao] = $value;
847 
+				} else {
848 
+					$all[$icao] = $value;
849 
+				}
700 850 
 			}
701 851 
 			$count = array();
702 852 
 			foreach ($all as $key => $row) {
 
@@ -708,7 +858,9 @@  discard block
 
 block discarded – undo
708 858 
 	}
709 859 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
710 860 
 		global $globalStatsFilters;
711 
-		if ($filter_name == '') $filter_name = $this->filter_name;
861 
+		if ($filter_name == '') {
862 
+			$filter_name = $this->filter_name;
863 
+		}
712 864 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
713 865 
 			$Spotter = new Spotter($this->db);
714 866 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -717,8 +869,11 @@  discard block
 
 block discarded – undo
717 869 
 				foreach ($airlines as $airline) {
718 870 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
719 871 
 				}
720 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
721 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
872 
+				if ($limit) {
873 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
874 
+				} else {
875 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
876 
+				}
722 877 
 				try {
723 878 
 					$sth = $this->db->prepare($query);
724 879 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -726,11 +881,16 @@  discard block
 
 block discarded – undo
726 881 
 					echo "error : ".$e->getMessage();
727 882 
 				}
728 883 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
729 
-			} else $all = array();
884 
+			} else {
885 
+				$all = array();
886 
+			}
730 887 
 		} else {
731 888 
 			if ($year == '' && $month == '') {
732 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
733 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
889 
+				if ($limit) {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
891 
+				} else {
892 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
893 
+				}
734 894 
 				try {
735 895 
 					$sth = $this->db->prepare($query);
736 896 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -738,7 +898,9 @@  discard block
 
 block discarded – undo
738 898 
 					echo "error : ".$e->getMessage();
739 899 
 				}
740 900 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
741 
-			} else $all = array();
901 
+			} else {
902 
+				$all = array();
903 
+			}
742 904 
 		}
743 905 
 		if (empty($all)) {
744 906 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -763,7 +925,9 @@  discard block
 
 block discarded – undo
763 925 
 				$icao = $value['airport_arrival_icao'];
764 926 
 				if (isset($all[$icao])) {
765 927 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
766 
-				} else $all[$icao] = $value;
928 
+				} else {
929 
+					$all[$icao] = $value;
930 
+				}
767 931 
 			}
768 932 
 			$count = array();
769 933 
 			foreach ($all as $key => $row) {
 
@@ -775,7 +939,9 @@  discard block
 
 block discarded – undo
775 939 
 	}
776 940 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
777 941 
 		global $globalDBdriver, $globalStatsFilters;
778 
-		if ($filter_name == '') $filter_name = $this->filter_name;
942 
+		if ($filter_name == '') {
943 
+			$filter_name = $this->filter_name;
944 
+		}
779 945 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
780 946 
 			$Spotter = new Spotter($this->db);
781 947 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -784,20 +950,32 @@  discard block
 
 block discarded – undo
784 950 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
785 951 
 			}
786 952 
 			if ($globalDBdriver == 'mysql') {
787 
-				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";
788 
-				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";
953 
+				if ($limit) {
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_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955 
+				} else {
956 
+					$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";
957 
+				}
789 958 
 			} else {
790 
-				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";
791 
-				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";
959 
+				if ($limit) {
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_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";
961 
+				} else {
962 
+					$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";
963 
+				}
792 964 
 			}
793 965 
 			$query_data = array(':filter_name' => $filter_name);
794 966 
 		} else {
795 967 
 			if ($globalDBdriver == 'mysql') {
796 
-				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";
797 
-				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";
968 
+				if ($limit) {
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_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
970 
+				} else {
971 
+					$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";
972 
+				}
798 973 
 			} else {
799 
-				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";
800 
-				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";
974 
+				if ($limit) {
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_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
976 
+				} else {
977 
+					$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";
978 
+				}
801 979 
 			}
802 980 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
803 981 
 		}
 
@@ -825,7 +1003,9 @@  discard block
 
 block discarded – undo
825 1003
826 1004 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
827 1005 
 		global $globalStatsFilters;
828 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1006 
+		if ($filter_name == '') {
1007 
+			$filter_name = $this->filter_name;
1008 
+		}
829 1009 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
830 1010 
 			$Spotter = new Spotter($this->db);
831 1011 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -862,7 +1042,9 @@  discard block
 
 block discarded – undo
862 1042 
 	}
863 1043 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
864 1044 
 		global $globalDBdriver, $globalStatsFilters;
865 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1045 
+		if ($filter_name == '') {
1046 
+			$filter_name = $this->filter_name;
1047 
+		}
866 1048 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
867 1049 
 			$Spotter = new Spotter($this->db);
868 1050 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -907,7 +1089,9 @@  discard block
 
 block discarded – undo
907 1089 
 	}
908 1090 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
909 1091 
 		global $globalStatsFilters;
910 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1092 
+		if ($filter_name == '') {
1093 
+			$filter_name = $this->filter_name;
1094 
+		}
911 1095 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
912 1096 
 			$Spotter = new Spotter($this->db);
913 1097 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -944,7 +1128,9 @@  discard block
 
 block discarded – undo
944 1128 
 	}
945 1129 
 	public function countAllDatesMarine($filter_name = '') {
946 1130 
 		global $globalStatsFilters;
947 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1131 
+		if ($filter_name == '') {
1132 
+			$filter_name = $this->filter_name;
1133 
+		}
948 1134 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
949 1135 
 		$query_data = array(':filter_name' => $filter_name);
950 1136 
 		try {
 
@@ -966,7 +1152,9 @@  discard block
 
 block discarded – undo
966 1152 
 	}
967 1153 
 	public function countAllDatesTracker($filter_name = '') {
968 1154 
 		global $globalStatsFilters;
969 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1155 
+		if ($filter_name == '') {
1156 
+			$filter_name = $this->filter_name;
1157 
+		}
970 1158 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
971 1159 
 		$query_data = array(':filter_name' => $filter_name);
972 1160 
 		try {
 
@@ -988,7 +1176,9 @@  discard block
 
 block discarded – undo
988 1176 
 	}
989 1177 
 	public function countAllDatesByAirlines($filter_name = '') {
990 1178 
 		global $globalStatsFilters;
991 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1179 
+		if ($filter_name == '') {
1180 
+			$filter_name = $this->filter_name;
1181 
+		}
992 1182 
 		$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";
993 1183 
 		$query_data = array('filter_name' => $filter_name);
994 1184 
 		try {
 
@@ -1010,7 +1200,9 @@  discard block
 
 block discarded – undo
1010 1200 
 	}
1011 1201 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
1012 1202 
 		global $globalStatsFilters, $globalDBdriver;
1013 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1203 
+		if ($filter_name == '') {
1204 
+			$filter_name = $this->filter_name;
1205 
+		}
1014 1206 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1015 1207 
 			$Spotter = new Spotter($this->db);
1016 1208 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1095,7 +1287,9 @@  discard block
 
 block discarded – undo
1095 1287 
 	}
1096 1288 
 	public function countAllMilitaryMonths($filter_name = '') {
1097 1289 
 		global $globalStatsFilters;
1098 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1290 
+		if ($filter_name == '') {
1291 
+			$filter_name = $this->filter_name;
1292 
+		}
1099 1293 
 		$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";
1100 1294 
 		try {
1101 1295 
 			$sth = $this->db->prepare($query);
 
@@ -1116,7 +1310,9 @@  discard block
 
 block discarded – undo
1116 1310 
 	}
1117 1311 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1118 1312 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1119 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1313 
+		if ($filter_name == '') {
1314 
+			$filter_name = $this->filter_name;
1315 
+		}
1120 1316 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1121 1317 
 			$Spotter = new Spotter($this->db);
1122 1318 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1124,12 +1320,18 @@  discard block
 
 block discarded – undo
1124 1320 
 			foreach ($airlines as $airline) {
1125 1321 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1126 1322 
 			}
1127 
-			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";
1128 
-			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";
1323 
+			if ($limit) {
1324 
+				$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";
1325 
+			} else {
1326 
+				$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";
1327 
+			}
1129 1328 
 			$query_data = array(':filter_name' => $filter_name);
1130 1329 
 		} else {
1131 
-			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";
1132 
-			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";
1330 
+			if ($limit) {
1331 
+				$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";
1332 
+			} else {
1333 
+				$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";
1334 
+			}
1133 1335 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1134 1336 
 		}
1135 1337 
 		if ($orderby == 'hour') {
 
@@ -1139,7 +1341,9 @@  discard block
 
 block discarded – undo
1139 1341 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1140 1342 
 			}
1141 1343 
 		}
1142 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1344 
+		if ($orderby == 'count') {
1345 
+			$query .= " ORDER BY hour_count DESC";
1346 
+		}
1143 1347 
 		try {
1144 1348 
 			$sth = $this->db->prepare($query);
1145 1349 
 			$sth->execute($query_data);
 
@@ -1163,8 +1367,12 @@  discard block
 
 block discarded – undo
1163 1367 
 	}
1164 1368 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1165 1369 
 		global $globalStatsFilters;
1166 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1167 
-		if ($year == '') $year = date('Y');
1370 
+		if ($filter_name == '') {
1371 
+			$filter_name = $this->filter_name;
1372 
+		}
1373 
+		if ($year == '') {
1374 
+			$year = date('Y');
1375 
+		}
1168 1376 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1169 1377 
 		if (empty($all)) {
1170 1378 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1183,8 +1391,12 @@  discard block
 
 block discarded – undo
1183 1391 
 	}
1184 1392 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1185 1393 
 		global $globalStatsFilters;
1186 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1187 
-		if ($year == '') $year = date('Y');
1394 
+		if ($filter_name == '') {
1395 
+			$filter_name = $this->filter_name;
1396 
+		}
1397 
+		if ($year == '') {
1398 
+			$year = date('Y');
1399 
+		}
1188 1400 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1189 1401 
 		if (empty($all)) {
1190 1402 
 			$filters = array();
 
@@ -1200,8 +1412,12 @@  discard block
 
 block discarded – undo
1200 1412 
 	}
1201 1413 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1202 1414 
 		global $globalStatsFilters;
1203 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1204 
-		if ($year == '') $year = date('Y');
1415 
+		if ($filter_name == '') {
1416 
+			$filter_name = $this->filter_name;
1417 
+		}
1418 
+		if ($year == '') {
1419 
+			$year = date('Y');
1420 
+		}
1205 1421 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1206 1422 
 		if (empty($all)) {
1207 1423 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1220,7 +1436,9 @@  discard block
 
 block discarded – undo
1220 1436 
 	}
1221 1437 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1222 1438 
 		global $globalStatsFilters;
1223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1439 
+		if ($filter_name == '') {
1440 
+			$filter_name = $this->filter_name;
1441 
+		}
1224 1442 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1225 1443 
 			$Spotter = new Spotter($this->db);
1226 1444 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1238,7 +1456,9 @@  discard block
 
 block discarded – undo
1238 1456 
 				}
1239 1457 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1240 1458 
 				$all = $result[0]['nb'];
1241 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1459 
+			} else {
1460 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1461 
+			}
1242 1462 
 		} else {
1243 1463 
 			if ($year == '' && $month == '') {
1244 1464 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1250,7 +1470,9 @@  discard block
 
 block discarded – undo
1250 1470 
 				}
1251 1471 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1252 1472 
 				$all = $result[0]['nb'];
1253 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1473 
+			} else {
1474 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1475 
+			}
1254 1476 
 		}
1255 1477 
 		if (empty($all)) {
1256 1478 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1269,7 +1491,9 @@  discard block
 
 block discarded – undo
1269 1491 
 	}
1270 1492 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1271 1493 
 		global $globalStatsFilters;
1272 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1494 
+		if ($filter_name == '') {
1495 
+			$filter_name = $this->filter_name;
1496 
+		}
1273 1497 
 		if ($year == '' && $month == '') {
1274 1498 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1275 1499 
 			try {
 
@@ -1280,7 +1504,9 @@  discard block
 
 block discarded – undo
1280 1504 
 			}
1281 1505 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1282 1506 
 			$all = $result[0]['nb_airline'];
1283 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1507 
+		} else {
1508 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1509 
+		}
1284 1510 
 		if (empty($all)) {
1285 1511 
 			$filters = array();
1286 1512 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1295,7 +1521,9 @@  discard block
 
 block discarded – undo
1295 1521 
 	}
1296 1522 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1297 1523 
 		global $globalStatsFilters;
1298 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1524 
+		if ($filter_name == '') {
1525 
+			$filter_name = $this->filter_name;
1526 
+		}
1299 1527 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1300 1528 
 			$Spotter = new Spotter($this->db);
1301 1529 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1350,7 +1578,9 @@  discard block
 
 block discarded – undo
1350 1578 
 	}
1351 1579 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1352 1580 
 		global $globalStatsFilters;
1353 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1581 
+		if ($filter_name == '') {
1582 
+			$filter_name = $this->filter_name;
1583 
+		}
1354 1584 
 		//if ($year == '') $year = date('Y');
1355 1585 
 		if ($year == '' && $month == '') {
1356 1586 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1379,7 +1609,9 @@  discard block
 
 block discarded – undo
1379 1609 
 	}
1380 1610
1381 1611 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1382 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1612 
+		if ($filter_name == '') {
1613 
+			$filter_name = $this->filter_name;
1614 
+		}
1383 1615 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1384 1616 
 			$Spotter = new Spotter($this->db);
1385 1617 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1403,7 +1635,9 @@  discard block
 
 block discarded – undo
1403 1635 
 		return $all;
1404 1636 
 	}
1405 1637 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1406 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1638 
+		if ($filter_name == '') {
1639 
+			$filter_name = $this->filter_name;
1640 
+		}
1407 1641 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1408 1642 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1409 1643 
 		try {
 
@@ -1416,7 +1650,9 @@  discard block
 
 block discarded – undo
1416 1650 
 		return $all;
1417 1651 
 	}
1418 1652 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1419 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1653 
+		if ($filter_name == '') {
1654 
+			$filter_name = $this->filter_name;
1655 
+		}
1420 1656 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1421 1657 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422 1658 
 		try {
 
@@ -1427,7 +1663,9 @@  discard block
 
 block discarded – undo
1427 1663 
 		}
1428 1664 
 	}
1429 1665 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1430 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1666 
+		if ($filter_name == '') {
1667 
+			$filter_name = $this->filter_name;
1668 
+		}
1431 1669 
 		global $globalArchiveMonths, $globalDBdriver;
1432 1670 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1433 1671 
 			$Spotter = new Spotter($this->db);
 
@@ -1483,7 +1721,9 @@  discard block
 
 block discarded – undo
1483 1721 
 	}
1484 1722 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1485 1723 
 		global $globalArchiveMonths, $globalDBdriver;
1486 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1724 
+		if ($filter_name == '') {
1725 
+			$filter_name = $this->filter_name;
1726 
+		}
1487 1727 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1488 1728 
 			$Spotter = new Spotter($this->db);
1489 1729 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1516,7 +1756,9 @@  discard block
 
 block discarded – undo
1516 1756 
 	}
1517 1757 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1518 1758 
 		global $globalArchiveMonths, $globalDBdriver;
1519 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1759 
+		if ($filter_name == '') {
1760 
+			$filter_name = $this->filter_name;
1761 
+		}
1520 1762 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1521 1763 
 			$Spotter = new Spotter($this->db);
1522 1764 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1547,7 +1789,9 @@  discard block
 
 block discarded – undo
1547 1789 
 	}
1548 1790 
 	public function getStatsAirlineTotal($filter_name = '') {
1549 1791 
 		global $globalArchiveMonths, $globalDBdriver;
1550 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1792 
+		if ($filter_name == '') {
1793 
+			$filter_name = $this->filter_name;
1794 
+		}
1551 1795 
 		if ($globalDBdriver == 'mysql') {
1552 1796 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1553 1797 
 		} else {
 
@@ -1564,7 +1808,9 @@  discard block
 
 block discarded – undo
1564 1808 
 	}
1565 1809 
 	public function getStatsOwnerTotal($filter_name = '') {
1566 1810 
 		global $globalArchiveMonths, $globalDBdriver;
1567 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1811 
+		if ($filter_name == '') {
1812 
+			$filter_name = $this->filter_name;
1813 
+		}
1568 1814 
 		if ($globalDBdriver == 'mysql') {
1569 1815 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1570 1816 
 		} else {
 
@@ -1581,7 +1827,9 @@  discard block
 
 block discarded – undo
1581 1827 
 	}
1582 1828 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1583 1829 
 		global $globalArchiveMonths, $globalDBdriver;
1584 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1830 
+		if ($filter_name == '') {
1831 
+			$filter_name = $this->filter_name;
1832 
+		}
1585 1833 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1586 1834 
 		try {
1587 1835 
 			$sth = $this->db->prepare($query);
 
@@ -1590,12 +1838,17 @@  discard block
 
 block discarded – undo
1590 1838 
 			echo "error : ".$e->getMessage();
1591 1839 
 		}
1592 1840 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1593 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1594 
-		else return 0;
1841 
+		if (isset($all[0]['cnt'])) {
1842 
+			return $all[0]['cnt'];
1843 
+		} else {
1844 
+			return 0;
1845 
+		}
1595 1846 
 	}
1596 1847 
 	public function getStatsPilotTotal($filter_name = '') {
1597 1848 
 		global $globalArchiveMonths, $globalDBdriver;
1598 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1849 
+		if ($filter_name == '') {
1850 
+			$filter_name = $this->filter_name;
1851 
+		}
1599 1852 
 		if ($globalDBdriver == 'mysql') {
1600 1853 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1601 1854 
 		} else {
 
@@ -1612,7 +1865,9 @@  discard block
 
 block discarded – undo
1612 1865 
 	}
1613 1866 
 	public function getStatsPilot($pilot,$filter_name = '') {
1614 1867 
 		global $globalArchiveMonths, $globalDBdriver;
1615 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1868 
+		if ($filter_name == '') {
1869 
+			$filter_name = $this->filter_name;
1870 
+		}
1616 1871 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1617 1872 
 		try {
1618 1873 
 			$sth = $this->db->prepare($query);
 
@@ -1621,13 +1876,18 @@  discard block
 
 block discarded – undo
1621 1876 
 			echo "error : ".$e->getMessage();
1622 1877 
 		}
1623 1878 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1624 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1625 
-		else return 0;
1879 
+		if (isset($all[0]['cnt'])) {
1880 
+			return $all[0]['cnt'];
1881 
+		} else {
1882 
+			return 0;
1883 
+		}
1626 1884 
 	}
1627 1885
1628 1886 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1629 1887 
 		global $globalDBdriver;
1630 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1888 
+		if ($filter_name == '') {
1889 
+			$filter_name = $this->filter_name;
1890 
+		}
1631 1891 
 		if ($globalDBdriver == 'mysql') {
1632 1892 
 			$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";
1633 1893 
 		} else {
 
@@ -1643,7 +1903,9 @@  discard block
 
 block discarded – undo
1643 1903 
 	}
1644 1904 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1645 1905 
 		global $globalDBdriver;
1646 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1906 
+		if ($filter_name == '') {
1907 
+			$filter_name = $this->filter_name;
1908 
+		}
1647 1909 
 		if ($globalDBdriver == 'mysql') {
1648 1910 
 			$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";
1649 1911 
 		} else {
 
@@ -2116,27 +2378,37 @@  discard block
 
 block discarded – undo
2116 2378 
 		date_default_timezone_set('UTC');
2117 2379 
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
2118 2380 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
2119 
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
2381 
+			if ($globalDebug) {
2382 
+				echo '!!! Update Marine stats !!!'."\n";
2383 
+			}
2120 2384 
 			if (isset($last_update[0]['value'])) {
2121 2385 
 				$last_update_day = $last_update[0]['value'];
2122 
-			} else $last_update_day = '2012-12-12 12:12:12';
2386 
+			} else {
2387 
+				$last_update_day = '2012-12-12 12:12:12';
2388 
+			}
2123 2389 
 			$reset = false;
2124 2390 
 			$Marine = new Marine($this->db);
2125 2391 
 			$filtername = 'marine';
2126 2392 
 			if ($Connection->tableExists('countries')) {
2127 
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2393 
+				if ($globalDebug) {
2394 
+					echo 'Count all vessels by countries...'."\n";
2395 
+				}
2128 2396 
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2129 2397 
 				foreach ($alldata as $number) {
2130 2398 
 					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2131 2399 
 				}
2132 2400 
 			}
2133 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2401 
+			if ($globalDebug) {
2402 
+				echo 'Count all vessels by months...'."\n";
2403 
+			}
2134 2404 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2135 2405 
 			$filter_last_month = array('since_date' => $last_month);
2136 2406 
 			$alldata = $Marine->countAllMonths($filter_last_month);
2137 2407 
 			$lastyear = false;
2138 2408 
 			foreach ($alldata as $number) {
2139 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2409 
+				if ($number['year_name'] != date('Y')) {
2410 
+					$lastyear = true;
2411 
+				}
2140 2412 
 				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2141 2413 
 			}
2142 2414 
 			echo 'Marine data...'."\n";
 
@@ -2172,26 +2444,36 @@  discard block
 
 block discarded – undo
2172 2444 
 		}
2173 2445 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2174 2446 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
2175 
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
2447 
+			if ($globalDebug) {
2448 
+				echo '!!! Update tracker stats !!!'."\n";
2449 
+			}
2176 2450 
 			if (isset($last_update[0]['value'])) {
2177 2451 
 				$last_update_day = $last_update[0]['value'];
2178 
-			} else $last_update_day = '2012-12-12 12:12:12';
2452 
+			} else {
2453 
+				$last_update_day = '2012-12-12 12:12:12';
2454 
+			}
2179 2455 
 			$reset = false;
2180 2456 
 			$Tracker = new Tracker($this->db);
2181 2457 
 			if ($Connection->tableExists('countries')) {
2182 
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2458 
+				if ($globalDebug) {
2459 
+					echo 'Count all trackers by countries...'."\n";
2460 
+				}
2183 2461 
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2184 2462 
 				foreach ($alldata as $number) {
2185 2463 
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2186 2464 
 				}
2187 2465 
 			}
2188 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2466 
+			if ($globalDebug) {
2467 
+				echo 'Count all vessels by months...'."\n";
2468 
+			}
2189 2469 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2190 2470 
 			$filter_last_month = array('since_date' => $last_month);
2191 2471 
 			$alldata = $Tracker->countAllMonths($filter_last_month);
2192 2472 
 			$lastyear = false;
2193 2473 
 			foreach ($alldata as $number) {
2194 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2474 
+				if ($number['year_name'] != date('Y')) {
2475 
+					$lastyear = true;
2476 
+				}
2195 2477 
 				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2196 2478 
 			}
2197 2479 
 			echo 'Tracker data...'."\n";
 
@@ -2228,10 +2510,14 @@  discard block
 
 block discarded – undo
2228 2510
2229 2511 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
2230 2512 
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
2231 
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
2513 
+			if ($globalDebug) {
2514 
+				echo '!!! Update aicraft stats !!!'."\n";
2515 
+			}
2232 2516 
 			if (isset($last_update[0]['value'])) {
2233 2517 
 				$last_update_day = $last_update[0]['value'];
2234 
-			} else $last_update_day = '2012-12-12 12:12:12';
2518 
+			} else {
2519 
+				$last_update_day = '2012-12-12 12:12:12';
2520 
+			}
2235 2521 
 			$reset = false;
2236 2522 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
2237 2523 
 			if ($globalStatsResetYear) {
 
@@ -2240,43 +2526,63 @@  discard block
 
 block discarded – undo
2240 2526 
 			}
2241 2527 
 			$Spotter = new Spotter($this->db);
2242 2528
2243 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2529 
+			if ($globalDebug) {
2530 
+				echo 'Count all aircraft types...'."\n";
2531 
+			}
2244 2532 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2245 2533 
 			foreach ($alldata as $number) {
2246 2534 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2247 2535 
 			}
2248 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2536 
+			if ($globalDebug) {
2537 
+				echo 'Count all airlines...'."\n";
2538 
+			}
2249 2539 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2250 2540 
 			foreach ($alldata as $number) {
2251 2541 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2252 2542 
 			}
2253 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2543 
+			if ($globalDebug) {
2544 
+				echo 'Count all registrations...'."\n";
2545 
+			}
2254 2546 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2255 2547 
 			foreach ($alldata as $number) {
2256 2548 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2257 2549 
 			}
2258 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2550 
+			if ($globalDebug) {
2551 
+				echo 'Count all callsigns...'."\n";
2552 
+			}
2259 2553 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2260 2554 
 			foreach ($alldata as $number) {
2261 2555 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2262 2556 
 			}
2263 
-			if ($globalDebug) echo 'Count all owners...'."\n";
2557 
+			if ($globalDebug) {
2558 
+				echo 'Count all owners...'."\n";
2559 
+			}
2264 2560 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2265 2561 
 			foreach ($alldata as $number) {
2266 2562 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2267 2563 
 			}
2268 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2564 
+			if ($globalDebug) {
2565 
+				echo 'Count all pilots...'."\n";
2566 
+			}
2269 2567 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2270 2568 
 			foreach ($alldata as $number) {
2271 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2569 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2570 
+					$number['pilot_id'] = $number['pilot_name'];
2571 
+				}
2272 2572 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2273 2573 
 			}
2274 2574
2275 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2575 
+			if ($globalDebug) {
2576 
+				echo 'Count all departure airports...'."\n";
2577 
+			}
2276 2578 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2277 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2579 
+			if ($globalDebug) {
2580 
+				echo 'Count all detected departure airports...'."\n";
2581 
+			}
2278 2582 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2279 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2583 
+			if ($globalDebug) {
2584 
+				echo 'Order departure airports...'."\n";
2585 
+			}
2280 2586 
 			$alldata = array();
2281 2587 
 			foreach ($pall as $value) {
2282 2588 
 				$icao = $value['airport_departure_icao'];
 
@@ -2286,7 +2592,9 @@  discard block
 
 block discarded – undo
2286 2592 
 				$icao = $value['airport_departure_icao'];
2287 2593 
 				if (isset($alldata[$icao])) {
2288 2594 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2289 
-				} else $alldata[$icao] = $value;
2595 
+				} else {
2596 
+					$alldata[$icao] = $value;
2597 
+				}
2290 2598 
 			}
2291 2599 
 			$count = array();
2292 2600 
 			foreach ($alldata as $key => $row) {
 
@@ -2296,11 +2604,17 @@  discard block
 
 block discarded – undo
2296 2604 
 			foreach ($alldata as $number) {
2297 2605 
 				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);
2298 2606 
 			}
2299 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2607 
+			if ($globalDebug) {
2608 
+				echo 'Count all arrival airports...'."\n";
2609 
+			}
2300 2610 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2301 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2611 
+			if ($globalDebug) {
2612 
+				echo 'Count all detected arrival airports...'."\n";
2613 
+			}
2302 2614 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2303 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2615 
+			if ($globalDebug) {
2616 
+				echo 'Order arrival airports...'."\n";
2617 
+			}
2304 2618 
 			$alldata = array();
2305 2619 
 			foreach ($pall as $value) {
2306 2620 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2310,7 +2624,9 @@  discard block
 
 block discarded – undo
2310 2624 
 				$icao = $value['airport_arrival_icao'];
2311 2625 
 				if (isset($alldata[$icao])) {
2312 2626 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2313 
-				} else $alldata[$icao] = $value;
2627 
+				} else {
2628 
+					$alldata[$icao] = $value;
2629 
+				}
2314 2630 
 			}
2315 2631 
 			$count = array();
2316 2632 
 			foreach ($alldata as $key => $row) {
 
@@ -2321,7 +2637,9 @@  discard block
 
 block discarded – undo
2321 2637 
 				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);
2322 2638 
 			}
2323 2639 
 			if ($Connection->tableExists('countries')) {
2324 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2640 
+				if ($globalDebug) {
2641 
+					echo 'Count all flights by countries...'."\n";
2642 
+				}
2325 2643 
 				//$SpotterArchive = new SpotterArchive();
2326 2644 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2327 2645 
 				$Spotter = new Spotter($this->db);
 
@@ -2332,7 +2650,9 @@  discard block
 
 block discarded – undo
2332 2650 
 			}
2333 2651
2334 2652 
 			if (isset($globalAccidents) && $globalAccidents) {
2335 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2653 
+				if ($globalDebug) {
2654 
+					echo 'Count fatalities stats...'."\n";
2655 
+				}
2336 2656 
 				$Accident = new Accident($this->db);
2337 2657 
 				$this->deleteStatsByType('fatalities_byyear');
2338 2658 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2348,48 +2668,68 @@  discard block
 
 block discarded – undo
2348 2668
2349 2669 
 			// Add by month using getstat if month finish...
2350 2670 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2351 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2671 
+			if ($globalDebug) {
2672 
+				echo 'Count all flights by months...'."\n";
2673 
+			}
2352 2674 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2353 2675 
 			$filter_last_month = array('since_date' => $last_month);
2354 2676 
 			$Spotter = new Spotter($this->db);
2355 2677 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2356 2678 
 			$lastyear = false;
2357 2679 
 			foreach ($alldata as $number) {
2358 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2680 
+				if ($number['year_name'] != date('Y')) {
2681 
+					$lastyear = true;
2682 
+				}
2359 2683 
 				$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'])));
2360 2684 
 			}
2361 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2685 
+			if ($globalDebug) {
2686 
+				echo 'Count all military flights by months...'."\n";
2687 
+			}
2362 2688 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2363 2689 
 			foreach ($alldata as $number) {
2364 2690 
 				$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'])));
2365 2691 
 			}
2366 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2692 
+			if ($globalDebug) {
2693 
+				echo 'Count all owners by months...'."\n";
2694 
+			}
2367 2695 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2368 2696 
 			foreach ($alldata as $number) {
2369 2697 
 				$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'])));
2370 2698 
 			}
2371 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2699 
+			if ($globalDebug) {
2700 
+				echo 'Count all pilots by months...'."\n";
2701 
+			}
2372 2702 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2373 2703 
 			foreach ($alldata as $number) {
2374 2704 
 				$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'])));
2375 2705 
 			}
2376 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2706 
+			if ($globalDebug) {
2707 
+				echo 'Count all airlines by months...'."\n";
2708 
+			}
2377 2709 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2378 2710 
 			foreach ($alldata as $number) {
2379 2711 
 				$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'])));
2380 2712 
 			}
2381 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2713 
+			if ($globalDebug) {
2714 
+				echo 'Count all aircrafts by months...'."\n";
2715 
+			}
2382 2716 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2383 2717 
 			foreach ($alldata as $number) {
2384 2718 
 				$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'])));
2385 2719 
 			}
2386 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2720 
+			if ($globalDebug) {
2721 
+				echo 'Count all real arrivals by months...'."\n";
2722 
+			}
2387 2723 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2388 2724 
 			foreach ($alldata as $number) {
2389 2725 
 				$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'])));
2390 2726 
 			}
2391 
-			if ($globalDebug) echo 'Airports data...'."\n";
2392 
-			if ($globalDebug) echo '...Departure'."\n";
2727 
+			if ($globalDebug) {
2728 
+				echo 'Airports data...'."\n";
2729 
+			}
2730 
+			if ($globalDebug) {
2731 
+				echo '...Departure'."\n";
2732 
+			}
2393 2733 
 			$this->deleteStatAirport('daily');
2394 2734 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2395 2735 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2507,7 +2847,9 @@  discard block
 
 block discarded – undo
2507 2847 
 			// Count by airlines
2508 2848 
 			echo '--- Stats by airlines ---'."\n";
2509 2849 
 			if ($Connection->tableExists('countries')) {
2510 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2850 
+				if ($globalDebug) {
2851 
+					echo 'Count all flights by countries by airlines...'."\n";
2852 
+				}
2511 2853 
 				$SpotterArchive = new SpotterArchive($this->db);
2512 2854 
 				//$Spotter = new Spotter($this->db);
2513 2855 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2516,37 +2858,53 @@  discard block
 
 block discarded – undo
2516 2858 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2517 2859 
 				}
2518 2860 
 			}
2519 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2861 
+			if ($globalDebug) {
2862 
+				echo 'Count all aircraft types by airlines...'."\n";
2863 
+			}
2520 2864 
 			$Spotter = new Spotter($this->db);
2521 2865 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2522 2866 
 			foreach ($alldata as $number) {
2523 2867 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2524 2868 
 			}
2525 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2869 
+			if ($globalDebug) {
2870 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2871 
+			}
2526 2872 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2527 2873 
 			foreach ($alldata as $number) {
2528 2874 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2529 2875 
 			}
2530 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2876 
+			if ($globalDebug) {
2877 
+				echo 'Count all callsigns by airlines...'."\n";
2878 
+			}
2531 2879 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2532 2880 
 			foreach ($alldata as $number) {
2533 2881 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2534 2882 
 			}
2535 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2883 
+			if ($globalDebug) {
2884 
+				echo 'Count all owners by airlines...'."\n";
2885 
+			}
2536 2886 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2537 2887 
 			foreach ($alldata as $number) {
2538 2888 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2539 2889 
 			}
2540 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2890 
+			if ($globalDebug) {
2891 
+				echo 'Count all pilots by airlines...'."\n";
2892 
+			}
2541 2893 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2542 2894 
 			foreach ($alldata as $number) {
2543 2895 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2544 2896 
 			}
2545 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2897 
+			if ($globalDebug) {
2898 
+				echo 'Count all departure airports by airlines...'."\n";
2899 
+			}
2546 2900 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2547 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2901 
+			if ($globalDebug) {
2902 
+				echo 'Count all detected departure airports by airlines...'."\n";
2903 
+			}
2548 2904 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2549 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2905 
+			if ($globalDebug) {
2906 
+				echo 'Order detected departure airports by airlines...'."\n";
2907 
+			}
2550 2908 
 			//$alldata = array();
2551 2909 
 			foreach ($dall as $value) {
2552 2910 
 				$icao = $value['airport_departure_icao'];
 
@@ -2567,11 +2925,17 @@  discard block
 
 block discarded – undo
2567 2925 
 			foreach ($alldata as $number) {
2568 2926 
 				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);
2569 2927 
 			}
2570 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2928 
+			if ($globalDebug) {
2929 
+				echo 'Count all arrival airports by airlines...'."\n";
2930 
+			}
2571 2931 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2572 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2932 
+			if ($globalDebug) {
2933 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2934 
+			}
2573 2935 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2574 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2936 
+			if ($globalDebug) {
2937 
+				echo 'Order arrival airports by airlines...'."\n";
2938 
+			}
2575 2939 
 			//$alldata = array();
2576 2940 
 			foreach ($dall as $value) {
2577 2941 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2590,37 +2954,53 @@  discard block
 
 block discarded – undo
2590 2954 
 			}
2591 2955 
 			$alldata = $pall;
2592 2956 
 			foreach ($alldata as $number) {
2593 
-				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);
2957 
+				if ($number['airline_icao'] != '') {
2958 
+					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);
2959 
+				}
2960 
+			}
2961 
+			if ($globalDebug) {
2962 
+				echo 'Count all flights by months by airlines...'."\n";
2594 2963 
 			}
2595 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2596 2964 
 			$Spotter = new Spotter($this->db);
2597 2965 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2598 2966 
 			$lastyear = false;
2599 2967 
 			foreach ($alldata as $number) {
2600 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2968 
+				if ($number['year_name'] != date('Y')) {
2969 
+					$lastyear = true;
2970 
+				}
2601 2971 
 				$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']);
2602 2972 
 			}
2603 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2973 
+			if ($globalDebug) {
2974 
+				echo 'Count all owners by months by airlines...'."\n";
2975 
+			}
2604 2976 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2605 2977 
 			foreach ($alldata as $number) {
2606 2978 
 				$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']);
2607 2979 
 			}
2608 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2980 
+			if ($globalDebug) {
2981 
+				echo 'Count all pilots by months by airlines...'."\n";
2982 
+			}
2609 2983 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2610 2984 
 			foreach ($alldata as $number) {
2611 2985 
 				$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']);
2612 2986 
 			}
2613 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2987 
+			if ($globalDebug) {
2988 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2989 
+			}
2614 2990 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2615 2991 
 			foreach ($alldata as $number) {
2616 2992 
 				$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']);
2617 2993 
 			}
2618 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2994 
+			if ($globalDebug) {
2995 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2996 
+			}
2619 2997 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2620 2998 
 			foreach ($alldata as $number) {
2621 2999 
 				$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']);
2622 3000 
 			}
2623 
-			if ($globalDebug) echo '...Departure'."\n";
3001 
+			if ($globalDebug) {
3002 
+				echo '...Departure'."\n";
3003 
+			}
2624 3004 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2625 3005 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2626 3006 
 			foreach ($dall as $value) {
 
@@ -2643,7 +3023,9 @@  discard block
 
 block discarded – undo
2643 3023 
 			foreach ($alldata as $number) {
2644 3024 
 				$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']);
2645 3025 
 			}
2646 
-			if ($globalDebug) echo '...Arrival'."\n";
3026 
+			if ($globalDebug) {
3027 
+				echo '...Arrival'."\n";
3028 
+			}
2647 3029 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2648 3030 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2649 3031 
 			foreach ($dall as $value) {
 
@@ -2667,13 +3049,19 @@  discard block
 
 block discarded – undo
2667 3049 
 				$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']);
2668 3050 
 			}
2669 3051
2670 
-			if ($globalDebug) echo 'Flights data...'."\n";
2671 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3052 
+			if ($globalDebug) {
3053 
+				echo 'Flights data...'."\n";
3054 
+			}
3055 
+			if ($globalDebug) {
3056 
+				echo '-> countAllDatesLastMonth...'."\n";
3057 
+			}
2672 3058 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2673 3059 
 			foreach ($alldata as $number) {
2674 3060 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2675 3061 
 			}
2676 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
3062 
+			if ($globalDebug) {
3063 
+				echo '-> countAllDates...'."\n";
3064 
+			}
2677 3065 
 			//$previousdata = $this->countAllDatesByAirlines();
2678 3066 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2679 3067 
 			$values = array();
 
@@ -2686,14 +3074,18 @@  discard block
 
 block discarded – undo
2686 3074 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2687 3075 
 			}
2688 3076
2689 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
3077 
+			if ($globalDebug) {
3078 
+				echo '-> countAllHours...'."\n";
3079 
+			}
2690 3080 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2691 3081 
 			foreach ($alldata as $number) {
2692 3082 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2693 3083 
 			}
2694 3084
2695 3085 
 			// Stats by filters
2696 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
3086 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
3087 
+				$globalStatsFilters = array();
3088 
+			}
2697 3089 
 			foreach ($globalStatsFilters as $name => $filter) {
2698 3090 
 				if (!empty($filter)) {
2699 3091 
 					//$filter_name = $filter['name'];
 
@@ -2701,7 +3093,9 @@  discard block
 
 block discarded – undo
2701 3093 
 					$reset = false;
2702 3094 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2703 3095 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2704 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3096 
+						if ($globalDebug) {
3097 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3098 
+						}
2705 3099 
 						$this->deleteOldStats($filter_name);
2706 3100 
 						unset($last_update);
2707 3101 
 					}
 
@@ -2718,39 +3112,55 @@  discard block
 
 block discarded – undo
2718 3112 
 						$reset = true;
2719 3113 
 					}
2720 3114 
 					// Count by filter
2721 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3115 
+					if ($globalDebug) {
3116 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
3117 
+					}
2722 3118 
 					$Spotter = new Spotter($this->db);
2723 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3119 
+					if ($globalDebug) {
3120 
+						echo 'Count all aircraft types...'."\n";
3121 
+					}
2724 3122 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2725 3123 
 					foreach ($alldata as $number) {
2726 3124 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2727 3125 
 					}
2728 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
3126 
+					if ($globalDebug) {
3127 
+						echo 'Count all airlines...'."\n";
3128 
+					}
2729 3129 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2730 3130 
 					foreach ($alldata as $number) {
2731 3131 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2732 3132 
 					}
2733 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3133 
+					if ($globalDebug) {
3134 
+						echo 'Count all aircraft registrations...'."\n";
3135 
+					}
2734 3136 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2735 3137 
 					foreach ($alldata as $number) {
2736 3138 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2737 3139 
 					}
2738 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
3140 
+					if ($globalDebug) {
3141 
+						echo 'Count all callsigns...'."\n";
3142 
+					}
2739 3143 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2740 3144 
 					foreach ($alldata as $number) {
2741 3145 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2742 3146 
 					}
2743 
-					if ($globalDebug) echo 'Count all owners...'."\n";
3147 
+					if ($globalDebug) {
3148 
+						echo 'Count all owners...'."\n";
3149 
+					}
2744 3150 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2745 3151 
 					foreach ($alldata as $number) {
2746 3152 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2747 3153 
 					}
2748 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
3154 
+					if ($globalDebug) {
3155 
+						echo 'Count all pilots...'."\n";
3156 
+					}
2749 3157 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2750 3158 
 					foreach ($alldata as $number) {
2751 3159 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2752 3160 
 					}
2753 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
3161 
+					if ($globalDebug) {
3162 
+						echo 'Count departure airports...'."\n";
3163 
+					}
2754 3164 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2755 3165 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2756 3166 
 					$alldata = array();
 
@@ -2762,7 +3172,9 @@  discard block
 
 block discarded – undo
2762 3172 
 						$icao = $value['airport_departure_icao'];
2763 3173 
 						if (isset($alldata[$icao])) {
2764 3174 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2765 
-						} else $alldata[$icao] = $value;
3175 
+						} else {
3176 
+							$alldata[$icao] = $value;
3177 
+						}
2766 3178 
 					}
2767 3179 
 					$count = array();
2768 3180 
 					foreach ($alldata as $key => $row) {
 
@@ -2772,7 +3184,9 @@  discard block
 
 block discarded – undo
2772 3184 
 					foreach ($alldata as $number) {
2773 3185 
 						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);
2774 3186 
 					}
2775 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3187 
+					if ($globalDebug) {
3188 
+						echo 'Count all arrival airports...'."\n";
3189 
+					}
2776 3190 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2777 3191 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2778 3192 
 					$alldata = array();
 
@@ -2784,7 +3198,9 @@  discard block
 
 block discarded – undo
2784 3198 
 						$icao = $value['airport_arrival_icao'];
2785 3199 
 						if (isset($alldata[$icao])) {
2786 3200 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2787 
-						} else $alldata[$icao] = $value;
3201 
+						} else {
3202 
+							$alldata[$icao] = $value;
3203 
+						}
2788 3204 
 					}
2789 3205 
 					$count = array();
2790 3206 
 					foreach ($alldata as $key => $row) {
 
@@ -2794,35 +3210,49 @@  discard block
 
 block discarded – undo
2794 3210 
 					foreach ($alldata as $number) {
2795 3211 
 						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);
2796 3212 
 					}
2797 
-					if ($globalDebug) echo 'Count all months...'."\n";
3213 
+					if ($globalDebug) {
3214 
+						echo 'Count all months...'."\n";
3215 
+					}
2798 3216 
 					$Spotter = new Spotter($this->db);
2799 3217 
 					$alldata = $Spotter->countAllMonths($filter);
2800 3218 
 					$lastyear = false;
2801 3219 
 					foreach ($alldata as $number) {
2802 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
3220 
+						if ($number['year_name'] != date('Y')) {
3221 
+							$lastyear = true;
3222 
+						}
2803 3223 
 						$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);
2804 3224 
 					}
2805 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
3225 
+					if ($globalDebug) {
3226 
+						echo 'Count all owners by months...'."\n";
3227 
+					}
2806 3228 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2807 3229 
 					foreach ($alldata as $number) {
2808 3230 
 						$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);
2809 3231 
 					}
2810 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3232 
+					if ($globalDebug) {
3233 
+						echo 'Count all pilots by months...'."\n";
3234 
+					}
2811 3235 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2812 3236 
 					foreach ($alldata as $number) {
2813 3237 
 						$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);
2814 3238 
 					}
2815 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
3239 
+					if ($globalDebug) {
3240 
+						echo 'Count all military by months...'."\n";
3241 
+					}
2816 3242 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2817 3243 
 					foreach ($alldata as $number) {
2818 3244 
 						$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);
2819 3245 
 					}
2820 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3246 
+					if ($globalDebug) {
3247 
+						echo 'Count all aircrafts by months...'."\n";
3248 
+					}
2821 3249 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2822 3250 
 				    	foreach ($alldata as $number) {
2823 3251 
 			    			$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);
2824 3252 
 					}
2825 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3253 
+					if ($globalDebug) {
3254 
+						echo 'Count all real arrivals by months...'."\n";
3255 
+					}
2826 3256 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2827 3257 
 					foreach ($alldata as $number) {
2828 3258 
 						$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.
header.php 1 patch
Braces   +77 added lines, -17 removed lines patch added patch discarded remove patch 
@@ -6,10 +6,15 @@  discard block
 
 block discarded – undo
6 6 
 //gets the page file and stores it in a variable
7 7 
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
8 8 
 $current_page = $file_path['filename'];
9 
-if ($globalTimezone == '') $globalTimezone = 'UTC';
9 
+if ($globalTimezone == '') {
10 
+	$globalTimezone = 'UTC';
11 
+}
10 12 
 date_default_timezone_set($globalTimezone);
11 
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
12 
-else $MapType = $globalMapProvider;
13 
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
14 
+	$MapType = $_COOKIE['MapType'];
15 
+} else {
16 
+	$MapType = $globalMapProvider;
17 
+}
13 18
14 19
15 20 
 if (isset($_GET['3d'])) {
 
@@ -241,7 +246,13 @@  discard block
 
 block discarded – undo
241 246 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
242 247 
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
243 248 
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
244 
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
249 
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
250 
+	print '&latitude='.$latitude;
251 
+}
252 
+?><?php if(isset($longitude)) {
253 
+	print '&longitude='.$longitude;
254 
+}
255 
+?>&<?php print time(); ?>"></script>
245 256 
 <?php
246 257 
 		if (!isset($type) || $type == 'aircraft') {
247 258 
 ?>
 
@@ -314,7 +325,13 @@  discard block
 
 block discarded – undo
314 325 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
315 326 
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
316 327 
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
317 
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
328 
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
329 
+	print '&latitude='.$latitude;
330 
+}
331 
+?><?php if(isset($longitude)) {
332 
+	print '&longitude='.$longitude;
333 
+}
334 
+?>&<?php print time(); ?>"></script>
318 335 
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
319 336 
 <?php
320 337 
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 
@@ -395,7 +412,12 @@  discard block
 
 block discarded – undo
395 412 
         <span class="icon-bar"></span>
396 413 
       </button>
397 414 
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
398 
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
415 
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
416 
+	print '/';
417 
+} else {
418 
+	print $globalURL;
419 
+}
420 
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
399 421 
     </div>
400 422 
     <div class="collapse navbar-collapse">
401 423 
 
@@ -434,7 +456,10 @@  discard block
 
 block discarded – undo
434 456 
 <?php
435 457 
     }
436 458 
 ?>
437 
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
459 
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
460 
+	echo 'right-';
461 
+}
462 
+?>caret"></b></a>
438 463 
           <ul class="dropdown-menu">
439 464 
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li>
440 465 
 <?php
 
@@ -505,8 +530,14 @@  discard block
 
 block discarded – undo
505 530 
         </li>
506 531 
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
507 532 
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
508 
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
509 
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
533 
+        <li class="dropdown<?php if ($sub) {
534 
+	echo '-submenu';
535 
+}
536 
+?>">
537 
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
538 
+	echo 'right-';
539 
+}
540 
+?>caret"></b></a>
510 541 
           <ul class="dropdown-menu">
511 542 
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
512 543 
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
 
@@ -542,7 +573,10 @@  discard block
 
 block discarded – undo
542 573 
 <?php
543 574 
 	}
544 575 
 ?>
545 
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
576 
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
577 
+	echo 'right-';
578 
+}
579 
+?>caret"></b></a>
546 580 
 		<ul class="dropdown-menu">
547 581 
 		    <li><a href="<?php print $globalURL; ?>/marine/currently"><?php echo _("Current Activity"); ?></a></li>
548 582 
 		    <li><a href="<?php print $globalURL; ?>/marine/latest"><?php echo _("Latest Activity"); ?></a></li>
 
@@ -575,7 +609,10 @@  discard block
 
 block discarded – undo
575 609 
 <?php
576 610 
 	}
577 611 
 ?>
578 
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
612 
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
613 
+	echo 'right-';
614 
+}
615 
+?>caret"></b></a>
579 616 
 		<ul class="dropdown-menu">
580 617 
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
581 618 
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
 
@@ -609,7 +646,10 @@  discard block
 
 block discarded – undo
609 646 
 	}
610 647 
 ?>
611 648 
 <!--
612 
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
649 
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
650 
+	echo 'right-';
651 
+}
652 
+?>caret"></b></a>
613 653 
 		<ul class="dropdown-menu">
614 654 
 		    <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li>
615 655 
 		    <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li>
 
@@ -666,7 +706,9 @@  discard block
 
 block discarded – undo
666 706 
   		        $alllang = $Language->getLanguages();
667 707 
   		        foreach ($alllang as $key => $lang) {
668 708 
   		            print '<option value="'.$key.'"';
669 
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
709 
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
710 
+  		            	print ' selected ';
711 
+  		            }
670 712 
   		            print '>'.$lang[0].'</option>';
671 713 
   		        }
672 714 
   		    ?>
 
@@ -806,9 +848,24 @@  discard block
 
 block discarded – undo
806 848 
 	$customid = $globalMapProvider;
807 849 
 ?>
808 850 
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
809 
-        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
810 
-        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
811 
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
851 
+        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
852 
+	print $globalMapCustomLayer[$customid]['maxZoom'];
853 
+} else {
854 
+	print '18';
855 
+}
856 
+?>,
857 
+        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
858 
+	print $globalMapCustomLayer[$customid]['minZoom'];
859 
+} else {
860 
+	print '0';
861 
+}
862 
+?>,
863 
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
864 
+	print 'false';
865 
+} else {
866 
+	print 'true';
867 
+}
868 
+?>,
812 869 
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
813 870 
     }).addTo(map);
814 871 
 <?php
 
@@ -831,4 +888,7 @@  discard block
 
 block discarded – undo
831 888
832 889 
 ?>
833 890
834 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
891 
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
892 
+	print 'index ';
893 
+}
894 
+?>clear">
Please login to merge, or discard this patch.