@@ -13,31 +13,31 @@ discard block |
||
13 | 13 | |
14 | 14 | |
15 | 15 | if (isset($_GET['3d'])) { |
16 | - setcookie('MapFormat','3d'); |
|
16 | + setcookie('MapFormat', '3d'); |
|
17 | 17 | } else if (isset($_GET['2d'])) { |
18 | - setcookie('MapFormat','2d'); |
|
18 | + setcookie('MapFormat', '2d'); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | if (isset($_POST['archive'])) { |
22 | - setcookie('archive','true'); |
|
23 | - setcookie('archive_begin',strtotime($_POST['start_date'])); |
|
24 | - setcookie('archive_end',strtotime($_POST['end_date'])); |
|
25 | - setcookie('archive_speed',$_POST['archivespeed']); |
|
22 | + setcookie('archive', 'true'); |
|
23 | + setcookie('archive_begin', strtotime($_POST['start_date'])); |
|
24 | + setcookie('archive_end', strtotime($_POST['end_date'])); |
|
25 | + setcookie('archive_speed', $_POST['archivespeed']); |
|
26 | 26 | } |
27 | 27 | if (isset($_POST['noarchive'])) { |
28 | - setcookie('archive','false',-1); |
|
29 | - setcookie('archive_begin','',-1); |
|
30 | - setcookie('archive_end','',-1); |
|
31 | - setcookie('archive_speed','',-1); |
|
28 | + setcookie('archive', 'false', -1); |
|
29 | + setcookie('archive_begin', '', -1); |
|
30 | + setcookie('archive_end', '', -1); |
|
31 | + setcookie('archive_speed', '', -1); |
|
32 | 32 | } |
33 | 33 | // When button "Remove all filters" is clicked |
34 | 34 | if (isset($_POST['removefilters'])) { |
35 | - $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
|
36 | - return strpos($key,'filter_') === 0; |
|
35 | + $allfilters = array_filter(array_keys($_COOKIE), function($key) { |
|
36 | + return strpos($key, 'filter_') === 0; |
|
37 | 37 | }); |
38 | 38 | foreach ($allfilters as $filt) { |
39 | 39 | unset($_COOKIE[$filt]); |
40 | - setcookie($filt,null,-1); |
|
40 | + setcookie($filt, null, -1); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | ?> |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
242 | 242 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
243 | 243 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
244 | -<script 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> |
|
244 | +<script 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> |
|
245 | 245 | <?php |
246 | 246 | if (!isset($type) || $type == 'aircraft') { |
247 | 247 | ?> |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
315 | 315 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
316 | 316 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
317 | -<script 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> |
|
317 | +<script 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> |
|
318 | 318 | <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script> |
319 | 319 | <?php |
320 | 320 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
@@ -678,8 +678,8 @@ discard block |
||
678 | 678 | ?> |
679 | 679 | <div class="search"> |
680 | 680 | <form action="<?php print $globalURL; ?>/search" method="get"> |
681 | - <!--<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>--> |
|
682 | - <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> |
|
681 | + <!--<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>--> |
|
682 | + <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> |
|
683 | 683 | </form> |
684 | 684 | </div> |
685 | 685 | <div class="social"> |
@@ -697,7 +697,7 @@ discard block |
||
697 | 697 | print '</div>'; |
698 | 698 | } |
699 | 699 | |
700 | -if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
700 | +if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
701 | 701 | ?> |
702 | 702 | <div class="top-header clear" role="main"> |
703 | 703 | <?php |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | </div> |
711 | 711 | <?php |
712 | 712 | } |
713 | -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)) |
|
713 | +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)) |
|
714 | 714 | { |
715 | 715 | ?> |
716 | 716 | <div class="top-header clear" role="main"> |
@@ -723,15 +723,15 @@ discard block |
||
723 | 723 | var zoom = 13; |
724 | 724 | //create the map |
725 | 725 | <?php |
726 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
726 | + if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
727 | 727 | ?> |
728 | 728 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
729 | 729 | <?php |
730 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
730 | + } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) { |
|
731 | 731 | ?> |
732 | 732 | map = L.map('map', { zoomControl:true }); |
733 | 733 | <?php |
734 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
734 | + } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
735 | 735 | ?> |
736 | 736 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
737 | 737 | 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); |
@@ -739,7 +739,7 @@ discard block |
||
739 | 739 | 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); |
740 | 740 | 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); |
741 | 741 | <?php |
742 | - } 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'])) { |
|
742 | + } 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'])) { |
|
743 | 743 | ?> |
744 | 744 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
745 | 745 | <?php |