View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 994417...89e41e )
by Yannick
34:04 queued 01:34
created
Status
Category
Toggle Patches
index.php 1 patch
Braces   +449 added lines, -113 removed lines patch added patch discarded remove patch 
@@ -163,11 +163,26 @@  discard block
 
 block discarded – undo
163 163 
 				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li>
164 164 
 				<li><?php echo _("NOTAM scope:"); ?>
165 165 
 					<select class="selectpicker" onchange="notamscope(this);">
166 
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
167 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
168 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
169 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
170 
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
166 
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
167 
+	print ' selected';
168 
+}
169 
+?>>All</option>
170 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
171 
+	print ' selected';
172 
+}
173 
+?>>Airport/Enroute warning</option>
174 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
175 
+	print ' selected';
176 
+}
177 
+?>>Airport warning</option>
178 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
179 
+	print ' selected';
180 
+}
181 
+?>>Navigation warning</option>
182 
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
183 
+	print ' selected';
184 
+}
185 
+?>>Enroute warning</option>
171 186 
 					</select
172 187 
 				</li>
173 188 
 			</ul>
 
@@ -195,7 +210,12 @@  discard block
 
 block discarded – undo
195 210 
 		        <div class="form-group">
196 211 
 			    <label>From (UTC):</label>
197 212 
 		            <div class='input-group date' id='datetimepicker1'>
198 
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
213 
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) {
214 
+	print $_POST['start_date'];
215 
+} elseif (isset($_COOKIE['archive_begin'])) {
216 
+	print date("m/d/Y h:i a",$_COOKIE['archive_begin']);
217 
+}
218 
+?>" required />
199 219 
 		                <span class="input-group-addon">
200 220 
             			    <span class="glyphicon glyphicon-calendar"></span>
201 221 
 		                </span>
 
@@ -204,7 +224,12 @@  discard block
 
 block discarded – undo
204 224 
 		        <div class="form-group">
205 225 
 			    <label>To (UTC):</label>
206 226 
 		            <div class='input-group date' id='datetimepicker2'>
207 
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
227 
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) {
228 
+	print $_POST['end_date'];
229 
+} elseif (isset($_COOKIE['archive_end'])) {
230 
+	print date("m/d/Y h:i a",$_COOKIE['archive_end']);
231 
+}
232 
+?>" />
208 233 
             			<span class="input-group-addon">
209 234 
 		                    <span class="glyphicon glyphicon-calendar"></span>
210 235 
             			</span>
 
@@ -229,8 +254,20 @@  discard block
 
 block discarded – undo
229 254 
 			</script>
230 255 
 		    <li><?php echo _("Playback speed:"); ?>
231 256 
 			<div class="range">
232 
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
233 
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
257 
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
258 
+	print $_POST['archivespeed'];
259 
+} elseif (isset($_COOKIE['archive_speed'])) {
260 
+	print $_COOKIE['archive_speed'];
261 
+} else {
262 
+	print '1';
263 
+}
264 
+?>">
265 
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
266 
+	print $_COOKIE['archive_speed'];
267 
+} else {
268 
+	print '1';
269 
+}
270 
+?></output>
234 271 
 			</div>
235 272 
 		    </li>
236 273 
 		    <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li>
 
@@ -252,15 +289,27 @@  discard block
 
 block discarded – undo
252 289 
 		    <li><?php echo _("Type of Map:"); ?>
253 290 
 			<select  class="selectpicker" onchange="mapType(this);">
254 291 
 			    <?php
255 
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
256 
-				else $MapType = $_COOKIE['MapType'];
292 
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
293 
+					$MapType = $globalMapProvider;
294 
+				} else {
295 
+					$MapType = $_COOKIE['MapType'];
296 
+				}
257 297 
 			    ?>
258 298 
 			    <?php
259 299 
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
260 300 
 			    ?>
261 
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
262 
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
263 
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
301 
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
302 
+	print ' selected';
303 
+}
304 
+?>>Bing-Aerial</option>
305 
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
306 
+	print ' selected';
307 
+}
308 
+?>>Bing-Hybrid</option>
309 
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
310 
+	print ' selected';
311 
+}
312 
+?>>Bing-Road</option>
264 313 
 			    <?php
265 314 
 				}
266 315 
 			    ?>
 
@@ -270,56 +319,131 @@  discard block
 
 block discarded – undo
270 319 
 			    <?php
271 320 
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
272 321 
 			    ?>
273 
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
274 
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
275 
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
322 
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
323 
+	print ' selected';
324 
+}
325 
+?>>Here-Aerial</option>
326 
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
327 
+	print ' selected';
328 
+}
329 
+?>>Here-Hybrid</option>
330 
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
331 
+	print ' selected';
332 
+}
333 
+?>>Here-Road</option>
276 334 
 			    <?php
277 335 
 				    }
278 336 
 			    ?>
279 337 
 			    <?php
280 338 
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
281 339 
 			    ?>
282 
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
283 
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
284 
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
285 
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
340 
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
341 
+	print ' selected';
342 
+}
343 
+?>>Google Roadmap</option>
344 
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
345 
+	print ' selected';
346 
+}
347 
+?>>Google Satellite</option>
348 
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
349 
+	print ' selected';
350 
+}
351 
+?>>Google Hybrid</option>
352 
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
353 
+	print ' selected';
354 
+}
355 
+?>>Google Terrain</option>
286 356 
 			    <?php
287 357 
 				    }
288 358 
 			    ?>
289 359 
 			    <?php
290 360 
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
291 361 
 			    ?>
292 
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
293 
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
294 
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
362 
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
363 
+	print ' selected';
364 
+}
365 
+?>>MapQuest-OSM</option>
366 
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
367 
+	print ' selected';
368 
+}
369 
+?>>MapQuest-Aerial</option>
370 
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
371 
+	print ' selected';
372 
+}
373 
+?>>MapQuest-Hybrid</option>
295 374 
 			    <?php
296 375 
 				    }
297 376 
 			    ?>
298 
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
377 
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
378 
+	print ' selected';
379 
+}
380 
+?>>Yandex</option>
299 381 
 			    <?php
300 382 
 				}
301 383 
 			    ?>
302 384 
 			    <?php
303 385 
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
304 
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
305 
-					else $MapBoxId = $_COOKIE['MapTypeId'];
386 
+					if (!isset($_COOKIE['MapTypeId'])) {
387 
+						$MapBoxId = 'default';
388 
+					} else {
389 
+						$MapBoxId = $_COOKIE['MapTypeId'];
390 
+					}
306 391 
 			    ?>
307 
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
308 
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
309 
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
310 
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
311 
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
312 
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
313 
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
314 
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
315 
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
316 
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
317 
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
318 
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
392 
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
393 
+	print ' selected';
394 
+}
395 
+?>>Mapbox default</option>
396 
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
397 
+	print ' selected';
398 
+}
399 
+?>>Mapbox streets</option>
400 
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
401 
+	print ' selected';
402 
+}
403 
+?>>Mapbox light</option>
404 
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
405 
+	print ' selected';
406 
+}
407 
+?>>Mapbox dark</option>
408 
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
409 
+	print ' selected';
410 
+}
411 
+?>>Mapbox satellite</option>
412 
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
413 
+	print ' selected';
414 
+}
415 
+?>>Mapbox streets-satellite</option>
416 
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
417 
+	print ' selected';
418 
+}
419 
+?>>Mapbox streets-basic</option>
420 
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
421 
+	print ' selected';
422 
+}
423 
+?>>Mapbox comic</option>
424 
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
425 
+	print ' selected';
426 
+}
427 
+?>>Mapbox outdoors</option>
428 
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
429 
+	print ' selected';
430 
+}
431 
+?>>Mapbox pencil</option>
432 
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
433 
+	print ' selected';
434 
+}
435 
+?>>Mapbox pirates</option>
436 
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
437 
+	print ' selected';
438 
+}
439 
+?>>Mapbox emerald</option>
319 440 
 			    <?php
320 441 
 				    }
321 442 
 			    ?>
322 
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
443 
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
444 
+	print ' selected';
445 
+}
446 
+?>>OpenStreetMap</option>
323 447 
 			</select>
324 448 
 		    </li>
325 449 
 <?php
 
@@ -327,10 +451,22 @@  discard block
 
 block discarded – undo
327 451 
 ?>
328 452 
 		    <li><?php echo _("Type of Terrain:"); ?>
329 453 
 			<select  class="selectpicker" onchange="terrainType(this);">
330 
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
331 
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
332 
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
333 
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
454 
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
455 
+	print ' selected';
456 
+}
457 
+?>>stk terrain</option>
458 
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
459 
+	print ' selected';
460 
+}
461 
+?>>ellipsoid</option>
462 
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
463 
+	print ' selected';
464 
+}
465 
+?>>vr terrain</option>
466 
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') {
467 
+	print ' selected';
468 
+}
469 
+?>>ArticDEM</option>
334 470 
 			</select>
335 471 
 		    </li>
336 472 
 <?php
 
@@ -342,33 +478,69 @@  discard block
 
 block discarded – undo
342 478 
 <?php
343 479 
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
344 480 
 ?>
345 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
346 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
347 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
348 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
349 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
481 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
482 
+	print 'checked';
483 
+}
484 
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
485 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) {
486 
+	print 'checked';
487 
+}
488 
+?> ><?php echo _("Display flight path"); ?></label></div></li>
489 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) {
490 
+	print 'checked';
491 
+}
492 
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
493 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) {
494 
+	print 'checked';
495 
+}
496 
+?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
497 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
498 
+	print 'checked';
499 
+}
500 
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
350 501 
 <?php
351 502 
 	}
352 503 
 	if (isset($globalSatellite) && $globalSatellite === TRUE) {
353 504 
 ?>
354 
-		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
505 
+		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
506 
+	print 'checked';
507 
+}
508 
+?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
355 509 
 <?php
356 510 
 	}
357 511 
     }
358 512 
 ?>
359 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
360 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
361 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
362 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
513 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) {
514 
+	print 'checked';
515 
+}
516 
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
517 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
518 
+	print 'checked';
519 
+}
520 
+?> ><?php echo _("Display ground station on map"); ?></label></div></li>
521 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
522 
+	print 'checked';
523 
+}
524 
+?> ><?php echo _("Display weather station on map"); ?></label></div></li>
525 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
526 
+	print 'checked';
527 
+}
528 
+?> ><?php echo _("Display lightning on map"); ?></label></div></li>
363 529 
 <?php
364 530 
 	if (isset($globalFires)) {
365 531 
 ?>
366 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li>
532 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
533 
+	print 'checked';
534 
+}
535 
+?> ><?php echo _("Display fires on map"); ?></label></div></li>
367 536 
 <?php
368 537 
 	}
369 538 
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
370 539 
 ?>
371 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
540 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
541 
+	print 'checked';
542 
+}
543 
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
372 544 
 <?php
373 545 
     }
374 546 
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 
@@ -381,17 +553,25 @@  discard block
 
 block discarded – undo
381 553 
 			if (function_exists('array_column')) {
382 554 
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
383 555 
 		    ?>
384 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
556 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
557 
+	print 'checked';
558 
+}
559 
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
385 560 
 		    <?php
386 561 
 			    }
387 562 
 			} elseif (isset($globalSources)) {
388 563 
 			    $dispolar = false;
389 564 
 			    foreach ($globalSources as $testsource) {
390 
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
565 
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
566 
+			        	$dispolar = true;
567 
+			        }
391 568 
 			    }
392 569 
 			    if ($dispolar) {
393 570 
 		    ?>
394 
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
571 
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
572 
+	print 'checked';
573 
+}
574 
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
395 575 
 		    <?php
396 576 
 			    }
397 577 
 		        }
 
@@ -404,12 +584,22 @@  discard block
 
 block discarded – undo
404 584 
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
405 585 
 		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
406 586 
 		    ?>
407 
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
587 
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
588 
+	print 'checked';
589 
+}
590 
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
408 591 
 		    <?php
409 592 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
410 593 
 		    ?>
411 594 
 		    <li><?php echo _("Aircraft icon color:"); ?>
412 
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
595 
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
596 
+	print $_COOKIE['IconColor'];
597 
+} elseif (isset($globalAircraftIconColor)) {
598 
+	print $globalAircraftIconColor;
599 
+} else {
600 
+	print '1a3151';
601 
+}
602 
+?>">
413 603 
 		    </li>
414 604 
 		    <?php
415 605 
 				}
 
@@ -421,7 +611,14 @@  discard block
 
 block discarded – undo
421 611 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
422 612 
 		    ?>
423 613 
 		    <li><?php echo _("Marine icon color:"); ?>
424 
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
614 
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
615 
+	print $_COOKIE['MarineIconColor'];
616 
+} elseif (isset($globalMarineIconColor)) {
617 
+	print $globalMarineIconColor;
618 
+} else {
619 
+	print '1a3151';
620 
+}
621 
+?>">
425 622 
 		    </li>
426 623 
 		    <?php
427 624 
 			    }
 
@@ -432,7 +629,14 @@  discard block
 
 block discarded – undo
432 629 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
433 630 
 		    ?>
434 631 
 		    <li><?php echo _("Tracker icon color:"); ?>
435 
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
632 
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
633 
+	print $_COOKIE['TrackerIconColor'];
634 
+} elseif (isset($globalTrackerIconColor)) {
635 
+	print $globalTrackerIconColor;
636 
+} else {
637 
+	print '1a3151';
638 
+}
639 
+?>">
436 640 
 		    </li>
437 641 
 		    <?php
438 642 
 			    }
 
@@ -443,8 +647,22 @@  discard block
 
 block discarded – undo
443 647 
 		    ?>
444 648 
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
445 649 
 			<div class="range">
446 
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
447 
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
650 
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
651 
+	print $_COOKIE['AirportZoom'];
652 
+} elseif (isset($globalAirportZoom)) {
653 
+	print $globalAirportZoom;
654 
+} else {
655 
+	print '7';
656 
+}
657 
+?>">
658 
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
659 
+	print $_COOKIE['AirportZoom'];
660 
+} elseif (isset($globalAirportZoom)) {
661 
+	print $globalAirportZoom;
662 
+} else {
663 
+	print '7';
664 
+}
665 
+?></output>
448 666 
 			</div>
449 667 
 		    </li>
450 668 
 		    <?php
 
@@ -456,10 +674,23 @@  discard block
 
 block discarded – undo
456 674 
 <?php
457 675 
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
458 676 
 ?>
459 
-		    <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') print 'checked'; ?> ><?php echo _("Use airlines liveries"); ?></li>
460 
-		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
677 
+		    <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') {
678 
+	print 'checked';
679 
+}
680 
+?> ><?php echo _("Use airlines liveries"); ?></li>
681 
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
682 
+	print 'checked';
683 
+}
684 
+?> ><?php echo _("Force Aircraft color"); ?></li>
461 685 
 		    <li><?php echo _("Aircraft icon color:"); ?>
462 
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
686 
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
687 
+	print $_COOKIE['IconColor'];
688 
+} elseif (isset($globalAircraftIconColor)) {
689 
+	print $globalAircraftIconColor;
690 
+} else {
691 
+	print 'ff0000';
692 
+}
693 
+?>">
463 694 
 		    </li>
464 695 
 <?php
465 696 
 	}
 
@@ -467,9 +698,19 @@  discard block
 
 block discarded – undo
467 698 
 <?php
468 699 
 	if (isset($globalMarine) && $globalMarine === TRUE) {
469 700 
 ?>
470 
-		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?></li>
701 
+		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') {
702 
+	print 'checked';
703 
+}
704 
+?> ><?php echo _("Force Marine color"); ?></li>
471 705 
 		    <li><?php echo _("Marine icon color:"); ?>
472 
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>">
706 
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
707 
+	print $_COOKIE['MarineIconColor'];
708 
+} elseif (isset($globalMarineIconColor)) {
709 
+	print $globalMarineIconColor;
710 
+} else {
711 
+	print 'ff0000';
712 
+}
713 
+?>">
473 714 
 		    </li>
474 715 
 <?php
475 716 
 	}
 
@@ -477,9 +718,19 @@  discard block
 
 block discarded – undo
477 718 
 <?php
478 719 
 	if (isset($globalTracker) && $globalTracker === TRUE) {
479 720 
 ?>
480 
-		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?></li>
721 
+		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') {
722 
+	print 'checked';
723 
+}
724 
+?> ><?php echo _("Force Tracker color"); ?></li>
481 725 
 		    <li><?php echo _("Tracker icon color:"); ?>
482 
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>">
726 
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
727 
+	print $_COOKIE['TrackerIconColor'];
728 
+} elseif (isset($globalTrackerIconColor)) {
729 
+	print $globalTrackerIconColor;
730 
+} else {
731 
+	print 'ff0000';
732 
+}
733 
+?>">
483 734 
 		    </li>
484 735 
 <?php
485 736 
 	}
 
@@ -487,22 +738,46 @@  discard block
 
 block discarded – undo
487 738 
 ?>
488 739 
 		    <li><?php echo _("Distance unit:"); ?>
489 740 
 			<select class="selectpicker" onchange="unitdistance(this);">
490 
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
491 
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
492 
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
741 
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
742 
+	echo ' selected';
743 
+}
744 
+?>>km</option>
745 
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
746 
+	echo ' selected';
747 
+}
748 
+?>>nm</option>
749 
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
750 
+	echo ' selected';
751 
+}
752 
+?>>mi</option>
493 753 
 		        </select>
494 754 
 		    </li>
495 755 
 		    <li><?php echo _("Altitude unit:"); ?>
496 756 
 			<select class="selectpicker" onchange="unitaltitude(this);">
497 
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
498 
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
757 
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
758 
+	echo ' selected';
759 
+}
760 
+?>>m</option>
761 
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
762 
+	echo ' selected';
763 
+}
764 
+?>>feet</option>
499 765 
 		        </select>
500 766 
 		    </li>
501 767 
 		    <li><?php echo _("Speed unit:"); ?>
502 768 
 			<select class="selectpicker" onchange="unitspeed(this);">
503 
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
504 
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
505 
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
769 
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
770 
+	echo ' selected';
771 
+}
772 
+?>>km/h</option>
773 
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
774 
+	echo ' selected';
775 
+}
776 
+?>>mph</option>
777 
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
778 
+	echo ' selected';
779 
+}
780 
+?>>knots</option>
506 781 
 		        </select>
507 782 
 		    </li>
508 783 
 
@@ -520,9 +795,18 @@  discard block
 
 block discarded – undo
520 795 
 		    <?php
521 796 
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
522 797 
 		    ?>
523 
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
524 
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
525 
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
798 
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
799 
+	print 'checked';
800 
+}
801 
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
802 
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
803 
+	print 'checked';
804 
+}
805 
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
806 
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
807 
+	print 'checked';
808 
+}
809 
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
526 810 
 		    <?php
527 811 
 			}
528 812 
 		    ?>
 
@@ -530,10 +814,16 @@  discard block
 
 block discarded – undo
530 814 
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
531 815 
 		    ?>
532 816 
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
533 
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
817 
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
818 
+	print 'checked';
819 
+}
820 
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
534 821 
 			<?php } ?>
535 822 
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
536 
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
823 
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
824 
+	print 'checked';
825 
+}
826 
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
537 827 
 			<?php } ?>
538 828 
 		    <?php
539 829 
 			}
 
@@ -550,7 +840,9 @@  discard block
 
 block discarded – undo
550 840 
 				}
551 841 
 				foreach($allairlinenames as $airline) {
552 842 
 					$airline_name = $airline['airline_name'];
553 
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
843 
+					if (strlen($airline_name) > 30) {
844 
+						$airline_name = substr($airline_name,0,30).'...';
845 
+					}
554 846 
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
555 847 
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
556 848 
 					} else {
 
@@ -568,7 +860,10 @@  discard block
 
 block discarded – undo
568 860 
 		    <li><?php echo _("Display alliance:"); ?>
569 861 
 		    <br/>
570 862 
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
571 
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
863 
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
864 
+	echo ' selected';
865 
+}
866 
+?>><?php echo _("All"); ?></option>
572 867 
 			    <?php
573 868 
 				foreach($allalliancenames as $alliance) {
574 869 
 					$alliance_name = $alliance['alliance'];
 
@@ -627,10 +922,22 @@  discard block
 
 block discarded – undo
627 922 
 		    ?>
628 923 
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
629 924 
 			<select class="selectpicker" onchange="airlinestype(this);">
630 
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
631 
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
632 
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
633 
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
925 
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
926 
+	echo ' selected';
927 
+}
928 
+?>><?php echo _("All"); ?></option>
929 
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
930 
+	echo ' selected';
931 
+}
932 
+?>><?php echo _("Passenger"); ?></option>
933 
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
934 
+	echo ' selected';
935 
+}
936 
+?>><?php echo _("Cargo"); ?></option>
937 
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
938 
+	echo ' selected';
939 
+}
940 
+?>><?php echo _("Military"); ?></option>
634 941 
 			</select>
635 942 
 		    </li>
636 943 
 		    <?php
 
@@ -644,14 +951,20 @@  discard block
 
 block discarded – undo
644 951 
 		    ?>
645 952 
 		    <li>
646 953 
 			<?php echo _("Display vessels with MMSI:"); ?>
647 
-			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
954 
+			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) {
955 
+	print $_COOKIE['filter_mmsi'];
956 
+}
957 
+?>" />
648 958 
 		    </li>
649 959 
 		    <?php
650 960 
 			}
651 961 
 		    ?>
652 962 
 		    <li>
653 963 
 			<?php echo _("Display with ident:"); ?>
654 
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
964 
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
965 
+	print $_COOKIE['filter_ident'];
966 
+}
967 
+?>" />
655 968 
 		    </li>
656 969 
 		</ul>
657 970 
 	    </form>
 
@@ -667,7 +980,10 @@  discard block
 
 block discarded – undo
667 980 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
668 981 
 	    <form>
669 982 
 		<ul>
670 
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
983 
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
984 
+	print 'checked';
985 
+}
986 
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
671 987 
 		    <li><?php echo _("Type:"); ?>
672 988 
 			<select class="selectpicker" multiple onchange="sattypes(this);">
673 989 
 			    <?php
 
@@ -675,25 +991,45 @@  discard block
 
 block discarded – undo
675 991 
 				$types = $Satellite->get_tle_types();
676 992 
 				foreach ($types as $type) {
677 993 
 					$type_name = $type['tle_type'];
678 
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
679 
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
680 
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
681 
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
682 
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
683 
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
684 
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
685 
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
686 
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
687 
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
688 
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
689 
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
690 
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
691 
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
692 
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
693 
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
694 
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
695 
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
696 
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
994 
+					if ($type_name == 'musson') {
995 
+						$type_name = 'Russian LEO Navigation';
996 
+					} else if ($type_name == 'nnss') {
997 
+						$type_name = 'Navi Navigation Satellite System';
998 
+					} else if ($type_name == 'sbas') {
999 
+						$type_name = 'Satellite-Based Augmentation System';
1000 
+					} else if ($type_name == 'glo-ops') {
1001 
+						$type_name = 'Glonass Operational';
1002 
+					} else if ($type_name == 'gps-ops') {
1003 
+						$type_name = 'GPS Operational';
1004 
+					} else if ($type_name == 'argos') {
1005 
+						$type_name = 'ARGOS Data Collection System';
1006 
+					} else if ($type_name == 'tdrss') {
1007 
+						$type_name = 'Tracking and Data Relay Satellite System';
1008 
+					} else if ($type_name == 'sarsat') {
1009 
+						$type_name = 'Search & Rescue';
1010 
+					} else if ($type_name == 'dmc') {
1011 
+						$type_name = 'Disaster Monitoring';
1012 
+					} else if ($type_name == 'resource') {
1013 
+						$type_name = 'Earth Resources';
1014 
+					} else if ($type_name == 'stations') {
1015 
+						$type_name = 'Space Stations';
1016 
+					} else if ($type_name == 'geo') {
1017 
+						$type_name = 'Geostationary';
1018 
+					} else if ($type_name == 'amateur') {
1019 
+						$type_name = 'Amateur Radio';
1020 
+					} else if ($type_name == 'x-comm') {
1021 
+						$type_name = 'Experimental';
1022 
+					} else if ($type_name == 'other-comm') {
1023 
+						$type_name = 'Other Comm';
1024 
+					} else if ($type_name == 'science') {
1025 
+						$type_name = 'Space & Earth Science';
1026 
+					} else if ($type_name == 'military') {
1027 
+						$type_name = 'Miscellaneous Military';
1028 
+					} else if ($type_name == 'radar') {
1029 
+						$type_name = 'Radar Calibration';
1030 
+					} else if ($type_name == 'tle-new') {
1031 
+						$type_name = 'Last 30 days launches';
1032 
+					}
697 1033
698 1034 
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
699 1035 
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
Please login to merge, or discard this patch.
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,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","scale" : 0.5},';
389 
+				} else {
390 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,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","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.
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 
 if (isset($_GET['ident'])) {
75 102 
 	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
 
@@ -163,24 +190,38 @@  discard block
 
 block discarded – undo
163 190 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
164 191 
 		}
165 192 
 	}
166 
-	if ($flightcnt == '') $flightcnt = 0;
167 
-} else $flightcnt = 0;
193 
+	if ($flightcnt == '') {
194 
+		$flightcnt = 0;
195 
+	}
196 
+	} else {
197 
+	$flightcnt = 0;
198 
+}
168 199
169 200 
 $sqltime = round(microtime(true)-$begintime,2);
170 201
171 202 
 $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
172 
-if ($currenttime != '') $currenttime = round($currenttime/1000);
203 
+if ($currenttime != '') {
204 
+	$currenttime = round($currenttime/1000);
205 
+}
173 206
174 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
175 
-else $usenextlatlon = true;
176 
-if ($usenextlatlon === false) $currenttime = '';
207 
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
208 
+	$usenextlatlon = false;
209 
+} else {
210 
+	$usenextlatlon = true;
211 
+}
212 
+if ($usenextlatlon === false) {
213 
+	$currenttime = '';
214 
+}
177 215 
 $j = 0;
178 216 
 $prev_flightaware_id = '';
179 217 
 $aircrafts_shadow = array();
180 218 
 $output = '{';
181 219 
 	$output .= '"type": "FeatureCollection",';
182 
-		if ($min) $output .= '"minimal": "true",';
183 
-		else $output .= '"minimal": "false",';
220 
+		if ($min) {
221 
+			$output .= '"minimal": "true",';
222 
+		} else {
223 
+			$output .= '"minimal": "false",';
224 
+		}
184 225 
 		//$output .= '"fc": "'.$flightcnt.'",';
185 226 
 		$output .= '"sqt": "'.$sqltime.'",';
186 227 
 
@@ -224,18 +265,29 @@  discard block
 
 block discarded – undo
224 265 
 						}
225 266 
 						$output .= '"properties": {';
226 267 
 						if (isset($spotter_item['flightaware_id'])) {
227 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
228 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
268 
+							if ($compress) {
269 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
270 
+							} else {
271 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
272 
+							}
229 273 
 						} elseif (isset($spotter_item['famtrackid'])) {
230 
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
231 
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
274 
+							if ($compress) {
275 
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
276 
+							} else {
277 
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
278 
+							}
232 279 
 						} elseif (isset($spotter_item['fammarine_id'])) {
233 
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
234 
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
280 
+							if ($compress) {
281 
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
282 
+							} else {
283 
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
284 
+							}
235 285 
 						}
236 286 
 							$output .= '"fc": "'.$flightcnt.'",';
237 287 
 							$output .= '"sqt": "'.$sqltime.'",';
238 
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
288 
+							if (isset($begindate)) {
289 
+								$output .= '"archive_date": "'.$begindate.'",';
290 
+							}
239 291
240 292 
 /*
241 293 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -243,14 +295,22 @@  discard block
 
 block discarded – undo
243 295 
 */
244 296 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
245 297 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
246 
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
247 
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
298 
+							if ($compress) {
299 
+								$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
300 
+							} else {
301 
+								$output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
302 
+							}
248 303 
 							//"
249 304 
 						} else {
250 
-							if ($compress) $output .= '"c": "NA",';
251 
-							else $output .= '"callsign": "NA",';
305 
+							if ($compress) {
306 
+								$output .= '"c": "NA",';
307 
+							} else {
308 
+								$output .= '"callsign": "NA",';
309 
+							}
310 
+						}
311 
+						if (isset($spotter_item['registration'])) {
312 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
252 313 
 						}
253 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
254 314 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
255 315 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
256 316 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -263,16 +323,23 @@  discard block
 
 block discarded – undo
263 323 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
264 324 
 						}
265 325 
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker) {
266 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
267 
-							else {
326 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
327 
+								$spotter_item['aircraft_shadow'] = '';
328 
+							} else {
268 329 
 								$aircraft_icao = $spotter_item['aircraft_icao'];
269 
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
270 
-								else {
330 
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
331 
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
332 
+								} else {
271 333 
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
272 
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
273 
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
274 
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
275 
-									else $spotter_item['aircraft_shadow'] = '';
334 
+									if (count($aircraft_info) > 0) {
335 
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
336 
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
337 
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
338 
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
339 
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
340 
+									} else {
341 
+										$spotter_item['aircraft_shadow'] = '';
342 
+									}
276 343 
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
277 344 
 								}
278 345 
 							}
 
@@ -280,73 +347,139 @@  discard block
 
 block discarded – undo
280 347 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
281 348 
 							if ($tracker) {
282 349 
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
283 
-									if ($compress) $output .= '"as": "ambulance.png",';
284 
-									else $output .= '"aircraft_shadow": "ambulance.png",';
350 
+									if ($compress) {
351 
+										$output .= '"as": "ambulance.png",';
352 
+									} else {
353 
+										$output .= '"aircraft_shadow": "ambulance.png",';
354 
+									}
285 355 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
286 
-									if ($compress) $output .= '"as": "police.png",';
287 
-									else $output .= '"aircraft_shadow": "police.png",';
356 
+									if ($compress) {
357 
+										$output .= '"as": "police.png",';
358 
+									} else {
359 
+										$output .= '"aircraft_shadow": "police.png",';
360 
+									}
288 361 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
289 
-									if ($compress) $output .= '"as": "ship.png",';
290 
-									else $output .= '"aircraft_shadow": "ship.png",';
362 
+									if ($compress) {
363 
+										$output .= '"as": "ship.png",';
364 
+									} else {
365 
+										$output .= '"aircraft_shadow": "ship.png",';
366 
+									}
291 367 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
292 
-									if ($compress) $output .= '"as": "ship.png",';
293 
-									else $output .= '"aircraft_shadow": "ship.png",';
368 
+									if ($compress) {
369 
+										$output .= '"as": "ship.png",';
370 
+									} else {
371 
+										$output .= '"aircraft_shadow": "ship.png",';
372 
+									}
294 373 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
295 
-									if ($compress) $output .= '"as": "ship.png",';
296 
-									else $output .= '"aircraft_shadow": "ship.png",';
374 
+									if ($compress) {
375 
+										$output .= '"as": "ship.png",';
376 
+									} else {
377 
+										$output .= '"aircraft_shadow": "ship.png",';
378 
+									}
297 379 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
298 
-									if ($compress) $output .= '"as": "truck.png",';
299 
-									else $output .= '"aircraft_shadow": "truck.png",';
380 
+									if ($compress) {
381 
+										$output .= '"as": "truck.png",';
382 
+									} else {
383 
+										$output .= '"aircraft_shadow": "truck.png",';
384 
+									}
300 385 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
301 
-									if ($compress) $output .= '"as": "truck.png",';
302 
-									else $output .= '"aircraft_shadow": "truck.png",';
386 
+									if ($compress) {
387 
+										$output .= '"as": "truck.png",';
388 
+									} else {
389 
+										$output .= '"aircraft_shadow": "truck.png",';
390 
+									}
303 391 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
304 
-									if ($compress) $output .= '"as": "aircraft.png",';
305 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
392 
+									if ($compress) {
393 
+										$output .= '"as": "aircraft.png",';
394 
+									} else {
395 
+										$output .= '"aircraft_shadow": "aircraft.png",';
396 
+									}
306 397 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
307 
-									if ($compress) $output .= '"as": "aircraft.png",';
308 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
398 
+									if ($compress) {
399 
+										$output .= '"as": "aircraft.png",';
400 
+									} else {
401 
+										$output .= '"aircraft_shadow": "aircraft.png",';
402 
+									}
309 403 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
310 
-									if ($compress) $output .= '"as": "helico.png",';
311 
-									else $output .= '"aircraft_shadow": "helico.png",';
404 
+									if ($compress) {
405 
+										$output .= '"as": "helico.png",';
406 
+									} else {
407 
+										$output .= '"aircraft_shadow": "helico.png",';
408 
+									}
312 409 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
313 
-									if ($compress) $output .= '"as": "rail.png",';
314 
-									else $output .= '"aircraft_shadow": "rail.png",';
410 
+									if ($compress) {
411 
+										$output .= '"as": "rail.png",';
412 
+									} else {
413 
+										$output .= '"aircraft_shadow": "rail.png",';
414 
+									}
315 415 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
316 
-									if ($compress) $output .= '"as": "firetruck.png",';
317 
-									else $output .= '"aircraft_shadow": "firetruck.png",';
416 
+									if ($compress) {
417 
+										$output .= '"as": "firetruck.png",';
418 
+									} else {
419 
+										$output .= '"aircraft_shadow": "firetruck.png",';
420 
+									}
318 421 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
319 
-									if ($compress) $output .= '"as": "bus.png",';
320 
-									else $output .= '"aircraft_shadow": "bus.png",';
422 
+									if ($compress) {
423 
+										$output .= '"as": "bus.png",';
424 
+									} else {
425 
+										$output .= '"aircraft_shadow": "bus.png",';
426 
+									}
321 427 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
322 
-									if ($compress) $output .= '"as": "phone.png",';
323 
-									else $output .= '"aircraft_shadow": "phone.png",';
428 
+									if ($compress) {
429 
+										$output .= '"as": "phone.png",';
430 
+									} else {
431 
+										$output .= '"aircraft_shadow": "phone.png",';
432 
+									}
324 433 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
325 
-									if ($compress) $output .= '"as": "jogger.png",';
326 
-									else $output .= '"aircraft_shadow": "jogger.png",';
434 
+									if ($compress) {
435 
+										$output .= '"as": "jogger.png",';
436 
+									} else {
437 
+										$output .= '"aircraft_shadow": "jogger.png",';
438 
+									}
327 439 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
328 
-									if ($compress) $output .= '"as": "bike.png",';
329 
-									else $output .= '"aircraft_shadow": "bike.png",';
440 
+									if ($compress) {
441 
+										$output .= '"as": "bike.png",';
442 
+									} else {
443 
+										$output .= '"aircraft_shadow": "bike.png",';
444 
+									}
330 445 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
331 
-									if ($compress) $output .= '"as": "motorcycle.png",';
332 
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
446 
+									if ($compress) {
447 
+										$output .= '"as": "motorcycle.png",';
448 
+									} else {
449 
+										$output .= '"aircraft_shadow": "motorcycle.png",';
450 
+									}
333 451 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
334 
-									if ($compress) $output .= '"as": "balloon.png",';
335 
-									else $output .= '"aircraft_shadow": "balloon.png",';
452 
+									if ($compress) {
453 
+										$output .= '"as": "balloon.png",';
454 
+									} else {
455 
+										$output .= '"aircraft_shadow": "balloon.png",';
456 
+									}
336 457 
 								} else {
337 
-									if ($compress) $output .= '"as": "car.png",';
338 
-									else $output .= '"aircraft_shadow": "car.png",';
458 
+									if ($compress) {
459 
+										$output .= '"as": "car.png",';
460 
+									} else {
461 
+										$output .= '"aircraft_shadow": "car.png",';
462 
+									}
339 463 
 								}
340 464 
 							} elseif ($marine) {
341 
-								if ($compress) $output .= '"as": "ship.png",';
342 
-								else $output .= '"aircraft_shadow": "ship.png",';
465 
+								if ($compress) {
466 
+									$output .= '"as": "ship.png",';
467 
+								} else {
468 
+									$output .= '"aircraft_shadow": "ship.png",';
469 
+								}
343 470 
 							} else {
344 
-								if ($compress) $output .= '"as": "default.png",';
345 
-								else $output .= '"aircraft_shadow": "default.png",';
471 
+								if ($compress) {
472 
+									$output .= '"as": "default.png",';
473 
+								} else {
474 
+									$output .= '"aircraft_shadow": "default.png",';
475 
+								}
346 476 
 							}
347 477 
 						} else {
348 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
349 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
478 
+							if ($compress) {
479 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
480 
+							} else {
481 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
482 
+							}
350 483 
 						}
351 484 
 						if (isset($spotter_item['airline_name'])) {
352 485 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -354,8 +487,11 @@  discard block
 
 block discarded – undo
354 487 
 							$output .= '"airline_name": "NA",';
355 488 
 						}
356 489 
 						if (isset($spotter_item['departure_airport'])) {
357 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
358 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
490 
+							if ($compress) {
491 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
492 
+							} else {
493 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
494 
+							}
359 495 
 						}
360 496 
 						if (isset($spotter_item['departure_airport_city'])) {
361 497 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -367,8 +503,11 @@  discard block
 
 block discarded – undo
367 503 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
368 504 
 						}
369 505 
 						if (isset($spotter_item['arrival_airport'])) {
370 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
371 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
506 
+							if ($compress) {
507 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
508 
+							} else {
509 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
510 
+							}
372 511 
 						}
373 512 
 						if (isset($spotter_item['arrival_airport_city'])) {
374 513 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -387,11 +526,17 @@  discard block
 
 block discarded – undo
387 526 
 						}
388 527
389 528 
 						if (isset($spotter_item['altitude'])) {
390 
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
391 
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
529 
+							if ($compress) {
530 
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
531 
+							} else {
532 
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
533 
+							}
534 
+						}
535 
+						if ($compress) {
536 
+							$output .= '"h": "'.$spotter_item['heading'].'",';
537 
+						} else {
538 
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
392 539 
 						}
393 
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
394 
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
395 540
396 541 
 						if ($currenttime != '') {
397 542 
 							if (strtotime($spotter_item['date']) < $currenttime) {
 
@@ -413,7 +558,9 @@  discard block
 
 block discarded – undo
413 558 
 							}
414 559 
 						}
415 560
416 
-						if (!$min) $output .= '"image": "'.$image.'",';
561 
+						if (!$min) {
562 
+							$output .= '"image": "'.$image.'",';
563 
+						}
417 564 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
418 565 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
419 566 
 						}
 
@@ -421,8 +568,11 @@  discard block
 
 block discarded – undo
421 568 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
422 569 
 						}
423 570 
 						if (isset($spotter_item['squawk'])) {
424 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
425 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
571 
+							if ($compress) {
572 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
573 
+							} else {
574 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
575 
+							}
426 576 
 						}
427 577 
 						if (isset($spotter_item['squawk_usage'])) {
428 578 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -441,14 +591,23 @@  discard block
 
 block discarded – undo
441 591 
 						}
442 592 
 						// type when not aircraft ?
443 593 
 						if (isset($spotter_item['type'])) {
444 
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
445 
-							else $output .= '"type": "'.$spotter_item['type'].'"';
594 
+							if ($compress) {
595 
+								$output .= '"t": "'.$spotter_item['type'].'"';
596 
+							} else {
597 
+								$output .= '"type": "'.$spotter_item['type'].'"';
598 
+							}
446 599 
 						} elseif ($marine) {
447 
-							if ($compress) $output .= '"t": "ship"';
448 
-							else $output .= '"type": "ship"';
600 
+							if ($compress) {
601 
+								$output .= '"t": "ship"';
602 
+							} else {
603 
+								$output .= '"type": "ship"';
604 
+							}
449 605 
 						} else {
450 
-							if ($compress) $output .= '"t": "aircraft"';
451 
-							else $output .= '"type": "aircraft"';
606 
+							if ($compress) {
607 
+								$output .= '"t": "aircraft"';
608 
+							} else {
609 
+								$output .= '"type": "aircraft"';
610 
+							}
452 611 
 						}
453 612 
 						$output .= '},';
454 613 
 						$output .= '"geometry": {';
 
@@ -456,7 +615,9 @@  discard block
 
 block discarded – undo
456 615 
 								$output .= '"coordinates": [';
457 616 
 								if ($currenttime != '') {
458 617 
 									if (strtotime($spotter_item['date']) < $currenttime) {
459 
-										if (!isset($archivespeed)) $archivespeed = 1;
618 
+										if (!isset($archivespeed)) {
619 
+											$archivespeed = 1;
620 
+										}
460 621 
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed,$currenttime-strtotime($spotter_item['date']));
461 622 
 										$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
462 623 
 									} else {
 
@@ -527,7 +688,9 @@  discard block
 
 block discarded – undo
527 688 
 			}
528 689 
 */
529 690 
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
530 
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
691 
+				if ($history == '' && isset($_COOKIE['history'])) {
692 
+					$history = $_COOKIE['history'];
693 
+				}
531 694
532 695 
 				if (
533 696 
 				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -571,8 +734,11 @@  discard block
 
 block discarded – undo
571 734 
 									$output_history .= ']}},';
572 735 
 									$output .= $output_history;
573 736 
 								}
574 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
575 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
737 
+								if ($compress) {
738 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
739 
+								} else {
740 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
741 
+								}
576 742 
 							}
577 743 
 							$output_history .= '[';
578 744 
 							$output_history .=  $spotter_history['longitude'].', ';
 
@@ -591,9 +757,14 @@  discard block
 
 block discarded – undo
591 757 
 							$prev_alt = $alt;
592 758 
 						} else {
593 759 
 							if ($d == false) {
594 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
595 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
596 
-							} else $d = true;
760 
+								if ($compress) {
761 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history"},"geometry": {"type": "LineString","coordinates": [';
762 
+								} else {
763 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
764 
+								}
765 
+							} else {
766 
+								$d = true;
767 
+							}
597 768 
 							$output_history .= '[';
598 769 
 							$output_history .=  $spotter_history['longitude'].', ';
599 770 
 							$output_history .=  $spotter_history['latitude'];
 
@@ -614,7 +785,9 @@  discard block
 
 block discarded – undo
614 785 
 							$output_historyd = '[';
615 786 
 							$output_historyd .=  $spotter_item['longitude'].', ';
616 787 
 							$output_historyd .=  $spotter_item['latitude'];
617 
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
788 
+							if (isset($spotter_history['altitude'])) {
789 
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
790 
+							}
618 791 
 							$output_historyd .= '],';
619 792 
 							//$output_history = $output_historyd.$output_history;
620 793 
 							$output_history = $output_history.$output_historyd;
 
@@ -636,8 +809,11 @@  discard block
 
 block discarded – undo
636 809 
 				        && $spotter_item['arrival_airport'] != 'NA'
637 810 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
638 811 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
639 
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
640 
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
812 
+				    if ($compress) {
813 
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
814 
+				    } else {
815 
+				    	$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
816 
+				    }
641 817 
 				    if (isset($spotter_item['departure_airport_latitude'])) {
642 818 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
643 819 
 				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 
@@ -670,8 +846,11 @@  discard block
 
 block discarded – undo
670 846 
 				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
671 847 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
672 848 
 				    $havedata = false;
673 
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
674 
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
849 
+				    if ($compress) {
850 
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
851 
+				    } else {
852 
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
853 
+				    }
675 854 
 				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
676 855
677 856 
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
 
@@ -686,7 +865,9 @@  discard block
 
 block discarded – undo
686 865 
 				    }
687 866 
 				    //$output_dest  = substr($output_dest, 0, -1);
688 867 
 				    $output_dest .= ']}},';
689 
-				    if ($havedata) $output .= $output_dest;
868 
+				    if ($havedata) {
869 
+				    	$output .= $output_dest;
870 
+				    }
690 871 
 				    unset($output_dest);
691 872 
 				}
692 873 
 			}
 
@@ -694,7 +875,9 @@  discard block
 
 block discarded – undo
694 875 
 			$output .= ']';
695 876 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
696 877 
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
697 
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
878 
+			if (isset($begindate)) {
879 
+				$output .= '"archive_date": "'.$begindate.'",';
880 
+			}
698 881 
 			$output .= '"fc": "'.$j.'"';
699 882 
 		} else {
700 883 
 			$output .= '"features": ';
Please login to merge, or discard this patch.