@@ -55,7 +55,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | |
@@ -306,15 +306,15 @@ discard block |
||
306 | 306 | </div> |
307 | 307 | </li> |
308 | 308 | <?php |
309 | - if (isset($globalDemo) && $globalDemo) { |
|
309 | + if (isset($globalDemo) && $globalDemo) { |
|
310 | 310 | ?> |
311 | 311 | <li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li> |
312 | 312 | <?php |
313 | - } else { |
|
313 | + } else { |
|
314 | 314 | ?> |
315 | 315 | <li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li> |
316 | 316 | <?php |
317 | - } |
|
317 | + } |
|
318 | 318 | ?> |
319 | 319 | </ul> |
320 | 320 | <ul> |
@@ -333,83 +333,83 @@ discard block |
||
333 | 333 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
334 | 334 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
335 | 335 | else $MapType = $_COOKIE['MapType']; |
336 | - ?> |
|
336 | + ?> |
|
337 | 337 | <select class="selectpicker" onchange="mapType(this);"> |
338 | 338 | <?php |
339 | 339 | } else { |
340 | 340 | if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider; |
341 | 341 | else $MapType = $_COOKIE['MapType3D']; |
342 | - ?> |
|
342 | + ?> |
|
343 | 343 | <select class="selectpicker" onchange="mapType3D(this);"> |
344 | 344 | <?php |
345 | 345 | } |
346 | - ?> |
|
346 | + ?> |
|
347 | 347 | <?php |
348 | 348 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
349 | - ?> |
|
349 | + ?> |
|
350 | 350 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
351 | 351 | <?php |
352 | 352 | } else { |
353 | - if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
354 | - ?> |
|
353 | + if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
354 | + ?> |
|
355 | 355 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
356 | 356 | <?php |
357 | - } |
|
358 | - ?> |
|
357 | + } |
|
358 | + ?> |
|
359 | 359 | <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
360 | 360 | <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
361 | 361 | <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option> |
362 | 362 | <?php |
363 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
364 | - ?> |
|
363 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
364 | + ?> |
|
365 | 365 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
366 | 366 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
367 | 367 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
368 | 368 | <?php |
369 | - } |
|
370 | - ?> |
|
369 | + } |
|
370 | + ?> |
|
371 | 371 | <?php |
372 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
373 | - ?> |
|
372 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
373 | + ?> |
|
374 | 374 | <?php |
375 | 375 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
376 | - ?> |
|
376 | + ?> |
|
377 | 377 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
378 | 378 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
379 | 379 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
380 | 380 | <?php |
381 | 381 | } |
382 | - ?> |
|
382 | + ?> |
|
383 | 383 | <?php |
384 | 384 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
385 | - ?> |
|
385 | + ?> |
|
386 | 386 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
387 | 387 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
388 | 388 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
389 | 389 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
390 | 390 | <?php |
391 | 391 | } |
392 | - ?> |
|
392 | + ?> |
|
393 | 393 | <?php |
394 | 394 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
395 | - ?> |
|
395 | + ?> |
|
396 | 396 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
397 | 397 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
398 | 398 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
399 | 399 | <?php |
400 | 400 | } |
401 | - ?> |
|
401 | + ?> |
|
402 | 402 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
403 | 403 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
404 | 404 | <?php |
405 | - } |
|
406 | - ?> |
|
405 | + } |
|
406 | + ?> |
|
407 | 407 | <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
408 | 408 | <?php |
409 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
409 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
410 | 410 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
411 | 411 | else $MapBoxId = $_COOKIE['MapTypeId']; |
412 | - ?> |
|
412 | + ?> |
|
413 | 413 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
414 | 414 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
415 | 415 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -424,16 +424,16 @@ discard block |
||
424 | 424 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
425 | 425 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
426 | 426 | <?php |
427 | - } |
|
428 | - ?> |
|
427 | + } |
|
428 | + ?> |
|
429 | 429 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
430 | 430 | <?php |
431 | 431 | } |
432 | - ?> |
|
432 | + ?> |
|
433 | 433 | </select> |
434 | 434 | </li> |
435 | 435 | <?php |
436 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
436 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
437 | 437 | ?> |
438 | 438 | <li><?php echo _("Type of Terrain:"); ?> |
439 | 439 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -444,18 +444,18 @@ discard block |
||
444 | 444 | </select> |
445 | 445 | </li> |
446 | 446 | <?php |
447 | - } |
|
447 | + } |
|
448 | 448 | ?> |
449 | 449 | |
450 | 450 | <?php |
451 | - if (isset($globalMap3D) && $globalMap3D) { |
|
451 | + if (isset($globalMap3D) && $globalMap3D) { |
|
452 | 452 | ?> |
453 | 453 | <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> |
454 | 454 | <?php |
455 | - } |
|
455 | + } |
|
456 | 456 | ?> |
457 | 457 | <?php |
458 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
458 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
459 | 459 | ?> |
460 | 460 | <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> |
461 | 461 | |
@@ -478,12 +478,12 @@ discard block |
||
478 | 478 | <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> |
479 | 479 | <?php |
480 | 480 | } |
481 | - } |
|
482 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
481 | + } |
|
482 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
483 | 483 | ?> |
484 | 484 | <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> |
485 | 485 | <?php |
486 | - } |
|
486 | + } |
|
487 | 487 | ?> |
488 | 488 | <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> |
489 | 489 | <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> |
@@ -502,88 +502,88 @@ discard block |
||
502 | 502 | ?> |
503 | 503 | <li><div class="checkbox"><label><input type="checkbox" name="truelight" value="1" onclick="clickTrueLight(this)" <?php if ((!isset($_COOKIE['truelight']) && (!isset($globalMapTrueLight) || $globalMapTrueLight)) || (isset($_COOKIE['truelight']) && $_COOKIE['truelight'] == 'true')) print 'checked'; ?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li> |
504 | 504 | <?php |
505 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
505 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
506 | 506 | ?> |
507 | 507 | <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> |
508 | 508 | <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> |
509 | 509 | <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> |
510 | 510 | <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> |
511 | 511 | <?php |
512 | - } |
|
513 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
512 | + } |
|
513 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
514 | 514 | ?> |
515 | 515 | <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> |
516 | 516 | <?php |
517 | - } |
|
517 | + } |
|
518 | 518 | ?> |
519 | 519 | <?php |
520 | 520 | if (function_exists('array_column')) { |
521 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
522 | - ?> |
|
521 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
522 | + ?> |
|
523 | 523 | <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> |
524 | 524 | <?php |
525 | - } |
|
525 | + } |
|
526 | 526 | } elseif (isset($globalSources)) { |
527 | - $dispolar = false; |
|
528 | - foreach ($globalSources as $testsource) { |
|
529 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
530 | - } |
|
531 | - if ($dispolar) { |
|
532 | - ?> |
|
527 | + $dispolar = false; |
|
528 | + foreach ($globalSources as $testsource) { |
|
529 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
530 | + } |
|
531 | + if ($dispolar) { |
|
532 | + ?> |
|
533 | 533 | <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> |
534 | 534 | <?php |
535 | - } |
|
536 | - } |
|
537 | - ?> |
|
535 | + } |
|
536 | + } |
|
537 | + ?> |
|
538 | 538 | <?php |
539 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
539 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
540 | 540 | ?> |
541 | 541 | <?php |
542 | 542 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
543 | - ?> |
|
543 | + ?> |
|
544 | 544 | <li><?php echo _("Max number of flights to display:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) print $_COOKIE['map_2d_limit']; elseif (isset($globalMap2DAircraftsLimit)) print $globalMap2DAircraftsLimit; else print 15000; ?>" onchange="map2dlimit(this.value);" /></li> |
545 | 545 | <?php |
546 | 546 | } |
547 | - ?> |
|
547 | + ?> |
|
548 | 548 | <?php |
549 | 549 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
550 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
551 | - ?> |
|
550 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
551 | + ?> |
|
552 | 552 | <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> |
553 | 553 | <?php |
554 | 554 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
555 | - ?> |
|
555 | + ?> |
|
556 | 556 | <li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"></li> |
557 | 557 | <?php |
558 | 558 | } |
559 | - } |
|
560 | - } |
|
561 | - ?> |
|
559 | + } |
|
560 | + } |
|
561 | + ?> |
|
562 | 562 | <?php |
563 | 563 | if (isset($globalMarine) && $globalMarine === TRUE) { |
564 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
565 | - ?> |
|
564 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
565 | + ?> |
|
566 | 566 | <li><?php echo _("Marine icon color:"); ?> |
567 | 567 | <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'; ?>"> |
568 | 568 | </li> |
569 | 569 | <?php |
570 | - } |
|
571 | - } |
|
572 | - ?> |
|
570 | + } |
|
571 | + } |
|
572 | + ?> |
|
573 | 573 | <?php |
574 | 574 | if (isset($globalTracker) && $globalTracker === TRUE) { |
575 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
576 | - ?> |
|
575 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
576 | + ?> |
|
577 | 577 | <li><?php echo _("Tracker icon color:"); ?> |
578 | 578 | <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'; ?>"> |
579 | 579 | </li> |
580 | 580 | <?php |
581 | - } |
|
582 | - } |
|
583 | - ?> |
|
581 | + } |
|
582 | + } |
|
583 | + ?> |
|
584 | 584 | <?php |
585 | 585 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
586 | - ?> |
|
586 | + ?> |
|
587 | 587 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
588 | 588 | <div class="range"> |
589 | 589 | <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'; ?>"> |
@@ -592,9 +592,9 @@ discard block |
||
592 | 592 | </li> |
593 | 593 | <?php |
594 | 594 | } |
595 | - ?> |
|
595 | + ?> |
|
596 | 596 | <?php |
597 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
597 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
598 | 598 | ?> |
599 | 599 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
600 | 600 | <div class="range"> |
@@ -632,7 +632,7 @@ discard block |
||
632 | 632 | </li> |
633 | 633 | <?php |
634 | 634 | } |
635 | - } |
|
635 | + } |
|
636 | 636 | ?> |
637 | 637 | <li><?php echo _("Distance unit:"); ?> |
638 | 638 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -672,19 +672,19 @@ discard block |
||
672 | 672 | <ul> |
673 | 673 | <?php |
674 | 674 | if (!isset($globalAircraft) || $globalAircraft) { |
675 | - ?> |
|
675 | + ?> |
|
676 | 676 | <?php |
677 | 677 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
678 | - ?> |
|
678 | + ?> |
|
679 | 679 | <?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 } ?> |
680 | 680 | <?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 } ?> |
681 | 681 | <?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 } ?> |
682 | 682 | <?php |
683 | 683 | } |
684 | - ?> |
|
684 | + ?> |
|
685 | 685 | <?php |
686 | 686 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
687 | - ?> |
|
687 | + ?> |
|
688 | 688 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
689 | 689 | <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> |
690 | 690 | <?php } ?> |
@@ -694,7 +694,7 @@ discard block |
||
694 | 694 | <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> |
695 | 695 | <?php |
696 | 696 | } |
697 | - ?> |
|
697 | + ?> |
|
698 | 698 | <li><?php echo _("Display airlines:"); ?> |
699 | 699 | <br/> |
700 | 700 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -714,14 +714,14 @@ discard block |
||
714 | 714 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
715 | 715 | } |
716 | 716 | } |
717 | - ?> |
|
717 | + ?> |
|
718 | 718 | </select> |
719 | 719 | </li> |
720 | 720 | <?php |
721 | 721 | $Spotter = new Spotter(); |
722 | 722 | $allalliancenames = $Spotter->getAllAllianceNames(); |
723 | 723 | if (!empty($allalliancenames)) { |
724 | - ?> |
|
724 | + ?> |
|
725 | 725 | <li><?php echo _("Display alliance:"); ?> |
726 | 726 | <br/> |
727 | 727 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -735,18 +735,18 @@ discard block |
||
735 | 735 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
736 | 736 | } |
737 | 737 | } |
738 | - ?> |
|
738 | + ?> |
|
739 | 739 | </select> |
740 | 740 | </li> |
741 | 741 | <?php |
742 | 742 | } |
743 | - ?> |
|
743 | + ?> |
|
744 | 744 | <?php |
745 | 745 | } |
746 | - ?> |
|
746 | + ?> |
|
747 | 747 | <?php |
748 | 748 | if (isset($globalAPRS) && $globalAPRS) { |
749 | - ?> |
|
749 | + ?> |
|
750 | 750 | <li><?php echo _("Display APRS sources name:"); ?> |
751 | 751 | <select class="selectpicker" multiple onchange="sources(this);"> |
752 | 752 | <?php |
@@ -770,18 +770,18 @@ discard block |
||
770 | 770 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
771 | 771 | } |
772 | 772 | } |
773 | - ?> |
|
773 | + ?> |
|
774 | 774 | </select> |
775 | 775 | </li> |
776 | 776 | <?php |
777 | 777 | } |
778 | - ?> |
|
778 | + ?> |
|
779 | 779 | <?php |
780 | 780 | if (!isset($globalAircraft) || $globalAircraft) { |
781 | - ?> |
|
781 | + ?> |
|
782 | 782 | <?php |
783 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
784 | - ?> |
|
783 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
784 | + ?> |
|
785 | 785 | <li><?php echo _("Display airlines of type:"); ?><br/> |
786 | 786 | <select class="selectpicker" onchange="airlinestype(this);"> |
787 | 787 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -791,14 +791,14 @@ discard block |
||
791 | 791 | </select> |
792 | 792 | </li> |
793 | 793 | <?php |
794 | - } |
|
795 | - ?> |
|
794 | + } |
|
795 | + ?> |
|
796 | 796 | <?php |
797 | 797 | } |
798 | - ?> |
|
798 | + ?> |
|
799 | 799 | <?php |
800 | 800 | if (isset($globalMarine) && $globalMarine) { |
801 | - ?> |
|
801 | + ?> |
|
802 | 802 | <li> |
803 | 803 | <?php echo _("Display vessels with MMSI:"); ?> |
804 | 804 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | print '<option value="'.$race['race_id'].'">'.$race['race_name'].'</option>'; |
822 | 822 | } |
823 | 823 | } |
824 | - ?> |
|
824 | + ?> |
|
825 | 825 | </select> |
826 | 826 | </li> |
827 | 827 | |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | } |
830 | 830 | } |
831 | 831 | } |
832 | - ?> |
|
832 | + ?> |
|
833 | 833 | <li> |
834 | 834 | <?php echo _("Display with ident:"); ?> |
835 | 835 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | </form> |
843 | 843 | </div> |
844 | 844 | <?php |
845 | - if (isset($globalSatellite) && $globalSatellite) { |
|
845 | + if (isset($globalSatellite) && $globalSatellite) { |
|
846 | 846 | ?> |
847 | 847 | <div class="sidebar-pane" id="satellites"> |
848 | 848 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -882,14 +882,14 @@ discard block |
||
882 | 882 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
883 | 883 | } |
884 | 884 | } |
885 | - ?> |
|
885 | + ?> |
|
886 | 886 | </select> |
887 | 887 | </li> |
888 | 888 | </ul> |
889 | 889 | </form> |
890 | 890 | </div> |
891 | 891 | <?php |
892 | - } |
|
892 | + } |
|
893 | 893 | ?> |
894 | 894 | </div> |
895 | 895 | </div> |
@@ -57,7 +57,10 @@ discard block |
||
57 | 57 | <?php |
58 | 58 | if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
59 | 59 | ?> |
60 | -<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
|
60 | +<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) { |
|
61 | + print '?tsk='.$tsk; |
|
62 | +} |
|
63 | +?>"></script> |
|
61 | 64 | <script src="<?php echo $globalURL; ?>/js/meuusjs.1.0.3.min.js"></script> |
62 | 65 | <script src="<?php echo $globalURL; ?>/js/map.3d.weather.js"></script> |
63 | 66 | <?php |
@@ -137,10 +140,22 @@ discard block |
||
137 | 140 | <h1>Weather</h1> |
138 | 141 | <ul> |
139 | 142 | |
140 | - <li><div class="checkbox"><label><input type="checkbox" name="wind" value="1" onclick="clickWind(this);" <?php if (isset($_COOKIE['weather_wind']) && $_COOKIE['weather_wind'] == 'true') print 'checked'; ?> /><?php echo _("Weather Winds"); ?></label></div></li> |
|
141 | - <li><div class="checkbox"><label><input type="checkbox" name="wave" value="1" onclick="clickWave(this);" <?php if (isset($_COOKIE['weather_wave']) && $_COOKIE['weather_wave'] == 'true') print 'checked'; ?> /><?php echo _("Ocean surface currents"); ?></label></div></li> |
|
142 | - <li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') print 'checked'; ?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li> |
|
143 | - <!-- <li><div class="checkbox"><label><input type="checkbox" name="backwave" value="1" onclick="clickBackWave(this);" <?php if (isset($_COOKIE['weather_backwave']) && $_COOKIE['weather_backwave'] == 'true') print 'checked'; ?> /><?php echo _("Weather Waves height background"); ?></label></div></li> --> |
|
143 | + <li><div class="checkbox"><label><input type="checkbox" name="wind" value="1" onclick="clickWind(this);" <?php if (isset($_COOKIE['weather_wind']) && $_COOKIE['weather_wind'] == 'true') { |
|
144 | + print 'checked'; |
|
145 | +} |
|
146 | +?> /><?php echo _("Weather Winds"); ?></label></div></li> |
|
147 | + <li><div class="checkbox"><label><input type="checkbox" name="wave" value="1" onclick="clickWave(this);" <?php if (isset($_COOKIE['weather_wave']) && $_COOKIE['weather_wave'] == 'true') { |
|
148 | + print 'checked'; |
|
149 | +} |
|
150 | +?> /><?php echo _("Ocean surface currents"); ?></label></div></li> |
|
151 | + <li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') { |
|
152 | + print 'checked'; |
|
153 | +} |
|
154 | +?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li> |
|
155 | + <!-- <li><div class="checkbox"><label><input type="checkbox" name="backwave" value="1" onclick="clickBackWave(this);" <?php if (isset($_COOKIE['weather_backwave']) && $_COOKIE['weather_backwave'] == 'true') { |
|
156 | + print 'checked'; |
|
157 | +} |
|
158 | +?> /><?php echo _("Weather Waves height background"); ?></label></div></li> --> |
|
144 | 159 | |
145 | 160 | <?php |
146 | 161 | if (isset($globalOpenWeatherMapKey) && $globalOpenWeatherMapKey != '') { |
@@ -162,12 +177,18 @@ discard block |
||
162 | 177 | <?php |
163 | 178 | if (isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) { |
164 | 179 | ?> |
165 | - <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) print 'checked'; ?> ><?php echo _("Display 3D weather"); ?></label></div></li> |
|
180 | + <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) { |
|
181 | + print 'checked'; |
|
182 | +} |
|
183 | +?> ><?php echo _("Display 3D weather"); ?></label></div></li> |
|
166 | 184 | <!-- <li><div class="checkbox"><label><input type="checkbox" name="displayrain" value="1" onclick="clickDisplayRain(this)" ><?php echo _("Display rain on 3D map"); ?></label></div></li>--> |
167 | 185 | <?php |
168 | 186 | } |
169 | 187 | ?> |
170 | - <li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') print 'checked'; ?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li> |
|
188 | + <li><div class="checkbox"><label><input type="checkbox" name="fire" value="1" onclick="clickFire(this);" <?php if (isset($_COOKIE['weather_fire']) && $_COOKIE['weather_fire'] == 'true') { |
|
189 | + print 'checked'; |
|
190 | +} |
|
191 | +?> /><?php echo _("NASA Fire Hotspots"); ?></label></div></li> |
|
171 | 192 | </ul> |
172 | 193 | <?php |
173 | 194 | } |
@@ -183,13 +204,22 @@ discard block |
||
183 | 204 | <?php |
184 | 205 | if (!isset($globalAircraft) || $globalAircraft) { |
185 | 206 | ?> |
186 | - <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?></label></div></li> |
|
187 | - <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?></label></div></li> |
|
207 | + <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') { |
|
208 | + print 'checked'; |
|
209 | +} |
|
210 | +?> /><?php echo _("Display waypoints"); ?></label></div></li> |
|
211 | + <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') { |
|
212 | + print 'checked'; |
|
213 | +} |
|
214 | +?> /><?php echo _("Display airspace"); ?></label></div></li> |
|
188 | 215 | <?php |
189 | 216 | } |
190 | 217 | if (isset($globalMarine) && $globalMarine) { |
191 | 218 | ?> |
192 | - <li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') print 'checked'; ?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li> |
|
219 | + <li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') { |
|
220 | + print 'checked'; |
|
221 | +} |
|
222 | +?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li> |
|
193 | 223 | <?php |
194 | 224 | } |
195 | 225 | ?> |
@@ -204,13 +234,22 @@ discard block |
||
204 | 234 | <?php |
205 | 235 | if (!isset($globalAircraft) || $globalAircraft) { |
206 | 236 | ?> |
207 | - <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li> |
|
208 | - <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?> Beta</label></div></li> |
|
237 | + <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') { |
|
238 | + print 'checked'; |
|
239 | +} |
|
240 | +?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li> |
|
241 | + <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') { |
|
242 | + print 'checked'; |
|
243 | +} |
|
244 | +?> /><?php echo _("Display airspace"); ?> Beta</label></div></li> |
|
209 | 245 | <?php |
210 | 246 | } |
211 | 247 | if (isset($globalMarine) && $globalMarine) { |
212 | 248 | ?> |
213 | - <li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') print 'checked'; ?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li> |
|
249 | + <li><div class="checkbox"><label><input type="checkbox" name="openseamap" value="1" onclick="clickOpenSeaMap(this);" <?php if (isset($_COOKIE['openseamap']) && $_COOKIE['openseamap'] == 'true') { |
|
250 | + print 'checked'; |
|
251 | +} |
|
252 | +?> /><?php echo _("Display OpenSeaMap"); ?></label></div></li> |
|
214 | 253 | <?php |
215 | 254 | } |
216 | 255 | ?> |
@@ -225,14 +264,32 @@ discard block |
||
225 | 264 | <h1>NOTAM</h1> |
226 | 265 | <form> |
227 | 266 | <ul> |
228 | - <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') print 'checked'; ?> /><?php echo _("Display NOTAM"); ?></label></div></li> |
|
267 | + <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') { |
|
268 | + print 'checked'; |
|
269 | +} |
|
270 | +?> /><?php echo _("Display NOTAM"); ?></label></div></li> |
|
229 | 271 | <li><?php echo _("NOTAM scope:"); ?> |
230 | 272 | <select class="selectpicker" onchange="notamscope(this);"> |
231 | - <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option> |
|
232 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option> |
|
233 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option> |
|
234 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option> |
|
235 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option> |
|
273 | + <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') { |
|
274 | + print ' selected'; |
|
275 | +} |
|
276 | +?>>All</option> |
|
277 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') { |
|
278 | + print ' selected'; |
|
279 | +} |
|
280 | +?>>Airport/Enroute warning</option> |
|
281 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') { |
|
282 | + print ' selected'; |
|
283 | +} |
|
284 | +?>>Airport warning</option> |
|
285 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') { |
|
286 | + print ' selected'; |
|
287 | +} |
|
288 | +?>>Navigation warning</option> |
|
289 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') { |
|
290 | + print ' selected'; |
|
291 | +} |
|
292 | +?>>Enroute warning</option> |
|
236 | 293 | </select |
237 | 294 | </li> |
238 | 295 | </ul> |
@@ -260,7 +317,10 @@ discard block |
||
260 | 317 | <div class="form-group"> |
261 | 318 | <label><?php echo _("From:"); ?></label> |
262 | 319 | <div class='input-group date' id='datetimepicker1'> |
263 | - <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC'; ?>" required /> |
|
320 | + <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') { |
|
321 | + print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC'; |
|
322 | +} |
|
323 | +?>" required /> |
|
264 | 324 | <span class="input-group-addon"> |
265 | 325 | <span class="glyphicon glyphicon-calendar"></span> |
266 | 326 | </span> |
@@ -269,7 +329,10 @@ discard block |
||
269 | 329 | <div class="form-group"> |
270 | 330 | <label><?php echo _("To:"); ?></label> |
271 | 331 | <div class='input-group date' id='datetimepicker2'> |
272 | - <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC'; ?>" /> |
|
332 | + <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') { |
|
333 | + print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC'; |
|
334 | +} |
|
335 | +?>" /> |
|
273 | 336 | <span class="input-group-addon"> |
274 | 337 | <span class="glyphicon glyphicon-calendar"></span> |
275 | 338 | </span> |
@@ -301,8 +364,20 @@ discard block |
||
301 | 364 | </script> |
302 | 365 | <li><?php echo _("Playback speed:"); ?> |
303 | 366 | <div class="range"> |
304 | - <input type="range" min="0" max="50" step="1" id="archivespeed" 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'; ?>"> |
|
305 | - <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output> |
|
367 | + <input type="range" min="0" max="50" step="1" id="archivespeed" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) { |
|
368 | + print $_POST['archivespeed']; |
|
369 | +} elseif (isset($_COOKIE['archive_speed'])) { |
|
370 | + print $_COOKIE['archive_speed']; |
|
371 | +} else { |
|
372 | + print '1'; |
|
373 | +} |
|
374 | +?>"> |
|
375 | + <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) { |
|
376 | + print $_COOKIE['archive_speed']; |
|
377 | +} else { |
|
378 | + print '1'; |
|
379 | +} |
|
380 | +?></output> |
|
306 | 381 | </div> |
307 | 382 | </li> |
308 | 383 | <?php |
@@ -331,14 +406,20 @@ discard block |
||
331 | 406 | <li><?php echo _("Type of Map:"); ?> |
332 | 407 | <?php |
333 | 408 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
334 | - if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
|
335 | - else $MapType = $_COOKIE['MapType']; |
|
409 | + if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') { |
|
410 | + $MapType = $globalMapProvider; |
|
411 | + } else { |
|
412 | + $MapType = $_COOKIE['MapType']; |
|
413 | + } |
|
336 | 414 | ?> |
337 | 415 | <select class="selectpicker" onchange="mapType(this);"> |
338 | 416 | <?php |
339 | 417 | } else { |
340 | - if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider; |
|
341 | - else $MapType = $_COOKIE['MapType3D']; |
|
418 | + if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') { |
|
419 | + $MapType = $globalMapProvider; |
|
420 | + } else { |
|
421 | + $MapType = $_COOKIE['MapType3D']; |
|
422 | + } |
|
342 | 423 | ?> |
343 | 424 | <select class="selectpicker" onchange="mapType3D(this);"> |
344 | 425 | <?php |
@@ -347,24 +428,48 @@ discard block |
||
347 | 428 | <?php |
348 | 429 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
349 | 430 | ?> |
350 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
431 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
432 | + print ' selected'; |
|
433 | +} |
|
434 | +?>>Natural Earth (local)</option> |
|
351 | 435 | <?php |
352 | 436 | } else { |
353 | 437 | if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
354 | 438 | ?> |
355 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
439 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
440 | + print ' selected'; |
|
441 | +} |
|
442 | +?>>Natural Earth (local)</option> |
|
356 | 443 | <?php |
357 | 444 | } |
358 | 445 | ?> |
359 | - <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
|
360 | - <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
|
361 | - <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option> |
|
446 | + <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') { |
|
447 | + print ' selected'; |
|
448 | +} |
|
449 | +?>>ArcGIS Streetmap</option> |
|
450 | + <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') { |
|
451 | + print ' selected'; |
|
452 | +} |
|
453 | +?>>ArcGIS Satellite</option> |
|
454 | + <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') { |
|
455 | + print ' selected'; |
|
456 | +} |
|
457 | +?>>ArcGIS Ocean</option> |
|
362 | 458 | <?php |
363 | 459 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
364 | 460 | ?> |
365 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
366 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
367 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
461 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
462 | + print ' selected'; |
|
463 | +} |
|
464 | +?>>Bing-Aerial</option> |
|
465 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
466 | + print ' selected'; |
|
467 | +} |
|
468 | +?>>Bing-Hybrid</option> |
|
469 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
470 | + print ' selected'; |
|
471 | +} |
|
472 | +?>>Bing-Road</option> |
|
368 | 473 | <?php |
369 | 474 | } |
370 | 475 | ?> |
@@ -374,59 +479,143 @@ discard block |
||
374 | 479 | <?php |
375 | 480 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
376 | 481 | ?> |
377 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
378 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
379 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
482 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
483 | + print ' selected'; |
|
484 | +} |
|
485 | +?>>Here-Aerial</option> |
|
486 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
487 | + print ' selected'; |
|
488 | +} |
|
489 | +?>>Here-Hybrid</option> |
|
490 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
491 | + print ' selected'; |
|
492 | +} |
|
493 | +?>>Here-Road</option> |
|
380 | 494 | <?php |
381 | 495 | } |
382 | 496 | ?> |
383 | 497 | <?php |
384 | 498 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
385 | 499 | ?> |
386 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
387 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
388 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
389 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
500 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
501 | + print ' selected'; |
|
502 | +} |
|
503 | +?>>Google Roadmap</option> |
|
504 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
505 | + print ' selected'; |
|
506 | +} |
|
507 | +?>>Google Satellite</option> |
|
508 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
509 | + print ' selected'; |
|
510 | +} |
|
511 | +?>>Google Hybrid</option> |
|
512 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
513 | + print ' selected'; |
|
514 | +} |
|
515 | +?>>Google Terrain</option> |
|
390 | 516 | <?php |
391 | 517 | } |
392 | 518 | ?> |
393 | 519 | <?php |
394 | 520 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
395 | 521 | ?> |
396 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
397 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
398 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
522 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
523 | + print ' selected'; |
|
524 | +} |
|
525 | +?>>MapQuest-OSM</option> |
|
526 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
527 | + print ' selected'; |
|
528 | +} |
|
529 | +?>>MapQuest-Aerial</option> |
|
530 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
531 | + print ' selected'; |
|
532 | +} |
|
533 | +?>>MapQuest-Hybrid</option> |
|
399 | 534 | <?php |
400 | 535 | } |
401 | 536 | ?> |
402 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
403 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
|
537 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
538 | + print ' selected'; |
|
539 | +} |
|
540 | +?>>Yandex</option> |
|
541 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
542 | + print ' selected'; |
|
543 | +} |
|
544 | +?>>Natural Earth</option> |
|
404 | 545 | <?php |
405 | 546 | } |
406 | 547 | ?> |
407 | - <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
|
548 | + <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') { |
|
549 | + print ' selected'; |
|
550 | +} |
|
551 | +?>>National Geographic Street</option> |
|
408 | 552 | <?php |
409 | 553 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
410 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
411 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
554 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
555 | + $MapBoxId = 'default'; |
|
556 | + } else { |
|
557 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
558 | + } |
|
412 | 559 | ?> |
413 | - <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
|
414 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
415 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
416 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
417 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
418 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
419 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
420 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
421 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
422 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
423 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
424 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
425 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
560 | + <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') { |
|
561 | + print ' selected'; |
|
562 | +} |
|
563 | +?>>Mapbox GL</option> |
|
564 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
565 | + print ' selected'; |
|
566 | +} |
|
567 | +?>>Mapbox default</option> |
|
568 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
569 | + print ' selected'; |
|
570 | +} |
|
571 | +?>>Mapbox streets</option> |
|
572 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
573 | + print ' selected'; |
|
574 | +} |
|
575 | +?>>Mapbox light</option> |
|
576 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
577 | + print ' selected'; |
|
578 | +} |
|
579 | +?>>Mapbox dark</option> |
|
580 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
581 | + print ' selected'; |
|
582 | +} |
|
583 | +?>>Mapbox satellite</option> |
|
584 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
585 | + print ' selected'; |
|
586 | +} |
|
587 | +?>>Mapbox streets-satellite</option> |
|
588 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
589 | + print ' selected'; |
|
590 | +} |
|
591 | +?>>Mapbox streets-basic</option> |
|
592 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
593 | + print ' selected'; |
|
594 | +} |
|
595 | +?>>Mapbox comic</option> |
|
596 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
597 | + print ' selected'; |
|
598 | +} |
|
599 | +?>>Mapbox outdoors</option> |
|
600 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
601 | + print ' selected'; |
|
602 | +} |
|
603 | +?>>Mapbox pencil</option> |
|
604 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
605 | + print ' selected'; |
|
606 | +} |
|
607 | +?>>Mapbox pirates</option> |
|
608 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
609 | + print ' selected'; |
|
610 | +} |
|
611 | +?>>Mapbox emerald</option> |
|
426 | 612 | <?php |
427 | 613 | } |
428 | 614 | ?> |
429 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
615 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
616 | + print ' selected'; |
|
617 | +} |
|
618 | +?>>OpenStreetMap</option> |
|
430 | 619 | <?php |
431 | 620 | } |
432 | 621 | ?> |
@@ -437,10 +626,22 @@ discard block |
||
437 | 626 | ?> |
438 | 627 | <li><?php echo _("Type of Terrain:"); ?> |
439 | 628 | <select class="selectpicker" onchange="terrainType(this);"> |
440 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
441 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
442 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
443 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
629 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
630 | + print ' selected'; |
|
631 | +} |
|
632 | +?>>stk terrain</option> |
|
633 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
634 | + print ' selected'; |
|
635 | +} |
|
636 | +?>>ellipsoid</option> |
|
637 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
638 | + print ' selected'; |
|
639 | +} |
|
640 | +?>>vr terrain</option> |
|
641 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
642 | + print ' selected'; |
|
643 | +} |
|
644 | +?>>ArticDEM</option> |
|
444 | 645 | </select> |
445 | 646 | </li> |
446 | 647 | <?php |
@@ -450,64 +651,124 @@ discard block |
||
450 | 651 | <?php |
451 | 652 | if (isset($globalMap3D) && $globalMap3D) { |
452 | 653 | ?> |
453 | - <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> |
|
654 | + <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') { |
|
655 | + print 'checked'; |
|
656 | +} |
|
657 | +?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li> |
|
454 | 658 | <?php |
455 | 659 | } |
456 | 660 | ?> |
457 | 661 | <?php |
458 | 662 | if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
459 | 663 | ?> |
460 | - <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> |
|
664 | + <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') { |
|
665 | + print 'checked'; |
|
666 | +} |
|
667 | +?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
|
461 | 668 | |
462 | 669 | <?php |
463 | 670 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
464 | 671 | ?> |
465 | - <!--<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>--> |
|
466 | - <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> |
|
467 | - <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
468 | - <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> |
|
469 | - <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> |
|
672 | + <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
673 | + print 'checked'; |
|
674 | +} |
|
675 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li>--> |
|
676 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
677 | + print 'checked'; |
|
678 | +} |
|
679 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
680 | + <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) { |
|
681 | + print 'checked'; |
|
682 | +} |
|
683 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
684 | + <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)) { |
|
685 | + print 'checked'; |
|
686 | +} |
|
687 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
688 | + <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)) { |
|
689 | + print 'checked'; |
|
690 | +} |
|
691 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
470 | 692 | <?php |
471 | 693 | } elseif (!isset($globalTracker) || $globalTracker === TRUE) { |
472 | 694 | ?> |
473 | - <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) print 'checked'; ?> ><?php echo _("Enable map matching"); ?></label></div></li> |
|
695 | + <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) { |
|
696 | + print 'checked'; |
|
697 | +} |
|
698 | +?> ><?php echo _("Enable map matching"); ?></label></div></li> |
|
474 | 699 | <?php |
475 | 700 | } |
476 | 701 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
477 | 702 | ?> |
478 | - <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> |
|
703 | + <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)) { |
|
704 | + print 'checked'; |
|
705 | +} |
|
706 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
479 | 707 | <?php |
480 | 708 | } |
481 | 709 | } |
482 | 710 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
483 | 711 | ?> |
484 | - <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> |
|
712 | + <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'])) { |
|
713 | + print 'checked'; |
|
714 | +} |
|
715 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
485 | 716 | <?php |
486 | 717 | } |
487 | 718 | ?> |
488 | - <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> |
|
489 | - <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> |
|
490 | - <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> |
|
719 | + <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))) { |
|
720 | + print 'checked'; |
|
721 | +} |
|
722 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
723 | + <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))) { |
|
724 | + print 'checked'; |
|
725 | +} |
|
726 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
727 | + <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))) { |
|
728 | + print 'checked'; |
|
729 | +} |
|
730 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
491 | 731 | <?php |
492 | 732 | if (isset($globalFires) && $globalFires) { |
493 | 733 | ?> |
494 | - <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> |
|
734 | + <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))) { |
|
735 | + print 'checked'; |
|
736 | +} |
|
737 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
495 | 738 | <?php |
496 | 739 | } |
497 | 740 | if (isset($globalMap3D) && $globalMap3D) { |
498 | 741 | ?> |
499 | - <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) print 'checked'; ?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li> |
|
742 | + <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') || (!isset($_COOKIE['singlemodel']) && isset($globalMap3DSelected) && $globalMap3DSelected)) { |
|
743 | + print 'checked'; |
|
744 | +} |
|
745 | +?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li> |
|
500 | 746 | <?php |
501 | 747 | } |
502 | 748 | ?> |
503 | - <li><div class="checkbox"><label><input type="checkbox" name="truelight" value="1" onclick="clickTrueLight(this)" <?php if ((!isset($_COOKIE['truelight']) && (!isset($globalMapTrueLight) || $globalMapTrueLight)) || (isset($_COOKIE['truelight']) && $_COOKIE['truelight'] == 'true')) print 'checked'; ?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li> |
|
749 | + <li><div class="checkbox"><label><input type="checkbox" name="truelight" value="1" onclick="clickTrueLight(this)" <?php if ((!isset($_COOKIE['truelight']) && (!isset($globalMapTrueLight) || $globalMapTrueLight)) || (isset($_COOKIE['truelight']) && $_COOKIE['truelight'] == 'true')) { |
|
750 | + print 'checked'; |
|
751 | +} |
|
752 | +?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li> |
|
504 | 753 | <?php |
505 | 754 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
506 | 755 | ?> |
507 | - <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> |
|
508 | - <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> |
|
509 | - <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> |
|
510 | - <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> |
|
756 | + <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')) { |
|
757 | + print 'checked'; |
|
758 | +} |
|
759 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
760 | + <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')) { |
|
761 | + print 'checked'; |
|
762 | +} |
|
763 | +?> ><?php echo _("Use shadows"); ?></label></div></li> |
|
764 | + <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)) { |
|
765 | + print 'checked'; |
|
766 | +} |
|
767 | +?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
|
768 | + <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'])) { |
|
769 | + print 'checked'; |
|
770 | +} |
|
771 | +?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li> |
|
511 | 772 | <?php |
512 | 773 | } |
513 | 774 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -520,17 +781,25 @@ discard block |
||
520 | 781 | if (function_exists('array_column')) { |
521 | 782 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
522 | 783 | ?> |
523 | - <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> |
|
784 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
785 | + print 'checked'; |
|
786 | +} |
|
787 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
524 | 788 | <?php |
525 | 789 | } |
526 | 790 | } elseif (isset($globalSources)) { |
527 | 791 | $dispolar = false; |
528 | 792 | foreach ($globalSources as $testsource) { |
529 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
793 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
794 | + $dispolar = true; |
|
795 | + } |
|
530 | 796 | } |
531 | 797 | if ($dispolar) { |
532 | 798 | ?> |
533 | - <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> |
|
799 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
800 | + print 'checked'; |
|
801 | +} |
|
802 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
534 | 803 | <?php |
535 | 804 | } |
536 | 805 | } |
@@ -541,7 +810,14 @@ discard block |
||
541 | 810 | <?php |
542 | 811 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
543 | 812 | ?> |
544 | - <li><?php echo _("Max number of flights to display:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) print $_COOKIE['map_2d_limit']; elseif (isset($globalMap2DAircraftsLimit)) print $globalMap2DAircraftsLimit; else print 15000; ?>" onchange="map2dlimit(this.value);" /></li> |
|
813 | + <li><?php echo _("Max number of flights to display:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) { |
|
814 | + print $_COOKIE['map_2d_limit']; |
|
815 | +} elseif (isset($globalMap2DAircraftsLimit)) { |
|
816 | + print $globalMap2DAircraftsLimit; |
|
817 | +} else { |
|
818 | + print 15000; |
|
819 | +} |
|
820 | +?>" onchange="map2dlimit(this.value);" /></li> |
|
545 | 821 | <?php |
546 | 822 | } |
547 | 823 | ?> |
@@ -549,11 +825,21 @@ discard block |
||
549 | 825 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
550 | 826 | if (extension_loaded('gd') && function_exists('gd_info')) { |
551 | 827 | ?> |
552 | - <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> |
|
828 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
829 | + print 'checked'; |
|
830 | +} |
|
831 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
553 | 832 | <?php |
554 | 833 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
555 | 834 | ?> |
556 | - <li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"></li> |
|
835 | + <li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
836 | + print $_COOKIE['IconColor']; |
|
837 | +} elseif (isset($globalAircraftIconColor)) { |
|
838 | + print $globalAircraftIconColor; |
|
839 | +} else { |
|
840 | + print '1a3151'; |
|
841 | +} |
|
842 | +?>"></li> |
|
557 | 843 | <?php |
558 | 844 | } |
559 | 845 | } |
@@ -564,7 +850,14 @@ discard block |
||
564 | 850 | if (extension_loaded('gd') && function_exists('gd_info')) { |
565 | 851 | ?> |
566 | 852 | <li><?php echo _("Marine icon color:"); ?> |
567 | - <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'; ?>"> |
|
853 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
854 | + print $_COOKIE['MarineIconColor']; |
|
855 | +} elseif (isset($globalMarineIconColor)) { |
|
856 | + print $globalMarineIconColor; |
|
857 | +} else { |
|
858 | + print '1a3151'; |
|
859 | +} |
|
860 | +?>"> |
|
568 | 861 | </li> |
569 | 862 | <?php |
570 | 863 | } |
@@ -575,7 +868,14 @@ discard block |
||
575 | 868 | if (extension_loaded('gd') && function_exists('gd_info')) { |
576 | 869 | ?> |
577 | 870 | <li><?php echo _("Tracker icon color:"); ?> |
578 | - <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'; ?>"> |
|
871 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
872 | + print $_COOKIE['TrackerIconColor']; |
|
873 | +} elseif (isset($globalTrackerIconColor)) { |
|
874 | + print $globalTrackerIconColor; |
|
875 | +} else { |
|
876 | + print '1a3151'; |
|
877 | +} |
|
878 | +?>"> |
|
579 | 879 | </li> |
580 | 880 | <?php |
581 | 881 | } |
@@ -586,8 +886,22 @@ discard block |
||
586 | 886 | ?> |
587 | 887 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
588 | 888 | <div class="range"> |
589 | - <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'; ?>"> |
|
590 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
889 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
890 | + print $_COOKIE['AirportZoom']; |
|
891 | +} elseif (isset($globalAirportZoom)) { |
|
892 | + print $globalAirportZoom; |
|
893 | +} else { |
|
894 | + print '7'; |
|
895 | +} |
|
896 | +?>"> |
|
897 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
898 | + print $_COOKIE['AirportZoom']; |
|
899 | +} elseif (isset($globalAirportZoom)) { |
|
900 | + print $globalAirportZoom; |
|
901 | +} else { |
|
902 | + print '7'; |
|
903 | +} |
|
904 | +?></output> |
|
591 | 905 | </div> |
592 | 906 | </li> |
593 | 907 | <?php |
@@ -598,17 +912,40 @@ discard block |
||
598 | 912 | ?> |
599 | 913 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
600 | 914 | <div class="range"> |
601 | - <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?>"> |
|
602 | - <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?></output> |
|
915 | + <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) { |
|
916 | + print $_COOKIE['resolutionScale']; |
|
917 | +} else { |
|
918 | + print '1'; |
|
919 | +} |
|
920 | +?>"> |
|
921 | + <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) { |
|
922 | + print $_COOKIE['resolutionScale']; |
|
923 | +} else { |
|
924 | + print '1'; |
|
925 | +} |
|
926 | +?></output> |
|
603 | 927 | </div> |
604 | 928 | </li> |
605 | 929 | <?php |
606 | 930 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
607 | 931 | ?> |
608 | - <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> |
|
609 | - <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"); ?> |
|
932 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
933 | + print 'checked'; |
|
934 | +} |
|
935 | +?> > <?php echo _("Use airlines liveries"); ?></li> |
|
936 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
937 | + print 'checked'; |
|
938 | +} |
|
939 | +?> > <?php echo _("Force Aircraft color"); ?> |
|
610 | 940 | <!--<li><?php echo _("Aircraft icon color:"); ?>--> |
611 | - <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'; ?>"> |
|
941 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
942 | + print $_COOKIE['IconColor']; |
|
943 | +} elseif (isset($globalAircraftIconColor)) { |
|
944 | + print $globalAircraftIconColor; |
|
945 | +} else { |
|
946 | + print 'ff0000'; |
|
947 | +} |
|
948 | +?>"> |
|
612 | 949 | </li> |
613 | 950 | <?php |
614 | 951 | } |
@@ -616,9 +953,19 @@ discard block |
||
616 | 953 | <?php |
617 | 954 | if (isset($globalMarine) && $globalMarine === TRUE) { |
618 | 955 | ?> |
619 | - <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"); ?> |
|
956 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
957 | + print 'checked'; |
|
958 | +} |
|
959 | +?> ><?php echo _("Force Marine color"); ?> |
|
620 | 960 | <!--<li><?php echo _("Marine icon color:"); ?>--> |
621 | - <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'; ?>"> |
|
961 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
962 | + print $_COOKIE['MarineIconColor']; |
|
963 | +} elseif (isset($globalMarineIconColor)) { |
|
964 | + print $globalMarineIconColor; |
|
965 | +} else { |
|
966 | + print 'ff0000'; |
|
967 | +} |
|
968 | +?>"> |
|
622 | 969 | </li> |
623 | 970 | <?php |
624 | 971 | } |
@@ -626,9 +973,19 @@ discard block |
||
626 | 973 | <?php |
627 | 974 | if (isset($globalTracker) && $globalTracker === TRUE) { |
628 | 975 | ?> |
629 | - <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"); ?> |
|
976 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
977 | + print 'checked'; |
|
978 | +} |
|
979 | +?> ><?php echo _("Force Tracker color"); ?> |
|
630 | 980 | <!--<li><?php echo _("Tracker icon color:"); ?>--> |
631 | - <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'; ?>"> |
|
981 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
982 | + print $_COOKIE['TrackerIconColor']; |
|
983 | +} elseif (isset($globalTrackerIconColor)) { |
|
984 | + print $globalTrackerIconColor; |
|
985 | +} else { |
|
986 | + print 'ff0000'; |
|
987 | +} |
|
988 | +?>"> |
|
632 | 989 | </li> |
633 | 990 | <?php |
634 | 991 | } |
@@ -636,29 +993,62 @@ discard block |
||
636 | 993 | ?> |
637 | 994 | <li><?php echo _("Distance unit:"); ?> |
638 | 995 | <select class="selectpicker" onchange="unitdistance(this);"> |
639 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
640 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
641 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
996 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
997 | + echo ' selected'; |
|
998 | +} |
|
999 | +?>>km</option> |
|
1000 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
1001 | + echo ' selected'; |
|
1002 | +} |
|
1003 | +?>>nm</option> |
|
1004 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
1005 | + echo ' selected'; |
|
1006 | +} |
|
1007 | +?>>mi</option> |
|
642 | 1008 | </select> |
643 | 1009 | </li> |
644 | 1010 | <li><?php echo _("Altitude unit:"); ?> |
645 | 1011 | <select class="selectpicker" onchange="unitaltitude(this);"> |
646 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
647 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
1012 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
1013 | + echo ' selected'; |
|
1014 | +} |
|
1015 | +?>>m</option> |
|
1016 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
1017 | + echo ' selected'; |
|
1018 | +} |
|
1019 | +?>>feet</option> |
|
648 | 1020 | </select> |
649 | 1021 | </li> |
650 | 1022 | <li><?php echo _("Speed unit:"); ?> |
651 | 1023 | <select class="selectpicker" onchange="unitspeed(this);"> |
652 | - <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> |
|
653 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
654 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
1024 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
1025 | + echo ' selected'; |
|
1026 | +} |
|
1027 | +?>>km/h</option> |
|
1028 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
1029 | + echo ' selected'; |
|
1030 | +} |
|
1031 | +?>>mph</option> |
|
1032 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
1033 | + echo ' selected'; |
|
1034 | +} |
|
1035 | +?>>knots</option> |
|
655 | 1036 | </select> |
656 | 1037 | </li> |
657 | 1038 | <li><?php echo _("Coordinate unit:"); ?> |
658 | 1039 | <select class="selectpicker" onchange="unitcoordinate(this);"> |
659 | - <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) echo ' selected'; ?>>DD</option> |
|
660 | - <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) echo ' selected'; ?>>DMS</option> |
|
661 | - <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) echo ' selected'; ?>>DM</option> |
|
1040 | + <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) { |
|
1041 | + echo ' selected'; |
|
1042 | +} |
|
1043 | +?>>DD</option> |
|
1044 | + <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) { |
|
1045 | + echo ' selected'; |
|
1046 | +} |
|
1047 | +?>>DMS</option> |
|
1048 | + <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) { |
|
1049 | + echo ' selected'; |
|
1050 | +} |
|
1051 | +?>>DM</option> |
|
662 | 1052 | </select> |
663 | 1053 | </li> |
664 | 1054 | |
@@ -676,9 +1066,18 @@ discard block |
||
676 | 1066 | <?php |
677 | 1067 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
678 | 1068 | ?> |
679 | - <?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 } ?> |
|
680 | - <?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 } ?> |
|
681 | - <?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 } ?> |
|
1069 | + <?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'])) { |
|
1070 | + print 'checked'; |
|
1071 | +} |
|
1072 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
1073 | + <?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'])) { |
|
1074 | + print 'checked'; |
|
1075 | +} |
|
1076 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
1077 | + <?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'])) { |
|
1078 | + print 'checked'; |
|
1079 | +} |
|
1080 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
682 | 1081 | <?php |
683 | 1082 | } |
684 | 1083 | ?> |
@@ -686,12 +1085,21 @@ discard block |
||
686 | 1085 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
687 | 1086 | ?> |
688 | 1087 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
689 | - <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> |
|
1088 | + <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'])) { |
|
1089 | + print 'checked'; |
|
1090 | +} |
|
1091 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
690 | 1092 | <?php } ?> |
691 | 1093 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
692 | - <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') || !isset($_COOKIE['filter_ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
1094 | + <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') || !isset($_COOKIE['filter_ShowAPRS'])) { |
|
1095 | + print 'checked'; |
|
1096 | +} |
|
1097 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
693 | 1098 | <?php } ?> |
694 | - <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> |
|
1099 | + <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') { |
|
1100 | + print 'checked'; |
|
1101 | +} |
|
1102 | +?> ><?php echo _("Only display FAA ASDI blocked aircrafts"); ?></label></div></li> |
|
695 | 1103 | <?php |
696 | 1104 | } |
697 | 1105 | ?> |
@@ -707,7 +1115,9 @@ discard block |
||
707 | 1115 | } |
708 | 1116 | foreach($allairlinenames as $airline) { |
709 | 1117 | $airline_name = $airline['airline_name']; |
710 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
1118 | + if (strlen($airline_name) > 30) { |
|
1119 | + $airline_name = substr($airline_name,0,30).'...'; |
|
1120 | + } |
|
711 | 1121 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
712 | 1122 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
713 | 1123 | } else { |
@@ -725,7 +1135,10 @@ discard block |
||
725 | 1135 | <li><?php echo _("Display alliance:"); ?> |
726 | 1136 | <br/> |
727 | 1137 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
728 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
1138 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
1139 | + echo ' selected'; |
|
1140 | +} |
|
1141 | +?>><?php echo _("All"); ?></option> |
|
729 | 1142 | <?php |
730 | 1143 | foreach($allalliancenames as $alliance) { |
731 | 1144 | $alliance_name = $alliance['alliance']; |
@@ -784,10 +1197,22 @@ discard block |
||
784 | 1197 | ?> |
785 | 1198 | <li><?php echo _("Display airlines of type:"); ?><br/> |
786 | 1199 | <select class="selectpicker" onchange="airlinestype(this);"> |
787 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
788 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
789 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
790 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
1200 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
1201 | + echo ' selected'; |
|
1202 | +} |
|
1203 | +?>><?php echo _("All"); ?></option> |
|
1204 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
1205 | + echo ' selected'; |
|
1206 | +} |
|
1207 | +?>><?php echo _("Passenger"); ?></option> |
|
1208 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
1209 | + echo ' selected'; |
|
1210 | +} |
|
1211 | +?>><?php echo _("Cargo"); ?></option> |
|
1212 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
1213 | + echo ' selected'; |
|
1214 | +} |
|
1215 | +?>><?php echo _("Military"); ?></option> |
|
791 | 1216 | </select> |
792 | 1217 | </li> |
793 | 1218 | <?php |
@@ -801,7 +1226,10 @@ discard block |
||
801 | 1226 | ?> |
802 | 1227 | <li> |
803 | 1228 | <?php echo _("Display vessels with MMSI:"); ?> |
804 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
1229 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
1230 | + print $_COOKIE['filter_mmsi']; |
|
1231 | +} |
|
1232 | +?>" /> |
|
805 | 1233 | </li> |
806 | 1234 | <?php |
807 | 1235 | if (isset($globalVM) && $globalVM) { |
@@ -832,7 +1260,10 @@ discard block |
||
832 | 1260 | ?> |
833 | 1261 | <li> |
834 | 1262 | <?php echo _("Display with ident:"); ?> |
835 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
1263 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
1264 | + print $_COOKIE['filter_ident']; |
|
1265 | +} |
|
1266 | +?>" /> |
|
836 | 1267 | </li> |
837 | 1268 | </ul> |
838 | 1269 | </form> |
@@ -848,7 +1279,10 @@ discard block |
||
848 | 1279 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
849 | 1280 | <form> |
850 | 1281 | <ul> |
851 | - <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> |
|
1282 | + <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'])) { |
|
1283 | + print 'checked'; |
|
1284 | +} |
|
1285 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
852 | 1286 | <li><?php echo _("Type:"); ?> |
853 | 1287 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
854 | 1288 | <?php |
@@ -856,25 +1290,45 @@ discard block |
||
856 | 1290 | $types = $Satellite->get_tle_types(); |
857 | 1291 | foreach ($types as $type) { |
858 | 1292 | $type_name = $type['tle_type']; |
859 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
860 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
861 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
862 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
863 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
864 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
865 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
866 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
867 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
868 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
869 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
870 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
871 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
872 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
873 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
874 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
875 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
876 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
877 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
1293 | + if ($type_name == 'musson') { |
|
1294 | + $type_name = 'Russian LEO Navigation'; |
|
1295 | + } else if ($type_name == 'nnss') { |
|
1296 | + $type_name = 'Navi Navigation Satellite System'; |
|
1297 | + } else if ($type_name == 'sbas') { |
|
1298 | + $type_name = 'Satellite-Based Augmentation System'; |
|
1299 | + } else if ($type_name == 'glo-ops') { |
|
1300 | + $type_name = 'Glonass Operational'; |
|
1301 | + } else if ($type_name == 'gps-ops') { |
|
1302 | + $type_name = 'GPS Operational'; |
|
1303 | + } else if ($type_name == 'argos') { |
|
1304 | + $type_name = 'ARGOS Data Collection System'; |
|
1305 | + } else if ($type_name == 'tdrss') { |
|
1306 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
1307 | + } else if ($type_name == 'sarsat') { |
|
1308 | + $type_name = 'Search & Rescue'; |
|
1309 | + } else if ($type_name == 'dmc') { |
|
1310 | + $type_name = 'Disaster Monitoring'; |
|
1311 | + } else if ($type_name == 'resource') { |
|
1312 | + $type_name = 'Earth Resources'; |
|
1313 | + } else if ($type_name == 'stations') { |
|
1314 | + $type_name = 'Space Stations'; |
|
1315 | + } else if ($type_name == 'geo') { |
|
1316 | + $type_name = 'Geostationary'; |
|
1317 | + } else if ($type_name == 'amateur') { |
|
1318 | + $type_name = 'Amateur Radio'; |
|
1319 | + } else if ($type_name == 'x-comm') { |
|
1320 | + $type_name = 'Experimental'; |
|
1321 | + } else if ($type_name == 'other-comm') { |
|
1322 | + $type_name = 'Other Comm'; |
|
1323 | + } else if ($type_name == 'science') { |
|
1324 | + $type_name = 'Space & Earth Science'; |
|
1325 | + } else if ($type_name == 'military') { |
|
1326 | + $type_name = 'Miscellaneous Military'; |
|
1327 | + } else if ($type_name == 'radar') { |
|
1328 | + $type_name = 'Radar Calibration'; |
|
1329 | + } else if ($type_name == 'tle-new') { |
|
1330 | + $type_name = 'Last 30 days launches'; |
|
1331 | + } |
|
878 | 1332 | |
879 | 1333 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
880 | 1334 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |