Completed
Push — master ( 3627f6...11ce7e )
by Yannick
30:00
created
index.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
56 56
 </tr></table></div>
57 57
 <?php
58
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
58
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
59 59
 ?>
60 60
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script>
61 61
 <script src="<?php echo $globalURL; ?>/js/meuusjs.1.0.3.min.js"></script>
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
82 82
 <?php
83 83
 	}
84
-    }
84
+	}
85 85
 ?>
86 86
 
87 87
 <div id="sidebar" class="sidebar collapsed">
@@ -92,13 +92,13 @@  discard block
 block discarded – undo
92 92
 	<li><a href="" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
93 93
 	<li><a href="" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
94 94
 <?php
95
-    //if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
95
+	//if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
96 96
 	if (isset($globalArchive) && $globalArchive == TRUE && (!isset($globalAircraft) || $globalAircraft === TRUE)) {
97 97
 ?>
98 98
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
99 99
 <?php
100 100
 	}
101
-    //}
101
+	//}
102 102
 ?>
103 103
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
104 104
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 ?>
113 113
 
114 114
 <?php
115
-    if (isset($globalMap3D) && $globalMap3D) {
115
+	if (isset($globalMap3D) && $globalMap3D) {
116 116
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
117 117
 ?>
118 118
 	<li><a href="" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	<li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
123 123
 <?php
124 124
 	}
125
-    }
125
+	}
126 126
 ?>
127 127
     </ul>
128 128
 
@@ -299,15 +299,15 @@  discard block
 block discarded – undo
299 299
 		    </div>
300 300
 		</li>
301 301
 		<?php
302
-		    if (isset($globalDemo) && $globalDemo) {
302
+			if (isset($globalDemo) && $globalDemo) {
303 303
 		?>
304 304
 		<li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li>
305 305
 		<?php
306
-		    } else {
306
+			} else {
307 307
 		?>
308 308
 		<li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li>
309 309
 		<?php
310
-		    }
310
+			}
311 311
 		?>
312 312
 	    </ul>
313 313
 	    <ul>
@@ -326,83 +326,83 @@  discard block
 block discarded – undo
326 326
 				if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
327 327
 					if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
328 328
 					else $MapType = $_COOKIE['MapType'];
329
-			    ?>
329
+				?>
330 330
 			<select  class="selectpicker" onchange="mapType(this);">
331 331
 			    <?php
332 332
 				} else {
333 333
 					if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider;
334 334
 					else $MapType = $_COOKIE['MapType3D'];
335
-			    ?>
335
+				?>
336 336
 			<select  class="selectpicker" onchange="mapType3D(this);">
337 337
 			    <?php
338 338
 				}
339
-			    ?>
339
+				?>
340 340
 			    <?php
341 341
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
342
-			    ?>
342
+				?>
343 343
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
344 344
 			    <?php
345 345
 				} else {
346
-				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
347
-			    ?>
346
+					if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
347
+				?>
348 348
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
349 349
 			    <?php
350
-				    }
351
-			    ?>
350
+					}
351
+				?>
352 352
 			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
353 353
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
354 354
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option>
355 355
 			    <?php
356
-				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
357
-			    ?>
356
+					if (isset($globalBingMapKey) && $globalBingMapKey != '') {
357
+				?>
358 358
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
359 359
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
360 360
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
361 361
 			    <?php
362
-				    }
363
-			    ?>
362
+					}
363
+				?>
364 364
 			    <?php
365
-				    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
366
-			    ?>
365
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
366
+				?>
367 367
 			    <?php
368 368
 					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
369
-			    ?>
369
+				?>
370 370
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
371 371
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
372 372
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
373 373
 			    <?php
374 374
 					}
375
-			    ?>
375
+				?>
376 376
 			    <?php
377 377
 					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
378
-			    ?>
378
+				?>
379 379
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
380 380
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
381 381
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
382 382
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
383 383
 			    <?php
384 384
 					}
385
-			    ?>
385
+				?>
386 386
 			    <?php
387 387
 					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
388
-			    ?>
388
+				?>
389 389
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
390 390
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
391 391
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
392 392
 			    <?php
393 393
 					}
394
-			    ?>
394
+				?>
395 395
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
396 396
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
397 397
 			    <?php
398
-				    }
399
-			    ?>
398
+					}
399
+				?>
400 400
 			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
401 401
 			    <?php
402
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
402
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
403 403
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
404 404
 					else $MapBoxId = $_COOKIE['MapTypeId'];
405
-			    ?>
405
+				?>
406 406
 			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
407 407
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
408 408
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
@@ -417,16 +417,16 @@  discard block
 block discarded – undo
417 417
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
418 418
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
419 419
 			    <?php
420
-				    }
421
-			    ?>
420
+					}
421
+				?>
422 422
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
423 423
 			    <?php
424 424
 				}
425
-			    ?>
425
+				?>
426 426
 			</select>
427 427
 		    </li>
428 428
 <?php
429
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
429
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
430 430
 ?>
431 431
 		    <li><?php echo _("Type of Terrain:"); ?>
432 432
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -437,18 +437,18 @@  discard block
 block discarded – undo
437 437
 			</select>
438 438
 		    </li>
439 439
 <?php
440
-    }
440
+	}
441 441
 ?>
442 442
 
443 443
 <?php
444
-    if (isset($globalMap3D) && $globalMap3D) {
444
+	if (isset($globalMap3D) && $globalMap3D) {
445 445
 ?>
446 446
 		    <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') print 'checked'; ?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li>
447 447
 <?php
448
-    }
448
+	}
449 449
 ?>
450 450
 <?php
451
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
451
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
452 452
 ?>
453 453
 		    <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li>
454 454
 
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 		    <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>
472 472
 <?php
473 473
 	}
474
-    }
474
+	}
475 475
 ?>
476 476
 		    <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>
477 477
 		    <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>
@@ -490,82 +490,82 @@  discard block
 block discarded – undo
490 490
 	}
491 491
 ?>
492 492
 <?php
493
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
493
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
494 494
 ?>
495 495
 		    <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>
496 496
 		    <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) print 'checked'; ?> ><?php echo _("Use shadows"); ?></label></div></li>
497 497
 		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li>
498 498
 		    <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) print 'checked'; ?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li>
499 499
 <?php
500
-    }
501
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
500
+	}
501
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
502 502
 ?>
503 503
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
504 504
 <?php
505
-    }
505
+	}
506 506
 ?>
507 507
 		    <?php
508 508
 			if (function_exists('array_column')) {
509
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
510
-		    ?>
509
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
510
+			?>
511 511
 		    <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>
512 512
 		    <?php
513
-			    }
513
+				}
514 514
 			} elseif (isset($globalSources)) {
515
-			    $dispolar = false;
516
-			    foreach ($globalSources as $testsource) {
517
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
518
-			    }
519
-			    if ($dispolar) {
520
-		    ?>
515
+				$dispolar = false;
516
+				foreach ($globalSources as $testsource) {
517
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
518
+				}
519
+				if ($dispolar) {
520
+			?>
521 521
 		    <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>
522 522
 		    <?php
523
-			    }
524
-		        }
525
-		    ?>
523
+				}
524
+				}
525
+			?>
526 526
 <?php
527
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
527
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
528 528
 ?>
529 529
 
530 530
 		    <?php
531 531
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
532
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
533
-		    ?>
532
+					if (extension_loaded('gd') && function_exists('gd_info')) {
533
+			?>
534 534
 		    <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>
535 535
 		    <?php 
536 536
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
537
-		    ?>
537
+			?>
538 538
 			<li><?php echo _("Aircraft icon color:"); ?><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'; ?>"></li>
539 539
 		    <?php
540 540
 				}
541
-			    }
542
-		        }
543
-		    ?>
541
+				}
542
+				}
543
+			?>
544 544
 		    <?php
545 545
 			if (isset($globalMarine) && $globalMarine === TRUE) {
546
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
547
-		    ?>
546
+				if (extension_loaded('gd') && function_exists('gd_info')) {
547
+			?>
548 548
 		    <li><?php echo _("Marine icon color:"); ?>
549 549
 			<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'; ?>">
550 550
 		    </li>
551 551
 		    <?php
552
-			    }
553
-		        }
554
-		    ?>
552
+				}
553
+				}
554
+			?>
555 555
 		    <?php
556 556
 			if (isset($globalTracker) && $globalTracker === TRUE) {
557
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
558
-		    ?>
557
+				if (extension_loaded('gd') && function_exists('gd_info')) {
558
+			?>
559 559
 		    <li><?php echo _("Tracker icon color:"); ?>
560 560
 			<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'; ?>">
561 561
 		    </li>
562 562
 		    <?php
563
-			    }
564
-		        }
565
-		    ?>
563
+				}
564
+				}
565
+			?>
566 566
 		    <?php
567 567
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
568
-		    ?>
568
+			?>
569 569
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
570 570
 			<div class="range">
571 571
 			    <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'; ?>">
@@ -574,9 +574,9 @@  discard block
 block discarded – undo
574 574
 		    </li>
575 575
 		    <?php
576 576
 			}
577
-		    ?>
577
+			?>
578 578
 <?php
579
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
579
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
580 580
 ?>
581 581
 		    <li><?php echo _("Set scaling factor for rendering resolution:"); ?>
582 582
 			<div class="range">
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		    </li>
615 615
 <?php
616 616
 	}
617
-    }
617
+	}
618 618
 ?>
619 619
 		    <li><?php echo _("Distance unit:"); ?>
620 620
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -654,19 +654,19 @@  discard block
 block discarded – undo
654 654
 		    <ul>
655 655
 		    <?php
656 656
 			if (!isset($globalAircraft) || $globalAircraft) {
657
-		    ?>
657
+			?>
658 658
 		    <?php
659 659
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
660
-		    ?>
660
+			?>
661 661
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') || !isset($_COOKIE['filter_ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
662 662
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') || !isset($_COOKIE['filter_ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
663 663
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') || !isset($_COOKIE['filter_ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
664 664
 		    <?php
665 665
 			}
666
-		    ?>
666
+			?>
667 667
 		    <?php
668 668
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
669
-		    ?>
669
+			?>
670 670
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
671 671
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') || !isset($_COOKIE['filter_ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
672 672
 			<?php } ?>
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 			<li><div class="checkbox"><label><input type="checkbox" name="blocked" value="1" onclick="clickBlocked(this)" <?php if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') print 'checked'; ?> ><?php echo _("Only display FAA ASDI blocked aircrafts"); ?></label></div></li>
677 677
 		    <?php
678 678
 			}
679
-		    ?>
679
+			?>
680 680
 		    <li><?php echo _("Display airlines:"); ?>
681 681
 		    <br/>
682 682
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -696,14 +696,14 @@  discard block
 block discarded – undo
696 696
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
697 697
 					}
698 698
 				}
699
-			    ?>
699
+				?>
700 700
 			</select>
701 701
 		    </li>
702 702
 		    <?php
703 703
 			$Spotter = new Spotter();
704 704
 			$allalliancenames = $Spotter->getAllAllianceNames();
705 705
 			if (!empty($allalliancenames)) {
706
-		    ?>
706
+			?>
707 707
 		    <li><?php echo _("Display alliance:"); ?>
708 708
 		    <br/>
709 709
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -717,18 +717,18 @@  discard block
 block discarded – undo
717 717
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
718 718
 					}
719 719
 				}
720
-			    ?>
720
+				?>
721 721
 			</select>
722 722
 		    </li>
723 723
 		    <?php
724 724
 			}
725
-		    ?>
725
+			?>
726 726
 		    <?php
727 727
 			}
728
-		    ?>
728
+			?>
729 729
 		    <?php
730 730
 			if (isset($globalAPRS) && $globalAPRS) {
731
-		    ?>
731
+			?>
732 732
 		    <li><?php echo _("Display APRS sources name:"); ?>
733 733
 			<select class="selectpicker" multiple onchange="sources(this);">
734 734
 			    <?php
@@ -752,18 +752,18 @@  discard block
 block discarded – undo
752 752
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
753 753
 					}
754 754
 				}
755
-			    ?>
755
+				?>
756 756
 			</select>
757 757
 		    </li>
758 758
 		    <?php
759 759
 			}
760
-		    ?>
760
+			?>
761 761
 		    <?php
762 762
 			if (!isset($globalAircraft) || $globalAircraft) {
763
-		    ?>
763
+			?>
764 764
 		    <?php
765
-			    if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
766
-		    ?>
765
+				if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
766
+			?>
767 767
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
768 768
 			<select class="selectpicker" onchange="airlinestype(this);">
769 769
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -773,14 +773,14 @@  discard block
 block discarded – undo
773 773
 			</select>
774 774
 		    </li>
775 775
 		    <?php
776
-			    }
777
-		    ?>
776
+				}
777
+			?>
778 778
 		    <?php
779 779
 			}
780
-		    ?>
780
+			?>
781 781
 		    <?php
782 782
 			if (isset($globalMarine) && $globalMarine) {
783
-		    ?>
783
+			?>
784 784
 		    <li>
785 785
 			<?php echo _("Display vessels with MMSI:"); ?>
786 786
 			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 								print '<option value="'.$race['race_id'].'">'.$race['race_name'].'</option>';
804 804
 							}
805 805
 						}
806
-			    ?>
806
+				?>
807 807
 			</select>
808 808
 		    </li>
809 809
 
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
 					}
812 812
 				}
813 813
 			}
814
-		    ?>
814
+			?>
815 815
 		    <li>
816 816
 			<?php echo _("Display with ident:"); ?>
817 817
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
 	    </form>
825 825
     	</div>
826 826
 <?php
827
-    if (isset($globalSatellite) && $globalSatellite) {
827
+	if (isset($globalSatellite) && $globalSatellite) {
828 828
 ?>
829 829
         <div class="sidebar-pane" id="satellites">
830 830
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -864,14 +864,14 @@  discard block
 block discarded – undo
864 864
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
865 865
 					}
866 866
 				}
867
-			    ?>
867
+				?>
868 868
 			</select>
869 869
 		    </li>
870 870
 		</ul>
871 871
 	    </form>
872 872
 	</div>
873 873
 <?php
874
-    }
874
+	}
875 875
 ?>
876 876
     </div>
877 877
 </div>
Please login to merge, or discard this patch.