Completed
Push — master ( 8d4415...1bf6ad )
by Yannick
72:06 queued 32:47
created
index.php 1 patch
Indentation   +101 added lines, -101 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,34 +85,34 @@  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>
98 98
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
99 99
 <?php
100
-    if (isset($globalMap3D) && $globalMap3D) {
100
+	if (isset($globalMap3D) && $globalMap3D) {
101 101
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
102 102
 ?>
103 103
 	<li><a href="" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
104 104
 <?php
105 105
 	} else {
106
-	    if (isset($globalSatellite) && $globalSatellite) {
106
+		if (isset($globalSatellite) && $globalSatellite) {
107 107
 ?>
108 108
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
109 109
 <?php
110
-	    }
110
+		}
111 111
 ?>
112 112
 	<li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
113 113
 <?php
114 114
 	}
115
-    }
115
+	}
116 116
 ?>
117 117
     </ul>
118 118
 
@@ -244,15 +244,15 @@  discard block
 block discarded – undo
244 244
 		    </div>
245 245
 		</li>
246 246
 		<?php
247
-		    if (isset($globalDemo) && $globalDemo) {
247
+			if (isset($globalDemo) && $globalDemo) {
248 248
 		?>
249 249
 		<li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li>
250 250
 		<?php
251
-		    } else {
251
+			} else {
252 252
 		?>
253 253
 		<li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li>
254 254
 		<?php
255
-		    }
255
+			}
256 256
 		?>
257 257
 	    </ul>
258 258
 	    <ul>
@@ -271,72 +271,72 @@  discard block
 block discarded – undo
271 271
 			    <?php
272 272
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
273 273
 				else $MapType = $_COOKIE['MapType'];
274
-			    ?>
274
+				?>
275 275
 			    <?php
276 276
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
277
-			    ?>
277
+				?>
278 278
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
279 279
 			    <?php
280 280
 				} else {
281
-				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
282
-			    ?>
281
+					if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
282
+				?>
283 283
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
284 284
 			    <?php
285
-				    }
286
-			    ?>
285
+					}
286
+				?>
287 287
 			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
288 288
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
289 289
 			    <?php
290
-				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
291
-			    ?>
290
+					if (isset($globalBingMapKey) && $globalBingMapKey != '') {
291
+				?>
292 292
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
293 293
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
294 294
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
295 295
 			    <?php
296
-				    }
297
-			    ?>
296
+					}
297
+				?>
298 298
 			    <?php
299
-				    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
300
-			    ?>
299
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
300
+				?>
301 301
 			    <?php
302 302
 					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
303
-			    ?>
303
+				?>
304 304
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
305 305
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
306 306
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
307 307
 			    <?php
308 308
 					}
309
-			    ?>
309
+				?>
310 310
 			    <?php
311 311
 					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
312
-			    ?>
312
+				?>
313 313
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
314 314
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
315 315
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
316 316
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
317 317
 			    <?php
318 318
 					}
319
-			    ?>
319
+				?>
320 320
 			    <?php
321 321
 					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
322
-			    ?>
322
+				?>
323 323
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
324 324
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
325 325
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
326 326
 			    <?php
327 327
 					}
328
-			    ?>
328
+				?>
329 329
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
330 330
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
331 331
 			    <?php
332
-				    }
333
-			    ?>
332
+					}
333
+				?>
334 334
 			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
335 335
 			    <?php
336
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
336
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
337 337
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
338 338
 					else $MapBoxId = $_COOKIE['MapTypeId'];
339
-			    ?>
339
+				?>
340 340
 			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
341 341
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
342 342
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
@@ -351,16 +351,16 @@  discard block
 block discarded – undo
351 351
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
352 352
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
353 353
 			    <?php
354
-				    }
355
-			    ?>
354
+					}
355
+				?>
356 356
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
357 357
 			    <?php
358 358
 				}
359
-			    ?>
359
+				?>
360 360
 			</select>
361 361
 		    </li>
362 362
 <?php
363
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
363
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
364 364
 ?>
365 365
 		    <li><?php echo _("Type of Terrain:"); ?>
366 366
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -371,10 +371,10 @@  discard block
 block discarded – undo
371 371
 			</select>
372 372
 		    </li>
373 373
 <?php
374
-    }
374
+	}
375 375
 ?>
376 376
 <?php
377
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
377
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
378 378
 ?>
379 379
 		    <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>
380 380
 
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 		    <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>
398 398
 <?php
399 399
 	}
400
-    }
400
+	}
401 401
 ?>
402 402
 		    <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>
403 403
 		    <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>
@@ -416,80 +416,80 @@  discard block
 block discarded – undo
416 416
 	}
417 417
 ?>
418 418
 <?php
419
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
419
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
420 420
 ?>
421 421
 		    <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>
422 422
 		    <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>
423 423
 <?php
424
-    }
425
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
424
+	}
425
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
426 426
 ?>
427 427
 		    <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>
428 428
 <?php
429
-    }
429
+	}
430 430
 ?>
431 431
 		    <?php
432 432
 			if (function_exists('array_column')) {
433
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
434
-		    ?>
433
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
434
+			?>
435 435
 		    <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>
436 436
 		    <?php
437
-			    }
437
+				}
438 438
 			} elseif (isset($globalSources)) {
439
-			    $dispolar = false;
440
-			    foreach ($globalSources as $testsource) {
441
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
442
-			    }
443
-			    if ($dispolar) {
444
-		    ?>
439
+				$dispolar = false;
440
+				foreach ($globalSources as $testsource) {
441
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
442
+				}
443
+				if ($dispolar) {
444
+			?>
445 445
 		    <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>
446 446
 		    <?php
447
-			    }
448
-		        }
449
-		    ?>
447
+				}
448
+				}
449
+			?>
450 450
 <?php
451
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
451
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
452 452
 ?>
453 453
 
454 454
 		    <?php
455 455
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
456
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
457
-		    ?>
456
+					if (extension_loaded('gd') && function_exists('gd_info')) {
457
+			?>
458 458
 		    <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>
459 459
 		    <?php 
460 460
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
461
-		    ?>
461
+			?>
462 462
 			<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>
463 463
 		    <?php
464 464
 				}
465
-			    }
466
-		        }
467
-		    ?>
465
+				}
466
+				}
467
+			?>
468 468
 		    <?php
469 469
 			if (isset($globalMarine) && $globalMarine === TRUE) {
470
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
471
-		    ?>
470
+				if (extension_loaded('gd') && function_exists('gd_info')) {
471
+			?>
472 472
 		    <li><?php echo _("Marine icon color:"); ?>
473 473
 			<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'; ?>">
474 474
 		    </li>
475 475
 		    <?php
476
-			    }
477
-		        }
478
-		    ?>
476
+				}
477
+				}
478
+			?>
479 479
 		    <?php
480 480
 			if (isset($globalTracker) && $globalTracker === TRUE) {
481
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
482
-		    ?>
481
+				if (extension_loaded('gd') && function_exists('gd_info')) {
482
+			?>
483 483
 		    <li><?php echo _("Tracker icon color:"); ?>
484 484
 			<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'; ?>">
485 485
 		    </li>
486 486
 		    <?php
487
-			    }
488
-		        }
489
-		    ?>
487
+				}
488
+				}
489
+			?>
490 490
 		    <?php
491 491
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
492
-		    ?>
492
+			?>
493 493
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
494 494
 			<div class="range">
495 495
 			    <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'; ?>">
@@ -498,9 +498,9 @@  discard block
 block discarded – undo
498 498
 		    </li>
499 499
 		    <?php
500 500
 			}
501
-		    ?>
501
+			?>
502 502
 <?php
503
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
503
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
504 504
 ?>
505 505
 		    <li><?php echo _("Set scaling factor for rendering resolution:"); ?>
506 506
 			<div class="range">
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 		    </li>
539 539
 <?php
540 540
 	}
541
-    }
541
+	}
542 542
 ?>
543 543
 		    <li><?php echo _("Distance unit:"); ?>
544 544
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -571,19 +571,19 @@  discard block
 block discarded – undo
571 571
 		    <ul>
572 572
 		    <?php
573 573
 			if (!isset($globalAircraft) || $globalAircraft) {
574
-		    ?>
574
+			?>
575 575
 		    <?php
576 576
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
577
-		    ?>
577
+			?>
578 578
 			<?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 } ?>
579 579
 			<?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 } ?>
580 580
 			<?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 } ?>
581 581
 		    <?php
582 582
 			}
583
-		    ?>
583
+			?>
584 584
 		    <?php
585 585
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
586
-		    ?>
586
+			?>
587 587
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
588 588
 			    <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>
589 589
 			<?php } ?>
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 			<?php } ?>
593 593
 		    <?php
594 594
 			}
595
-		    ?>
595
+			?>
596 596
 		    <li><?php echo _("Display airlines:"); ?>
597 597
 		    <br/>
598 598
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -612,14 +612,14 @@  discard block
 block discarded – undo
612 612
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
613 613
 					}
614 614
 				}
615
-			    ?>
615
+				?>
616 616
 			</select>
617 617
 		    </li>
618 618
 		    <?php
619 619
 			$Spotter = new Spotter();
620 620
 			$allalliancenames = $Spotter->getAllAllianceNames();
621 621
 			if (!empty($allalliancenames)) {
622
-		    ?>
622
+			?>
623 623
 		    <li><?php echo _("Display alliance:"); ?>
624 624
 		    <br/>
625 625
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -633,18 +633,18 @@  discard block
 block discarded – undo
633 633
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
634 634
 					}
635 635
 				}
636
-			    ?>
636
+				?>
637 637
 			</select>
638 638
 		    </li>
639 639
 		    <?php
640 640
 			}
641
-		    ?>
641
+			?>
642 642
 		    <?php
643 643
 			}
644
-		    ?>
644
+			?>
645 645
 		    <?php
646 646
 			if (isset($globalAPRS) && $globalAPRS) {
647
-		    ?>
647
+			?>
648 648
 		    <li><?php echo _("Display APRS sources name:"); ?>
649 649
 			<select class="selectpicker" multiple onchange="sources(this);">
650 650
 			    <?php
@@ -668,18 +668,18 @@  discard block
 block discarded – undo
668 668
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
669 669
 					}
670 670
 				}
671
-			    ?>
671
+				?>
672 672
 			</select>
673 673
 		    </li>
674 674
 		    <?php
675 675
 			}
676
-		    ?>
676
+			?>
677 677
 		    <?php
678 678
 			if (!isset($globalAircraft) || $globalAircraft) {
679
-		    ?>
679
+			?>
680 680
 		    <?php
681
-			    if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
682
-		    ?>
681
+				if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
682
+			?>
683 683
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
684 684
 			<select class="selectpicker" onchange="airlinestype(this);">
685 685
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -689,21 +689,21 @@  discard block
 block discarded – undo
689 689
 			</select>
690 690
 		    </li>
691 691
 		    <?php
692
-			    }
693
-		    ?>
692
+				}
693
+			?>
694 694
 		    <?php
695 695
 			}
696
-		    ?>
696
+			?>
697 697
 		    <?php
698 698
 			if (isset($globalMarine) && $globalMarine) {
699
-		    ?>
699
+			?>
700 700
 		    <li>
701 701
 			<?php echo _("Display vessels with MMSI:"); ?>
702 702
 			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
703 703
 		    </li>
704 704
 		    <?php
705 705
 			}
706
-		    ?>
706
+			?>
707 707
 		    <li>
708 708
 			<?php echo _("Display with ident:"); ?>
709 709
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 	    </form>
717 717
     	</div>
718 718
 <?php
719
-    if (isset($globalSatellite) && $globalSatellite) {
719
+	if (isset($globalSatellite) && $globalSatellite) {
720 720
 ?>
721 721
         <div class="sidebar-pane" id="satellites">
722 722
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -756,14 +756,14 @@  discard block
 block discarded – undo
756 756
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
757 757
 					}
758 758
 				}
759
-			    ?>
759
+				?>
760 760
 			</select>
761 761
 		    </li>
762 762
 		</ul>
763 763
 	    </form>
764 764
 	</div>
765 765
 <?php
766
-    }
766
+	}
767 767
 ?>
768 768
     </div>
769 769
 </div>
Please login to merge, or discard this patch.