@@ -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'].'],'; |
@@ -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">'; |
@@ -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 | { |
@@ -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'].'],'; |
@@ -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['airport'])) { |
| 6 | - header('Location: '.$globalURL.'/airport'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/airport'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
| 10 | 10 | $Spotter = new Spotter(); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | function drawChart() { |
| 67 | 67 | var data = google.visualization.arrayToDataTable([ |
| 68 | 68 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
| 69 | - $hour_data = ''; |
|
| 69 | + $hour_data = ''; |
|
| 70 | 70 | foreach($hour_array as $hour_item) |
| 71 | 71 | { |
| 72 | 72 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
@@ -23,7 +23,9 @@ |
||
| 23 | 23 | print '<option></option>'; |
| 24 | 24 | $Stats = new Stats(); |
| 25 | 25 | $airport_names = $tats->getAllAirportNames(); |
| 26 | - if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
|
| 26 | + if (empty($airport_names)) { |
|
| 27 | + $airport_names = $Spotter->getAllAirportNames(); |
|
| 28 | + } |
|
| 27 | 29 | ksort($airport_names); |
| 28 | 30 | foreach($airport_names as $airport_name) |
| 29 | 31 | { |
@@ -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['aircraft_type'])) { |
| 6 | - header('Location: '.$globalURL.'/aircraft'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/aircraft'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | $aircraft_type = filter_input(FILTER_INPUT,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | function drawChart() { |
| 61 | 61 | var data = google.visualization.arrayToDataTable([ |
| 62 | 62 | ["'._("Country").'", "'._("# of times").'"], '; |
| 63 | - $country_data = ''; |
|
| 63 | + $country_data = ''; |
|
| 64 | 64 | foreach($airport_country_array as $airport_item) |
| 65 | 65 | { |
| 66 | 66 | $country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],'; |
@@ -23,7 +23,9 @@ |
||
| 23 | 23 | print '<option></option>'; |
| 24 | 24 | $Stats = new Stats(); |
| 25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 26 | + if (empty($aircraft_types)) { |
|
| 27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 28 | + } |
|
| 27 | 29 | foreach($aircraft_types as $aircrafttype) |
| 28 | 30 | { |
| 29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -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> |
@@ -5,55 +5,55 @@ discard block |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['start_date'])) { |
| 8 | - //for the date manipulation into the query |
|
| 9 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 10 | - $start_date = $_GET['start_date'].":00"; |
|
| 11 | - $end_date = $_GET['end_date'].":00"; |
|
| 12 | - $sql_date = $start_date.",".$end_date; |
|
| 13 | - } else if($_GET['start_date'] != ""){ |
|
| 14 | - $start_date = $_GET['start_date'].":00"; |
|
| 15 | - $sql_date = $start_date; |
|
| 16 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 17 | - $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
| 18 | - $sql_date = $end_date; |
|
| 19 | - } else $sql_date = ''; |
|
| 8 | + //for the date manipulation into the query |
|
| 9 | + if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 10 | + $start_date = $_GET['start_date'].":00"; |
|
| 11 | + $end_date = $_GET['end_date'].":00"; |
|
| 12 | + $sql_date = $start_date.",".$end_date; |
|
| 13 | + } else if($_GET['start_date'] != ""){ |
|
| 14 | + $start_date = $_GET['start_date'].":00"; |
|
| 15 | + $sql_date = $start_date; |
|
| 16 | + } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 17 | + $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
| 18 | + $sql_date = $end_date; |
|
| 19 | + } else $sql_date = ''; |
|
| 20 | 20 | } else $sql_date = ''; |
| 21 | 21 | |
| 22 | 22 | if (isset($_GET['highest_altitude'])) { |
| 23 | - //for altitude manipulation |
|
| 24 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 25 | - $end_altitude = $_GET['highest_altitude']; |
|
| 26 | - $start_altitude = $_GET['lowest_altitude']; |
|
| 27 | - $sql_altitude = $start_altitude.",".$end_altitude; |
|
| 28 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 29 | - $end_altitude = $_GET['highest_altitude']; |
|
| 30 | - $sql_altitude = $end_altitude; |
|
| 31 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 32 | - $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
| 33 | - $sql_altitude = $start_altitude; |
|
| 34 | - } else $sql_altitude = ''; |
|
| 23 | + //for altitude manipulation |
|
| 24 | + if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 25 | + $end_altitude = $_GET['highest_altitude']; |
|
| 26 | + $start_altitude = $_GET['lowest_altitude']; |
|
| 27 | + $sql_altitude = $start_altitude.",".$end_altitude; |
|
| 28 | + } else if($_GET['highest_altitude'] != ""){ |
|
| 29 | + $end_altitude = $_GET['highest_altitude']; |
|
| 30 | + $sql_altitude = $end_altitude; |
|
| 31 | + } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 32 | + $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
| 33 | + $sql_altitude = $start_altitude; |
|
| 34 | + } else $sql_altitude = ''; |
|
| 35 | 35 | } else $sql_altitude = ''; |
| 36 | 36 | |
| 37 | 37 | //calculuation for the pagination |
| 38 | 38 | if(!isset($_GET['limit'])) |
| 39 | 39 | { |
| 40 | - if (!isset($_GET['number_results'])) |
|
| 41 | - { |
|
| 42 | - $limit_start = 0; |
|
| 43 | - $limit_end = 25; |
|
| 44 | - $absolute_difference = 25; |
|
| 45 | - } else { |
|
| 46 | - if ($_GET['number_results'] > 1000){ |
|
| 47 | - $_GET['number_results'] = 1000; |
|
| 48 | - } |
|
| 49 | - $limit_start = 0; |
|
| 50 | - $limit_end = $_GET['number_results']; |
|
| 51 | - $absolute_difference = $_GET['number_results']; |
|
| 52 | - } |
|
| 40 | + if (!isset($_GET['number_results'])) |
|
| 41 | + { |
|
| 42 | + $limit_start = 0; |
|
| 43 | + $limit_end = 25; |
|
| 44 | + $absolute_difference = 25; |
|
| 45 | + } else { |
|
| 46 | + if ($_GET['number_results'] > 1000){ |
|
| 47 | + $_GET['number_results'] = 1000; |
|
| 48 | + } |
|
| 49 | + $limit_start = 0; |
|
| 50 | + $limit_end = $_GET['number_results']; |
|
| 51 | + $absolute_difference = $_GET['number_results']; |
|
| 52 | + } |
|
| 53 | 53 | } else { |
| 54 | - $limit_explode = explode(",", $_GET['limit']); |
|
| 55 | - $limit_start = $limit_explode[0]; |
|
| 56 | - $limit_end = $limit_explode[1]; |
|
| 54 | + $limit_explode = explode(",", $_GET['limit']); |
|
| 55 | + $limit_start = $limit_explode[0]; |
|
| 56 | + $limit_end = $limit_explode[1]; |
|
| 57 | 57 | } |
| 58 | 58 | $absolute_difference = abs($limit_start - $limit_end); |
| 59 | 59 | $limit_next = $limit_end + $absolute_difference; |
@@ -96,41 +96,41 @@ discard block |
||
| 96 | 96 | foreach($spotter_array as $spotter_item) |
| 97 | 97 | { |
| 98 | 98 | |
| 99 | - $output .= $spotter_item['spotter_id'].','; |
|
| 100 | - $output .= $spotter_item['ident'].','; |
|
| 101 | - $output .= $spotter_item['registration'].','; |
|
| 102 | - $output .= $spotter_item['aircraft_type'].','; |
|
| 103 | - $output .= $spotter_item['aircraft_name'].','; |
|
| 104 | - $output .= $spotter_item['aircraft_manufacturer'].','; |
|
| 105 | - $output .= $spotter_item['airline_name'].','; |
|
| 106 | - $output .= $spotter_item['airline_icao'].','; |
|
| 107 | - $output .= $spotter_item['airline_iata'].','; |
|
| 108 | - $output .= $spotter_item['airline_country'].','; |
|
| 109 | - $output .= $spotter_item['airline_callsign'].','; |
|
| 110 | - $output .= $spotter_item['airline_type'].','; |
|
| 111 | - $output .= $spotter_item['departure_airport_city'].','; |
|
| 112 | - $output .= $spotter_item['departure_airport_country'].','; |
|
| 113 | - $output .= $spotter_item['departure_airport_iata'].','; |
|
| 114 | - $output .= $spotter_item['departure_airport_icao'].','; |
|
| 115 | - $output .= $spotter_item['departure_airport_latitude'].','; |
|
| 116 | - $output .= $spotter_item['departure_airport_longitude'].','; |
|
| 117 | - $output .= $spotter_item['departure_airport_altitude'].','; |
|
| 118 | - $output .= $spotter_item['arrival_airport_city'].','; |
|
| 119 | - $output .= $spotter_item['arrival_airport_country'].','; |
|
| 120 | - $output .= $spotter_item['arrival_airport_iata'].','; |
|
| 121 | - $output .= $spotter_item['arrival_airport_icao'].','; |
|
| 122 | - $output .= $spotter_item['arrival_airport_latitude'].','; |
|
| 123 | - $output .= $spotter_item['arrival_airport_longitude'].','; |
|
| 124 | - $output .= $spotter_item['arrival_airport_altitude'].','; |
|
| 125 | - $output .= $spotter_item['latitude'].','; |
|
| 126 | - $output .= $spotter_item['longitude'].','; |
|
| 127 | - $output .= $spotter_item['altitude'].','; |
|
| 128 | - $output .= $spotter_item['ground_speed'].','; |
|
| 129 | - $output .= $spotter_item['heading'].','; |
|
| 130 | - $output .= $spotter_item['heading_name'].','; |
|
| 131 | - $output .= $spotter_item['waypoints'].','; |
|
| 132 | - $output .= date("c", strtotime($spotter_item['date_iso_8601'])); |
|
| 133 | - $output .= "\n"; |
|
| 99 | + $output .= $spotter_item['spotter_id'].','; |
|
| 100 | + $output .= $spotter_item['ident'].','; |
|
| 101 | + $output .= $spotter_item['registration'].','; |
|
| 102 | + $output .= $spotter_item['aircraft_type'].','; |
|
| 103 | + $output .= $spotter_item['aircraft_name'].','; |
|
| 104 | + $output .= $spotter_item['aircraft_manufacturer'].','; |
|
| 105 | + $output .= $spotter_item['airline_name'].','; |
|
| 106 | + $output .= $spotter_item['airline_icao'].','; |
|
| 107 | + $output .= $spotter_item['airline_iata'].','; |
|
| 108 | + $output .= $spotter_item['airline_country'].','; |
|
| 109 | + $output .= $spotter_item['airline_callsign'].','; |
|
| 110 | + $output .= $spotter_item['airline_type'].','; |
|
| 111 | + $output .= $spotter_item['departure_airport_city'].','; |
|
| 112 | + $output .= $spotter_item['departure_airport_country'].','; |
|
| 113 | + $output .= $spotter_item['departure_airport_iata'].','; |
|
| 114 | + $output .= $spotter_item['departure_airport_icao'].','; |
|
| 115 | + $output .= $spotter_item['departure_airport_latitude'].','; |
|
| 116 | + $output .= $spotter_item['departure_airport_longitude'].','; |
|
| 117 | + $output .= $spotter_item['departure_airport_altitude'].','; |
|
| 118 | + $output .= $spotter_item['arrival_airport_city'].','; |
|
| 119 | + $output .= $spotter_item['arrival_airport_country'].','; |
|
| 120 | + $output .= $spotter_item['arrival_airport_iata'].','; |
|
| 121 | + $output .= $spotter_item['arrival_airport_icao'].','; |
|
| 122 | + $output .= $spotter_item['arrival_airport_latitude'].','; |
|
| 123 | + $output .= $spotter_item['arrival_airport_longitude'].','; |
|
| 124 | + $output .= $spotter_item['arrival_airport_altitude'].','; |
|
| 125 | + $output .= $spotter_item['latitude'].','; |
|
| 126 | + $output .= $spotter_item['longitude'].','; |
|
| 127 | + $output .= $spotter_item['altitude'].','; |
|
| 128 | + $output .= $spotter_item['ground_speed'].','; |
|
| 129 | + $output .= $spotter_item['heading'].','; |
|
| 130 | + $output .= $spotter_item['heading_name'].','; |
|
| 131 | + $output .= $spotter_item['waypoints'].','; |
|
| 132 | + $output .= date("c", strtotime($spotter_item['date_iso_8601'])); |
|
| 133 | + $output .= "\n"; |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -67,8 +75,11 @@ discard block |
||
| 67 | 75 | |
| 68 | 76 | header("Content-type: text/yaml"); |
| 69 | 77 | |
| 70 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 71 | -else $sort = ''; |
|
| 78 | +if (isset($_GET['sort'])) { |
|
| 79 | + $sort = $_GET['sort']; |
|
| 80 | +} else { |
|
| 81 | + $sort = ''; |
|
| 82 | +} |
|
| 72 | 83 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 73 | 84 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 74 | 85 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -5,8 +5,11 @@ |
||
| 5 | 5 | |
| 6 | 6 | $Spotter = new Spotter(); |
| 7 | 7 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
| 8 | -if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort); |
|
| 9 | -else $spotter_array = ''; |
|
| 8 | +if (isset($_GET['date'])) { |
|
| 9 | + $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort); |
|
| 10 | +} else { |
|
| 11 | + $spotter_array = ''; |
|
| 12 | +} |
|
| 10 | 13 | |
| 11 | 14 | if (!empty($spotter_array)) |
| 12 | 15 | { |