@@ -4,8 +4,8 @@ |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | $aircraft_manufacturer = urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)); |
11 | 11 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | // When button "Remove all filters" is clicked |
29 | 29 | if (isset($_POST['removefilters'])) { |
30 | 30 | $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
31 | - return strpos($key,'filter_') === 0; |
|
31 | + return strpos($key,'filter_') === 0; |
|
32 | 32 | }); |
33 | 33 | foreach ($allfilters as $filt) { |
34 | 34 | unset($_COOKIE[$filt]); |
@@ -160,17 +160,17 @@ discard block |
||
160 | 160 | } |
161 | 161 | ?> |
162 | 162 | <?php |
163 | - if (isset($_POST['archive'])) { |
|
163 | + if (isset($_POST['archive'])) { |
|
164 | 164 | ?> |
165 | 165 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
166 | 166 | <?php |
167 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
167 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
168 | 168 | ?> |
169 | 169 | |
170 | 170 | <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script> |
171 | 171 | <?php |
172 | - } |
|
173 | - } else { |
|
172 | + } |
|
173 | + } else { |
|
174 | 174 | ?> |
175 | 175 | <?php |
176 | 176 | /* if (isset($globalBeta) && $globalBeta) { |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | */ |
183 | 183 | ?> |
184 | 184 | <?php |
185 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
185 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
186 | 186 | ?> |
187 | 187 | <?php |
188 | 188 | // if (isset($globalBeta) && $globalBeta) { |
@@ -213,13 +213,13 @@ discard block |
||
213 | 213 | <script src="<?php print $globalURL; ?>/js/map-satellite.2d.js.php?<?php print time(); ?>"></script> |
214 | 214 | <?php |
215 | 215 | } |
216 | - } |
|
216 | + } |
|
217 | 217 | ?> |
218 | 218 | <?php |
219 | 219 | // } |
220 | 220 | ?> |
221 | 221 | <?php |
222 | - } |
|
222 | + } |
|
223 | 223 | } |
224 | 224 | ?> |
225 | 225 | <?php |
@@ -397,61 +397,61 @@ discard block |
||
397 | 397 | <ul class="nav navbar-nav"> |
398 | 398 | |
399 | 399 | <?php |
400 | - $sub = false; |
|
401 | - if ( |
|
400 | + $sub = false; |
|
401 | + if ( |
|
402 | 402 | ( |
403 | - (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
403 | + (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
404 | 404 | ) || |
405 | 405 | ( |
406 | - isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
406 | + isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
407 | 407 | ) || |
408 | 408 | ( |
409 | - isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
409 | + isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE)) |
|
410 | 410 | ) || |
411 | 411 | ( |
412 | - isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
412 | + isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE)) |
|
413 | 413 | ) |
414 | - ) { |
|
414 | + ) { |
|
415 | 415 | $sub = true; |
416 | - } |
|
416 | + } |
|
417 | 417 | ?> |
418 | 418 | <?php |
419 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
419 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
420 | 420 | ?> |
421 | 421 | <li class="dropdown"> |
422 | 422 | <?php |
423 | - if ($sub) { |
|
423 | + if ($sub) { |
|
424 | 424 | ?> |
425 | 425 | <li class="dropdown"> |
426 | 426 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Aircrafts"); ?> <b class="caret"></b></a> |
427 | 427 | <ul class="dropdown-menu multi-level"> |
428 | 428 | <li class="dropdown-submenu"> |
429 | 429 | <?php |
430 | - } |
|
430 | + } |
|
431 | 431 | ?> |
432 | 432 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
433 | 433 | <ul class="dropdown-menu"> |
434 | 434 | <li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li> |
435 | 435 | <?php |
436 | - if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
436 | + if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
|
437 | 437 | ?> |
438 | 438 | <li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li> |
439 | 439 | <?php |
440 | - } |
|
440 | + } |
|
441 | 441 | ?> |
442 | 442 | <li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li> |
443 | 443 | <?php |
444 | - if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
444 | + if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
|
445 | 445 | ?> |
446 | 446 | <li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li> |
447 | 447 | <?php |
448 | - } |
|
449 | - if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
448 | + } |
|
449 | + if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
|
450 | 450 | |
451 | 451 | ?> |
452 | 452 | <li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li> |
453 | 453 | <?php |
454 | - } |
|
454 | + } |
|
455 | 455 | ?> |
456 | 456 | <li><hr /></li> |
457 | 457 | <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li> |
@@ -459,43 +459,43 @@ discard block |
||
459 | 459 | <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li> |
460 | 460 | <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li> |
461 | 461 | <?php |
462 | - if ($globalACARS) { |
|
463 | - if (isset($globalDemo) && $globalDemo) { |
|
464 | - ?> |
|
462 | + if ($globalACARS) { |
|
463 | + if (isset($globalDemo) && $globalDemo) { |
|
464 | + ?> |
|
465 | 465 | <li><hr /></li> |
466 | 466 | <li><i><?php echo _('ACARS data not available publicly'); ?></i></li> |
467 | 467 | <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li> |
468 | 468 | <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li> |
469 | 469 | <?php |
470 | - } else { |
|
471 | - ?> |
|
470 | + } else { |
|
471 | + ?> |
|
472 | 472 | <li><hr /></li> |
473 | 473 | <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li> |
474 | 474 | <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li> |
475 | 475 | <?php |
476 | - } |
|
477 | - } |
|
478 | - ?> |
|
476 | + } |
|
477 | + } |
|
478 | + ?> |
|
479 | 479 | <?php |
480 | - if (isset($globalAccidents) && $globalAccidents) { |
|
481 | - ?> |
|
480 | + if (isset($globalAccidents) && $globalAccidents) { |
|
481 | + ?> |
|
482 | 482 | <li><hr /></li> |
483 | 483 | <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li> |
484 | 484 | <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li> |
485 | 485 | <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li> |
486 | 486 | <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li> |
487 | 487 | <?php |
488 | - } |
|
489 | - ?> |
|
488 | + } |
|
489 | + ?> |
|
490 | 490 | <li><hr /></li> |
491 | 491 | <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li> |
492 | 492 | <?php |
493 | 493 | if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) { |
494 | - ?> |
|
494 | + ?> |
|
495 | 495 | <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li> |
496 | 496 | <?php |
497 | 497 | } |
498 | - ?> |
|
498 | + ?> |
|
499 | 499 | </ul> |
500 | 500 | </li> |
501 | 501 | <li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li> |
@@ -522,14 +522,14 @@ discard block |
||
522 | 522 | </ul> |
523 | 523 | <?php |
524 | 524 | } |
525 | - } |
|
525 | + } |
|
526 | 526 | ?> |
527 | 527 | <?php |
528 | - if (isset($globalMarine) && $globalMarine) { |
|
528 | + if (isset($globalMarine) && $globalMarine) { |
|
529 | 529 | ?> |
530 | 530 | <li class="dropdown"> |
531 | 531 | <?php |
532 | - if ($sub) { |
|
532 | + if ($sub) { |
|
533 | 533 | ?> |
534 | 534 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Vessels"); ?> <b class="caret"></b></a> |
535 | 535 | <ul class="dropdown-menu multi-level"> |
@@ -555,14 +555,14 @@ discard block |
||
555 | 555 | } |
556 | 556 | ?> |
557 | 557 | <?php |
558 | - } |
|
558 | + } |
|
559 | 559 | ?> |
560 | 560 | <?php |
561 | - if (isset($globalTracker) && $globalTracker) { |
|
561 | + if (isset($globalTracker) && $globalTracker) { |
|
562 | 562 | ?> |
563 | 563 | <li class="dropdown"> |
564 | 564 | <?php |
565 | - if ($sub) { |
|
565 | + if ($sub) { |
|
566 | 566 | ?> |
567 | 567 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a> |
568 | 568 | <ul class="dropdown-menu multi-level"> |
@@ -588,14 +588,14 @@ discard block |
||
588 | 588 | } |
589 | 589 | ?> |
590 | 590 | <?php |
591 | - } |
|
591 | + } |
|
592 | 592 | ?> |
593 | 593 | <?php |
594 | - if (isset($globalSatellite) && $globalSatellite) { |
|
594 | + if (isset($globalSatellite) && $globalSatellite) { |
|
595 | 595 | ?> |
596 | 596 | <li class="dropdown"> |
597 | 597 | <?php |
598 | - if ($sub) { |
|
598 | + if ($sub) { |
|
599 | 599 | ?> |
600 | 600 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellite"); ?> <b class="caret"></b></a> |
601 | 601 | <ul class="dropdown-menu multi-level"> |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | } |
623 | 623 | ?> |
624 | 624 | <?php |
625 | - } |
|
625 | + } |
|
626 | 626 | ?> |
627 | 627 | |
628 | 628 | <li class="dropdown"> |
@@ -631,12 +631,12 @@ discard block |
||
631 | 631 | <li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li> |
632 | 632 | <li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li> |
633 | 633 | <?php |
634 | - if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
634 | + if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
|
635 | 635 | ?> |
636 | 636 | <li><hr /></li> |
637 | 637 | <li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li> |
638 | 638 | <?php |
639 | - } |
|
639 | + } |
|
640 | 640 | ?> |
641 | 641 | <?php if (isset($globalContribute) && $globalContribute) { ?> |
642 | 642 | <li><hr /></li> |
@@ -657,14 +657,14 @@ discard block |
||
657 | 657 | <form> |
658 | 658 | <select class="selectpicker" data-width="120px" onchange="language(this);"> |
659 | 659 | <?php |
660 | - $Language = new Language(); |
|
661 | - $alllang = $Language->getLanguages(); |
|
662 | - foreach ($alllang as $key => $lang) { |
|
663 | - print '<option value="'.$key.'"'; |
|
664 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
665 | - print '>'.$lang[0].'</option>'; |
|
666 | - } |
|
667 | - ?> |
|
660 | + $Language = new Language(); |
|
661 | + $alllang = $Language->getLanguages(); |
|
662 | + foreach ($alllang as $key => $lang) { |
|
663 | + print '<option value="'.$key.'"'; |
|
664 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
665 | + print '>'.$lang[0].'</option>'; |
|
666 | + } |
|
667 | + ?> |
|
668 | 668 | </select> |
669 | 669 | </form> |
670 | 670 | </div> |
@@ -695,18 +695,18 @@ discard block |
||
695 | 695 | ?> |
696 | 696 | <div class="top-header clear" role="main"> |
697 | 697 | <?php |
698 | - if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
698 | + if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
699 | 699 | ?> |
700 | 700 | <div id="archive-map"></div> |
701 | 701 | <?php |
702 | - } |
|
702 | + } |
|
703 | 703 | ?> |
704 | 704 | </div> |
705 | 705 | <?php |
706 | 706 | } |
707 | 707 | 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)) |
708 | 708 | { |
709 | - ?> |
|
709 | + ?> |
|
710 | 710 | <div class="top-header clear" role="main"> |
711 | 711 | <div id="map"></div> |
712 | 712 | <link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" /> |
@@ -717,15 +717,15 @@ discard block |
||
717 | 717 | var zoom = 13; |
718 | 718 | //create the map |
719 | 719 | <?php |
720 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
720 | + if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
721 | 721 | ?> |
722 | 722 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
723 | 723 | <?php |
724 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
724 | + } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
725 | 725 | ?> |
726 | 726 | map = L.map('map', { zoomControl:true }); |
727 | 727 | <?php |
728 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
728 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
729 | 729 | ?> |
730 | 730 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
731 | 731 | 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); |
@@ -733,22 +733,22 @@ discard block |
||
733 | 733 | 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); |
734 | 734 | 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); |
735 | 735 | <?php |
736 | - } 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'])) { |
|
736 | + } 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'])) { |
|
737 | 737 | ?> |
738 | 738 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
739 | 739 | <?php |
740 | - } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
740 | + } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
741 | 741 | ?> |
742 | 742 | map = L.map('map', { zoomControl:true }); |
743 | 743 | <?php |
744 | - } |
|
744 | + } |
|
745 | 745 | ?> |
746 | 746 | //initialize the layer group for the aircrft markers |
747 | 747 | var layer_data = L.layerGroup(); |
748 | 748 | |
749 | 749 | //a few title layers |
750 | 750 | <?php |
751 | - if ($globalMapProvider == 'Mapbox') { |
|
751 | + if ($globalMapProvider == 'Mapbox') { |
|
752 | 752 | ?> |
753 | 753 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
754 | 754 | maxZoom: 18, |
@@ -759,7 +759,7 @@ discard block |
||
759 | 759 | token : '<?php print $globalMapboxToken; ?>' |
760 | 760 | }).addTo(map); |
761 | 761 | <?php |
762 | - } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
762 | + } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
763 | 763 | ?> |
764 | 764 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', { |
765 | 765 | maxZoom: 18, |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>' |
769 | 769 | }).addTo(map); |
770 | 770 | <?php |
771 | - } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
771 | + } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
772 | 772 | ?> |
773 | 773 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', { |
774 | 774 | maxZoom: 18, |
@@ -777,27 +777,27 @@ discard block |
||
777 | 777 | '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"' |
778 | 778 | }).addTo(map); |
779 | 779 | <?php |
780 | - } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
780 | + } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
781 | 781 | ?> |
782 | 782 | var googleLayer = new L.Google('ROADMAP'); |
783 | 783 | map.addLayer(googleLayer); |
784 | 784 | <?php |
785 | - } elseif ($globalMapProvider == 'Google-Satellite') { |
|
785 | + } elseif ($globalMapProvider == 'Google-Satellite') { |
|
786 | 786 | ?> |
787 | 787 | var googleLayer = new L.Google('SATELLITE'); |
788 | 788 | map.addLayer(googleLayer); |
789 | 789 | <?php |
790 | - } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
790 | + } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
791 | 791 | ?> |
792 | 792 | var googleLayer = new L.Google('HYBRID'); |
793 | 793 | map.addLayer(googleLayer); |
794 | 794 | <?php |
795 | - } elseif ($globalMapProvider == 'Google-Terrain') { |
|
795 | + } elseif ($globalMapProvider == 'Google-Terrain') { |
|
796 | 796 | ?> |
797 | 797 | var googleLayer = new L.Google('Terrain'); |
798 | 798 | map.addLayer(googleLayer); |
799 | 799 | <?php |
800 | - } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
800 | + } elseif (isset($globalMapCustomLayer[$globalMapProvider])) { |
|
801 | 801 | $customid = $globalMapProvider; |
802 | 802 | ?> |
803 | 803 | L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', { |
@@ -807,8 +807,8 @@ discard block |
||
807 | 807 | attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
808 | 808 | }).addTo(map); |
809 | 809 | <?php |
810 | - //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
811 | - } else { |
|
810 | + //} elseif ($globalMapProvider == 'OpenStreetMap') { |
|
811 | + } else { |
|
812 | 812 | ?> |
813 | 813 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
814 | 814 | maxZoom: 18, |
@@ -817,7 +817,7 @@ discard block |
||
817 | 817 | }).addTo(map); |
818 | 818 | |
819 | 819 | <?php |
820 | - } |
|
820 | + } |
|
821 | 821 | ?> |
822 | 822 | </script> |
823 | 823 | </div> |