@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | ?> |
| 146 | 146 | <?php |
| 147 | - if (isset($_POST['archive'])) { |
|
| 147 | + if (isset($_POST['archive'])) { |
|
| 148 | 148 | ?> |
| 149 | 149 | <?php |
| 150 | 150 | /* if (isset($globalBeta) && $globalBeta) { |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | // } |
| 162 | 162 | ?> |
| 163 | 163 | <?php |
| 164 | - } else { |
|
| 164 | + } else { |
|
| 165 | 165 | ?> |
| 166 | 166 | <?php |
| 167 | 167 | /* if (isset($globalBeta) && $globalBeta) { |
@@ -173,17 +173,17 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | ?> |
| 175 | 175 | <?php |
| 176 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 176 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 177 | 177 | ?> |
| 178 | 178 | <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script> |
| 179 | 179 | <?php |
| 180 | - } |
|
| 180 | + } |
|
| 181 | 181 | ?> |
| 182 | 182 | <?php |
| 183 | 183 | // } |
| 184 | 184 | ?> |
| 185 | 185 | <?php |
| 186 | - } |
|
| 186 | + } |
|
| 187 | 187 | } |
| 188 | 188 | ?> |
| 189 | 189 | <?php |
@@ -343,23 +343,23 @@ discard block |
||
| 343 | 343 | <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li> |
| 344 | 344 | <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li> |
| 345 | 345 | <?php |
| 346 | - if ($globalACARS) { |
|
| 347 | - if (isset($globalDemo) && $globalDemo) { |
|
| 348 | - ?> |
|
| 346 | + if ($globalACARS) { |
|
| 347 | + if (isset($globalDemo) && $globalDemo) { |
|
| 348 | + ?> |
|
| 349 | 349 | <li><hr /></li> |
| 350 | 350 | <li><i><?php echo _('ACARS data not available publicly'); ?></i></li> |
| 351 | 351 | <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li> |
| 352 | 352 | <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li> |
| 353 | 353 | <?php |
| 354 | - } else { |
|
| 355 | - ?> |
|
| 354 | + } else { |
|
| 355 | + ?> |
|
| 356 | 356 | <li><hr /></li> |
| 357 | 357 | <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li> |
| 358 | 358 | <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li> |
| 359 | 359 | <?php |
| 360 | - } |
|
| 361 | - } |
|
| 362 | - ?> |
|
| 360 | + } |
|
| 361 | + } |
|
| 362 | + ?> |
|
| 363 | 363 | <li><hr /></li> |
| 364 | 364 | <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li> |
| 365 | 365 | <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li> |
@@ -401,14 +401,14 @@ discard block |
||
| 401 | 401 | <form> |
| 402 | 402 | <select class="selectpicker" data-width="120px" onchange="language(this);"> |
| 403 | 403 | <?php |
| 404 | - $Language = new Language(); |
|
| 405 | - $alllang = $Language->getLanguages(); |
|
| 406 | - foreach ($alllang as $key => $lang) { |
|
| 407 | - print '<option value="'.$key.'"'; |
|
| 408 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 409 | - print '>'.$lang[0].'</option>'; |
|
| 410 | - } |
|
| 411 | - ?> |
|
| 404 | + $Language = new Language(); |
|
| 405 | + $alllang = $Language->getLanguages(); |
|
| 406 | + foreach ($alllang as $key => $lang) { |
|
| 407 | + print '<option value="'.$key.'"'; |
|
| 408 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 409 | + print '>'.$lang[0].'</option>'; |
|
| 410 | + } |
|
| 411 | + ?> |
|
| 412 | 412 | </select> |
| 413 | 413 | </form> |
| 414 | 414 | </div> |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } |
| 445 | 445 | 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)) |
| 446 | 446 | { |
| 447 | - ?> |
|
| 447 | + ?> |
|
| 448 | 448 | <div class="top-header clear" role="main"> |
| 449 | 449 | <div id="map"></div> |
| 450 | 450 | <link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" /> |
@@ -455,15 +455,15 @@ discard block |
||
| 455 | 455 | var zoom = 13; |
| 456 | 456 | //create the map |
| 457 | 457 | <?php |
| 458 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 458 | + if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 459 | 459 | ?> |
| 460 | 460 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
| 461 | 461 | <?php |
| 462 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 462 | + } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 463 | 463 | ?> |
| 464 | 464 | map = L.map('map', { zoomControl:true }); |
| 465 | 465 | <?php |
| 466 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 466 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 467 | 467 | ?> |
| 468 | 468 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
| 469 | 469 | 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); |
@@ -471,22 +471,22 @@ discard block |
||
| 471 | 471 | 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); |
| 472 | 472 | 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); |
| 473 | 473 | <?php |
| 474 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 474 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 475 | 475 | ?> |
| 476 | 476 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
| 477 | 477 | <?php |
| 478 | - } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
| 478 | + } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
| 479 | 479 | ?> |
| 480 | 480 | map = L.map('map', { zoomControl:true }); |
| 481 | 481 | <?php |
| 482 | - } |
|
| 482 | + } |
|
| 483 | 483 | ?> |
| 484 | 484 | //initialize the layer group for the aircrft markers |
| 485 | 485 | var layer_data = L.layerGroup(); |
| 486 | 486 | |
| 487 | 487 | //a few title layers |
| 488 | 488 | <?php |
| 489 | - if ($globalMapProvider == 'Mapbox') { |
|
| 489 | + if ($globalMapProvider == 'Mapbox') { |
|
| 490 | 490 | ?> |
| 491 | 491 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
| 492 | 492 | maxZoom: 18, |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | token : '<?php print $globalMapboxToken; ?>' |
| 498 | 498 | }).addTo(map); |
| 499 | 499 | <?php |
| 500 | - } elseif ($globalMapProvider == 'OpenStreetMap') { |
|
| 500 | + } elseif ($globalMapProvider == 'OpenStreetMap') { |
|
| 501 | 501 | ?> |
| 502 | 502 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
| 503 | 503 | maxZoom: 18, |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>' |
| 506 | 506 | }).addTo(map); |
| 507 | 507 | <?php |
| 508 | - } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
| 508 | + } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
| 509 | 509 | ?> |
| 510 | 510 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', { |
| 511 | 511 | maxZoom: 18, |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>' |
| 515 | 515 | }).addTo(map); |
| 516 | 516 | <?php |
| 517 | - } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
| 517 | + } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
| 518 | 518 | ?> |
| 519 | 519 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', { |
| 520 | 520 | maxZoom: 18, |
@@ -523,27 +523,27 @@ discard block |
||
| 523 | 523 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"' |
| 524 | 524 | }).addTo(map); |
| 525 | 525 | <?php |
| 526 | - } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
| 526 | + } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
| 527 | 527 | ?> |
| 528 | 528 | var googleLayer = new L.Google('ROADMAP'); |
| 529 | 529 | map.addLayer(googleLayer); |
| 530 | 530 | <?php |
| 531 | - } elseif ($globalMapProvider == 'Google-Satellite') { |
|
| 531 | + } elseif ($globalMapProvider == 'Google-Satellite') { |
|
| 532 | 532 | ?> |
| 533 | 533 | var googleLayer = new L.Google('SATELLITE'); |
| 534 | 534 | map.addLayer(googleLayer); |
| 535 | 535 | <?php |
| 536 | - } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
| 536 | + } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
| 537 | 537 | ?> |
| 538 | 538 | var googleLayer = new L.Google('HYBRID'); |
| 539 | 539 | map.addLayer(googleLayer); |
| 540 | 540 | <?php |
| 541 | - } elseif ($globalMapProvider == 'Google-Terrain') { |
|
| 541 | + } elseif ($globalMapProvider == 'Google-Terrain') { |
|
| 542 | 542 | ?> |
| 543 | 543 | var googleLayer = new L.Google('Terrain'); |
| 544 | 544 | map.addLayer(googleLayer); |
| 545 | 545 | <?php |
| 546 | - } |
|
| 546 | + } |
|
| 547 | 547 | ?> |
| 548 | 548 | </script> |
| 549 | 549 | </div> |