Ysurac /
FlightAirMap
@@ -14,35 +14,35 @@ discard block |
||
| 14 | 14 | if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline'; |
| 15 | 15 | |
| 16 | 16 | if (isset($_GET['3d'])) { |
| 17 | - setcookie('MapFormat','3d'); |
|
| 17 | + setcookie('MapFormat', '3d'); |
|
| 18 | 18 | } else if (isset($_GET['2d'])) { |
| 19 | - setcookie('MapFormat','2d'); |
|
| 19 | + setcookie('MapFormat', '2d'); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) { |
| 23 | - $tsk = filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); |
|
| 23 | + $tsk = filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | if (isset($_POST['archive'])) { |
| 27 | - setcookie('archive','true'); |
|
| 28 | - setcookie('archive_begin',strtotime($_POST['start_date'])); |
|
| 29 | - setcookie('archive_end',strtotime($_POST['end_date'])); |
|
| 30 | - setcookie('archive_speed',$_POST['archivespeed']); |
|
| 27 | + setcookie('archive', 'true'); |
|
| 28 | + setcookie('archive_begin', strtotime($_POST['start_date'])); |
|
| 29 | + setcookie('archive_end', strtotime($_POST['end_date'])); |
|
| 30 | + setcookie('archive_speed', $_POST['archivespeed']); |
|
| 31 | 31 | } |
| 32 | 32 | if (isset($_POST['noarchive'])) { |
| 33 | - setcookie('archive','false',-1); |
|
| 34 | - setcookie('archive_begin','',-1); |
|
| 35 | - setcookie('archive_end','',-1); |
|
| 36 | - setcookie('archive_speed','',-1); |
|
| 33 | + setcookie('archive', 'false', -1); |
|
| 34 | + setcookie('archive_begin', '', -1); |
|
| 35 | + setcookie('archive_end', '', -1); |
|
| 36 | + setcookie('archive_speed', '', -1); |
|
| 37 | 37 | } |
| 38 | 38 | // When button "Remove all filters" is clicked |
| 39 | 39 | if (isset($_POST['removefilters'])) { |
| 40 | - $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
|
| 41 | - return strpos($key,'filter_') === 0; |
|
| 40 | + $allfilters = array_filter(array_keys($_COOKIE), function($key) { |
|
| 41 | + return strpos($key, 'filter_') === 0; |
|
| 42 | 42 | }); |
| 43 | 43 | foreach ($allfilters as $filt) { |
| 44 | 44 | unset($_COOKIE[$filt]); |
| 45 | - setcookie($filt,null,-1); |
|
| 45 | + setcookie($filt, null, -1); |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | ?> |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 251 | 251 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 252 | 252 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 253 | -<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 253 | +<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 254 | 254 | <?php |
| 255 | 255 | if (!isset($type) || $type == 'aircraft') { |
| 256 | 256 | ?> |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 324 | 324 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 325 | 325 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 326 | -<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 326 | +<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 327 | 327 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script> |
| 328 | 328 | <?php |
| 329 | 329 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
@@ -743,8 +743,8 @@ discard block |
||
| 743 | 743 | ?> |
| 744 | 744 | <div class="search"> |
| 745 | 745 | <form action="<?php print $globalURL; ?>/search" method="get"> |
| 746 | - <!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>--> |
|
| 747 | - <input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != ""){ print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button> |
|
| 746 | + <!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>--> |
|
| 747 | + <input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != "") { print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button> |
|
| 748 | 748 | </form> |
| 749 | 749 | </div> |
| 750 | 750 | <div class="social"> |
@@ -762,7 +762,7 @@ discard block |
||
| 762 | 762 | print '</div>'; |
| 763 | 763 | } |
| 764 | 764 | |
| 765 | -if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
| 765 | +if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
| 766 | 766 | ?> |
| 767 | 767 | <div class="top-header clear" role="main"> |
| 768 | 768 | <?php |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | </div> |
| 776 | 776 | <?php |
| 777 | 777 | } |
| 778 | -if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false)) |
|
| 778 | +if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false)) |
|
| 779 | 779 | { |
| 780 | 780 | ?> |
| 781 | 781 | <div class="top-header clear" role="main"> |
@@ -788,15 +788,15 @@ discard block |
||
| 788 | 788 | var zoom = 13; |
| 789 | 789 | //create the map |
| 790 | 790 | <?php |
| 791 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 791 | + if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 792 | 792 | ?> |
| 793 | 793 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
| 794 | 794 | <?php |
| 795 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 795 | + } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) { |
|
| 796 | 796 | ?> |
| 797 | 797 | map = L.map('map', { zoomControl:true }); |
| 798 | 798 | <?php |
| 799 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 799 | + } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 800 | 800 | ?> |
| 801 | 801 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
| 802 | 802 | var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map); |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 805 | 805 | var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 806 | 806 | <?php |
| 807 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
| 807 | + } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
| 808 | 808 | ?> |
| 809 | 809 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
| 810 | 810 | <?php |
@@ -6,12 +6,19 @@ discard block |
||
| 6 | 6 | //gets the page file and stores it in a variable |
| 7 | 7 | $file_path = pathinfo($_SERVER['SCRIPT_NAME']); |
| 8 | 8 | $current_page = $file_path['filename']; |
| 9 | -if ($globalTimezone == '') $globalTimezone = 'UTC'; |
|
| 9 | +if ($globalTimezone == '') { |
|
| 10 | + $globalTimezone = 'UTC'; |
|
| 11 | +} |
|
| 10 | 12 | date_default_timezone_set($globalTimezone); |
| 11 | -if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType']; |
|
| 12 | -else $MapType = $globalMapProvider; |
|
| 13 | +if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') { |
|
| 14 | + $MapType = $_COOKIE['MapType']; |
|
| 15 | +} else { |
|
| 16 | + $MapType = $globalMapProvider; |
|
| 17 | +} |
|
| 13 | 18 | |
| 14 | -if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline'; |
|
| 19 | +if (isset($globalMapOffline) && $globalMapOffline) { |
|
| 20 | + $MapType = 'offline'; |
|
| 21 | +} |
|
| 15 | 22 | |
| 16 | 23 | if (isset($_GET['3d'])) { |
| 17 | 24 | setcookie('MapFormat','3d'); |
@@ -210,7 +217,10 @@ discard block |
||
| 210 | 217 | <?php |
| 211 | 218 | } else { |
| 212 | 219 | ?> |
| 213 | -<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) print '&tsk='.$tsk; ?>"></script> |
|
| 220 | +<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) { |
|
| 221 | + print '&tsk='.$tsk; |
|
| 222 | +} |
|
| 223 | +?>"></script> |
|
| 214 | 224 | <?php |
| 215 | 225 | } |
| 216 | 226 | if (!isset($globalAircraft) || $globalAircraft) { |
@@ -250,7 +260,13 @@ discard block |
||
| 250 | 260 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 251 | 261 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 252 | 262 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 253 | -<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 263 | +<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) { |
|
| 264 | + print '&latitude='.$latitude; |
|
| 265 | +} |
|
| 266 | +?><?php if(isset($longitude)) { |
|
| 267 | + print '&longitude='.$longitude; |
|
| 268 | +} |
|
| 269 | +?>&<?php print time(); ?>"></script> |
|
| 254 | 270 | <?php |
| 255 | 271 | if (!isset($type) || $type == 'aircraft') { |
| 256 | 272 | ?> |
@@ -323,7 +339,13 @@ discard block |
||
| 323 | 339 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 324 | 340 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 325 | 341 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 326 | -<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 342 | +<script type="text/javascript" src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) { |
|
| 343 | + print '&latitude='.$latitude; |
|
| 344 | +} |
|
| 345 | +?><?php if(isset($longitude)) { |
|
| 346 | + print '&longitude='.$longitude; |
|
| 347 | +} |
|
| 348 | +?>&<?php print time(); ?>"></script> |
|
| 327 | 349 | <script type="text/javascript" src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script> |
| 328 | 350 | <?php |
| 329 | 351 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
@@ -389,7 +411,9 @@ discard block |
||
| 389 | 411 | } |
| 390 | 412 | ?> |
| 391 | 413 | <?php |
| 392 | -if (isset($globalPubHeader)) print $globalPubHeader; |
|
| 414 | +if (isset($globalPubHeader)) { |
|
| 415 | + print $globalPubHeader; |
|
| 416 | +} |
|
| 393 | 417 | ?> |
| 394 | 418 | |
| 395 | 419 | <meta property="og:title" content="<?php print $title; ?> | <?php print $globalName; ?>"/> |
@@ -407,7 +431,12 @@ discard block |
||
| 407 | 431 | <span class="icon-bar"></span> |
| 408 | 432 | </button> |
| 409 | 433 | <a href="<?php print $globalURL; ?>/search" class="navbar-toggle search"><i class="fa fa-search"></i></a> |
| 410 | - <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
| 434 | + <a class="navbar-brand" href="<?php if ($globalURL == '') { |
|
| 435 | + print '/'; |
|
| 436 | +} else { |
|
| 437 | + print $globalURL; |
|
| 438 | +} |
|
| 439 | +?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
| 411 | 440 | </div> |
| 412 | 441 | <div class="collapse navbar-collapse"> |
| 413 | 442 | |
@@ -462,7 +491,10 @@ discard block |
||
| 462 | 491 | } |
| 463 | 492 | ?> |
| 464 | 493 | |
| 465 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
| 494 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
| 495 | + echo 'right-'; |
|
| 496 | +} |
|
| 497 | +?>caret"></b></a> |
|
| 466 | 498 | <ul class="dropdown-menu"> |
| 467 | 499 | <li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li> |
| 468 | 500 | <?php |
@@ -533,8 +565,14 @@ discard block |
||
| 533 | 565 | </li> |
| 534 | 566 | <li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li> |
| 535 | 567 | <li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li> |
| 536 | - <li class="dropdown<?php if ($sub) echo '-submenu'; ?>"> |
|
| 537 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
| 568 | + <li class="dropdown<?php if ($sub) { |
|
| 569 | + echo '-submenu'; |
|
| 570 | +} |
|
| 571 | +?>"> |
|
| 572 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) { |
|
| 573 | + echo 'right-'; |
|
| 574 | +} |
|
| 575 | +?>caret"></b></a> |
|
| 538 | 576 | <ul class="dropdown-menu"> |
| 539 | 577 | <li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li> |
| 540 | 578 | <li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li> |
@@ -578,7 +616,10 @@ discard block |
||
| 578 | 616 | <?php |
| 579 | 617 | } |
| 580 | 618 | ?> |
| 581 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
| 619 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
| 620 | + echo 'right-'; |
|
| 621 | +} |
|
| 622 | +?>caret"></b></a> |
|
| 582 | 623 | <ul class="dropdown-menu"> |
| 583 | 624 | <?php |
| 584 | 625 | if (isset($globalVM) && $globalVM) { |
@@ -628,7 +669,10 @@ discard block |
||
| 628 | 669 | <?php |
| 629 | 670 | } |
| 630 | 671 | ?> |
| 631 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
| 672 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
| 673 | + echo 'right-'; |
|
| 674 | +} |
|
| 675 | +?>caret"></b></a> |
|
| 632 | 676 | <ul class="dropdown-menu"> |
| 633 | 677 | <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li> |
| 634 | 678 | <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li> |
@@ -671,7 +715,10 @@ discard block |
||
| 671 | 715 | ?> |
| 672 | 716 | |
| 673 | 717 | <!-- |
| 674 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
| 718 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
| 719 | + echo 'right-'; |
|
| 720 | +} |
|
| 721 | +?>caret"></b></a> |
|
| 675 | 722 | <ul class="dropdown-menu"> |
| 676 | 723 | <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li> |
| 677 | 724 | <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li> |
@@ -729,9 +776,14 @@ discard block |
||
| 729 | 776 | <?php |
| 730 | 777 | foreach ($alllang as $key => $lang) { |
| 731 | 778 | print '<option value="'.$key.'"'; |
| 732 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 733 | - if ($lang[0] == 'Deutsch') print '>'.$lang[0].' (βeta)</option>'; |
|
| 734 | - else print '>'.$lang[0].'</option>'; |
|
| 779 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) { |
|
| 780 | + print ' selected '; |
|
| 781 | + } |
|
| 782 | + if ($lang[0] == 'Deutsch') { |
|
| 783 | + print '>'.$lang[0].' (βeta)</option>'; |
|
| 784 | + } else { |
|
| 785 | + print '>'.$lang[0].'</option>'; |
|
| 786 | + } |
|
| 735 | 787 | } |
| 736 | 788 | ?> |
| 737 | 789 | </select> |
@@ -879,9 +931,24 @@ discard block |
||
| 879 | 931 | $customid = $globalMapProvider; |
| 880 | 932 | ?> |
| 881 | 933 | L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', { |
| 882 | - maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>, |
|
| 883 | - minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>, |
|
| 884 | - noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>, |
|
| 934 | + maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) { |
|
| 935 | + print $globalMapCustomLayer[$customid]['maxZoom']; |
|
| 936 | +} else { |
|
| 937 | + print '18'; |
|
| 938 | +} |
|
| 939 | +?>, |
|
| 940 | + minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) { |
|
| 941 | + print $globalMapCustomLayer[$customid]['minZoom']; |
|
| 942 | +} else { |
|
| 943 | + print '0'; |
|
| 944 | +} |
|
| 945 | +?>, |
|
| 946 | + noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) { |
|
| 947 | + print 'false'; |
|
| 948 | +} else { |
|
| 949 | + print 'true'; |
|
| 950 | +} |
|
| 951 | +?>, |
|
| 885 | 952 | attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
| 886 | 953 | }).addTo(map); |
| 887 | 954 | <?php |
@@ -896,7 +963,12 @@ discard block |
||
| 896 | 963 | maxZoom: 5, |
| 897 | 964 | tms : true, |
| 898 | 965 | zindex : 3, |
| 899 | - noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>, |
|
| 966 | + noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) { |
|
| 967 | + print 'false'; |
|
| 968 | +} else { |
|
| 969 | + print 'true'; |
|
| 970 | +} |
|
| 971 | +?>, |
|
| 900 | 972 | attribution: 'Natural Earth' |
| 901 | 973 | }).addTo(map); |
| 902 | 974 | <?php |
@@ -919,4 +991,7 @@ discard block |
||
| 919 | 991 | |
| 920 | 992 | ?> |
| 921 | 993 | |
| 922 | -<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear"> |
|
| 994 | +<section class="container main-content <?php if (strtolower($current_page) == 'index') { |
|
| 995 | + print 'index '; |
|
| 996 | +} |
|
| 997 | +?>clear"> |
|
@@ -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 type="text/javascript" src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
| 61 | 61 | <script type="text/javascript" src="<?php echo $globalURL; ?>/js/meuusjs.1.0.3.min.js"></script> |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | <script type="text/javascript" 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,82 +333,82 @@ 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-Aerial') print ' selected'; ?>>Here-Aerial</option> |
| 378 | 378 | <option value="Here-Hybrid"<?php if ($MapType == 'Here-Hybrid') print ' selected'; ?>>Here-Hybrid</option> |
| 379 | 379 | <option value="Here-Road"<?php if ($MapType == 'Here-Road') 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="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
| 403 | 403 | <?php |
| 404 | - } |
|
| 405 | - ?> |
|
| 404 | + } |
|
| 405 | + ?> |
|
| 406 | 406 | <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
| 407 | 407 | <?php |
| 408 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 408 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 409 | 409 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 410 | 410 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 411 | - ?> |
|
| 411 | + ?> |
|
| 412 | 412 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
| 413 | 413 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 414 | 414 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -423,17 +423,17 @@ discard block |
||
| 423 | 423 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 424 | 424 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 425 | 425 | <?php |
| 426 | - } |
|
| 427 | - ?> |
|
| 426 | + } |
|
| 427 | + ?> |
|
| 428 | 428 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 429 | 429 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</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);"> |
@@ -445,18 +445,18 @@ discard block |
||
| 445 | 445 | </select> |
| 446 | 446 | </li> |
| 447 | 447 | <?php |
| 448 | - } |
|
| 448 | + } |
|
| 449 | 449 | ?> |
| 450 | 450 | |
| 451 | 451 | <?php |
| 452 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 452 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 453 | 453 | ?> |
| 454 | 454 | <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> |
| 455 | 455 | <?php |
| 456 | - } |
|
| 456 | + } |
|
| 457 | 457 | ?> |
| 458 | 458 | <?php |
| 459 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 459 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 460 | 460 | ?> |
| 461 | 461 | <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> |
| 462 | 462 | |
@@ -479,12 +479,12 @@ discard block |
||
| 479 | 479 | <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> |
| 480 | 480 | <?php |
| 481 | 481 | } |
| 482 | - } |
|
| 483 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
| 482 | + } |
|
| 483 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
| 484 | 484 | ?> |
| 485 | 485 | <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> |
| 486 | 486 | <?php |
| 487 | - } |
|
| 487 | + } |
|
| 488 | 488 | ?> |
| 489 | 489 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
| 490 | 490 | <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> |
@@ -503,88 +503,88 @@ discard block |
||
| 503 | 503 | ?> |
| 504 | 504 | <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> |
| 505 | 505 | <?php |
| 506 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 506 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 507 | 507 | ?> |
| 508 | 508 | <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> |
| 509 | 509 | <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> |
| 510 | 510 | <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> |
| 511 | 511 | <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> |
| 512 | 512 | <?php |
| 513 | - } |
|
| 514 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 513 | + } |
|
| 514 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 515 | 515 | ?> |
| 516 | 516 | <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> |
| 517 | 517 | <?php |
| 518 | - } |
|
| 518 | + } |
|
| 519 | 519 | ?> |
| 520 | 520 | <?php |
| 521 | 521 | if (function_exists('array_column')) { |
| 522 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 523 | - ?> |
|
| 522 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 523 | + ?> |
|
| 524 | 524 | <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> |
| 525 | 525 | <?php |
| 526 | - } |
|
| 526 | + } |
|
| 527 | 527 | } elseif (isset($globalSources)) { |
| 528 | - $dispolar = false; |
|
| 529 | - foreach ($globalSources as $testsource) { |
|
| 530 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 531 | - } |
|
| 532 | - if ($dispolar) { |
|
| 533 | - ?> |
|
| 528 | + $dispolar = false; |
|
| 529 | + foreach ($globalSources as $testsource) { |
|
| 530 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 531 | + } |
|
| 532 | + if ($dispolar) { |
|
| 533 | + ?> |
|
| 534 | 534 | <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> |
| 535 | 535 | <?php |
| 536 | - } |
|
| 537 | - } |
|
| 538 | - ?> |
|
| 536 | + } |
|
| 537 | + } |
|
| 538 | + ?> |
|
| 539 | 539 | <?php |
| 540 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 540 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 541 | 541 | ?> |
| 542 | 542 | <?php |
| 543 | 543 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 544 | - ?> |
|
| 544 | + ?> |
|
| 545 | 545 | <li><?php echo _("Max number of flights to display in 2D:"); ?> <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> |
| 546 | 546 | <?php |
| 547 | 547 | } |
| 548 | - ?> |
|
| 548 | + ?> |
|
| 549 | 549 | <?php |
| 550 | 550 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 551 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 552 | - ?> |
|
| 551 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 552 | + ?> |
|
| 553 | 553 | <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> |
| 554 | 554 | <?php |
| 555 | 555 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 556 | - ?> |
|
| 556 | + ?> |
|
| 557 | 557 | <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> |
| 558 | 558 | <?php |
| 559 | 559 | } |
| 560 | - } |
|
| 561 | - } |
|
| 562 | - ?> |
|
| 560 | + } |
|
| 561 | + } |
|
| 562 | + ?> |
|
| 563 | 563 | <?php |
| 564 | 564 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 565 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 566 | - ?> |
|
| 565 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 566 | + ?> |
|
| 567 | 567 | <li><?php echo _("Marine icon color:"); ?> |
| 568 | 568 | <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'; ?>"> |
| 569 | 569 | </li> |
| 570 | 570 | <?php |
| 571 | - } |
|
| 572 | - } |
|
| 573 | - ?> |
|
| 571 | + } |
|
| 572 | + } |
|
| 573 | + ?> |
|
| 574 | 574 | <?php |
| 575 | 575 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 576 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 577 | - ?> |
|
| 576 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 577 | + ?> |
|
| 578 | 578 | <li><?php echo _("Tracker icon color:"); ?> |
| 579 | 579 | <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'; ?>"> |
| 580 | 580 | </li> |
| 581 | 581 | <?php |
| 582 | - } |
|
| 583 | - } |
|
| 584 | - ?> |
|
| 582 | + } |
|
| 583 | + } |
|
| 584 | + ?> |
|
| 585 | 585 | <?php |
| 586 | 586 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 587 | - ?> |
|
| 587 | + ?> |
|
| 588 | 588 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 589 | 589 | <div class="range"> |
| 590 | 590 | <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'; ?>"> |
@@ -593,9 +593,9 @@ discard block |
||
| 593 | 593 | </li> |
| 594 | 594 | <?php |
| 595 | 595 | } |
| 596 | - ?> |
|
| 596 | + ?> |
|
| 597 | 597 | <?php |
| 598 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 598 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 599 | 599 | ?> |
| 600 | 600 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
| 601 | 601 | <div class="range"> |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | </li> |
| 635 | 635 | <?php |
| 636 | 636 | } |
| 637 | - } |
|
| 637 | + } |
|
| 638 | 638 | ?> |
| 639 | 639 | <li><?php echo _("Distance unit:"); ?> |
| 640 | 640 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -674,19 +674,19 @@ discard block |
||
| 674 | 674 | <ul> |
| 675 | 675 | <?php |
| 676 | 676 | if (!isset($globalAircraft) || $globalAircraft) { |
| 677 | - ?> |
|
| 677 | + ?> |
|
| 678 | 678 | <?php |
| 679 | 679 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 680 | - ?> |
|
| 680 | + ?> |
|
| 681 | 681 | <?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 } ?> |
| 682 | 682 | <?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 } ?> |
| 683 | 683 | <?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 } ?> |
| 684 | 684 | <?php |
| 685 | 685 | } |
| 686 | - ?> |
|
| 686 | + ?> |
|
| 687 | 687 | <?php |
| 688 | 688 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 689 | - ?> |
|
| 689 | + ?> |
|
| 690 | 690 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 691 | 691 | <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> |
| 692 | 692 | <?php } ?> |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | <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> |
| 697 | 697 | <?php |
| 698 | 698 | } |
| 699 | - ?> |
|
| 699 | + ?> |
|
| 700 | 700 | <li><?php echo _("Display airlines:"); ?> |
| 701 | 701 | <br/> |
| 702 | 702 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -716,14 +716,14 @@ discard block |
||
| 716 | 716 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 717 | 717 | } |
| 718 | 718 | } |
| 719 | - ?> |
|
| 719 | + ?> |
|
| 720 | 720 | </select> |
| 721 | 721 | </li> |
| 722 | 722 | <?php |
| 723 | 723 | $Spotter = new Spotter(); |
| 724 | 724 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 725 | 725 | if (!empty($allalliancenames)) { |
| 726 | - ?> |
|
| 726 | + ?> |
|
| 727 | 727 | <li><?php echo _("Display alliance:"); ?> |
| 728 | 728 | <br/> |
| 729 | 729 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -737,18 +737,18 @@ discard block |
||
| 737 | 737 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 738 | 738 | } |
| 739 | 739 | } |
| 740 | - ?> |
|
| 740 | + ?> |
|
| 741 | 741 | </select> |
| 742 | 742 | </li> |
| 743 | 743 | <?php |
| 744 | 744 | } |
| 745 | - ?> |
|
| 745 | + ?> |
|
| 746 | 746 | <?php |
| 747 | 747 | } |
| 748 | - ?> |
|
| 748 | + ?> |
|
| 749 | 749 | <?php |
| 750 | 750 | if (isset($globalAPRS) && $globalAPRS) { |
| 751 | - ?> |
|
| 751 | + ?> |
|
| 752 | 752 | <li><?php echo _("Display APRS sources name:"); ?> |
| 753 | 753 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 754 | 754 | <?php |
@@ -772,18 +772,18 @@ discard block |
||
| 772 | 772 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
| 773 | 773 | } |
| 774 | 774 | } |
| 775 | - ?> |
|
| 775 | + ?> |
|
| 776 | 776 | </select> |
| 777 | 777 | </li> |
| 778 | 778 | <?php |
| 779 | 779 | } |
| 780 | - ?> |
|
| 780 | + ?> |
|
| 781 | 781 | <?php |
| 782 | 782 | if (!isset($globalAircraft) || $globalAircraft) { |
| 783 | - ?> |
|
| 783 | + ?> |
|
| 784 | 784 | <?php |
| 785 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 786 | - ?> |
|
| 785 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 786 | + ?> |
|
| 787 | 787 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 788 | 788 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 789 | 789 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -793,14 +793,14 @@ discard block |
||
| 793 | 793 | </select> |
| 794 | 794 | </li> |
| 795 | 795 | <?php |
| 796 | - } |
|
| 797 | - ?> |
|
| 796 | + } |
|
| 797 | + ?> |
|
| 798 | 798 | <?php |
| 799 | 799 | } |
| 800 | - ?> |
|
| 800 | + ?> |
|
| 801 | 801 | <?php |
| 802 | 802 | if (isset($globalMarine) && $globalMarine) { |
| 803 | - ?> |
|
| 803 | + ?> |
|
| 804 | 804 | <li> |
| 805 | 805 | <?php echo _("Display vessels with MMSI:"); ?> |
| 806 | 806 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
@@ -823,7 +823,7 @@ discard block |
||
| 823 | 823 | print '<option value="'.$race['race_id'].'">'.$race['race_name'].'</option>'; |
| 824 | 824 | } |
| 825 | 825 | } |
| 826 | - ?> |
|
| 826 | + ?> |
|
| 827 | 827 | </select> |
| 828 | 828 | </li> |
| 829 | 829 | |
@@ -831,7 +831,7 @@ discard block |
||
| 831 | 831 | } |
| 832 | 832 | } |
| 833 | 833 | } |
| 834 | - ?> |
|
| 834 | + ?> |
|
| 835 | 835 | <li> |
| 836 | 836 | <?php echo _("Display with ident:"); ?> |
| 837 | 837 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | </form> |
| 845 | 845 | </div> |
| 846 | 846 | <?php |
| 847 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 847 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 848 | 848 | ?> |
| 849 | 849 | <div class="sidebar-pane" id="satellites"> |
| 850 | 850 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -884,14 +884,14 @@ discard block |
||
| 884 | 884 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 885 | 885 | } |
| 886 | 886 | } |
| 887 | - ?> |
|
| 887 | + ?> |
|
| 888 | 888 | </select> |
| 889 | 889 | </li> |
| 890 | 890 | </ul> |
| 891 | 891 | </form> |
| 892 | 892 | </div> |
| 893 | 893 | <?php |
| 894 | - } |
|
| 894 | + } |
|
| 895 | 895 | ?> |
| 896 | 896 | </div> |
| 897 | 897 | </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 type="text/javascript" src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
|
| 60 | +<script type="text/javascript" src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) { |
|
| 61 | + print '?tsk='.$tsk; |
|
| 62 | +} |
|
| 63 | +?>"></script> |
|
| 61 | 64 | <script type="text/javascript" src="<?php echo $globalURL; ?>/js/meuusjs.1.0.3.min.js"></script> |
| 62 | 65 | <script type="text/javascript" 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-Aerial') print ' selected'; ?>>Here-Aerial</option> |
|
| 378 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here-Hybrid') print ' selected'; ?>>Here-Hybrid</option> |
|
| 379 | - <option value="Here-Road"<?php if ($MapType == 'Here-Road') print ' selected'; ?>>Here-Road</option> |
|
| 482 | + <option value="Here-Aerial"<?php if ($MapType == 'Here-Aerial') { |
|
| 483 | + print ' selected'; |
|
| 484 | +} |
|
| 485 | +?>>Here-Aerial</option> |
|
| 486 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here-Hybrid') { |
|
| 487 | + print ' selected'; |
|
| 488 | +} |
|
| 489 | +?>>Here-Hybrid</option> |
|
| 490 | + <option value="Here-Road"<?php if ($MapType == 'Here-Road') { |
|
| 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="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
|
| 537 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
| 538 | + print ' selected'; |
|
| 539 | +} |
|
| 540 | +?>>Natural Earth</option> |
|
| 403 | 541 | <?php |
| 404 | 542 | } |
| 405 | 543 | ?> |
| 406 | - <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
|
| 544 | + <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') { |
|
| 545 | + print ' selected'; |
|
| 546 | +} |
|
| 547 | +?>>National Geographic Street</option> |
|
| 407 | 548 | <?php |
| 408 | 549 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
| 409 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
| 410 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 550 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
| 551 | + $MapBoxId = 'default'; |
|
| 552 | + } else { |
|
| 553 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 554 | + } |
|
| 411 | 555 | ?> |
| 412 | - <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
|
| 413 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
| 414 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
| 415 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
| 416 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
| 417 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
| 418 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
| 419 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
| 420 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
| 421 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
| 422 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
| 423 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
| 424 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
| 556 | + <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') { |
|
| 557 | + print ' selected'; |
|
| 558 | +} |
|
| 559 | +?>>Mapbox GL</option> |
|
| 560 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
| 561 | + print ' selected'; |
|
| 562 | +} |
|
| 563 | +?>>Mapbox default</option> |
|
| 564 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
| 565 | + print ' selected'; |
|
| 566 | +} |
|
| 567 | +?>>Mapbox streets</option> |
|
| 568 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
| 569 | + print ' selected'; |
|
| 570 | +} |
|
| 571 | +?>>Mapbox light</option> |
|
| 572 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
| 573 | + print ' selected'; |
|
| 574 | +} |
|
| 575 | +?>>Mapbox dark</option> |
|
| 576 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
| 577 | + print ' selected'; |
|
| 578 | +} |
|
| 579 | +?>>Mapbox satellite</option> |
|
| 580 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
| 581 | + print ' selected'; |
|
| 582 | +} |
|
| 583 | +?>>Mapbox streets-satellite</option> |
|
| 584 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
| 585 | + print ' selected'; |
|
| 586 | +} |
|
| 587 | +?>>Mapbox streets-basic</option> |
|
| 588 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
| 589 | + print ' selected'; |
|
| 590 | +} |
|
| 591 | +?>>Mapbox comic</option> |
|
| 592 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
| 593 | + print ' selected'; |
|
| 594 | +} |
|
| 595 | +?>>Mapbox outdoors</option> |
|
| 596 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
| 597 | + print ' selected'; |
|
| 598 | +} |
|
| 599 | +?>>Mapbox pencil</option> |
|
| 600 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
| 601 | + print ' selected'; |
|
| 602 | +} |
|
| 603 | +?>>Mapbox pirates</option> |
|
| 604 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
| 605 | + print ' selected'; |
|
| 606 | +} |
|
| 607 | +?>>Mapbox emerald</option> |
|
| 425 | 608 | <?php |
| 426 | 609 | } |
| 427 | 610 | ?> |
| 428 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
| 429 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
| 611 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
| 612 | + print ' selected'; |
|
| 613 | +} |
|
| 614 | +?>>OpenStreetMap</option> |
|
| 615 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
| 616 | + print ' selected'; |
|
| 617 | +} |
|
| 618 | +?>>Yandex</option> |
|
| 430 | 619 | <?php |
| 431 | 620 | } |
| 432 | 621 | ?> |
@@ -437,11 +626,26 @@ discard block |
||
| 437 | 626 | ?> |
| 438 | 627 | <li><?php echo _("Type of Terrain:"); ?> |
| 439 | 628 | <select class="selectpicker" onchange="terrainType(this);"> |
| 440 | - <option value="world"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'world') print ' selected'; ?>>world terrain</option> |
|
| 441 | - <option value="stk"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
| 442 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 443 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 444 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 629 | + <option value="world"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'world') { |
|
| 630 | + print ' selected'; |
|
| 631 | +} |
|
| 632 | +?>>world terrain</option> |
|
| 633 | + <option value="stk"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'stk') { |
|
| 634 | + print ' selected'; |
|
| 635 | +} |
|
| 636 | +?>>stk terrain</option> |
|
| 637 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
| 638 | + print ' selected'; |
|
| 639 | +} |
|
| 640 | +?>>ellipsoid</option> |
|
| 641 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
| 642 | + print ' selected'; |
|
| 643 | +} |
|
| 644 | +?>>vr terrain</option> |
|
| 645 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
| 646 | + print ' selected'; |
|
| 647 | +} |
|
| 648 | +?>>ArticDEM</option> |
|
| 445 | 649 | </select> |
| 446 | 650 | </li> |
| 447 | 651 | <?php |
@@ -451,64 +655,124 @@ discard block |
||
| 451 | 655 | <?php |
| 452 | 656 | if (isset($globalMap3D) && $globalMap3D) { |
| 453 | 657 | ?> |
| 454 | - <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> |
|
| 658 | + <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') { |
|
| 659 | + print 'checked'; |
|
| 660 | +} |
|
| 661 | +?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li> |
|
| 455 | 662 | <?php |
| 456 | 663 | } |
| 457 | 664 | ?> |
| 458 | 665 | <?php |
| 459 | 666 | if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
| 460 | 667 | ?> |
| 461 | - <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> |
|
| 668 | + <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') { |
|
| 669 | + print 'checked'; |
|
| 670 | +} |
|
| 671 | +?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
|
| 462 | 672 | |
| 463 | 673 | <?php |
| 464 | 674 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 465 | 675 | ?> |
| 466 | - <!--<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>--> |
|
| 467 | - <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> |
|
| 468 | - <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> |
|
| 469 | - <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> |
|
| 470 | - <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> |
|
| 676 | + <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
| 677 | + print 'checked'; |
|
| 678 | +} |
|
| 679 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li>--> |
|
| 680 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
| 681 | + print 'checked'; |
|
| 682 | +} |
|
| 683 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 684 | + <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)) { |
|
| 685 | + print 'checked'; |
|
| 686 | +} |
|
| 687 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 688 | + <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)) { |
|
| 689 | + print 'checked'; |
|
| 690 | +} |
|
| 691 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 692 | + <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)) { |
|
| 693 | + print 'checked'; |
|
| 694 | +} |
|
| 695 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 471 | 696 | <?php |
| 472 | 697 | } elseif (!isset($globalTracker) || $globalTracker === TRUE) { |
| 473 | 698 | ?> |
| 474 | - <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> |
|
| 699 | + <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)) { |
|
| 700 | + print 'checked'; |
|
| 701 | +} |
|
| 702 | +?> ><?php echo _("Enable map matching"); ?></label></div></li> |
|
| 475 | 703 | <?php |
| 476 | 704 | } |
| 477 | 705 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
| 478 | 706 | ?> |
| 479 | - <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> |
|
| 707 | + <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)) { |
|
| 708 | + print 'checked'; |
|
| 709 | +} |
|
| 710 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
| 480 | 711 | <?php |
| 481 | 712 | } |
| 482 | 713 | } |
| 483 | 714 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 484 | 715 | ?> |
| 485 | - <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> |
|
| 716 | + <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'])) { |
|
| 717 | + print 'checked'; |
|
| 718 | +} |
|
| 719 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 486 | 720 | <?php |
| 487 | 721 | } |
| 488 | 722 | ?> |
| 489 | - <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 490 | - <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> |
|
| 491 | - <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> |
|
| 723 | + <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))) { |
|
| 724 | + print 'checked'; |
|
| 725 | +} |
|
| 726 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 727 | + <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))) { |
|
| 728 | + print 'checked'; |
|
| 729 | +} |
|
| 730 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 731 | + <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))) { |
|
| 732 | + print 'checked'; |
|
| 733 | +} |
|
| 734 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 492 | 735 | <?php |
| 493 | 736 | if (isset($globalFires) && $globalFires) { |
| 494 | 737 | ?> |
| 495 | - <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> |
|
| 738 | + <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))) { |
|
| 739 | + print 'checked'; |
|
| 740 | +} |
|
| 741 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
| 496 | 742 | <?php |
| 497 | 743 | } |
| 498 | 744 | if (isset($globalMap3D) && $globalMap3D) { |
| 499 | 745 | ?> |
| 500 | - <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> |
|
| 746 | + <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)) { |
|
| 747 | + print 'checked'; |
|
| 748 | +} |
|
| 749 | +?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li> |
|
| 501 | 750 | <?php |
| 502 | 751 | } |
| 503 | 752 | ?> |
| 504 | - <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> |
|
| 753 | + <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')) { |
|
| 754 | + print 'checked'; |
|
| 755 | +} |
|
| 756 | +?> ><?php echo _("Enable globe sun lighting"); ?></label></div></li> |
|
| 505 | 757 | <?php |
| 506 | 758 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
| 507 | 759 | ?> |
| 508 | - <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> |
|
| 509 | - <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> |
|
| 510 | - <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> |
|
| 511 | - <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> |
|
| 760 | + <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')) { |
|
| 761 | + print 'checked'; |
|
| 762 | +} |
|
| 763 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 764 | + <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')) { |
|
| 765 | + print 'checked'; |
|
| 766 | +} |
|
| 767 | +?> ><?php echo _("Use shadows"); ?></label></div></li> |
|
| 768 | + <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)) { |
|
| 769 | + print 'checked'; |
|
| 770 | +} |
|
| 771 | +?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
|
| 772 | + <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'])) { |
|
| 773 | + print 'checked'; |
|
| 774 | +} |
|
| 775 | +?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li> |
|
| 512 | 776 | <?php |
| 513 | 777 | } |
| 514 | 778 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -521,17 +785,25 @@ discard block |
||
| 521 | 785 | if (function_exists('array_column')) { |
| 522 | 786 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
| 523 | 787 | ?> |
| 524 | - <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> |
|
| 788 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 789 | + print 'checked'; |
|
| 790 | +} |
|
| 791 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 525 | 792 | <?php |
| 526 | 793 | } |
| 527 | 794 | } elseif (isset($globalSources)) { |
| 528 | 795 | $dispolar = false; |
| 529 | 796 | foreach ($globalSources as $testsource) { |
| 530 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 797 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
| 798 | + $dispolar = true; |
|
| 799 | + } |
|
| 531 | 800 | } |
| 532 | 801 | if ($dispolar) { |
| 533 | 802 | ?> |
| 534 | - <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> |
|
| 803 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 804 | + print 'checked'; |
|
| 805 | +} |
|
| 806 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 535 | 807 | <?php |
| 536 | 808 | } |
| 537 | 809 | } |
@@ -542,7 +814,14 @@ discard block |
||
| 542 | 814 | <?php |
| 543 | 815 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 544 | 816 | ?> |
| 545 | - <li><?php echo _("Max number of flights to display in 2D:"); ?> <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> |
|
| 817 | + <li><?php echo _("Max number of flights to display in 2D:"); ?> <input type="number" name="2dlimit" value="<?php if (isset($_COOKIE['map_2d_limit'])) { |
|
| 818 | + print $_COOKIE['map_2d_limit']; |
|
| 819 | +} elseif (isset($globalMap2DAircraftsLimit)) { |
|
| 820 | + print $globalMap2DAircraftsLimit; |
|
| 821 | +} else { |
|
| 822 | + print 15000; |
|
| 823 | +} |
|
| 824 | +?>" onchange="map2dlimit(this.value);" /></li> |
|
| 546 | 825 | <?php |
| 547 | 826 | } |
| 548 | 827 | ?> |
@@ -550,11 +829,21 @@ discard block |
||
| 550 | 829 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 551 | 830 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 552 | 831 | ?> |
| 553 | - <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> |
|
| 832 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
| 833 | + print 'checked'; |
|
| 834 | +} |
|
| 835 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 554 | 836 | <?php |
| 555 | 837 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 556 | 838 | ?> |
| 557 | - <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> |
|
| 839 | + <li><?php echo _("Aircraft icon color:"); ?> <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(this.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 840 | + print $_COOKIE['IconColor']; |
|
| 841 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 842 | + print $globalAircraftIconColor; |
|
| 843 | +} else { |
|
| 844 | + print '1a3151'; |
|
| 845 | +} |
|
| 846 | +?>"></li> |
|
| 558 | 847 | <?php |
| 559 | 848 | } |
| 560 | 849 | } |
@@ -565,7 +854,14 @@ discard block |
||
| 565 | 854 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 566 | 855 | ?> |
| 567 | 856 | <li><?php echo _("Marine icon color:"); ?> |
| 568 | - <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'; ?>"> |
|
| 857 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 858 | + print $_COOKIE['MarineIconColor']; |
|
| 859 | +} elseif (isset($globalMarineIconColor)) { |
|
| 860 | + print $globalMarineIconColor; |
|
| 861 | +} else { |
|
| 862 | + print '1a3151'; |
|
| 863 | +} |
|
| 864 | +?>"> |
|
| 569 | 865 | </li> |
| 570 | 866 | <?php |
| 571 | 867 | } |
@@ -576,7 +872,14 @@ discard block |
||
| 576 | 872 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 577 | 873 | ?> |
| 578 | 874 | <li><?php echo _("Tracker icon color:"); ?> |
| 579 | - <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'; ?>"> |
|
| 875 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 876 | + print $_COOKIE['TrackerIconColor']; |
|
| 877 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 878 | + print $globalTrackerIconColor; |
|
| 879 | +} else { |
|
| 880 | + print '1a3151'; |
|
| 881 | +} |
|
| 882 | +?>"> |
|
| 580 | 883 | </li> |
| 581 | 884 | <?php |
| 582 | 885 | } |
@@ -587,8 +890,22 @@ discard block |
||
| 587 | 890 | ?> |
| 588 | 891 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 589 | 892 | <div class="range"> |
| 590 | - <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'; ?>"> |
|
| 591 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
| 893 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 894 | + print $_COOKIE['AirportZoom']; |
|
| 895 | +} elseif (isset($globalAirportZoom)) { |
|
| 896 | + print $globalAirportZoom; |
|
| 897 | +} else { |
|
| 898 | + print '7'; |
|
| 899 | +} |
|
| 900 | +?>"> |
|
| 901 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 902 | + print $_COOKIE['AirportZoom']; |
|
| 903 | +} elseif (isset($globalAirportZoom)) { |
|
| 904 | + print $globalAirportZoom; |
|
| 905 | +} else { |
|
| 906 | + print '7'; |
|
| 907 | +} |
|
| 908 | +?></output> |
|
| 592 | 909 | </div> |
| 593 | 910 | </li> |
| 594 | 911 | <?php |
@@ -599,18 +916,48 @@ discard block |
||
| 599 | 916 | ?> |
| 600 | 917 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
| 601 | 918 | <div class="range"> |
| 602 | - <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'; ?>"> |
|
| 603 | - <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?></output> |
|
| 919 | + <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'])) { |
|
| 920 | + print $_COOKIE['resolutionScale']; |
|
| 921 | +} else { |
|
| 922 | + print '1'; |
|
| 923 | +} |
|
| 924 | +?>"> |
|
| 925 | + <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) { |
|
| 926 | + print $_COOKIE['resolutionScale']; |
|
| 927 | +} else { |
|
| 928 | + print '1'; |
|
| 929 | +} |
|
| 930 | +?></output> |
|
| 604 | 931 | </div> |
| 605 | 932 | </li> |
| 606 | 933 | <?php |
| 607 | 934 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 608 | 935 | ?> |
| 609 | - <!-- <li><?php echo _("Max number of flights to display in 3D:"); ?> <input type="number" name="3dlimit" value="<?php if (isset($_COOKIE['map_3d_limit'])) print $_COOKIE['map_3d_limit']; elseif (isset($globalMap3DAircraftsLimit)) print $globalMap3DAircraftsLimit; else print 300; ?>" onchange="map3dlimit(this.value);" /></li> --> |
|
| 610 | - <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> |
|
| 611 | - <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"); ?> |
|
| 936 | + <!-- <li><?php echo _("Max number of flights to display in 3D:"); ?> <input type="number" name="3dlimit" value="<?php if (isset($_COOKIE['map_3d_limit'])) { |
|
| 937 | + print $_COOKIE['map_3d_limit']; |
|
| 938 | +} elseif (isset($globalMap3DAircraftsLimit)) { |
|
| 939 | + print $globalMap3DAircraftsLimit; |
|
| 940 | +} else { |
|
| 941 | + print 300; |
|
| 942 | +} |
|
| 943 | +?>" onchange="map3dlimit(this.value);" /></li> --> |
|
| 944 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
| 945 | + print 'checked'; |
|
| 946 | +} |
|
| 947 | +?> > <?php echo _("Use airlines liveries"); ?></li> |
|
| 948 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
| 949 | + print 'checked'; |
|
| 950 | +} |
|
| 951 | +?> > <?php echo _("Force Aircraft color"); ?> |
|
| 612 | 952 | <!--<li><?php echo _("Aircraft icon color:"); ?>--> |
| 613 | - <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'; ?>"> |
|
| 953 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 954 | + print $_COOKIE['IconColor']; |
|
| 955 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 956 | + print $globalAircraftIconColor; |
|
| 957 | +} else { |
|
| 958 | + print 'ff0000'; |
|
| 959 | +} |
|
| 960 | +?>"> |
|
| 614 | 961 | </li> |
| 615 | 962 | <?php |
| 616 | 963 | } |
@@ -618,9 +965,19 @@ discard block |
||
| 618 | 965 | <?php |
| 619 | 966 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 620 | 967 | ?> |
| 621 | - <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"); ?> |
|
| 968 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
| 969 | + print 'checked'; |
|
| 970 | +} |
|
| 971 | +?> ><?php echo _("Force Marine color"); ?> |
|
| 622 | 972 | <!--<li><?php echo _("Marine icon color:"); ?>--> |
| 623 | - <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'; ?>"> |
|
| 973 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 974 | + print $_COOKIE['MarineIconColor']; |
|
| 975 | +} elseif (isset($globalMarineIconColor)) { |
|
| 976 | + print $globalMarineIconColor; |
|
| 977 | +} else { |
|
| 978 | + print 'ff0000'; |
|
| 979 | +} |
|
| 980 | +?>"> |
|
| 624 | 981 | </li> |
| 625 | 982 | <?php |
| 626 | 983 | } |
@@ -628,9 +985,19 @@ discard block |
||
| 628 | 985 | <?php |
| 629 | 986 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 630 | 987 | ?> |
| 631 | - <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"); ?> |
|
| 988 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
| 989 | + print 'checked'; |
|
| 990 | +} |
|
| 991 | +?> ><?php echo _("Force Tracker color"); ?> |
|
| 632 | 992 | <!--<li><?php echo _("Tracker icon color:"); ?>--> |
| 633 | - <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'; ?>"> |
|
| 993 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 994 | + print $_COOKIE['TrackerIconColor']; |
|
| 995 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 996 | + print $globalTrackerIconColor; |
|
| 997 | +} else { |
|
| 998 | + print 'ff0000'; |
|
| 999 | +} |
|
| 1000 | +?>"> |
|
| 634 | 1001 | </li> |
| 635 | 1002 | <?php |
| 636 | 1003 | } |
@@ -638,29 +1005,62 @@ discard block |
||
| 638 | 1005 | ?> |
| 639 | 1006 | <li><?php echo _("Distance unit:"); ?> |
| 640 | 1007 | <select class="selectpicker" onchange="unitdistance(this);"> |
| 641 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
| 642 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
| 643 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
| 1008 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
| 1009 | + echo ' selected'; |
|
| 1010 | +} |
|
| 1011 | +?>>km</option> |
|
| 1012 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
| 1013 | + echo ' selected'; |
|
| 1014 | +} |
|
| 1015 | +?>>nm</option> |
|
| 1016 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
| 1017 | + echo ' selected'; |
|
| 1018 | +} |
|
| 1019 | +?>>mi</option> |
|
| 644 | 1020 | </select> |
| 645 | 1021 | </li> |
| 646 | 1022 | <li><?php echo _("Altitude unit:"); ?> |
| 647 | 1023 | <select class="selectpicker" onchange="unitaltitude(this);"> |
| 648 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
| 649 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
| 1024 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
| 1025 | + echo ' selected'; |
|
| 1026 | +} |
|
| 1027 | +?>>m</option> |
|
| 1028 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
| 1029 | + echo ' selected'; |
|
| 1030 | +} |
|
| 1031 | +?>>feet</option> |
|
| 650 | 1032 | </select> |
| 651 | 1033 | </li> |
| 652 | 1034 | <li><?php echo _("Speed unit:"); ?> |
| 653 | 1035 | <select class="selectpicker" onchange="unitspeed(this);"> |
| 654 | - <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> |
|
| 655 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
| 656 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
| 1036 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
| 1037 | + echo ' selected'; |
|
| 1038 | +} |
|
| 1039 | +?>>km/h</option> |
|
| 1040 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
| 1041 | + echo ' selected'; |
|
| 1042 | +} |
|
| 1043 | +?>>mph</option> |
|
| 1044 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
| 1045 | + echo ' selected'; |
|
| 1046 | +} |
|
| 1047 | +?>>knots</option> |
|
| 657 | 1048 | </select> |
| 658 | 1049 | </li> |
| 659 | 1050 | <li><?php echo _("Coordinate unit:"); ?> |
| 660 | 1051 | <select class="selectpicker" onchange="unitcoordinate(this);"> |
| 661 | - <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) echo ' selected'; ?>>DD</option> |
|
| 662 | - <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) echo ' selected'; ?>>DMS</option> |
|
| 663 | - <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) echo ' selected'; ?>>DM</option> |
|
| 1052 | + <option value="dd"<?php if ((!isset($_COOKIE['unitcoordinate']) && (!isset($globalUnitCoordinate) || (isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dd'))) || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dd')) { |
|
| 1053 | + echo ' selected'; |
|
| 1054 | +} |
|
| 1055 | +?>>DD</option> |
|
| 1056 | + <option value="dms"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) { |
|
| 1057 | + echo ' selected'; |
|
| 1058 | +} |
|
| 1059 | +?>>DMS</option> |
|
| 1060 | + <option value="dm"<?php if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) { |
|
| 1061 | + echo ' selected'; |
|
| 1062 | +} |
|
| 1063 | +?>>DM</option> |
|
| 664 | 1064 | </select> |
| 665 | 1065 | </li> |
| 666 | 1066 | |
@@ -678,9 +1078,18 @@ discard block |
||
| 678 | 1078 | <?php |
| 679 | 1079 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 680 | 1080 | ?> |
| 681 | - <?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 } ?> |
|
| 682 | - <?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 } ?> |
|
| 683 | - <?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 } ?> |
|
| 1081 | + <?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'])) { |
|
| 1082 | + print 'checked'; |
|
| 1083 | +} |
|
| 1084 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 1085 | + <?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'])) { |
|
| 1086 | + print 'checked'; |
|
| 1087 | +} |
|
| 1088 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 1089 | + <?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'])) { |
|
| 1090 | + print 'checked'; |
|
| 1091 | +} |
|
| 1092 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 684 | 1093 | <?php |
| 685 | 1094 | } |
| 686 | 1095 | ?> |
@@ -688,12 +1097,21 @@ discard block |
||
| 688 | 1097 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 689 | 1098 | ?> |
| 690 | 1099 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 691 | - <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> |
|
| 1100 | + <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'])) { |
|
| 1101 | + print 'checked'; |
|
| 1102 | +} |
|
| 1103 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 692 | 1104 | <?php } ?> |
| 693 | 1105 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
| 694 | - <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> |
|
| 1106 | + <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'])) { |
|
| 1107 | + print 'checked'; |
|
| 1108 | +} |
|
| 1109 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 695 | 1110 | <?php } ?> |
| 696 | - <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> |
|
| 1111 | + <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') { |
|
| 1112 | + print 'checked'; |
|
| 1113 | +} |
|
| 1114 | +?> ><?php echo _("Only display FAA ASDI blocked aircrafts"); ?></label></div></li> |
|
| 697 | 1115 | <?php |
| 698 | 1116 | } |
| 699 | 1117 | ?> |
@@ -709,7 +1127,9 @@ discard block |
||
| 709 | 1127 | } |
| 710 | 1128 | foreach($allairlinenames as $airline) { |
| 711 | 1129 | $airline_name = $airline['airline_name']; |
| 712 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 1130 | + if (strlen($airline_name) > 30) { |
|
| 1131 | + $airline_name = substr($airline_name,0,30).'...'; |
|
| 1132 | + } |
|
| 713 | 1133 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
| 714 | 1134 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 715 | 1135 | } else { |
@@ -727,7 +1147,10 @@ discard block |
||
| 727 | 1147 | <li><?php echo _("Display alliance:"); ?> |
| 728 | 1148 | <br/> |
| 729 | 1149 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 730 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 1150 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
| 1151 | + echo ' selected'; |
|
| 1152 | +} |
|
| 1153 | +?>><?php echo _("All"); ?></option> |
|
| 731 | 1154 | <?php |
| 732 | 1155 | foreach($allalliancenames as $alliance) { |
| 733 | 1156 | $alliance_name = $alliance['alliance']; |
@@ -786,10 +1209,22 @@ discard block |
||
| 786 | 1209 | ?> |
| 787 | 1210 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 788 | 1211 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 789 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 790 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
| 791 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
| 792 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
| 1212 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
| 1213 | + echo ' selected'; |
|
| 1214 | +} |
|
| 1215 | +?>><?php echo _("All"); ?></option> |
|
| 1216 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
| 1217 | + echo ' selected'; |
|
| 1218 | +} |
|
| 1219 | +?>><?php echo _("Passenger"); ?></option> |
|
| 1220 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
| 1221 | + echo ' selected'; |
|
| 1222 | +} |
|
| 1223 | +?>><?php echo _("Cargo"); ?></option> |
|
| 1224 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
| 1225 | + echo ' selected'; |
|
| 1226 | +} |
|
| 1227 | +?>><?php echo _("Military"); ?></option> |
|
| 793 | 1228 | </select> |
| 794 | 1229 | </li> |
| 795 | 1230 | <?php |
@@ -803,7 +1238,10 @@ discard block |
||
| 803 | 1238 | ?> |
| 804 | 1239 | <li> |
| 805 | 1240 | <?php echo _("Display vessels with MMSI:"); ?> |
| 806 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
| 1241 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
| 1242 | + print $_COOKIE['filter_mmsi']; |
|
| 1243 | +} |
|
| 1244 | +?>" /> |
|
| 807 | 1245 | </li> |
| 808 | 1246 | <?php |
| 809 | 1247 | if (isset($globalVM) && $globalVM) { |
@@ -834,7 +1272,10 @@ discard block |
||
| 834 | 1272 | ?> |
| 835 | 1273 | <li> |
| 836 | 1274 | <?php echo _("Display with ident:"); ?> |
| 837 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
| 1275 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
| 1276 | + print $_COOKIE['filter_ident']; |
|
| 1277 | +} |
|
| 1278 | +?>" /> |
|
| 838 | 1279 | </li> |
| 839 | 1280 | </ul> |
| 840 | 1281 | </form> |
@@ -850,7 +1291,10 @@ discard block |
||
| 850 | 1291 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
| 851 | 1292 | <form> |
| 852 | 1293 | <ul> |
| 853 | - <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> |
|
| 1294 | + <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'])) { |
|
| 1295 | + print 'checked'; |
|
| 1296 | +} |
|
| 1297 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 854 | 1298 | <li><?php echo _("Type:"); ?> |
| 855 | 1299 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
| 856 | 1300 | <?php |
@@ -858,25 +1302,45 @@ discard block |
||
| 858 | 1302 | $types = $Satellite->get_tle_types(); |
| 859 | 1303 | foreach ($types as $type) { |
| 860 | 1304 | $type_name = $type['tle_type']; |
| 861 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
| 862 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
| 863 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
| 864 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
| 865 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
| 866 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
| 867 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 868 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
| 869 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
| 870 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
| 871 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
| 872 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
| 873 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
| 874 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
| 875 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
| 876 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
| 877 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
| 878 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
| 879 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
| 1305 | + if ($type_name == 'musson') { |
|
| 1306 | + $type_name = 'Russian LEO Navigation'; |
|
| 1307 | + } else if ($type_name == 'nnss') { |
|
| 1308 | + $type_name = 'Navi Navigation Satellite System'; |
|
| 1309 | + } else if ($type_name == 'sbas') { |
|
| 1310 | + $type_name = 'Satellite-Based Augmentation System'; |
|
| 1311 | + } else if ($type_name == 'glo-ops') { |
|
| 1312 | + $type_name = 'Glonass Operational'; |
|
| 1313 | + } else if ($type_name == 'gps-ops') { |
|
| 1314 | + $type_name = 'GPS Operational'; |
|
| 1315 | + } else if ($type_name == 'argos') { |
|
| 1316 | + $type_name = 'ARGOS Data Collection System'; |
|
| 1317 | + } else if ($type_name == 'tdrss') { |
|
| 1318 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 1319 | + } else if ($type_name == 'sarsat') { |
|
| 1320 | + $type_name = 'Search & Rescue'; |
|
| 1321 | + } else if ($type_name == 'dmc') { |
|
| 1322 | + $type_name = 'Disaster Monitoring'; |
|
| 1323 | + } else if ($type_name == 'resource') { |
|
| 1324 | + $type_name = 'Earth Resources'; |
|
| 1325 | + } else if ($type_name == 'stations') { |
|
| 1326 | + $type_name = 'Space Stations'; |
|
| 1327 | + } else if ($type_name == 'geo') { |
|
| 1328 | + $type_name = 'Geostationary'; |
|
| 1329 | + } else if ($type_name == 'amateur') { |
|
| 1330 | + $type_name = 'Amateur Radio'; |
|
| 1331 | + } else if ($type_name == 'x-comm') { |
|
| 1332 | + $type_name = 'Experimental'; |
|
| 1333 | + } else if ($type_name == 'other-comm') { |
|
| 1334 | + $type_name = 'Other Comm'; |
|
| 1335 | + } else if ($type_name == 'science') { |
|
| 1336 | + $type_name = 'Space & Earth Science'; |
|
| 1337 | + } else if ($type_name == 'military') { |
|
| 1338 | + $type_name = 'Miscellaneous Military'; |
|
| 1339 | + } else if ($type_name == 'radar') { |
|
| 1340 | + $type_name = 'Radar Calibration'; |
|
| 1341 | + } else if ($type_name == 'tle-new') { |
|
| 1342 | + $type_name = 'Last 30 days launches'; |
|
| 1343 | + } |
|
| 880 | 1344 | |
| 881 | 1345 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
| 882 | 1346 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
