@@ -14,7 +14,7 @@ |
||
14 | 14 | $limit_start = 0; |
15 | 15 | $limit_end = 25; |
16 | 16 | $absolute_difference = 25; |
17 | - } else { |
|
17 | + } else { |
|
18 | 18 | $limit_explode = explode(",", $_GET['limit']); |
19 | 19 | $limit_start = $limit_explode[0]; |
20 | 20 | $limit_end = $limit_explode[1]; |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['country'])) { |
6 | - header('Location: '.$globalURL.'/country'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/country'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | function drawChart() { |
62 | 62 | var data = google.visualization.arrayToDataTable([ |
63 | 63 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
64 | - $hour_data = ''; |
|
64 | + $hour_data = ''; |
|
65 | 65 | foreach($hour_array as $hour_item) |
66 | 66 | { |
67 | 67 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['country'])) { |
6 | - header('Location: '.$globalURL.'/country'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/country'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | $limit_start = 0; |
13 | 13 | $limit_end = 25; |
14 | 14 | $absolute_difference = 25; |
15 | -} else { |
|
15 | +} else { |
|
16 | 16 | $limit_explode = explode(",", $_GET['limit']); |
17 | 17 | $limit_start = $limit_explode[0]; |
18 | 18 | $limit_end = $limit_explode[1]; |
@@ -41,7 +41,9 @@ discard block |
||
41 | 41 | { |
42 | 42 | if (isset($globalTimezone)) { |
43 | 43 | date_default_timezone_set($globalTimezone); |
44 | - } else date_default_timezone_set('UTC'); |
|
44 | + } else { |
|
45 | + date_default_timezone_set('UTC'); |
|
46 | + } |
|
45 | 47 | print '<tr>'; |
46 | 48 | if (isset($_GET['image']) && $_GET['image'] == "true") |
47 | 49 | { |
@@ -98,10 +100,14 @@ discard block |
||
98 | 100 | print '</div>'; |
99 | 101 | print '<div class="other2">'; |
100 | 102 | print '<span><i class="fa fa-arrow-up"></i> '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country']; |
101 | - if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') print ' ('.$spotter_item['departure_airport_time'].')'; |
|
103 | + if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') { |
|
104 | + print ' ('.$spotter_item['departure_airport_time'].')'; |
|
105 | + } |
|
102 | 106 | print '</span>'; |
103 | 107 | print '<span><i class="fa fa-arrow-down"></i> '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country']; |
104 | - if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') print ' ('.$spotter_item['arrival_airport_time'].')'; |
|
108 | + if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != '') { |
|
109 | + print ' ('.$spotter_item['arrival_airport_time'].')'; |
|
110 | + } |
|
105 | 111 | print '</span>'; |
106 | 112 | print '</div>'; |
107 | 113 | print '<div class="other3">'; |
@@ -62,7 +62,7 @@ |
||
62 | 62 | function drawChart6() { |
63 | 63 | var data = google.visualization.arrayToDataTable([ |
64 | 64 | ["Hour","Altitude","Speed"], '; |
65 | - $altitude_data = ''; |
|
65 | + $altitude_data = ''; |
|
66 | 66 | foreach($all_data as $data) |
67 | 67 | { |
68 | 68 | $altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],'; |
@@ -51,7 +51,9 @@ discard block |
||
51 | 51 | |
52 | 52 | if (isset($globalTimezone)) { |
53 | 53 | date_default_timezone_set($globalTimezone); |
54 | - } else date_default_timezone_set('UTC'); |
|
54 | + } else { |
|
55 | + date_default_timezone_set('UTC'); |
|
56 | + } |
|
55 | 57 | |
56 | 58 | //date_default_timezone_set('UTC'); |
57 | 59 | if (is_array($all_data) && count($all_data) > 0) { |
@@ -300,9 +302,13 @@ discard block |
||
300 | 302 | print '<div>'; |
301 | 303 | if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "") |
302 | 304 | { |
303 | - if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>'; |
|
304 | - elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>'; |
|
305 | - else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')'; |
|
305 | + if ($spotter_item['format_source'] == 'whazzup') { |
|
306 | + print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>'; |
|
307 | + } elseif ($spotter_item['format_source'] == 'vatsimtxt') { |
|
308 | + print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>'; |
|
309 | + } else { |
|
310 | + print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')'; |
|
311 | + } |
|
306 | 312 | } else { |
307 | 313 | if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "") |
308 | 314 | { |
@@ -8,7 +8,9 @@ |
||
8 | 8 | if ($registration != '') { |
9 | 9 | $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort); |
10 | 10 | $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration); |
11 | -} else $spotter_array=array(); |
|
11 | +} else { |
|
12 | + $spotter_array=array(); |
|
13 | +} |
|
12 | 14 | |
13 | 15 | |
14 | 16 | if (!empty($spotter_array)) |
@@ -89,7 +89,7 @@ |
||
89 | 89 | function drawChart6() { |
90 | 90 | var data = google.visualization.arrayToDataTable([ |
91 | 91 | ["Hour","'._("Altitude").'","'._("Speed").'"], '; |
92 | - $altitude_data = ''; |
|
92 | + $altitude_data = ''; |
|
93 | 93 | foreach($all_data as $data) |
94 | 94 | { |
95 | 95 | $altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],'; |
@@ -71,8 +71,12 @@ discard block |
||
71 | 71 | { |
72 | 72 | $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']); |
73 | 73 | $ident = $spotter_array[0]['ident']; |
74 | - if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
|
75 | - if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
|
74 | + if (isset($spotter_array[0]['latitude'])) { |
|
75 | + $latitude = $spotter_array[0]['latitude']; |
|
76 | + } |
|
77 | + if (isset($spotter_array[0]['longitude'])) { |
|
78 | + $longitude = $spotter_array[0]['longitude']; |
|
79 | + } |
|
76 | 80 | require_once('header.php'); |
77 | 81 | if (isset($globalArchive) && $globalArchive) { |
78 | 82 | // Requirement for altitude graph |
@@ -80,7 +84,9 @@ discard block |
||
80 | 84 | $all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']); |
81 | 85 | if (isset($globalTimezone)) { |
82 | 86 | date_default_timezone_set($globalTimezone); |
83 | - } else date_default_timezone_set('UTC'); |
|
87 | + } else { |
|
88 | + date_default_timezone_set('UTC'); |
|
89 | + } |
|
84 | 90 | if (count($all_data) > 0) { |
85 | 91 | print '<div id="chart6" class="chart" width="100%"></div> |
86 | 92 | <script> |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <div class="info column"> |
12 | 12 | <h1>About <?php print $globalName; ?></h1> |
13 | 13 | <?php |
14 | - if ($globalName == 'FlightAirMap') { |
|
14 | + if ($globalName == 'FlightAirMap') { |
|
15 | 15 | ?> |
16 | 16 | <p>This is an open source project displaying <u>most</u> (mostly <a href="http://en.wikipedia.org/wiki/Instrument_flight_rules" target="_blank">IFR</a>) flights that have flown near this site area. |
17 | 17 | <?php if ($globalADSBHUB) { ?> Some ADS-B sources come from <a href="http://www.adsbhub.net">ADSBHUB.net</a>.<?php } ?> |
@@ -27,18 +27,18 @@ discard block |
||
27 | 27 | |
28 | 28 | <br /><br /> |
29 | 29 | <?php |
30 | - } else { |
|
30 | + } else { |
|
31 | 31 | ?> |
32 | 32 | <p>This project use <a href="http://www.flightairmap.fr/">FlightAirMap</a> (<a href="https://github.com/Ysurac/FlightAirMap/">source</a>) by Ycarus from <a href="http://www.zugaina.com/">Zugaina</a>.</p> |
33 | 33 | <?php |
34 | - } |
|
34 | + } |
|
35 | 35 | ?> |
36 | 36 | <a name="source"></a> |
37 | 37 | <h3>Source & Credits</h3> |
38 | 38 | |
39 | 39 | <?php |
40 | 40 | if ($globalFlightAware) { |
41 | - ?> |
|
41 | + ?> |
|
42 | 42 | <p>The data from FlightAware is coming from multiple sources. Not every aircraft is tracked on FlightAware, especially not older aircrafts as well as government aircrafts, however most modern airliners will work. You can learn more about how it works on <a href="http://flightaware.com/adsb/" target="_blank">FlightAware's ADS-B</a> page. Also, not every aircraft is shown to have flown exactly at that minute as seen on this site (aka real-time). There is a 5 minute delay on some of the sources.</p> |
43 | 43 | <?php } ?> |
44 | 44 | <p>None of this project would have been possible without the help and contributions of these organizations and people:</p> |