|
@@ -14,35 +14,35 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |