Ysurac /
FlightAirMap
@@ -3,16 +3,16 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | -$sort=filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 7 | -$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING); |
|
| 6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 7 | +$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING); |
|
| 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 $spotter_array = array(); |
|
| 12 | 12 | |
| 13 | 13 | if (!empty($spotter_array)) |
| 14 | 14 | { |
| 15 | - $title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"),$registration); |
|
| 15 | + $title = sprintf(_("Most Common Arrival Airports of aircraft with registration %s"), $registration); |
|
| 16 | 16 | |
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | print '<div class="info column">'; |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | include('registration-sub-menu.php'); |
| 26 | 26 | print '<div class="column">'; |
| 27 | 27 | print '<h2>'._("Most Common Arrival Airports").'</h2>'; |
| 28 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>'; |
|
| 28 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>'; |
|
| 29 | 29 | $airport_airport_array = $Spotter->countAllArrivalAirportsByRegistration($registration); |
| 30 | 30 | print '<script type="text/javascript" src="https://www.google.com/jsapi"></script> |
| 31 | 31 | <script> |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | ["'._("Airport").'", "'._("# of times").'"],'; |
| 41 | 41 | |
| 42 | 42 | $airport_data = ''; |
| 43 | - foreach($airport_airport_array as $airport_item) |
|
| 43 | + foreach ($airport_airport_array as $airport_item) |
|
| 44 | 44 | { |
| 45 | 45 | $name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')'; |
| 46 | 46 | $name = str_replace("'", "", $name); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | print '</thead>'; |
| 79 | 79 | print '<tbody>'; |
| 80 | 80 | $i = 1; |
| 81 | - foreach($airport_airport_array as $airport_item) |
|
| 81 | + foreach ($airport_airport_array as $airport_item) |
|
| 82 | 82 | { |
| 83 | 83 | print '<tr>'; |
| 84 | 84 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 13 | 13 | |
| 14 | 14 | $spotter_array = $Spotter->getAllFlightsforSitemap(); |
| 15 | - foreach($spotter_array as $spotter_item) |
|
| 15 | + foreach ($spotter_array as $spotter_item) |
|
| 16 | 16 | { |
| 17 | 17 | $output .= '<url>'; |
| 18 | 18 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
@@ -23,13 +23,13 @@ discard block |
||
| 23 | 23 | $output .= '</urlset>'; |
| 24 | 24 | |
| 25 | 25 | |
| 26 | -} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){ |
|
| 26 | +} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") { |
|
| 27 | 27 | |
| 28 | 28 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 29 | 29 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 30 | 30 | |
| 31 | 31 | $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 32 | - foreach($aircraft_types as $aircraft_item) |
|
| 32 | + foreach ($aircraft_types as $aircraft_item) |
|
| 33 | 33 | { |
| 34 | 34 | $output .= '<url>'; |
| 35 | 35 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.$aircraft_item['aircraft_icao'].'</loc>'; |
@@ -40,13 +40,13 @@ discard block |
||
| 40 | 40 | $output .= '</urlset>'; |
| 41 | 41 | |
| 42 | 42 | |
| 43 | -} else if (isset($_GET['type']) && $_GET['type'] == "registration"){ |
|
| 43 | +} else if (isset($_GET['type']) && $_GET['type'] == "registration") { |
|
| 44 | 44 | |
| 45 | 45 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 46 | 46 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 47 | 47 | |
| 48 | 48 | $aircraft_registrations = $Spotter->getAllAircraftRegistrations(); |
| 49 | - foreach($aircraft_registrations as $aircraft_item) |
|
| 49 | + foreach ($aircraft_registrations as $aircraft_item) |
|
| 50 | 50 | { |
| 51 | 51 | $output .= '<url>'; |
| 52 | 52 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.$aircraft_item['registration'].'</loc>'; |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | $output .= '</urlset>'; |
| 58 | 58 | |
| 59 | -} else if (isset($_GET['type']) && $_GET['type'] == "airline"){ |
|
| 59 | +} else if (isset($_GET['type']) && $_GET['type'] == "airline") { |
|
| 60 | 60 | |
| 61 | 61 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 62 | 62 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 63 | 63 | |
| 64 | 64 | $airline_names = $Spotter->getAllAirlineNames(); |
| 65 | - foreach($airline_names as $airline_item) |
|
| 65 | + foreach ($airline_names as $airline_item) |
|
| 66 | 66 | { |
| 67 | 67 | $output .= '<url>'; |
| 68 | 68 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.$airline_item['airline_icao'].'</loc>'; |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | $output .= '</urlset>'; |
| 74 | 74 | |
| 75 | -} else if (isset($_GET['type']) && $_GET['type'] == "airport"){ |
|
| 75 | +} else if (isset($_GET['type']) && $_GET['type'] == "airport") { |
|
| 76 | 76 | |
| 77 | 77 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 78 | 78 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 79 | 79 | |
| 80 | 80 | $airport_names = $Spotter->getAllAirportNames(); |
| 81 | - foreach($airport_names as $airport_item) |
|
| 81 | + foreach ($airport_names as $airport_item) |
|
| 82 | 82 | { |
| 83 | 83 | $output .= '<url>'; |
| 84 | 84 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | $output .= '</urlset>'; |
| 90 | 90 | |
| 91 | -} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){ |
|
| 91 | +} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") { |
|
| 92 | 92 | |
| 93 | 93 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 94 | 94 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 95 | 95 | |
| 96 | 96 | $manufacturer_names = $Spotter->getAllManufacturers(); |
| 97 | - foreach($manufacturer_names as $manufacturer_item) |
|
| 97 | + foreach ($manufacturer_names as $manufacturer_item) |
|
| 98 | 98 | { |
| 99 | 99 | $output .= '<url>'; |
| 100 | 100 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer'])).'</loc>'; |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | $output .= '</urlset>'; |
| 106 | 106 | |
| 107 | -} else if (isset($_GET['type']) && $_GET['type'] == "country"){ |
|
| 107 | +} else if (isset($_GET['type']) && $_GET['type'] == "country") { |
|
| 108 | 108 | |
| 109 | 109 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 110 | 110 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 111 | 111 | |
| 112 | 112 | $country_names = $Spotter->getAllCountries(); |
| 113 | - foreach($country_names as $country_item) |
|
| 113 | + foreach ($country_names as $country_item) |
|
| 114 | 114 | { |
| 115 | 115 | $output .= '<url>'; |
| 116 | 116 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.strtolower(str_replace(" ", "-", $country_item['country'])).'</loc>'; |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | $output .= '</urlset>'; |
| 122 | 122 | |
| 123 | -} else if (isset($_GET['type']) && $_GET['type'] == "ident"){ |
|
| 123 | +} else if (isset($_GET['type']) && $_GET['type'] == "ident") { |
|
| 124 | 124 | |
| 125 | 125 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 126 | 126 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 127 | 127 | |
| 128 | 128 | $ident_names = $Spotter->getAllIdents(); |
| 129 | - foreach($ident_names as $ident_item) |
|
| 129 | + foreach ($ident_names as $ident_item) |
|
| 130 | 130 | { |
| 131 | 131 | if (ctype_alnum($ident_item['ident'])) { |
| 132 | 132 | $output .= '<url>'; |
@@ -138,13 +138,13 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | $output .= '</urlset>'; |
| 140 | 140 | |
| 141 | -} else if (isset($_GET['type']) && $_GET['type'] == "date"){ |
|
| 141 | +} else if (isset($_GET['type']) && $_GET['type'] == "date") { |
|
| 142 | 142 | |
| 143 | 143 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 144 | 144 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 145 | 145 | |
| 146 | 146 | $date_names = $Spotter->getAllDates(); |
| 147 | - foreach($date_names as $date_item) |
|
| 147 | + foreach ($date_names as $date_item) |
|
| 148 | 148 | { |
| 149 | 149 | $output .= '<url>'; |
| 150 | 150 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
@@ -154,13 +154,13 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | $output .= '</urlset>'; |
| 156 | 156 | |
| 157 | -} else if (isset($_GET['type']) && $_GET['type'] == "route"){ |
|
| 157 | +} else if (isset($_GET['type']) && $_GET['type'] == "route") { |
|
| 158 | 158 | |
| 159 | 159 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 160 | 160 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 161 | 161 | |
| 162 | 162 | $route_names = $Spotter->getAllRoutes(); |
| 163 | - foreach($route_names as $route_item) |
|
| 163 | + foreach ($route_names as $route_item) |
|
| 164 | 164 | { |
| 165 | 165 | $output .= '<url>'; |
| 166 | 166 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | $output .= '</urlset>'; |
| 172 | 172 | |
| 173 | -} else if (isset($_GET['type']) && $_GET['type'] == "static"){ |
|
| 173 | +} else if (isset($_GET['type']) && $_GET['type'] == "static") { |
|
| 174 | 174 | |
| 175 | 175 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 176 | 176 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | if (isset($_GET['start_date'])) { |
| 7 | 7 | //for the date manipulation into the query |
| 8 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 8 | + if ($_GET['start_date'] != "" && $_GET['end_date'] != "") { |
|
| 9 | 9 | $start_date = $_GET['start_date'].":00"; |
| 10 | 10 | $end_date = $_GET['end_date'].":00"; |
| 11 | 11 | $sql_date = $start_date.",".$end_date; |
| 12 | - } else if($_GET['start_date'] != ""){ |
|
| 12 | + } else if ($_GET['start_date'] != "") { |
|
| 13 | 13 | $start_date = $_GET['start_date'].":00"; |
| 14 | 14 | $sql_date = $start_date; |
| 15 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 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 | 18 | } else $sql_date = ''; |
@@ -20,21 +20,21 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | if (isset($_GET['highest_altitude'])) { |
| 22 | 22 | //for altitude manipulation |
| 23 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 23 | + if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") { |
|
| 24 | 24 | $end_altitude = $_GET['highest_altitude']; |
| 25 | 25 | $start_altitude = $_GET['lowest_altitude']; |
| 26 | 26 | $sql_altitude = $start_altitude.",".$end_altitude; |
| 27 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 27 | + } else if ($_GET['highest_altitude'] != "") { |
|
| 28 | 28 | $end_altitude = $_GET['highest_altitude']; |
| 29 | 29 | $sql_altitude = $end_altitude; |
| 30 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 30 | + } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") { |
|
| 31 | 31 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 32 | $sql_altitude = $start_altitude; |
| 33 | 33 | } else $sql_altitude = ''; |
| 34 | 34 | } else $sql_altitude = ''; |
| 35 | 35 | |
| 36 | 36 | //calculuation for the pagination |
| 37 | -if(!isset($_GET['limit'])) |
|
| 37 | +if (!isset($_GET['limit'])) |
|
| 38 | 38 | { |
| 39 | 39 | if (!isset($_GET['number_results'])) |
| 40 | 40 | { |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | $limit_end = 25; |
| 43 | 43 | $absolute_difference = 25; |
| 44 | 44 | } else { |
| 45 | - if ($_GET['number_results'] > 1000){ |
|
| 45 | + if ($_GET['number_results'] > 1000) { |
|
| 46 | 46 | $_GET['number_results'] = 1000; |
| 47 | 47 | } |
| 48 | 48 | $limit_start = 0; |
| 49 | 49 | $limit_end = $_GET['number_results']; |
| 50 | 50 | $absolute_difference = $_GET['number_results']; |
| 51 | 51 | } |
| 52 | -} else { |
|
| 52 | +} else { |
|
| 53 | 53 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 54 | $limit_start = $limit_explode[0]; |
| 55 | 55 | $limit_end = $limit_explode[1]; |
@@ -69,29 +69,29 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | if (isset($_GET['sort'])) $sort = $_GET['sort']; |
| 71 | 71 | else $sort = ''; |
| 72 | -$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
|
| 73 | -$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
|
| 74 | -$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
|
| 75 | -$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING); |
|
| 76 | -$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING); |
|
| 77 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 78 | -$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING); |
|
| 79 | -$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING); |
|
| 80 | -$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
|
| 81 | -$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING); |
|
| 82 | -$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING); |
|
| 83 | -$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING); |
|
| 84 | -$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING); |
|
| 85 | -$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING); |
|
| 86 | -$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING); |
|
| 87 | -$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING); |
|
| 88 | -$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,''); |
|
| 72 | +$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 73 | +$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING); |
|
| 74 | +$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING); |
|
| 75 | +$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING); |
|
| 76 | +$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING); |
|
| 77 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 78 | +$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING); |
|
| 79 | +$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 80 | +$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 81 | +$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING); |
|
| 82 | +$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING); |
|
| 83 | +$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 84 | +$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING); |
|
| 85 | +$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING); |
|
| 86 | +$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING); |
|
| 87 | +$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING); |
|
| 88 | +$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, ''); |
|
| 89 | 89 | |
| 90 | 90 | $output = "-flights:\n"; |
| 91 | 91 | |
| 92 | 92 | if (!empty($spotter_array)) |
| 93 | 93 | { |
| 94 | - foreach($spotter_array as $spotter_item) |
|
| 94 | + foreach ($spotter_array as $spotter_item) |
|
| 95 | 95 | { |
| 96 | 96 | |
| 97 | 97 | $output .= ' - id: '.$spotter_item['spotter_id']; |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | if (isset($_GET['start_date'])) { |
| 7 | 7 | //for the date manipulation into the query |
| 8 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 8 | + if ($_GET['start_date'] != "" && $_GET['end_date'] != "") { |
|
| 9 | 9 | $start_date = $_GET['start_date'].":00"; |
| 10 | 10 | $end_date = $_GET['end_date'].":00"; |
| 11 | 11 | $sql_date = $start_date.",".$end_date; |
| 12 | - } else if($_GET['start_date'] != ""){ |
|
| 12 | + } else if ($_GET['start_date'] != "") { |
|
| 13 | 13 | $start_date = $_GET['start_date'].":00"; |
| 14 | 14 | $sql_date = $start_date; |
| 15 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 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 | 18 | } else $sql_date = ''; |
@@ -20,21 +20,21 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | if (isset($_GET['highest_altitude'])) { |
| 22 | 22 | //for altitude manipulation |
| 23 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 23 | + if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") { |
|
| 24 | 24 | $end_altitude = $_GET['highest_altitude']; |
| 25 | 25 | $start_altitude = $_GET['lowest_altitude']; |
| 26 | 26 | $sql_altitude = $start_altitude.",".$end_altitude; |
| 27 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 27 | + } else if ($_GET['highest_altitude'] != "") { |
|
| 28 | 28 | $end_altitude = $_GET['highest_altitude']; |
| 29 | 29 | $sql_altitude = $end_altitude; |
| 30 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 30 | + } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") { |
|
| 31 | 31 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 32 | $sql_altitude = $start_altitude; |
| 33 | 33 | } else $sql_altitude = ''; |
| 34 | 34 | } else $sql_altitude = ''; |
| 35 | 35 | |
| 36 | 36 | //calculuation for the pagination |
| 37 | -if(!isset($_GET['limit'])) |
|
| 37 | +if (!isset($_GET['limit'])) |
|
| 38 | 38 | { |
| 39 | 39 | if (!isset($_GET['number_results'])) |
| 40 | 40 | { |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | $limit_end = 25; |
| 43 | 43 | $absolute_difference = 25; |
| 44 | 44 | } else { |
| 45 | - if ($_GET['number_results'] > 1000){ |
|
| 45 | + if ($_GET['number_results'] > 1000) { |
|
| 46 | 46 | $_GET['number_results'] = 1000; |
| 47 | 47 | } |
| 48 | 48 | $limit_start = 0; |
| 49 | 49 | $limit_end = $_GET['number_results']; |
| 50 | 50 | $absolute_difference = $_GET['number_results']; |
| 51 | 51 | } |
| 52 | -} else { |
|
| 52 | +} else { |
|
| 53 | 53 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 54 | $limit_start = $limit_explode[0]; |
| 55 | 55 | $limit_end = $limit_explode[1]; |
@@ -69,30 +69,30 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | if (isset($_GET['sort'])) $sort = $_GET['sort']; |
| 71 | 71 | else $sort = ''; |
| 72 | -$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
|
| 73 | -$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
|
| 74 | -$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
|
| 75 | -$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING); |
|
| 76 | -$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING); |
|
| 77 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 78 | -$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING); |
|
| 79 | -$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING); |
|
| 80 | -$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
|
| 81 | -$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING); |
|
| 82 | -$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING); |
|
| 83 | -$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING); |
|
| 84 | -$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING); |
|
| 85 | -$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING); |
|
| 86 | -$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING); |
|
| 87 | -$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING); |
|
| 88 | -$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,''); |
|
| 72 | +$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 73 | +$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING); |
|
| 74 | +$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING); |
|
| 75 | +$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING); |
|
| 76 | +$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING); |
|
| 77 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 78 | +$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING); |
|
| 79 | +$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 80 | +$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 81 | +$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING); |
|
| 82 | +$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING); |
|
| 83 | +$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 84 | +$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING); |
|
| 85 | +$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING); |
|
| 86 | +$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING); |
|
| 87 | +$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING); |
|
| 88 | +$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, ''); |
|
| 89 | 89 | |
| 90 | 90 | $i = 1; |
| 91 | 91 | //$output .= "oid;Line\n"; |
| 92 | 92 | $output = ''; |
| 93 | 93 | if (!empty($spotter_array)) |
| 94 | 94 | { |
| 95 | - foreach($spotter_array as $spotter_item) |
|
| 95 | + foreach ($spotter_array as $spotter_item) |
|
| 96 | 96 | { |
| 97 | 97 | if ($spotter_item['waypoints'] != '') { |
| 98 | 98 | $waypoint_pieces = explode(' ', $spotter_item['waypoints']); |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | if (isset($_GET['start_date'])) { |
| 7 | 7 | //for the date manipulation into the query |
| 8 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 8 | + if ($_GET['start_date'] != "" && $_GET['end_date'] != "") { |
|
| 9 | 9 | $start_date = $_GET['start_date'].":00"; |
| 10 | 10 | $end_date = $_GET['end_date'].":00"; |
| 11 | 11 | $sql_date = $start_date.",".$end_date; |
| 12 | - } else if($_GET['start_date'] != ""){ |
|
| 12 | + } else if ($_GET['start_date'] != "") { |
|
| 13 | 13 | $start_date = $_GET['start_date'].":00"; |
| 14 | 14 | $sql_date = $start_date; |
| 15 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 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 | 18 | } else $sql_date = ''; |
@@ -20,21 +20,21 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | if (isset($_GET['highest_altitude'])) { |
| 22 | 22 | //for altitude manipulation |
| 23 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 23 | + if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") { |
|
| 24 | 24 | $end_altitude = $_GET['highest_altitude']; |
| 25 | 25 | $start_altitude = $_GET['lowest_altitude']; |
| 26 | 26 | $sql_altitude = $start_altitude.",".$end_altitude; |
| 27 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 27 | + } else if ($_GET['highest_altitude'] != "") { |
|
| 28 | 28 | $end_altitude = $_GET['highest_altitude']; |
| 29 | 29 | $sql_altitude = $end_altitude; |
| 30 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 30 | + } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") { |
|
| 31 | 31 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 32 | $sql_altitude = $start_altitude; |
| 33 | 33 | } else $sql_altitude = ''; |
| 34 | 34 | } else $sql_altitude = ''; |
| 35 | 35 | |
| 36 | 36 | //calculuation for the pagination |
| 37 | -if(!isset($_GET['limit'])) |
|
| 37 | +if (!isset($_GET['limit'])) |
|
| 38 | 38 | { |
| 39 | 39 | if (!isset($_GET['number_results'])) |
| 40 | 40 | { |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | $limit_end = 25; |
| 43 | 43 | $absolute_difference = 25; |
| 44 | 44 | } else { |
| 45 | - if ($_GET['number_results'] > 1000){ |
|
| 45 | + if ($_GET['number_results'] > 1000) { |
|
| 46 | 46 | $_GET['number_results'] = 1000; |
| 47 | 47 | } |
| 48 | 48 | $limit_start = 0; |
| 49 | 49 | $limit_end = $_GET['number_results']; |
| 50 | 50 | $absolute_difference = $_GET['number_results']; |
| 51 | 51 | } |
| 52 | -} else { |
|
| 52 | +} else { |
|
| 53 | 53 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 54 | $limit_start = $limit_explode[0]; |
| 55 | 55 | $limit_end = $limit_explode[1]; |
@@ -69,23 +69,23 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | if (isset($_GET['sort'])) $sort = $_GET['sort']; |
| 71 | 71 | else $sort = ''; |
| 72 | -$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
|
| 73 | -$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
|
| 74 | -$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
|
| 75 | -$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING); |
|
| 76 | -$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING); |
|
| 77 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 78 | -$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING); |
|
| 79 | -$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING); |
|
| 80 | -$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
|
| 81 | -$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING); |
|
| 82 | -$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING); |
|
| 83 | -$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING); |
|
| 84 | -$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING); |
|
| 85 | -$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING); |
|
| 86 | -$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING); |
|
| 87 | -$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING); |
|
| 88 | -$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,''); |
|
| 72 | +$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 73 | +$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING); |
|
| 74 | +$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING); |
|
| 75 | +$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING); |
|
| 76 | +$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING); |
|
| 77 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 78 | +$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING); |
|
| 79 | +$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 80 | +$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 81 | +$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING); |
|
| 82 | +$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING); |
|
| 83 | +$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 84 | +$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING); |
|
| 85 | +$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING); |
|
| 86 | +$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING); |
|
| 87 | +$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING); |
|
| 88 | +$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, ''); |
|
| 89 | 89 | |
| 90 | 90 | $output = '{'; |
| 91 | 91 | $output .= '"flightairmap": {'; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | if (!empty($spotter_array)) |
| 97 | 97 | { |
| 98 | - foreach($spotter_array as $spotter_item) |
|
| 98 | + foreach ($spotter_array as $spotter_item) |
|
| 99 | 99 | { |
| 100 | 100 | |
| 101 | 101 | $output .= '{'; |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | $page_url = $globalURL.'/acars-archive'; |
| 10 | 10 | |
| 11 | -if(!isset($_GET['limit'])) |
|
| 11 | +if (!isset($_GET['limit'])) |
|
| 12 | 12 | { |
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') { |
| 69 | 69 | $dbroot = $_SESSION['database_root']; |
| 70 | 70 | $dbrootpass = $_SESSION['database_rootpass']; |
| 71 | - $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost); |
|
| 71 | + $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost); |
|
| 72 | 72 | if ($error != '') { |
| 73 | 73 | $_SESSION['error'] = $error; |
| 74 | 74 | } |
| 75 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 75 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database')); |
|
| 76 | 76 | $_SESSION['install'] = 'database_import'; |
| 77 | 77 | $_SESSION['next'] = 'Create and import tables'; |
| 78 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 78 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 79 | 79 | print json_encode($result); |
| 80 | 80 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 81 | 81 | if (update_schema::check_version(false) == '0') { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | if ($error != '') { |
| 88 | 88 | $_SESSION['error'] = $error; |
| 89 | 89 | } |
| 90 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 90 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables')); |
|
| 91 | 91 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 92 | 92 | $_SESSION['install'] = 'populate'; |
| 93 | 93 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -95,84 +95,84 @@ discard block |
||
| 95 | 95 | $_SESSION['install'] = 'sources'; |
| 96 | 96 | $_SESSION['next'] = 'Insert data in source table'; |
| 97 | 97 | } |
| 98 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 98 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 99 | 99 | print json_encode($result); |
| 100 | 100 | } else { |
| 101 | 101 | $error .= update_schema::check_version(true); |
| 102 | 102 | if ($error != '') { |
| 103 | 103 | $_SESSION['error'] = $error; |
| 104 | 104 | } |
| 105 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 105 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
| 106 | 106 | $_SESSION['install'] = 'sources'; |
| 107 | 107 | $_SESSION['next'] = 'Insert data in source table'; |
| 108 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 108 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 109 | 109 | print json_encode($result); |
| 110 | 110 | } |
| 111 | 111 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
| 112 | 112 | include_once('class.update_db.php'); |
| 113 | 113 | $error .= update_db::update_waypoints(); |
| 114 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 114 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
| 115 | 115 | |
| 116 | 116 | $_SESSION['install'] = 'airspace'; |
| 117 | 117 | $_SESSION['next'] = 'Populate airspace table'; |
| 118 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 118 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 119 | 119 | print json_encode($result); |
| 120 | 120 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
| 121 | 121 | include_once('class.update_db.php'); |
| 122 | 122 | $error .= update_db::update_airspace(); |
| 123 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 123 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
| 124 | 124 | $_SESSION['install'] = 'countries'; |
| 125 | 125 | $_SESSION['next'] = 'Populate countries table'; |
| 126 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 126 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 127 | 127 | print json_encode($result); |
| 128 | 128 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
| 129 | 129 | include_once('class.update_db.php'); |
| 130 | 130 | $error .= update_db::update_countries(); |
| 131 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 131 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
| 132 | 132 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 133 | 133 | $_SESSION['install'] = 'notam'; |
| 134 | 134 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
| 135 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 135 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 136 | 136 | print json_encode($result); |
| 137 | 137 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 138 | 138 | $_SESSION['install'] = 'owner'; |
| 139 | 139 | $_SESSION['next'] = 'Populate owner table with externals data'; |
| 140 | 140 | unset($_SESSION['owner']); |
| 141 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 141 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 142 | 142 | print json_encode($result); |
| 143 | 143 | } else { |
| 144 | 144 | $_SESSION['install'] = 'sources'; |
| 145 | 145 | $_SESSION['next'] = 'Insert data in source table'; |
| 146 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 146 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 147 | 147 | print json_encode($result); |
| 148 | 148 | } |
| 149 | 149 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 150 | 150 | if (!is_writable('tmp')) { |
| 151 | 151 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 152 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 152 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 153 | 153 | print json_encode($result); |
| 154 | 154 | } else { |
| 155 | 155 | include_once('class.update_db.php'); |
| 156 | 156 | $globalDebug = FALSE; |
| 157 | 157 | $error .= update_db::update_ModeS(); |
| 158 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 158 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 159 | 159 | |
| 160 | 160 | $_SESSION['install'] = 'populate_flarm'; |
| 161 | 161 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 162 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 162 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 163 | 163 | print json_encode($result); |
| 164 | 164 | } |
| 165 | 165 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 166 | 166 | if (!is_writable('tmp')) { |
| 167 | 167 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 168 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 168 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 169 | 169 | print json_encode($result); |
| 170 | 170 | } else { |
| 171 | 171 | include_once('class.update_db.php'); |
| 172 | 172 | $globalDebug = FALSE; |
| 173 | 173 | $error .= update_db::update_ModeS_flarm(); |
| 174 | 174 | $error .= update_db::update_ModeS_ogn(); |
| 175 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 175 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 176 | 176 | |
| 177 | 177 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 178 | 178 | $_SESSION['install'] = 'vatsim'; |
@@ -192,34 +192,34 @@ discard block |
||
| 192 | 192 | $_SESSION['install'] = 'routes'; |
| 193 | 193 | $_SESSION['next'] = 'Populate routes table with externals data'; |
| 194 | 194 | } |
| 195 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 195 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 196 | 196 | print json_encode($result); |
| 197 | 197 | } |
| 198 | 198 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 199 | 199 | if (!is_writable('tmp')) { |
| 200 | 200 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 201 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 201 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 202 | 202 | print json_encode($result); |
| 203 | 203 | } else { |
| 204 | 204 | include_once('class.update_db.php'); |
| 205 | 205 | $globalDebug = FALSE; |
| 206 | 206 | $error .= update_db::update_routes(); |
| 207 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 207 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
| 208 | 208 | $_SESSION['install'] = 'translation'; |
| 209 | 209 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 210 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 210 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 211 | 211 | print json_encode($result); |
| 212 | 212 | } |
| 213 | 213 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 214 | 214 | if (!is_writable('tmp')) { |
| 215 | 215 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 216 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 216 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 217 | 217 | print json_encode($result); |
| 218 | 218 | } else { |
| 219 | 219 | include_once('class.update_db.php'); |
| 220 | 220 | $globalDebug = FALSE; |
| 221 | 221 | $error .= update_db::update_translation(); |
| 222 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 222 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
| 223 | 223 | |
| 224 | 224 | if ($_SESSION['waypoints'] == 1) { |
| 225 | 225 | $_SESSION['install'] = 'waypoints'; |
@@ -236,48 +236,48 @@ discard block |
||
| 236 | 236 | $_SESSION['install'] = 'sources'; |
| 237 | 237 | $_SESSION['next'] = 'Insert data in source table'; |
| 238 | 238 | } |
| 239 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 239 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 240 | 240 | print json_encode($result); |
| 241 | 241 | } |
| 242 | 242 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 243 | 243 | if (!is_writable('tmp')) { |
| 244 | 244 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 245 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 245 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 246 | 246 | print json_encode($result); |
| 247 | 247 | } else { |
| 248 | 248 | include_once('class.update_db.php'); |
| 249 | 249 | $globalDebug = FALSE; |
| 250 | 250 | $error = update_db::update_owner(); |
| 251 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 251 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
| 252 | 252 | $_SESSION['install'] = 'sources'; |
| 253 | 253 | $_SESSION['next'] = 'Insert data in source table'; |
| 254 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 254 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 255 | 255 | print json_encode($result); |
| 256 | 256 | } |
| 257 | 257 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 258 | 258 | if (!is_writable('tmp')) { |
| 259 | 259 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 260 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 260 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 261 | 261 | print json_encode($result); |
| 262 | 262 | } else { |
| 263 | 263 | include_once('class.update_db.php'); |
| 264 | 264 | $globalDebug = FALSE; |
| 265 | 265 | if (isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 266 | 266 | $error .= update_db::update_notam(); |
| 267 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 267 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
| 268 | 268 | } else { |
| 269 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 269 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
| 270 | 270 | } |
| 271 | 271 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 272 | 272 | $_SESSION['install'] = 'owner'; |
| 273 | 273 | $_SESSION['next'] = 'Populate owner table'; |
| 274 | 274 | unset($_SESSION['owner']); |
| 275 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 275 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 276 | 276 | print json_encode($result); |
| 277 | 277 | } else { |
| 278 | 278 | $_SESSION['install'] = 'sources'; |
| 279 | 279 | $_SESSION['next'] = 'Insert data in source table'; |
| 280 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 280 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 281 | 281 | print json_encode($result); |
| 282 | 282 | } |
| 283 | 283 | } |
@@ -315,9 +315,9 @@ discard block |
||
| 315 | 315 | $Source = new Source(); |
| 316 | 316 | $Source->deleteAllLocation(); |
| 317 | 317 | foreach ($sources as $src) { |
| 318 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 318 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
| 319 | 319 | } |
| 320 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 320 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
| 321 | 321 | unset($_SESSION['sources']); |
| 322 | 322 | } |
| 323 | 323 | /* |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | $_SESSION['install'] = 'finish'; |
| 343 | 343 | $_SESSION['next'] = 'finish'; |
| 344 | 344 | } |
| 345 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 345 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 346 | 346 | print json_encode($result); |
| 347 | 347 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
| 348 | 348 | include_once('../install/class.create_db.php'); |
@@ -352,36 +352,36 @@ discard block |
||
| 352 | 352 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 353 | 353 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 354 | 354 | $error .= update_db::update_IVAO(); |
| 355 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 355 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 356 | 356 | } else { |
| 357 | 357 | $error .= update_db::update_vatsim(); |
| 358 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 358 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 359 | 359 | } |
| 360 | 360 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 361 | 361 | $error .= update_db::update_vatsim(); |
| 362 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 362 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 363 | 363 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 364 | 364 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 365 | 365 | $error .= update_db::update_IVAO(); |
| 366 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 366 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 367 | 367 | } else { |
| 368 | 368 | $error .= update_db::update_vatsim(); |
| 369 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 369 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
| 370 | 370 | } |
| 371 | 371 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 372 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
| 372 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
| 373 | 373 | } |
| 374 | 374 | //$_SESSION['install'] = 'routes'; |
| 375 | 375 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
| 376 | 376 | $_SESSION['install'] = 'finish'; |
| 377 | 377 | $_SESSION['next'] = 'finish'; |
| 378 | 378 | |
| 379 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 379 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 380 | 380 | print json_encode($result); |
| 381 | 381 | } else { |
| 382 | 382 | //unset($_SESSION['install']); |
| 383 | 383 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
| 384 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
| 384 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
| 385 | 385 | print json_encode($result); |
| 386 | 386 | } |
| 387 | 387 | ?> |
| 388 | 388 | \ No newline at end of file |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | header('Content-Type: text/javascript'); |
| 18 | 18 | |
| 19 | 19 | |
| 20 | -$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 20 | +$polar = $Stats->getStatsSource(date('Y-m-d'), 'polar'); |
|
| 21 | 21 | $output = '{"type": "FeatureCollection","features": ['; |
| 22 | 22 | if (!empty($polar)) { |
| 23 | - foreach($polar as $eachpolar) { |
|
| 23 | + foreach ($polar as $eachpolar) { |
|
| 24 | 24 | $data = json_decode($eachpolar['source_data']); |
| 25 | 25 | $name = $eachpolar['source_name']; |
| 26 | 26 | $coord = $Location->getLocationInfobySourceName($name); |
@@ -33,15 +33,15 @@ discard block |
||
| 33 | 33 | $initial_longitude = $globalCenterLongitude; |
| 34 | 34 | } |
| 35 | 35 | $first = ''; |
| 36 | - foreach($data as $value => $key) { |
|
| 37 | - $final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key); |
|
| 38 | - if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']'; |
|
| 36 | + foreach ($data as $value => $key) { |
|
| 37 | + $final_coord = $Common->getCoordfromDistanceBearing($initial_latitude, $initial_longitude, $value*22.5, $key); |
|
| 38 | + if ($first == '') $first = '['.round($final_coord['longitude'], 5).','.round($final_coord['latitude'], 5).']'; |
|
| 39 | 39 | $output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],'; |
| 40 | 40 | } |
| 41 | 41 | $output .= $first; |
| 42 | 42 | $output .= ']]}},'; |
| 43 | 43 | } |
| 44 | - $output = substr($output, 0, -1); |
|
| 44 | + $output = substr($output, 0, -1); |
|
| 45 | 45 | } |
| 46 | 46 | $output .= ']}'; |
| 47 | 47 | print $output; |
@@ -23,13 +23,13 @@ discard block |
||
| 23 | 23 | $min = false; |
| 24 | 24 | $allhistory = false; |
| 25 | 25 | $filter['source'] = array(); |
| 26 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 27 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 28 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 29 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs')); |
|
| 30 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 31 | -if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']); |
|
| 32 | -if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']); |
|
| 26 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt')); |
|
| 27 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup')); |
|
| 28 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars')); |
|
| 29 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs')); |
|
| 30 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs')); |
|
| 31 | +if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',', $_COOKIE['Airlines']); |
|
| 32 | +if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',', $_COOKIE['Sources']); |
|
| 33 | 33 | if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype']; |
| 34 | 34 | |
| 35 | 35 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | if (isset($_GET['ident'])) { |
| 40 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 40 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 41 | 41 | $from_archive = true; |
| 42 | 42 | $spotter_array = $SpotterArchive->getLastArchiveSpotterDataByIdent($ident); |
| 43 | 43 | $allhistory = true; |
| 44 | 44 | } elseif (isset($_GET['flightaware_id'])) { |
| 45 | - $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 45 | + $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
| 46 | 46 | $from_archive = true; |
| 47 | 47 | $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id); |
| 48 | 48 | $allhistory = true; |
@@ -50,20 +50,20 @@ discard block |
||
| 50 | 50 | $from_archive = true; |
| 51 | 51 | // $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~'))); |
| 52 | 52 | // $enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~'))); |
| 53 | - $begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT); |
|
| 54 | - $enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT); |
|
| 55 | - $archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT); |
|
| 56 | - $begindate = date('Y-m-d H:i:s',$begindate); |
|
| 57 | - $enddate = date('Y-m-d H:i:s',$enddate); |
|
| 58 | - $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter); |
|
| 53 | + $begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT); |
|
| 54 | + $enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT); |
|
| 55 | + $archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT); |
|
| 56 | + $begindate = date('Y-m-d H:i:s', $begindate); |
|
| 57 | + $enddate = date('Y-m-d H:i:s', $enddate); |
|
| 58 | + $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if (!empty($spotter_array)) { |
| 62 | - $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter); |
|
| 62 | + $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter); |
|
| 63 | 63 | if ($flightcnt == '') $flightcnt = 0; |
| 64 | 64 | } else $flightcnt = 0; |
| 65 | 65 | |
| 66 | -$sqltime = round(microtime(true)-$begintime,2); |
|
| 66 | +$sqltime = round(microtime(true) - $begintime, 2); |
|
| 67 | 67 | |
| 68 | 68 | //var_dump($spotter_array); |
| 69 | 69 | $j = 0; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | if (!empty($spotter_array) && is_array($spotter_array)) |
| 79 | 79 | { |
| 80 | 80 | $output .= '"features": ['; |
| 81 | - foreach($spotter_array as $spotter_item) |
|
| 81 | + foreach ($spotter_array as $spotter_item) |
|
| 82 | 82 | { |
| 83 | 83 | $j++; |
| 84 | 84 | date_default_timezone_set('UTC'); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",'; |
| 162 | 162 | if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) { |
| 163 | 163 | $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",'; |
| 164 | - $output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",'; |
|
| 164 | + $output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",'; |
|
| 165 | 165 | } elseif (isset($spotter_item['aircraft_type'])) { |
| 166 | 166 | $output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",'; |
| 167 | 167 | } elseif (!$min) { |
@@ -228,15 +228,15 @@ discard block |
||
| 228 | 228 | if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",'; |
| 229 | 229 | else $output .= '"heading": "'.$spotter_item['heading'].'",'; |
| 230 | 230 | |
| 231 | - if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed); |
|
| 232 | - else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']); |
|
| 231 | + if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed); |
|
| 232 | + else $nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']); |
|
| 233 | 233 | //$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",'; |
| 234 | 234 | //$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",'; |
| 235 | 235 | $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],'; |
| 236 | 236 | |
| 237 | 237 | if (!$min) $output .= '"image": "'.$image.'",'; |
| 238 | 238 | if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') { |
| 239 | - $output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",'; |
|
| 239 | + $output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",'; |
|
| 240 | 240 | } |
| 241 | 241 | if (isset($spotter_item['image_source_website'])) { |
| 242 | 242 | $output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",'; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | $output .= '"waypoints": "'.$spotter_item['waypoints'].'",'; |
| 259 | 259 | } |
| 260 | 260 | if (isset($spotter_item['acars'])) { |
| 261 | - $output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",'; |
|
| 261 | + $output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",'; |
|
| 262 | 262 | } |
| 263 | 263 | $spotter_history_array = $SpotterArchive->getCoordArchiveSpotterDataById($spotter_item['flightaware_id']); |
| 264 | 264 | //$spotter_history_array = array(); |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | $output_time .= (strtotime($spotter_history['date'])*1000).','; |
| 271 | 271 | } |
| 272 | 272 | if (isset($output_time)) { |
| 273 | - $output_time = substr($output_time, 0, -1); |
|
| 273 | + $output_time = substr($output_time, 0, -1); |
|
| 274 | 274 | $output .= '"time": ['.$output_time.'],'; |
| 275 | 275 | } |
| 276 | 276 | |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | $output .= '"coordinates": ['; |
| 286 | 286 | |
| 287 | 287 | if (isset($output_history)) { |
| 288 | - $output_history = substr($output_history, 0, -1); |
|
| 288 | + $output_history = substr($output_history, 0, -1); |
|
| 289 | 289 | $output .= $output_history; |
| 290 | 290 | } |
| 291 | 291 | |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $output = substr($output, 0, -1); |
| 298 | 298 | $output .= ']'; |
| 299 | 299 | $output .= ',"initial_sqltime": "'.$sqltime.'",'; |
| 300 | - $output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",'; |
|
| 300 | + $output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",'; |
|
| 301 | 301 | if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",'; |
| 302 | 302 | $output .= '"fc": "'.$flightcnt.'"'; |
| 303 | 303 | } else { |
