Completed
Push — master ( 2b1ee6...5d1159 )
by Yannick
31:35
created
index.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     <?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 } ?>
51 51
 </tr></table></div>
52 52
 <?php
53
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
53
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
54 54
 ?>
55 55
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script>
56 56
 <?php
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
75 75
 <?php
76 76
 	}
77
-    }
77
+	}
78 78
 ?>
79 79
 
80 80
 <div id="sidebar" class="sidebar collapsed">
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 	<li><a href="" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
86 86
 	<li><a href="" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
87 87
 <?php
88
-    //if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
88
+	//if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
89 89
 	if (isset($globalArchive) && $globalArchive == TRUE && (!isset($globalAircraft) || $globalAircraft === TRUE)) {
90 90
 ?>
91 91
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
92 92
 <?php
93 93
 	}
94
-    //}
94
+	//}
95 95
 ?>
96 96
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
97 97
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 ?>
106 106
 
107 107
 <?php
108
-    if (isset($globalMap3D) && $globalMap3D) {
108
+	if (isset($globalMap3D) && $globalMap3D) {
109 109
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
110 110
 ?>
111 111
 	<li><a href="" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	<li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
116 116
 <?php
117 117
 	}
118
-    }
118
+	}
119 119
 ?>
120 120
     </ul>
121 121
 
@@ -284,15 +284,15 @@  discard block
 block discarded – undo
284 284
 		    </div>
285 285
 		</li>
286 286
 		<?php
287
-		    if (isset($globalDemo) && $globalDemo) {
287
+			if (isset($globalDemo) && $globalDemo) {
288 288
 		?>
289 289
 		<li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li>
290 290
 		<?php
291
-		    } else {
291
+			} else {
292 292
 		?>
293 293
 		<li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li>
294 294
 		<?php
295
-		    }
295
+			}
296 296
 		?>
297 297
 	    </ul>
298 298
 	    <ul>
@@ -311,83 +311,83 @@  discard block
 block discarded – undo
311 311
 				if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
312 312
 					if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
313 313
 					else $MapType = $_COOKIE['MapType'];
314
-			    ?>
314
+				?>
315 315
 			<select  class="selectpicker" onchange="mapType(this);">
316 316
 			    <?php
317 317
 				} else {
318 318
 					if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider;
319 319
 					else $MapType = $_COOKIE['MapType3D'];
320
-			    ?>
320
+				?>
321 321
 			<select  class="selectpicker" onchange="mapType3D(this);">
322 322
 			    <?php
323 323
 				}
324
-			    ?>
324
+				?>
325 325
 			    <?php
326 326
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
327
-			    ?>
327
+				?>
328 328
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
329 329
 			    <?php
330 330
 				} else {
331
-				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
332
-			    ?>
331
+					if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
332
+				?>
333 333
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
334 334
 			    <?php
335
-				    }
336
-			    ?>
335
+					}
336
+				?>
337 337
 			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
338 338
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
339 339
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option>
340 340
 			    <?php
341
-				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
342
-			    ?>
341
+					if (isset($globalBingMapKey) && $globalBingMapKey != '') {
342
+				?>
343 343
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
344 344
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
345 345
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
346 346
 			    <?php
347
-				    }
348
-			    ?>
347
+					}
348
+				?>
349 349
 			    <?php
350
-				    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
351
-			    ?>
350
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
351
+				?>
352 352
 			    <?php
353 353
 					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
354
-			    ?>
354
+				?>
355 355
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
356 356
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
357 357
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
358 358
 			    <?php
359 359
 					}
360
-			    ?>
360
+				?>
361 361
 			    <?php
362 362
 					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
363
-			    ?>
363
+				?>
364 364
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
365 365
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
366 366
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
367 367
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
368 368
 			    <?php
369 369
 					}
370
-			    ?>
370
+				?>
371 371
 			    <?php
372 372
 					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
373
-			    ?>
373
+				?>
374 374
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
375 375
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
376 376
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
377 377
 			    <?php
378 378
 					}
379
-			    ?>
379
+				?>
380 380
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
381 381
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
382 382
 			    <?php
383
-				    }
384
-			    ?>
383
+					}
384
+				?>
385 385
 			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
386 386
 			    <?php
387
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
387
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
388 388
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
389 389
 					else $MapBoxId = $_COOKIE['MapTypeId'];
390
-			    ?>
390
+				?>
391 391
 			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
392 392
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
393 393
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
@@ -402,16 +402,16 @@  discard block
 block discarded – undo
402 402
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
403 403
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
404 404
 			    <?php
405
-				    }
406
-			    ?>
405
+					}
406
+				?>
407 407
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
408 408
 			    <?php
409 409
 				}
410
-			    ?>
410
+				?>
411 411
 			</select>
412 412
 		    </li>
413 413
 <?php
414
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
414
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
415 415
 ?>
416 416
 		    <li><?php echo _("Type of Terrain:"); ?>
417 417
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -422,18 +422,18 @@  discard block
 block discarded – undo
422 422
 			</select>
423 423
 		    </li>
424 424
 <?php
425
-    }
425
+	}
426 426
 ?>
427 427
 
428 428
 <?php
429
-    if (isset($globalMap3D) && $globalMap3D) {
429
+	if (isset($globalMap3D) && $globalMap3D) {
430 430
 ?>
431 431
 		    <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>
432 432
 <?php
433
-    }
433
+	}
434 434
 ?>
435 435
 <?php
436
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
436
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
437 437
 ?>
438 438
 		    <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>
439 439
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		    <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>
457 457
 <?php
458 458
 	}
459
-    }
459
+	}
460 460
 ?>
461 461
 		    <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>
462 462
 		    <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>
@@ -475,82 +475,82 @@  discard block
 block discarded – undo
475 475
 	}
476 476
 ?>
477 477
 <?php
478
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
478
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
479 479
 ?>
480 480
 		    <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>
481 481
 		    <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>
482 482
 		    <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>
483 483
 		    <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>
484 484
 <?php
485
-    }
486
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
485
+	}
486
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
487 487
 ?>
488 488
 		    <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>
489 489
 <?php
490
-    }
490
+	}
491 491
 ?>
492 492
 		    <?php
493 493
 			if (function_exists('array_column')) {
494
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
495
-		    ?>
494
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
495
+			?>
496 496
 		    <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>
497 497
 		    <?php
498
-			    }
498
+				}
499 499
 			} elseif (isset($globalSources)) {
500
-			    $dispolar = false;
501
-			    foreach ($globalSources as $testsource) {
502
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
503
-			    }
504
-			    if ($dispolar) {
505
-		    ?>
500
+				$dispolar = false;
501
+				foreach ($globalSources as $testsource) {
502
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
503
+				}
504
+				if ($dispolar) {
505
+			?>
506 506
 		    <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>
507 507
 		    <?php
508
-			    }
509
-		        }
510
-		    ?>
508
+				}
509
+				}
510
+			?>
511 511
 <?php
512
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
512
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
513 513
 ?>
514 514
 
515 515
 		    <?php
516 516
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
517
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
518
-		    ?>
517
+					if (extension_loaded('gd') && function_exists('gd_info')) {
518
+			?>
519 519
 		    <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>
520 520
 		    <?php 
521 521
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
522
-		    ?>
522
+			?>
523 523
 			<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>
524 524
 		    <?php
525 525
 				}
526
-			    }
527
-		        }
528
-		    ?>
526
+				}
527
+				}
528
+			?>
529 529
 		    <?php
530 530
 			if (isset($globalMarine) && $globalMarine === TRUE) {
531
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
532
-		    ?>
531
+				if (extension_loaded('gd') && function_exists('gd_info')) {
532
+			?>
533 533
 		    <li><?php echo _("Marine icon color:"); ?>
534 534
 			<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'; ?>">
535 535
 		    </li>
536 536
 		    <?php
537
-			    }
538
-		        }
539
-		    ?>
537
+				}
538
+				}
539
+			?>
540 540
 		    <?php
541 541
 			if (isset($globalTracker) && $globalTracker === TRUE) {
542
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
543
-		    ?>
542
+				if (extension_loaded('gd') && function_exists('gd_info')) {
543
+			?>
544 544
 		    <li><?php echo _("Tracker icon color:"); ?>
545 545
 			<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'; ?>">
546 546
 		    </li>
547 547
 		    <?php
548
-			    }
549
-		        }
550
-		    ?>
548
+				}
549
+				}
550
+			?>
551 551
 		    <?php
552 552
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
553
-		    ?>
553
+			?>
554 554
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
555 555
 			<div class="range">
556 556
 			    <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'; ?>">
@@ -559,9 +559,9 @@  discard block
 block discarded – undo
559 559
 		    </li>
560 560
 		    <?php
561 561
 			}
562
-		    ?>
562
+			?>
563 563
 <?php
564
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
564
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
565 565
 ?>
566 566
 		    <li><?php echo _("Set scaling factor for rendering resolution:"); ?>
567 567
 			<div class="range">
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
 		    </li>
600 600
 <?php
601 601
 	}
602
-    }
602
+	}
603 603
 ?>
604 604
 		    <li><?php echo _("Distance unit:"); ?>
605 605
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -632,19 +632,19 @@  discard block
 block discarded – undo
632 632
 		    <ul>
633 633
 		    <?php
634 634
 			if (!isset($globalAircraft) || $globalAircraft) {
635
-		    ?>
635
+			?>
636 636
 		    <?php
637 637
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
638
-		    ?>
638
+			?>
639 639
 			<?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 } ?>
640 640
 			<?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 } ?>
641 641
 			<?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 } ?>
642 642
 		    <?php
643 643
 			}
644
-		    ?>
644
+			?>
645 645
 		    <?php
646 646
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
647
-		    ?>
647
+			?>
648 648
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
649 649
 			    <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>
650 650
 			<?php } ?>
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 			<?php } ?>
654 654
 		    <?php
655 655
 			}
656
-		    ?>
656
+			?>
657 657
 		    <li><?php echo _("Display airlines:"); ?>
658 658
 		    <br/>
659 659
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -673,14 +673,14 @@  discard block
 block discarded – undo
673 673
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
674 674
 					}
675 675
 				}
676
-			    ?>
676
+				?>
677 677
 			</select>
678 678
 		    </li>
679 679
 		    <?php
680 680
 			$Spotter = new Spotter();
681 681
 			$allalliancenames = $Spotter->getAllAllianceNames();
682 682
 			if (!empty($allalliancenames)) {
683
-		    ?>
683
+			?>
684 684
 		    <li><?php echo _("Display alliance:"); ?>
685 685
 		    <br/>
686 686
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -694,18 +694,18 @@  discard block
 block discarded – undo
694 694
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
695 695
 					}
696 696
 				}
697
-			    ?>
697
+				?>
698 698
 			</select>
699 699
 		    </li>
700 700
 		    <?php
701 701
 			}
702
-		    ?>
702
+			?>
703 703
 		    <?php
704 704
 			}
705
-		    ?>
705
+			?>
706 706
 		    <?php
707 707
 			if (isset($globalAPRS) && $globalAPRS) {
708
-		    ?>
708
+			?>
709 709
 		    <li><?php echo _("Display APRS sources name:"); ?>
710 710
 			<select class="selectpicker" multiple onchange="sources(this);">
711 711
 			    <?php
@@ -729,18 +729,18 @@  discard block
 block discarded – undo
729 729
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
730 730
 					}
731 731
 				}
732
-			    ?>
732
+				?>
733 733
 			</select>
734 734
 		    </li>
735 735
 		    <?php
736 736
 			}
737
-		    ?>
737
+			?>
738 738
 		    <?php
739 739
 			if (!isset($globalAircraft) || $globalAircraft) {
740
-		    ?>
740
+			?>
741 741
 		    <?php
742
-			    if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
743
-		    ?>
742
+				if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
743
+			?>
744 744
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
745 745
 			<select class="selectpicker" onchange="airlinestype(this);">
746 746
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -750,14 +750,14 @@  discard block
 block discarded – undo
750 750
 			</select>
751 751
 		    </li>
752 752
 		    <?php
753
-			    }
754
-		    ?>
753
+				}
754
+			?>
755 755
 		    <?php
756 756
 			}
757
-		    ?>
757
+			?>
758 758
 		    <?php
759 759
 			if (isset($globalMarine) && $globalMarine) {
760
-		    ?>
760
+			?>
761 761
 		    <li>
762 762
 			<?php echo _("Display vessels with MMSI:"); ?>
763 763
 			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
 						foreach ($races as $race) {
777 777
 							print '<option value="'.$race['race_id'].'">'.$race['race_name'].'</option>';
778 778
 						}
779
-			    ?>
779
+				?>
780 780
 			</select>
781 781
 		    </li>
782 782
 
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 					}
785 785
 				}
786 786
 			}
787
-		    ?>
787
+			?>
788 788
 		    <li>
789 789
 			<?php echo _("Display with ident:"); ?>
790 790
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -797,7 +797,7 @@  discard block
 block discarded – undo
797 797
 	    </form>
798 798
     	</div>
799 799
 <?php
800
-    if (isset($globalSatellite) && $globalSatellite) {
800
+	if (isset($globalSatellite) && $globalSatellite) {
801 801
 ?>
802 802
         <div class="sidebar-pane" id="satellites">
803 803
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -837,14 +837,14 @@  discard block
 block discarded – undo
837 837
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
838 838
 					}
839 839
 				}
840
-			    ?>
840
+				?>
841 841
 			</select>
842 842
 		    </li>
843 843
 		</ul>
844 844
 	    </form>
845 845
 	</div>
846 846
 <?php
847
-    }
847
+	}
848 848
 ?>
849 849
     </div>
850 850
 </div>
Please login to merge, or discard this patch.