Ysurac /
FlightAirMap
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $Source = new Source(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['sourceid'])) { |
| 8 | - $sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT); |
|
| 8 | + $sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | 9 | $source_data = $Source->getLocationInfoById($sourceid); |
| 10 | 10 | if (isset($source_data[0])) { |
| 11 | 11 | ?> |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | print '</div>'; |
| 38 | 38 | |
| 39 | 39 | if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
| 40 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 41 | -print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>'; |
|
| 40 | +if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 41 | +print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>'; |
|
| 42 | 42 | /* |
| 43 | 43 | if ($spotter_item['atc_range'] > 0) { |
| 44 | 44 | print '<div><span>'._("Range").'</span>'; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | */ |
| 49 | 49 | if ($spotter_item['type'] == 'wx') { |
| 50 | - $weather = json_decode($spotter_item['description'],true); |
|
| 50 | + $weather = json_decode($spotter_item['description'], true); |
|
| 51 | 51 | //print_r($weather); |
| 52 | 52 | if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
| 53 | 53 | if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
@@ -17,12 +17,19 @@ discard block |
||
| 17 | 17 | date_default_timezone_set('UTC'); |
| 18 | 18 | |
| 19 | 19 | print '<div class="top">'; |
| 20 | -if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 21 | -elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 22 | -elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 23 | -elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 24 | -elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>'; |
|
| 25 | -else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 20 | +if ($spotter_item['name'] != '') { |
|
| 21 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 22 | +} elseif ($spotter_item['location_id'] != 0) { |
|
| 23 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 24 | +} elseif ($spotter_item['type'] == 'lightning') { |
|
| 25 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 26 | +} elseif ($spotter_item['type'] == 'wx') { |
|
| 27 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 28 | +} elseif ($spotter_item['type'] == 'fires') { |
|
| 29 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>'; |
|
| 30 | +} else { |
|
| 31 | + print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 32 | +} |
|
| 26 | 33 | print '</div>'; |
| 27 | 34 | |
| 28 | 35 | print '</div></div>'; |
@@ -40,8 +47,12 @@ discard block |
||
| 40 | 47 | print $spotter_item['last_seen'].' UTC'; |
| 41 | 48 | print '</div>'; |
| 42 | 49 | |
| 43 | -if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 44 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 50 | +if ($spotter_item['city'] != '') { |
|
| 51 | + print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 52 | +} |
|
| 53 | +if ($spotter_item['country'] !='') { |
|
| 54 | + print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 55 | +} |
|
| 45 | 56 | print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>'; |
| 46 | 57 | /* |
| 47 | 58 | if ($spotter_item['atc_range'] > 0) { |
@@ -53,13 +64,27 @@ discard block |
||
| 53 | 64 | if ($spotter_item['type'] == 'wx') { |
| 54 | 65 | $weather = json_decode($spotter_item['description'],true); |
| 55 | 66 | //print_r($weather); |
| 56 | - if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 57 | - if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 58 | - if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 59 | - if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 60 | - if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 61 | - if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 62 | - if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 67 | + if (isset($weather['temp'])) { |
|
| 68 | + print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 69 | + } |
|
| 70 | + if (isset($weather['pressure'])) { |
|
| 71 | + print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 72 | + } |
|
| 73 | + if (isset($weather['wind_gust'])) { |
|
| 74 | + print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 75 | + } |
|
| 76 | + if (isset($weather['humidity'])) { |
|
| 77 | + print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 78 | + } |
|
| 79 | + if (isset($weather['rain'])) { |
|
| 80 | + print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 81 | + } |
|
| 82 | + if (isset($weather['precipitation'])) { |
|
| 83 | + print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 84 | + } |
|
| 85 | + if (isset($weather['precipitation24h'])) { |
|
| 86 | + print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 87 | + } |
|
| 63 | 88 | $spotter_item['description'] = $weather['comment']; |
| 64 | 89 | } elseif ($spotter_item['type'] == 'fires') { |
| 65 | 90 | //print_r(json_decode($spotter_item['description'],true)); |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 15 | 15 | |
| 16 | 16 | $spotter_array = $Spotter->getAllFlightsforSitemap(); |
| 17 | - foreach($spotter_array as $spotter_item) |
|
| 17 | + foreach ($spotter_array as $spotter_item) |
|
| 18 | 18 | { |
| 19 | 19 | $output .= '<url>'; |
| 20 | 20 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
@@ -25,13 +25,13 @@ discard block |
||
| 25 | 25 | $output .= '</urlset>'; |
| 26 | 26 | |
| 27 | 27 | |
| 28 | -} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){ |
|
| 28 | +} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") { |
|
| 29 | 29 | |
| 30 | 30 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 31 | 31 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 32 | 32 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 33 | 33 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 34 | - foreach($aircraft_types as $aircraft_item) |
|
| 34 | + foreach ($aircraft_types as $aircraft_item) |
|
| 35 | 35 | { |
| 36 | 36 | $output .= '<url>'; |
| 37 | 37 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
@@ -42,13 +42,13 @@ discard block |
||
| 42 | 42 | $output .= '</urlset>'; |
| 43 | 43 | |
| 44 | 44 | |
| 45 | -} else if (isset($_GET['type']) && $_GET['type'] == "registration"){ |
|
| 45 | +} else if (isset($_GET['type']) && $_GET['type'] == "registration") { |
|
| 46 | 46 | |
| 47 | 47 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 48 | 48 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 49 | 49 | |
| 50 | 50 | $aircraft_registrations = $Spotter->getAllAircraftRegistrations(); |
| 51 | - foreach($aircraft_registrations as $aircraft_item) |
|
| 51 | + foreach ($aircraft_registrations as $aircraft_item) |
|
| 52 | 52 | { |
| 53 | 53 | $output .= '<url>'; |
| 54 | 54 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
@@ -58,13 +58,13 @@ discard block |
||
| 58 | 58 | } |
| 59 | 59 | $output .= '</urlset>'; |
| 60 | 60 | |
| 61 | -} else if (isset($_GET['type']) && $_GET['type'] == "airline"){ |
|
| 61 | +} else if (isset($_GET['type']) && $_GET['type'] == "airline") { |
|
| 62 | 62 | |
| 63 | 63 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 64 | 64 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 65 | 65 | |
| 66 | 66 | $airline_names = $Stats->getAllAirlineNames(); |
| 67 | - foreach($airline_names as $airline_item) |
|
| 67 | + foreach ($airline_names as $airline_item) |
|
| 68 | 68 | { |
| 69 | 69 | $output .= '<url>'; |
| 70 | 70 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
@@ -74,14 +74,14 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | $output .= '</urlset>'; |
| 76 | 76 | |
| 77 | -} else if (isset($_GET['type']) && $_GET['type'] == "airport"){ |
|
| 77 | +} else if (isset($_GET['type']) && $_GET['type'] == "airport") { |
|
| 78 | 78 | |
| 79 | 79 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 80 | 80 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 81 | 81 | |
| 82 | 82 | $airport_names = $Stats->getAllAirportNames(); |
| 83 | 83 | if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
| 84 | - foreach($airport_names as $airport_item) |
|
| 84 | + foreach ($airport_names as $airport_item) |
|
| 85 | 85 | { |
| 86 | 86 | $output .= '<url>'; |
| 87 | 87 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
@@ -91,14 +91,14 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | $output .= '</urlset>'; |
| 93 | 93 | |
| 94 | -} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){ |
|
| 94 | +} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") { |
|
| 95 | 95 | |
| 96 | 96 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 97 | 97 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 98 | 98 | |
| 99 | 99 | $manufacturer_names = $Stats->getAllManufacturers(); |
| 100 | 100 | if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers(); |
| 101 | - foreach($manufacturer_names as $manufacturer_item) |
|
| 101 | + foreach ($manufacturer_names as $manufacturer_item) |
|
| 102 | 102 | { |
| 103 | 103 | $output .= '<url>'; |
| 104 | 104 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | $output .= '</urlset>'; |
| 110 | 110 | |
| 111 | -} else if (isset($_GET['type']) && $_GET['type'] == "country"){ |
|
| 111 | +} else if (isset($_GET['type']) && $_GET['type'] == "country") { |
|
| 112 | 112 | |
| 113 | 113 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 114 | 114 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 115 | 115 | |
| 116 | 116 | $country_names = $Spotter->getAllCountries(); |
| 117 | - foreach($country_names as $country_item) |
|
| 117 | + foreach ($country_names as $country_item) |
|
| 118 | 118 | { |
| 119 | 119 | $output .= '<url>'; |
| 120 | 120 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | $output .= '</urlset>'; |
| 126 | 126 | |
| 127 | -} else if (isset($_GET['type']) && $_GET['type'] == "ident"){ |
|
| 127 | +} else if (isset($_GET['type']) && $_GET['type'] == "ident") { |
|
| 128 | 128 | |
| 129 | 129 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 130 | 130 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 131 | 131 | |
| 132 | 132 | $ident_names = $Spotter->getAllIdents(); |
| 133 | - foreach($ident_names as $ident_item) |
|
| 133 | + foreach ($ident_names as $ident_item) |
|
| 134 | 134 | { |
| 135 | 135 | if (ctype_alnum($ident_item['ident'])) { |
| 136 | 136 | $output .= '<url>'; |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | $output .= '</urlset>'; |
| 144 | 144 | |
| 145 | -} else if (isset($_GET['type']) && $_GET['type'] == "date"){ |
|
| 145 | +} else if (isset($_GET['type']) && $_GET['type'] == "date") { |
|
| 146 | 146 | |
| 147 | 147 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 148 | 148 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 149 | 149 | |
| 150 | 150 | $date_names = $Spotter->getAllDates(); |
| 151 | - foreach($date_names as $date_item) |
|
| 151 | + foreach ($date_names as $date_item) |
|
| 152 | 152 | { |
| 153 | 153 | $output .= '<url>'; |
| 154 | 154 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
@@ -158,13 +158,13 @@ discard block |
||
| 158 | 158 | } |
| 159 | 159 | $output .= '</urlset>'; |
| 160 | 160 | |
| 161 | -} else if (isset($_GET['type']) && $_GET['type'] == "route"){ |
|
| 161 | +} else if (isset($_GET['type']) && $_GET['type'] == "route") { |
|
| 162 | 162 | |
| 163 | 163 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 164 | 164 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 165 | 165 | |
| 166 | 166 | $route_names = $Spotter->getAllRoutes(); |
| 167 | - foreach($route_names as $route_item) |
|
| 167 | + foreach ($route_names as $route_item) |
|
| 168 | 168 | { |
| 169 | 169 | $output .= '<url>'; |
| 170 | 170 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | $output .= '</urlset>'; |
| 176 | 176 | |
| 177 | -} else if (isset($_GET['type']) && $_GET['type'] == "static"){ |
|
| 177 | +} else if (isset($_GET['type']) && $_GET['type'] == "static") { |
|
| 178 | 178 | |
| 179 | 179 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 180 | 180 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
@@ -30,7 +30,9 @@ discard block |
||
| 30 | 30 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 31 | 31 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 32 | 32 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 33 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 33 | + if (empty($aircraft_types)) { |
|
| 34 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 35 | + } |
|
| 34 | 36 | foreach($aircraft_types as $aircraft_item) |
| 35 | 37 | { |
| 36 | 38 | $output .= '<url>'; |
@@ -80,7 +82,9 @@ discard block |
||
| 80 | 82 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 81 | 83 | |
| 82 | 84 | $airport_names = $Stats->getAllAirportNames(); |
| 83 | - if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
|
| 85 | + if (empty($airport_names)) { |
|
| 86 | + $airport_names = $Spotter->getAllAirportNames(); |
|
| 87 | + } |
|
| 84 | 88 | foreach($airport_names as $airport_item) |
| 85 | 89 | { |
| 86 | 90 | $output .= '<url>'; |
@@ -97,7 +101,9 @@ discard block |
||
| 97 | 101 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 98 | 102 | |
| 99 | 103 | $manufacturer_names = $Stats->getAllManufacturers(); |
| 100 | - if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers(); |
|
| 104 | + if (empty($manufacturer_names)) { |
|
| 105 | + $manufacturer_names = $Spotter->getAllManufacturers(); |
|
| 106 | + } |
|
| 101 | 107 | foreach($manufacturer_names as $manufacturer_item) |
| 102 | 108 | { |
| 103 | 109 | $output .= '<url>'; |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | foreach($spotter_array as $spotter_item) |
| 18 | 18 | { |
| 19 | 19 | $output .= '<url>'; |
| 20 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 21 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 22 | - $output .= '<changefreq>weekly</changefreq>'; |
|
| 20 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 21 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 22 | + $output .= '<changefreq>weekly</changefreq>'; |
|
| 23 | 23 | $output .= '</url>'; |
| 24 | 24 | } |
| 25 | 25 | $output .= '</urlset>'; |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | foreach($aircraft_types as $aircraft_item) |
| 35 | 35 | { |
| 36 | 36 | $output .= '<url>'; |
| 37 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 38 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 39 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 37 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 38 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 39 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 40 | 40 | $output .= '</url>'; |
| 41 | 41 | } |
| 42 | 42 | $output .= '</urlset>'; |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | foreach($aircraft_registrations as $aircraft_item) |
| 52 | 52 | { |
| 53 | 53 | $output .= '<url>'; |
| 54 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 55 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 56 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 54 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 55 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 56 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 57 | 57 | $output .= '</url>'; |
| 58 | 58 | } |
| 59 | 59 | $output .= '</urlset>'; |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | foreach($airline_names as $airline_item) |
| 68 | 68 | { |
| 69 | 69 | $output .= '<url>'; |
| 70 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 71 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 72 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 70 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 71 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 72 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 73 | 73 | $output .= '</url>'; |
| 74 | 74 | } |
| 75 | 75 | $output .= '</urlset>'; |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | foreach($airport_names as $airport_item) |
| 85 | 85 | { |
| 86 | 86 | $output .= '<url>'; |
| 87 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 88 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 89 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 87 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 88 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 89 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 90 | 90 | $output .= '</url>'; |
| 91 | 91 | } |
| 92 | 92 | $output .= '</urlset>'; |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | foreach($manufacturer_names as $manufacturer_item) |
| 102 | 102 | { |
| 103 | 103 | $output .= '<url>'; |
| 104 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
|
| 105 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 106 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 104 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
|
| 105 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 106 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 107 | 107 | $output .= '</url>'; |
| 108 | 108 | } |
| 109 | 109 | $output .= '</urlset>'; |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | foreach($country_names as $country_item) |
| 118 | 118 | { |
| 119 | 119 | $output .= '<url>'; |
| 120 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
|
| 121 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 122 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 120 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
|
| 121 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 122 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 123 | 123 | $output .= '</url>'; |
| 124 | 124 | } |
| 125 | 125 | $output .= '</urlset>'; |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | { |
| 135 | 135 | if (ctype_alnum($ident_item['ident'])) { |
| 136 | 136 | $output .= '<url>'; |
| 137 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.urlencode($ident_item['ident']).'</loc>'; |
|
| 138 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 139 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 137 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.urlencode($ident_item['ident']).'</loc>'; |
|
| 138 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 139 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 140 | 140 | $output .= '</url>'; |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -151,9 +151,9 @@ discard block |
||
| 151 | 151 | foreach($date_names as $date_item) |
| 152 | 152 | { |
| 153 | 153 | $output .= '<url>'; |
| 154 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
|
| 155 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 156 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 154 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
|
| 155 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 156 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 157 | 157 | $output .= '</url>'; |
| 158 | 158 | } |
| 159 | 159 | $output .= '</urlset>'; |
@@ -167,9 +167,9 @@ discard block |
||
| 167 | 167 | foreach($route_names as $route_item) |
| 168 | 168 | { |
| 169 | 169 | $output .= '<url>'; |
| 170 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
|
| 171 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 172 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 170 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
|
| 171 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 172 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 173 | 173 | $output .= '</url>'; |
| 174 | 174 | } |
| 175 | 175 | $output .= '</urlset>'; |
@@ -181,34 +181,34 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | /* STATIC PAGES */ |
| 183 | 183 | $output .= '<url>'; |
| 184 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>'; |
|
| 185 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 186 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 184 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>'; |
|
| 185 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 186 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 187 | 187 | $output .= '</url>'; |
| 188 | 188 | $output .= '<url>'; |
| 189 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>'; |
|
| 190 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 191 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 189 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>'; |
|
| 190 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 191 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 192 | 192 | $output .= '</url>'; |
| 193 | 193 | $output .= '<url>'; |
| 194 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>'; |
|
| 195 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 196 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 194 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>'; |
|
| 195 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 196 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 197 | 197 | $output .= '</url>'; |
| 198 | 198 | $output .= '<url>'; |
| 199 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>'; |
|
| 200 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 201 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 199 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>'; |
|
| 200 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 201 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 202 | 202 | $output .= '</url>'; |
| 203 | 203 | $output .= '<url>'; |
| 204 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>'; |
|
| 205 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 206 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 204 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>'; |
|
| 205 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 206 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 207 | 207 | $output .= '</url>'; |
| 208 | 208 | $output .= '<url>'; |
| 209 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>'; |
|
| 210 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 211 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 209 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>'; |
|
| 210 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 211 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 212 | 212 | $output .= '</url>'; |
| 213 | 213 | /* |
| 214 | 214 | $output .= '<url>'; |
@@ -218,82 +218,82 @@ discard block |
||
| 218 | 218 | $output .= '</url>'; |
| 219 | 219 | */ |
| 220 | 220 | $output .= '<url>'; |
| 221 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>'; |
|
| 222 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 223 | - $output .= '<changefreq>weekly</changefreq>'; |
|
| 221 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>'; |
|
| 222 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 223 | + $output .= '<changefreq>weekly</changefreq>'; |
|
| 224 | 224 | $output .= '</url>'; |
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | /* STATISTIC PAGES */ |
| 228 | 228 | $output .= '<url>'; |
| 229 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>'; |
|
| 230 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 231 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 229 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>'; |
|
| 230 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 231 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 232 | 232 | $output .= '</url>'; |
| 233 | 233 | $output .= '<url>'; |
| 234 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>'; |
|
| 235 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 236 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 234 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>'; |
|
| 235 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 236 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 237 | 237 | $output .= '</url>'; |
| 238 | 238 | $output .= '<url>'; |
| 239 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>'; |
|
| 240 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 241 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 239 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>'; |
|
| 240 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 241 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 242 | 242 | $output .= '</url>'; |
| 243 | 243 | $output .= '<url>'; |
| 244 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>'; |
|
| 245 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 246 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 244 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>'; |
|
| 245 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 246 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 247 | 247 | $output .= '</url>'; |
| 248 | 248 | $output .= '<url>'; |
| 249 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>'; |
|
| 250 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 251 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 249 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>'; |
|
| 250 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 251 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 252 | 252 | $output .= '</url>'; |
| 253 | 253 | $output .= '<url>'; |
| 254 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>'; |
|
| 255 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 256 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 254 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>'; |
|
| 255 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 256 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 257 | 257 | $output .= '</url>'; |
| 258 | 258 | $output .= '<url>'; |
| 259 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>'; |
|
| 260 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 261 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 259 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>'; |
|
| 260 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 261 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 262 | 262 | $output .= '</url>'; |
| 263 | 263 | $output .= '<url>'; |
| 264 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>'; |
|
| 265 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 266 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 264 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>'; |
|
| 265 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 266 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 267 | 267 | $output .= '</url>'; |
| 268 | 268 | $output .= '<url>'; |
| 269 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>'; |
|
| 270 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 271 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 269 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>'; |
|
| 270 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 271 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 272 | 272 | $output .= '</url>'; |
| 273 | 273 | $output .= '<url>'; |
| 274 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>'; |
|
| 275 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 276 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 274 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>'; |
|
| 275 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 276 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 277 | 277 | $output .= '</url>'; |
| 278 | 278 | $output .= '<url>'; |
| 279 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>'; |
|
| 280 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 281 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 279 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>'; |
|
| 280 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 281 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 282 | 282 | $output .= '</url>'; |
| 283 | 283 | $output .= '<url>'; |
| 284 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>'; |
|
| 285 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 286 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 284 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>'; |
|
| 285 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 286 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 287 | 287 | $output .= '</url>'; |
| 288 | 288 | $output .= '<url>'; |
| 289 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>'; |
|
| 290 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 291 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 289 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>'; |
|
| 290 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 291 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 292 | 292 | $output .= '</url>'; |
| 293 | 293 | $output .= '<url>'; |
| 294 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>'; |
|
| 295 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 296 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 294 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>'; |
|
| 295 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 296 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 297 | 297 | $output .= '</url>'; |
| 298 | 298 | $output .= '</urlset>'; |
| 299 | 299 | |
@@ -303,31 +303,31 @@ discard block |
||
| 303 | 303 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 304 | 304 | $output .= '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'; |
| 305 | 305 | $output .= '<sitemap>'; |
| 306 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>'; |
|
| 306 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>'; |
|
| 307 | 307 | $output .= '</sitemap>'; |
| 308 | 308 | $output .= '<sitemap>'; |
| 309 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>'; |
|
| 309 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>'; |
|
| 310 | 310 | $output .= '</sitemap>'; |
| 311 | 311 | $output .= '<sitemap>'; |
| 312 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>'; |
|
| 312 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>'; |
|
| 313 | 313 | $output .= '</sitemap>'; |
| 314 | 314 | $output .= '<sitemap>'; |
| 315 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>'; |
|
| 315 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>'; |
|
| 316 | 316 | $output .= '</sitemap>'; |
| 317 | 317 | $output .= '<sitemap>'; |
| 318 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>'; |
|
| 318 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>'; |
|
| 319 | 319 | $output .= '</sitemap>'; |
| 320 | 320 | $output .= '<sitemap>'; |
| 321 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>'; |
|
| 321 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>'; |
|
| 322 | 322 | $output .= '</sitemap>'; |
| 323 | 323 | $output .= '<sitemap>'; |
| 324 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>'; |
|
| 324 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>'; |
|
| 325 | 325 | $output .= '</sitemap>'; |
| 326 | 326 | $output .= '<sitemap>'; |
| 327 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>'; |
|
| 327 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>'; |
|
| 328 | 328 | $output .= '</sitemap>'; |
| 329 | 329 | $output .= '<sitemap>'; |
| 330 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>'; |
|
| 330 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>'; |
|
| 331 | 331 | $output .= '</sitemap>'; |
| 332 | 332 | /* |
| 333 | 333 | $output .= '<sitemap>'; |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $output .= '</sitemap>'; |
| 336 | 336 | */ |
| 337 | 337 | $output .= '<sitemap>'; |
| 338 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>'; |
|
| 338 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>'; |
|
| 339 | 339 | $output .= '</sitemap>'; |
| 340 | 340 | $output .= '</sitemapindex>'; |
| 341 | 341 | |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * Get SQL query part for filter used |
| 16 | 16 | * @param Array $filter the filter |
| 17 | - * @return Array the SQL part |
|
| 17 | + * @return string the SQL part |
|
| 18 | 18 | */ |
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -10,10 +10,10 @@ discard block |
||
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * Get SQL query part for filter used |
|
| 14 | - * @param Array $filter the filter |
|
| 15 | - * @return Array the SQL part |
|
| 16 | - */ |
|
| 13 | + * Get SQL query part for filter used |
|
| 14 | + * @param Array $filter the filter |
|
| 15 | + * @return Array the SQL part |
|
| 16 | + */ |
|
| 17 | 17 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
@@ -151,44 +151,44 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Gets all the spotter information based on a particular callsign |
|
| 156 | - * |
|
| 157 | - * @return Array the spotter information |
|
| 158 | - * |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | - { |
|
| 154 | + /** |
|
| 155 | + * Gets all the spotter information based on a particular callsign |
|
| 156 | + * |
|
| 157 | + * @return Array the spotter information |
|
| 158 | + * |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | + { |
|
| 162 | 162 | $Spotter = new Spotter($this->db); |
| 163 | - date_default_timezone_set('UTC'); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | 164 | |
| 165 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 165 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | - return $spotter_array; |
|
| 172 | - } |
|
| 171 | + return $spotter_array; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Gets last the spotter information based on a particular id |
|
| 177 | - * |
|
| 178 | - * @return Array the spotter information |
|
| 179 | - * |
|
| 180 | - */ |
|
| 181 | - public function getLastArchiveSpotterDataById($id) |
|
| 182 | - { |
|
| 183 | - $Spotter = new Spotter($this->db); |
|
| 184 | - date_default_timezone_set('UTC'); |
|
| 185 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 175 | + /** |
|
| 176 | + * Gets last the spotter information based on a particular id |
|
| 177 | + * |
|
| 178 | + * @return Array the spotter information |
|
| 179 | + * |
|
| 180 | + */ |
|
| 181 | + public function getLastArchiveSpotterDataById($id) |
|
| 182 | + { |
|
| 183 | + $Spotter = new Spotter($this->db); |
|
| 184 | + date_default_timezone_set('UTC'); |
|
| 185 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | - /* |
|
| 191 | + /* |
|
| 192 | 192 | try { |
| 193 | 193 | $Connection = new Connection(); |
| 194 | 194 | $sth = Connection->$db->prepare($query); |
@@ -198,122 +198,122 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | - |
|
| 203 | - return $spotter_array; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Gets all the spotter information based on a particular id |
|
| 208 | - * |
|
| 209 | - * @return Array the spotter information |
|
| 210 | - * |
|
| 211 | - */ |
|
| 212 | - public function getAllArchiveSpotterDataById($id) |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + |
|
| 203 | + return $spotter_array; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Gets all the spotter information based on a particular id |
|
| 208 | + * |
|
| 209 | + * @return Array the spotter information |
|
| 210 | + * |
|
| 211 | + */ |
|
| 212 | + public function getAllArchiveSpotterDataById($id) |
|
| 213 | 213 | { |
| 214 | - date_default_timezone_set('UTC'); |
|
| 215 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 214 | + date_default_timezone_set('UTC'); |
|
| 215 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | - try { |
|
| 221 | - $sth = $this->db->prepare($query); |
|
| 222 | - $sth->execute(array(':id' => $id)); |
|
| 223 | - } catch(PDOException $e) { |
|
| 224 | - echo $e->getMessage(); |
|
| 225 | - die; |
|
| 226 | - } |
|
| 227 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | - |
|
| 229 | - return $spotter_array; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * Gets coordinate & time spotter information based on a particular id |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 238 | - public function getCoordArchiveSpotterDataById($id) |
|
| 239 | - { |
|
| 240 | - date_default_timezone_set('UTC'); |
|
| 241 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 220 | + try { |
|
| 221 | + $sth = $this->db->prepare($query); |
|
| 222 | + $sth->execute(array(':id' => $id)); |
|
| 223 | + } catch(PDOException $e) { |
|
| 224 | + echo $e->getMessage(); |
|
| 225 | + die; |
|
| 226 | + } |
|
| 227 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + |
|
| 229 | + return $spotter_array; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * Gets coordinate & time spotter information based on a particular id |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | + public function getCoordArchiveSpotterDataById($id) |
|
| 239 | + { |
|
| 240 | + date_default_timezone_set('UTC'); |
|
| 241 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':id' => $id)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo $e->getMessage(); |
|
| 251 | - die; |
|
| 252 | - } |
|
| 253 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':id' => $id)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo $e->getMessage(); |
|
| 251 | + die; |
|
| 252 | + } |
|
| 253 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | 254 | |
| 255 | - return $spotter_array; |
|
| 256 | - } |
|
| 255 | + return $spotter_array; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets altitude information based on a particular callsign |
|
| 261 | - * |
|
| 262 | - * @return Array the spotter information |
|
| 263 | - * |
|
| 264 | - */ |
|
| 265 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | - { |
|
| 259 | + /** |
|
| 260 | + * Gets altitude information based on a particular callsign |
|
| 261 | + * |
|
| 262 | + * @return Array the spotter information |
|
| 263 | + * |
|
| 264 | + */ |
|
| 265 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | + { |
|
| 267 | 267 | |
| 268 | - date_default_timezone_set('UTC'); |
|
| 268 | + date_default_timezone_set('UTC'); |
|
| 269 | 269 | |
| 270 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 270 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | 272 | |
| 273 | - try { |
|
| 274 | - $sth = $this->db->prepare($query); |
|
| 275 | - $sth->execute(array(':ident' => $ident)); |
|
| 276 | - } catch(PDOException $e) { |
|
| 277 | - echo $e->getMessage(); |
|
| 278 | - die; |
|
| 279 | - } |
|
| 280 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + try { |
|
| 274 | + $sth = $this->db->prepare($query); |
|
| 275 | + $sth->execute(array(':ident' => $ident)); |
|
| 276 | + } catch(PDOException $e) { |
|
| 277 | + echo $e->getMessage(); |
|
| 278 | + die; |
|
| 279 | + } |
|
| 280 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 281 | 281 | |
| 282 | - return $spotter_array; |
|
| 283 | - } |
|
| 282 | + return $spotter_array; |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - /** |
|
| 286 | - * Gets altitude information based on a particular id |
|
| 287 | - * |
|
| 288 | - * @return Array the spotter information |
|
| 289 | - * |
|
| 290 | - */ |
|
| 291 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | - { |
|
| 285 | + /** |
|
| 286 | + * Gets altitude information based on a particular id |
|
| 287 | + * |
|
| 288 | + * @return Array the spotter information |
|
| 289 | + * |
|
| 290 | + */ |
|
| 291 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | + { |
|
| 293 | 293 | |
| 294 | - date_default_timezone_set('UTC'); |
|
| 294 | + date_default_timezone_set('UTC'); |
|
| 295 | 295 | |
| 296 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 296 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | 298 | |
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute(array(':id' => $id)); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - echo $e->getMessage(); |
|
| 304 | - die; |
|
| 305 | - } |
|
| 306 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute(array(':id' => $id)); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + echo $e->getMessage(); |
|
| 304 | + die; |
|
| 305 | + } |
|
| 306 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 307 | 307 | |
| 308 | - return $spotter_array; |
|
| 309 | - } |
|
| 308 | + return $spotter_array; |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets altitude & speed information based on a particular id |
|
| 313 | - * |
|
| 314 | - * @return Array the spotter information |
|
| 315 | - * |
|
| 316 | - */ |
|
| 311 | + /** |
|
| 312 | + * Gets altitude & speed information based on a particular id |
|
| 313 | + * |
|
| 314 | + * @return Array the spotter information |
|
| 315 | + * |
|
| 316 | + */ |
|
| 317 | 317 | public function getAltitudeSpeedArchiveSpotterDataById($id) |
| 318 | 318 | { |
| 319 | 319 | date_default_timezone_set('UTC'); |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | return $spotter_array; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | - /** |
|
| 334 | - * Gets altitude information based on a particular callsign |
|
| 335 | - * |
|
| 336 | - * @return Array the spotter information |
|
| 337 | - * |
|
| 338 | - */ |
|
| 333 | + /** |
|
| 334 | + * Gets altitude information based on a particular callsign |
|
| 335 | + * |
|
| 336 | + * @return Array the spotter information |
|
| 337 | + * |
|
| 338 | + */ |
|
| 339 | 339 | public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
| 340 | 340 | { |
| 341 | 341 | date_default_timezone_set('UTC'); |
@@ -355,12 +355,12 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | |
| 357 | 357 | |
| 358 | - /** |
|
| 359 | - * Gets all the archive spotter information |
|
| 360 | - * |
|
| 361 | - * @return Array the spotter information |
|
| 362 | - * |
|
| 363 | - */ |
|
| 358 | + /** |
|
| 359 | + * Gets all the archive spotter information |
|
| 360 | + * |
|
| 361 | + * @return Array the spotter information |
|
| 362 | + * |
|
| 363 | + */ |
|
| 364 | 364 | public function getSpotterArchiveData($ident,$flightaware_id,$date) |
| 365 | 365 | { |
| 366 | 366 | $Spotter = new Spotter($this->db); |
@@ -388,34 +388,34 @@ discard block |
||
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | /** |
| 391 | - * Gets Minimal Live Spotter data |
|
| 392 | - * |
|
| 393 | - * @return Array the spotter information |
|
| 394 | - * |
|
| 395 | - */ |
|
| 396 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | - { |
|
| 398 | - global $globalDBdriver, $globalLiveInterval; |
|
| 399 | - date_default_timezone_set('UTC'); |
|
| 400 | - |
|
| 401 | - $filter_query = ''; |
|
| 402 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | - } |
|
| 405 | - // Use spotter_output also ? |
|
| 406 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 408 | - } |
|
| 409 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | - } |
|
| 412 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | - } |
|
| 391 | + * Gets Minimal Live Spotter data |
|
| 392 | + * |
|
| 393 | + * @return Array the spotter information |
|
| 394 | + * |
|
| 395 | + */ |
|
| 396 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | + { |
|
| 398 | + global $globalDBdriver, $globalLiveInterval; |
|
| 399 | + date_default_timezone_set('UTC'); |
|
| 400 | + |
|
| 401 | + $filter_query = ''; |
|
| 402 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | + } |
|
| 405 | + // Use spotter_output also ? |
|
| 406 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 408 | + } |
|
| 409 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | + } |
|
| 412 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | - if ($globalDBdriver == 'mysql') { |
|
| 418 | - /* |
|
| 416 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | + if ($globalDBdriver == 'mysql') { |
|
| 418 | + /* |
|
| 419 | 419 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 420 | 420 | FROM spotter_archive |
| 421 | 421 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -434,56 +434,56 @@ discard block |
||
| 434 | 434 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 435 | 435 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 436 | 436 | '.$filter_query.' ORDER BY flightaware_id'; |
| 437 | - } else { |
|
| 438 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | + } else { |
|
| 438 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 440 | 440 | FROM spotter_archive |
| 441 | 441 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 442 | 442 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 443 | 443 | '.$filter_query.' ORDER BY flightaware_id'; |
| 444 | - } |
|
| 445 | - //echo $query; |
|
| 446 | - try { |
|
| 447 | - $sth = $this->db->prepare($query); |
|
| 448 | - $sth->execute(); |
|
| 449 | - } catch(PDOException $e) { |
|
| 450 | - echo $e->getMessage(); |
|
| 451 | - die; |
|
| 452 | - } |
|
| 453 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 444 | + } |
|
| 445 | + //echo $query; |
|
| 446 | + try { |
|
| 447 | + $sth = $this->db->prepare($query); |
|
| 448 | + $sth->execute(); |
|
| 449 | + } catch(PDOException $e) { |
|
| 450 | + echo $e->getMessage(); |
|
| 451 | + die; |
|
| 452 | + } |
|
| 453 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 454 | 454 | |
| 455 | - return $spotter_array; |
|
| 456 | - } |
|
| 455 | + return $spotter_array; |
|
| 456 | + } |
|
| 457 | 457 | |
| 458 | 458 | /** |
| 459 | - * Gets Minimal Live Spotter data |
|
| 460 | - * |
|
| 461 | - * @return Array the spotter information |
|
| 462 | - * |
|
| 463 | - */ |
|
| 464 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | - { |
|
| 466 | - global $globalDBdriver, $globalLiveInterval; |
|
| 467 | - date_default_timezone_set('UTC'); |
|
| 468 | - |
|
| 469 | - $filter_query = ''; |
|
| 470 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | - } |
|
| 473 | - // Should use spotter_output also ? |
|
| 474 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 476 | - } |
|
| 477 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | - } |
|
| 480 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | - } |
|
| 459 | + * Gets Minimal Live Spotter data |
|
| 460 | + * |
|
| 461 | + * @return Array the spotter information |
|
| 462 | + * |
|
| 463 | + */ |
|
| 464 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | + { |
|
| 466 | + global $globalDBdriver, $globalLiveInterval; |
|
| 467 | + date_default_timezone_set('UTC'); |
|
| 468 | + |
|
| 469 | + $filter_query = ''; |
|
| 470 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | + } |
|
| 473 | + // Should use spotter_output also ? |
|
| 474 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 476 | + } |
|
| 477 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | + } |
|
| 480 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | + } |
|
| 483 | 483 | |
| 484 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | - if ($globalDBdriver == 'mysql') { |
|
| 486 | - /* |
|
| 484 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | + if ($globalDBdriver == 'mysql') { |
|
| 486 | + /* |
|
| 487 | 487 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 488 | 488 | FROM spotter_archive |
| 489 | 489 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -494,95 +494,95 @@ discard block |
||
| 494 | 494 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 495 | 495 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 496 | 496 | |
| 497 | - } else { |
|
| 498 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | - /* |
|
| 497 | + } else { |
|
| 498 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | + /* |
|
| 500 | 500 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 501 | 501 | FROM spotter_archive_output |
| 502 | 502 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 503 | 503 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 504 | 504 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 505 | 505 | */ |
| 506 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 506 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 507 | 507 | FROM spotter_archive_output |
| 508 | 508 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 509 | 509 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 510 | 510 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 511 | 511 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 512 | 512 | |
| 513 | - } |
|
| 514 | - //echo $query; |
|
| 515 | - try { |
|
| 516 | - $sth = $this->db->prepare($query); |
|
| 517 | - $sth->execute(); |
|
| 518 | - } catch(PDOException $e) { |
|
| 519 | - echo $e->getMessage(); |
|
| 520 | - die; |
|
| 521 | - } |
|
| 522 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 513 | + } |
|
| 514 | + //echo $query; |
|
| 515 | + try { |
|
| 516 | + $sth = $this->db->prepare($query); |
|
| 517 | + $sth->execute(); |
|
| 518 | + } catch(PDOException $e) { |
|
| 519 | + echo $e->getMessage(); |
|
| 520 | + die; |
|
| 521 | + } |
|
| 522 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 523 | 523 | |
| 524 | - return $spotter_array; |
|
| 525 | - } |
|
| 524 | + return $spotter_array; |
|
| 525 | + } |
|
| 526 | 526 | |
| 527 | 527 | /** |
| 528 | - * Gets count Live Spotter data |
|
| 529 | - * |
|
| 530 | - * @return Array the spotter information |
|
| 531 | - * |
|
| 532 | - */ |
|
| 533 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | - { |
|
| 535 | - global $globalDBdriver, $globalLiveInterval; |
|
| 536 | - date_default_timezone_set('UTC'); |
|
| 537 | - |
|
| 538 | - $filter_query = ''; |
|
| 539 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | - } |
|
| 542 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 544 | - } |
|
| 545 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | - } |
|
| 548 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | - } |
|
| 528 | + * Gets count Live Spotter data |
|
| 529 | + * |
|
| 530 | + * @return Array the spotter information |
|
| 531 | + * |
|
| 532 | + */ |
|
| 533 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | + { |
|
| 535 | + global $globalDBdriver, $globalLiveInterval; |
|
| 536 | + date_default_timezone_set('UTC'); |
|
| 551 | 537 | |
| 552 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | - if ($globalDBdriver == 'mysql') { |
|
| 538 | + $filter_query = ''; |
|
| 539 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | + } |
|
| 542 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 544 | + } |
|
| 545 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | + } |
|
| 548 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | + } |
|
| 551 | + |
|
| 552 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | + if ($globalDBdriver == 'mysql') { |
|
| 554 | 554 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 555 | 555 | FROM spotter_archive l |
| 556 | 556 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 557 | - } else { |
|
| 557 | + } else { |
|
| 558 | 558 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 559 | - } |
|
| 560 | - //echo $query; |
|
| 561 | - try { |
|
| 562 | - $sth = $this->db->prepare($query); |
|
| 563 | - $sth->execute(); |
|
| 564 | - } catch(PDOException $e) { |
|
| 565 | - echo $e->getMessage(); |
|
| 566 | - die; |
|
| 567 | - } |
|
| 559 | + } |
|
| 560 | + //echo $query; |
|
| 561 | + try { |
|
| 562 | + $sth = $this->db->prepare($query); |
|
| 563 | + $sth->execute(); |
|
| 564 | + } catch(PDOException $e) { |
|
| 565 | + echo $e->getMessage(); |
|
| 566 | + die; |
|
| 567 | + } |
|
| 568 | 568 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 569 | 569 | $sth->closeCursor(); |
| 570 | - return $result['nb']; |
|
| 570 | + return $result['nb']; |
|
| 571 | 571 | |
| 572 | - } |
|
| 572 | + } |
|
| 573 | 573 | |
| 574 | 574 | |
| 575 | 575 | |
| 576 | 576 | // Spotter_Archive_output |
| 577 | 577 | |
| 578 | - /** |
|
| 579 | - * Gets all the spotter information |
|
| 580 | - * |
|
| 581 | - * @return Array the spotter information |
|
| 582 | - * |
|
| 583 | - */ |
|
| 584 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 585 | - { |
|
| 578 | + /** |
|
| 579 | + * Gets all the spotter information |
|
| 580 | + * |
|
| 581 | + * @return Array the spotter information |
|
| 582 | + * |
|
| 583 | + */ |
|
| 584 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 585 | + { |
|
| 586 | 586 | global $globalTimezone, $globalDBdriver; |
| 587 | 587 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 588 | 588 | $Translation = new Translation($this->db); |
@@ -596,159 +596,159 @@ discard block |
||
| 596 | 596 | $filter_query = $this->getFilter($filters); |
| 597 | 597 | if ($q != "") |
| 598 | 598 | { |
| 599 | - if (!is_string($q)) |
|
| 600 | - { |
|
| 599 | + if (!is_string($q)) |
|
| 600 | + { |
|
| 601 | 601 | return false; |
| 602 | - } else { |
|
| 602 | + } else { |
|
| 603 | 603 | |
| 604 | 604 | $q_array = explode(" ", $q); |
| 605 | 605 | |
| 606 | 606 | foreach ($q_array as $q_item){ |
| 607 | - $additional_query .= " AND ("; |
|
| 608 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | - $translate = $Translation->ident2icao($q_item); |
|
| 629 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | - $additional_query .= ")"; |
|
| 607 | + $additional_query .= " AND ("; |
|
| 608 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | + $translate = $Translation->ident2icao($q_item); |
|
| 629 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | + $additional_query .= ")"; |
|
| 632 | + } |
|
| 632 | 633 | } |
| 633 | - } |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | if ($registration != "") |
| 637 | 637 | { |
| 638 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | - if (!is_string($registration)) |
|
| 640 | - { |
|
| 638 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | + if (!is_string($registration)) |
|
| 640 | + { |
|
| 641 | 641 | return false; |
| 642 | - } else { |
|
| 642 | + } else { |
|
| 643 | 643 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 644 | - } |
|
| 644 | + } |
|
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | if ($aircraft_icao != "") |
| 648 | 648 | { |
| 649 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | - if (!is_string($aircraft_icao)) |
|
| 651 | - { |
|
| 649 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | + if (!is_string($aircraft_icao)) |
|
| 651 | + { |
|
| 652 | 652 | return false; |
| 653 | - } else { |
|
| 653 | + } else { |
|
| 654 | 654 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 655 | - } |
|
| 655 | + } |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | if ($aircraft_manufacturer != "") |
| 659 | 659 | { |
| 660 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | - if (!is_string($aircraft_manufacturer)) |
|
| 662 | - { |
|
| 660 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | + if (!is_string($aircraft_manufacturer)) |
|
| 662 | + { |
|
| 663 | 663 | return false; |
| 664 | - } else { |
|
| 664 | + } else { |
|
| 665 | 665 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 666 | - } |
|
| 666 | + } |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if ($highlights == "true") |
| 670 | 670 | { |
| 671 | - if (!is_string($highlights)) |
|
| 672 | - { |
|
| 671 | + if (!is_string($highlights)) |
|
| 672 | + { |
|
| 673 | 673 | return false; |
| 674 | - } else { |
|
| 674 | + } else { |
|
| 675 | 675 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 676 | - } |
|
| 676 | + } |
|
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | if ($airline_icao != "") |
| 680 | 680 | { |
| 681 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | - if (!is_string($airline_icao)) |
|
| 683 | - { |
|
| 681 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | + if (!is_string($airline_icao)) |
|
| 683 | + { |
|
| 684 | 684 | return false; |
| 685 | - } else { |
|
| 685 | + } else { |
|
| 686 | 686 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 687 | - } |
|
| 687 | + } |
|
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | if ($airline_country != "") |
| 691 | 691 | { |
| 692 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | - if (!is_string($airline_country)) |
|
| 694 | - { |
|
| 692 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | + if (!is_string($airline_country)) |
|
| 694 | + { |
|
| 695 | 695 | return false; |
| 696 | - } else { |
|
| 696 | + } else { |
|
| 697 | 697 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 698 | - } |
|
| 698 | + } |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | if ($airline_type != "") |
| 702 | 702 | { |
| 703 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | - if (!is_string($airline_type)) |
|
| 705 | - { |
|
| 703 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | + if (!is_string($airline_type)) |
|
| 705 | + { |
|
| 706 | 706 | return false; |
| 707 | - } else { |
|
| 707 | + } else { |
|
| 708 | 708 | if ($airline_type == "passenger") |
| 709 | 709 | { |
| 710 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 710 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 711 | 711 | } |
| 712 | 712 | if ($airline_type == "cargo") |
| 713 | 713 | { |
| 714 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 714 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 715 | 715 | } |
| 716 | 716 | if ($airline_type == "military") |
| 717 | 717 | { |
| 718 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 718 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 719 | + } |
|
| 719 | 720 | } |
| 720 | - } |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | if ($airport != "") |
| 724 | 724 | { |
| 725 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | - if (!is_string($airport)) |
|
| 727 | - { |
|
| 725 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | + if (!is_string($airport)) |
|
| 727 | + { |
|
| 728 | 728 | return false; |
| 729 | - } else { |
|
| 729 | + } else { |
|
| 730 | 730 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 731 | - } |
|
| 731 | + } |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | if ($airport_country != "") |
| 735 | 735 | { |
| 736 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | - if (!is_string($airport_country)) |
|
| 738 | - { |
|
| 736 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | + if (!is_string($airport_country)) |
|
| 738 | + { |
|
| 739 | 739 | return false; |
| 740 | - } else { |
|
| 740 | + } else { |
|
| 741 | 741 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 742 | - } |
|
| 742 | + } |
|
| 743 | 743 | } |
| 744 | 744 | |
| 745 | 745 | if ($callsign != "") |
| 746 | 746 | { |
| 747 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | - if (!is_string($callsign)) |
|
| 749 | - { |
|
| 747 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | + if (!is_string($callsign)) |
|
| 749 | + { |
|
| 750 | 750 | return false; |
| 751 | - } else { |
|
| 751 | + } else { |
|
| 752 | 752 | $translate = $Translation->ident2icao($callsign); |
| 753 | 753 | if ($translate != $callsign) { |
| 754 | 754 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -756,81 +756,81 @@ discard block |
||
| 756 | 756 | } else { |
| 757 | 757 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 758 | 758 | } |
| 759 | - } |
|
| 759 | + } |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | if ($owner != "") |
| 763 | 763 | { |
| 764 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | - if (!is_string($owner)) |
|
| 766 | - { |
|
| 764 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | + if (!is_string($owner)) |
|
| 766 | + { |
|
| 767 | 767 | return false; |
| 768 | - } else { |
|
| 768 | + } else { |
|
| 769 | 769 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 770 | - } |
|
| 770 | + } |
|
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | if ($pilot_name != "") |
| 774 | 774 | { |
| 775 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | - if (!is_string($pilot_name)) |
|
| 777 | - { |
|
| 775 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | + if (!is_string($pilot_name)) |
|
| 777 | + { |
|
| 778 | 778 | return false; |
| 779 | - } else { |
|
| 779 | + } else { |
|
| 780 | 780 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 781 | - } |
|
| 781 | + } |
|
| 782 | 782 | } |
| 783 | 783 | |
| 784 | 784 | if ($pilot_id != "") |
| 785 | 785 | { |
| 786 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | - if (!is_string($pilot_id)) |
|
| 788 | - { |
|
| 786 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | + if (!is_string($pilot_id)) |
|
| 788 | + { |
|
| 789 | 789 | return false; |
| 790 | - } else { |
|
| 790 | + } else { |
|
| 791 | 791 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 792 | - } |
|
| 792 | + } |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | 795 | if ($departure_airport_route != "") |
| 796 | 796 | { |
| 797 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | - if (!is_string($departure_airport_route)) |
|
| 799 | - { |
|
| 797 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | + if (!is_string($departure_airport_route)) |
|
| 799 | + { |
|
| 800 | 800 | return false; |
| 801 | - } else { |
|
| 801 | + } else { |
|
| 802 | 802 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 803 | - } |
|
| 803 | + } |
|
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | if ($arrival_airport_route != "") |
| 807 | 807 | { |
| 808 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | - if (!is_string($arrival_airport_route)) |
|
| 810 | - { |
|
| 808 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | + if (!is_string($arrival_airport_route)) |
|
| 810 | + { |
|
| 811 | 811 | return false; |
| 812 | - } else { |
|
| 812 | + } else { |
|
| 813 | 813 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 814 | - } |
|
| 814 | + } |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | if ($altitude != "") |
| 818 | 818 | { |
| 819 | - $altitude_array = explode(",", $altitude); |
|
| 819 | + $altitude_array = explode(",", $altitude); |
|
| 820 | 820 | |
| 821 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 821 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 823 | 823 | |
| 824 | 824 | |
| 825 | - if ($altitude_array[1] != "") |
|
| 826 | - { |
|
| 825 | + if ($altitude_array[1] != "") |
|
| 826 | + { |
|
| 827 | 827 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 828 | 828 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 829 | 829 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 830 | - } else { |
|
| 830 | + } else { |
|
| 831 | 831 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 832 | 832 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 833 | - } |
|
| 833 | + } |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | if ($date_posted != "") |
@@ -915,14 +915,14 @@ discard block |
||
| 915 | 915 | } |
| 916 | 916 | } |
| 917 | 917 | |
| 918 | - /** |
|
| 919 | - * Gets all the spotter information based on the callsign |
|
| 920 | - * |
|
| 921 | - * @return Array the spotter information |
|
| 922 | - * |
|
| 923 | - */ |
|
| 924 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | - { |
|
| 918 | + /** |
|
| 919 | + * Gets all the spotter information based on the callsign |
|
| 920 | + * |
|
| 921 | + * @return Array the spotter information |
|
| 922 | + * |
|
| 923 | + */ |
|
| 924 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | + { |
|
| 926 | 926 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 927 | 927 | |
| 928 | 928 | date_default_timezone_set('UTC'); |
@@ -934,35 +934,35 @@ discard block |
||
| 934 | 934 | |
| 935 | 935 | if ($ident != "") |
| 936 | 936 | { |
| 937 | - if (!is_string($ident)) |
|
| 938 | - { |
|
| 937 | + if (!is_string($ident)) |
|
| 938 | + { |
|
| 939 | 939 | return false; |
| 940 | - } else { |
|
| 940 | + } else { |
|
| 941 | 941 | $additional_query = " AND spotter_archive_output.ident = :ident"; |
| 942 | 942 | $query_values = array(':ident' => $ident); |
| 943 | - } |
|
| 943 | + } |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | if ($limit != "") |
| 947 | 947 | { |
| 948 | - $limit_array = explode(",", $limit); |
|
| 948 | + $limit_array = explode(",", $limit); |
|
| 949 | 949 | |
| 950 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 950 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 952 | 952 | |
| 953 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | - { |
|
| 953 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | + { |
|
| 955 | 955 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 956 | 956 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 957 | - } |
|
| 957 | + } |
|
| 958 | 958 | } |
| 959 | 959 | |
| 960 | 960 | if ($sort != "") |
| 961 | 961 | { |
| 962 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 962 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 964 | 964 | } else { |
| 965 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 965 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -970,17 +970,17 @@ discard block |
||
| 970 | 970 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 971 | 971 | |
| 972 | 972 | return $spotter_array; |
| 973 | - } |
|
| 973 | + } |
|
| 974 | 974 | |
| 975 | 975 | |
| 976 | - /** |
|
| 977 | - * Gets all the spotter information based on the owner |
|
| 978 | - * |
|
| 979 | - * @return Array the spotter information |
|
| 980 | - * |
|
| 981 | - */ |
|
| 982 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | - { |
|
| 976 | + /** |
|
| 977 | + * Gets all the spotter information based on the owner |
|
| 978 | + * |
|
| 979 | + * @return Array the spotter information |
|
| 980 | + * |
|
| 981 | + */ |
|
| 982 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | + { |
|
| 984 | 984 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 985 | 985 | |
| 986 | 986 | date_default_timezone_set('UTC'); |
@@ -993,35 +993,35 @@ discard block |
||
| 993 | 993 | |
| 994 | 994 | if ($owner != "") |
| 995 | 995 | { |
| 996 | - if (!is_string($owner)) |
|
| 997 | - { |
|
| 996 | + if (!is_string($owner)) |
|
| 997 | + { |
|
| 998 | 998 | return false; |
| 999 | - } else { |
|
| 999 | + } else { |
|
| 1000 | 1000 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1001 | 1001 | $query_values = array(':owner' => $owner); |
| 1002 | - } |
|
| 1002 | + } |
|
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | 1005 | if ($limit != "") |
| 1006 | 1006 | { |
| 1007 | - $limit_array = explode(",", $limit); |
|
| 1007 | + $limit_array = explode(",", $limit); |
|
| 1008 | 1008 | |
| 1009 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1009 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1011 | 1011 | |
| 1012 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | - { |
|
| 1012 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | + { |
|
| 1014 | 1014 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1015 | 1015 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1016 | - } |
|
| 1016 | + } |
|
| 1017 | 1017 | } |
| 1018 | 1018 | |
| 1019 | 1019 | if ($sort != "") |
| 1020 | 1020 | { |
| 1021 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1021 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1023 | 1023 | } else { |
| 1024 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1024 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1029,16 +1029,16 @@ discard block |
||
| 1029 | 1029 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1030 | 1030 | |
| 1031 | 1031 | return $spotter_array; |
| 1032 | - } |
|
| 1033 | - |
|
| 1034 | - /** |
|
| 1035 | - * Gets all the spotter information based on the pilot |
|
| 1036 | - * |
|
| 1037 | - * @return Array the spotter information |
|
| 1038 | - * |
|
| 1039 | - */ |
|
| 1040 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | - { |
|
| 1032 | + } |
|
| 1033 | + |
|
| 1034 | + /** |
|
| 1035 | + * Gets all the spotter information based on the pilot |
|
| 1036 | + * |
|
| 1037 | + * @return Array the spotter information |
|
| 1038 | + * |
|
| 1039 | + */ |
|
| 1040 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | + { |
|
| 1042 | 1042 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1043 | 1043 | |
| 1044 | 1044 | date_default_timezone_set('UTC'); |
@@ -1057,24 +1057,24 @@ discard block |
||
| 1057 | 1057 | |
| 1058 | 1058 | if ($limit != "") |
| 1059 | 1059 | { |
| 1060 | - $limit_array = explode(",", $limit); |
|
| 1060 | + $limit_array = explode(",", $limit); |
|
| 1061 | 1061 | |
| 1062 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1062 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | 1064 | |
| 1065 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | - { |
|
| 1065 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | + { |
|
| 1067 | 1067 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1068 | 1068 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1069 | - } |
|
| 1069 | + } |
|
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | 1072 | if ($sort != "") |
| 1073 | 1073 | { |
| 1074 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1074 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1076 | 1076 | } else { |
| 1077 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1077 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1078 | 1078 | } |
| 1079 | 1079 | |
| 1080 | 1080 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1082,16 +1082,16 @@ discard block |
||
| 1082 | 1082 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1083 | 1083 | |
| 1084 | 1084 | return $spotter_array; |
| 1085 | - } |
|
| 1086 | - |
|
| 1087 | - /** |
|
| 1088 | - * Gets all number of flight over countries |
|
| 1089 | - * |
|
| 1090 | - * @return Array the airline country list |
|
| 1091 | - * |
|
| 1092 | - */ |
|
| 1093 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | - { |
|
| 1085 | + } |
|
| 1086 | + |
|
| 1087 | + /** |
|
| 1088 | + * Gets all number of flight over countries |
|
| 1089 | + * |
|
| 1090 | + * @return Array the airline country list |
|
| 1091 | + * |
|
| 1092 | + */ |
|
| 1093 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | + { |
|
| 1095 | 1095 | global $globalDBdriver; |
| 1096 | 1096 | /* |
| 1097 | 1097 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1101,14 +1101,14 @@ discard block |
||
| 1101 | 1101 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1102 | 1102 | FROM countries c, spotter_archive s |
| 1103 | 1103 | WHERE c.iso2 = s.over_country "; |
| 1104 | - if ($olderthanmonths > 0) { |
|
| 1105 | - if ($globalDBdriver == 'mysql') { |
|
| 1104 | + if ($olderthanmonths > 0) { |
|
| 1105 | + if ($globalDBdriver == 'mysql') { |
|
| 1106 | 1106 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1107 | 1107 | } else { |
| 1108 | 1108 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1109 | 1109 | } |
| 1110 | 1110 | } |
| 1111 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1111 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1112 | 1112 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1113 | 1113 | if ($limit) $query .= " LIMIT 0,10"; |
| 1114 | 1114 | |
@@ -1121,23 +1121,23 @@ discard block |
||
| 1121 | 1121 | |
| 1122 | 1122 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1123 | 1123 | { |
| 1124 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | - $temp_array['flight_country'] = $row['name']; |
|
| 1126 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | - $flight_array[] = $temp_array; |
|
| 1124 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | + $temp_array['flight_country'] = $row['name']; |
|
| 1126 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | + $flight_array[] = $temp_array; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | return $flight_array; |
| 1131 | - } |
|
| 1132 | - |
|
| 1133 | - /** |
|
| 1134 | - * Gets all number of flight over countries |
|
| 1135 | - * |
|
| 1136 | - * @return Array the airline country list |
|
| 1137 | - * |
|
| 1138 | - */ |
|
| 1139 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | - { |
|
| 1131 | + } |
|
| 1132 | + |
|
| 1133 | + /** |
|
| 1134 | + * Gets all number of flight over countries |
|
| 1135 | + * |
|
| 1136 | + * @return Array the airline country list |
|
| 1137 | + * |
|
| 1138 | + */ |
|
| 1139 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | + { |
|
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | /* |
| 1143 | 1143 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1147,14 +1147,14 @@ discard block |
||
| 1147 | 1147 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1148 | 1148 | FROM countries c, spotter_archive s, spotter_output o |
| 1149 | 1149 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1150 | - if ($olderthanmonths > 0) { |
|
| 1151 | - if ($globalDBdriver == 'mysql') { |
|
| 1150 | + if ($olderthanmonths > 0) { |
|
| 1151 | + if ($globalDBdriver == 'mysql') { |
|
| 1152 | 1152 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1153 | 1153 | } else { |
| 1154 | 1154 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1155 | 1155 | } |
| 1156 | 1156 | } |
| 1157 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1157 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1158 | 1158 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1159 | 1159 | if ($limit) $query .= " LIMIT 0,10"; |
| 1160 | 1160 | |
@@ -1167,24 +1167,24 @@ discard block |
||
| 1167 | 1167 | |
| 1168 | 1168 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1169 | 1169 | { |
| 1170 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | - $temp_array['flight_country'] = $row['name']; |
|
| 1173 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | - $flight_array[] = $temp_array; |
|
| 1170 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | + $temp_array['flight_country'] = $row['name']; |
|
| 1173 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | + $flight_array[] = $temp_array; |
|
| 1176 | 1176 | } |
| 1177 | 1177 | return $flight_array; |
| 1178 | - } |
|
| 1179 | - |
|
| 1180 | - /** |
|
| 1181 | - * Gets last spotter information based on a particular callsign |
|
| 1182 | - * |
|
| 1183 | - * @return Array the spotter information |
|
| 1184 | - * |
|
| 1185 | - */ |
|
| 1186 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | - { |
|
| 1178 | + } |
|
| 1179 | + |
|
| 1180 | + /** |
|
| 1181 | + * Gets last spotter information based on a particular callsign |
|
| 1182 | + * |
|
| 1183 | + * @return Array the spotter information |
|
| 1184 | + * |
|
| 1185 | + */ |
|
| 1186 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | + { |
|
| 1188 | 1188 | $Spotter = new Spotter($this->db); |
| 1189 | 1189 | date_default_timezone_set('UTC'); |
| 1190 | 1190 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1192,16 +1192,16 @@ discard block |
||
| 1192 | 1192 | $date = date('c',$date); |
| 1193 | 1193 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1194 | 1194 | return $spotter_array; |
| 1195 | - } |
|
| 1196 | - |
|
| 1197 | - /** |
|
| 1198 | - * Gets all the spotter information based on a particular callsign |
|
| 1199 | - * |
|
| 1200 | - * @return Array the spotter information |
|
| 1201 | - * |
|
| 1202 | - */ |
|
| 1203 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | - { |
|
| 1195 | + } |
|
| 1196 | + |
|
| 1197 | + /** |
|
| 1198 | + * Gets all the spotter information based on a particular callsign |
|
| 1199 | + * |
|
| 1200 | + * @return Array the spotter information |
|
| 1201 | + * |
|
| 1202 | + */ |
|
| 1203 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | + { |
|
| 1205 | 1205 | $Spotter = new Spotter($this->db); |
| 1206 | 1206 | date_default_timezone_set('UTC'); |
| 1207 | 1207 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1209,16 +1209,16 @@ discard block |
||
| 1209 | 1209 | $date = date('c',$date); |
| 1210 | 1210 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1211 | 1211 | return $spotter_array; |
| 1212 | - } |
|
| 1213 | - |
|
| 1214 | - /** |
|
| 1215 | - * Gets all the spotter information based on the airport |
|
| 1216 | - * |
|
| 1217 | - * @return Array the spotter information |
|
| 1218 | - * |
|
| 1219 | - */ |
|
| 1220 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | - { |
|
| 1212 | + } |
|
| 1213 | + |
|
| 1214 | + /** |
|
| 1215 | + * Gets all the spotter information based on the airport |
|
| 1216 | + * |
|
| 1217 | + * @return Array the spotter information |
|
| 1218 | + * |
|
| 1219 | + */ |
|
| 1220 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | + { |
|
| 1222 | 1222 | global $global_query; |
| 1223 | 1223 | $Spotter = new Spotter($this->db); |
| 1224 | 1224 | date_default_timezone_set('UTC'); |
@@ -1229,35 +1229,35 @@ discard block |
||
| 1229 | 1229 | |
| 1230 | 1230 | if ($airport != "") |
| 1231 | 1231 | { |
| 1232 | - if (!is_string($airport)) |
|
| 1233 | - { |
|
| 1232 | + if (!is_string($airport)) |
|
| 1233 | + { |
|
| 1234 | 1234 | return false; |
| 1235 | - } else { |
|
| 1235 | + } else { |
|
| 1236 | 1236 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1237 | 1237 | $query_values = array(':airport' => $airport); |
| 1238 | - } |
|
| 1238 | + } |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | if ($limit != "") |
| 1242 | 1242 | { |
| 1243 | - $limit_array = explode(",", $limit); |
|
| 1243 | + $limit_array = explode(",", $limit); |
|
| 1244 | 1244 | |
| 1245 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1245 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1247 | 1247 | |
| 1248 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | - { |
|
| 1248 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | + { |
|
| 1250 | 1250 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1251 | 1251 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1252 | - } |
|
| 1252 | + } |
|
| 1253 | 1253 | } |
| 1254 | 1254 | |
| 1255 | 1255 | if ($sort != "") |
| 1256 | 1256 | { |
| 1257 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1257 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1259 | 1259 | } else { |
| 1260 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1260 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1261 | 1261 | } |
| 1262 | 1262 | |
| 1263 | 1263 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1265,6 +1265,6 @@ discard block |
||
| 1265 | 1265 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1266 | 1266 | |
| 1267 | 1267 | return $spotter_array; |
| 1268 | - } |
|
| 1268 | + } |
|
| 1269 | 1269 | } |
| 1270 | 1270 | ?> |
| 1271 | 1271 | \ No newline at end of file |
@@ -14,82 +14,82 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | 22 | $filters = $globalStatsFilters[$globalFilterName]; |
| 23 | 23 | } else { |
| 24 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 24 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | if (isset($filter[0]['source'])) { |
| 28 | - $filters = array_merge($filters,$filter); |
|
| 28 | + $filters = array_merge($filters, $filter); |
|
| 29 | 29 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 30 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 31 | 31 | $filter_query_join = ''; |
| 32 | 32 | $filter_query_where = ''; |
| 33 | - foreach($filters as $flt) { |
|
| 33 | + foreach ($filters as $flt) { |
|
| 34 | 34 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 35 | 35 | if ($flt['airlines'][0] != '') { |
| 36 | 36 | if (isset($flt['source'])) { |
| 37 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | 38 | } else { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | 46 | } else { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 51 | 51 | if (isset($flt['source'])) { |
| 52 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | 53 | } else { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 58 | 58 | if (isset($flt['source'])) { |
| 59 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | 60 | } else { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 65 | 65 | if (isset($flt['source'])) { |
| 66 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 71 | 71 | if ($filter['airlines'][0] != '') { |
| 72 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | 82 | if (count($filter['source']) == 1) { |
| 83 | 83 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 84 | 84 | } else { |
| 85 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 85 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 89 | 89 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 90 | 90 | } |
| 91 | 91 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 92 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 92 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 93 | 93 | } |
| 94 | 94 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 95 | 95 | $filter_query_date = ''; |
@@ -114,41 +114,41 @@ discard block |
||
| 114 | 114 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 117 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 118 | 118 | } |
| 119 | 119 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 120 | 120 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 121 | 121 | if ($filter_query_where != '') { |
| 122 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 122 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 123 | 123 | } |
| 124 | 124 | $filter_query = $filter_query_join.$filter_query_where; |
| 125 | 125 | return $filter_query; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | // Spotter_archive |
| 129 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 129 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 130 | 130 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 131 | 131 | if ($over_country == '') { |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 133 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 134 | 134 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 135 | 135 | else $country = ''; |
| 136 | 136 | } else $country = $over_country; |
| 137 | - if ($airline_type === NULL) $airline_type =''; |
|
| 137 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 138 | 138 | |
| 139 | 139 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 140 | 140 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 141 | 141 | |
| 142 | 142 | // Route is not added in spotter_archive |
| 143 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 143 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 144 | 144 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 145 | 145 | |
| 146 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 146 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 147 | 147 | try { |
| 148 | 148 | $sth = $this->db->prepare($query); |
| 149 | 149 | $sth->execute($query_values); |
| 150 | 150 | $sth->closeCursor(); |
| 151 | - } catch(PDOException $e) { |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | return "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | return "success"; |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 170 | 170 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 171 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 171 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 172 | 172 | |
| 173 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 173 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 174 | 174 | |
| 175 | 175 | return $spotter_array; |
| 176 | 176 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 190 | 190 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 191 | 191 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 192 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 192 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 193 | 193 | |
| 194 | 194 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 195 | 195 | /* |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 204 | 204 | */ |
| 205 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 205 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 206 | 206 | |
| 207 | 207 | return $spotter_array; |
| 208 | 208 | } |
@@ -217,14 +217,14 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | date_default_timezone_set('UTC'); |
| 219 | 219 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 220 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 220 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 221 | 221 | |
| 222 | 222 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 223 | 223 | |
| 224 | 224 | try { |
| 225 | 225 | $sth = $this->db->prepare($query); |
| 226 | 226 | $sth->execute(array(':id' => $id)); |
| 227 | - } catch(PDOException $e) { |
|
| 227 | + } catch (PDOException $e) { |
|
| 228 | 228 | echo $e->getMessage(); |
| 229 | 229 | die; |
| 230 | 230 | } |
@@ -243,14 +243,14 @@ discard block |
||
| 243 | 243 | { |
| 244 | 244 | date_default_timezone_set('UTC'); |
| 245 | 245 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 246 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 246 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 247 | 247 | |
| 248 | 248 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 249 | 249 | |
| 250 | 250 | try { |
| 251 | 251 | $sth = $this->db->prepare($query); |
| 252 | 252 | $sth->execute(array(':id' => $id)); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | echo $e->getMessage(); |
| 255 | 255 | die; |
| 256 | 256 | } |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | date_default_timezone_set('UTC'); |
| 273 | 273 | |
| 274 | 274 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 275 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 275 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 276 | 276 | |
| 277 | 277 | try { |
| 278 | 278 | $sth = $this->db->prepare($query); |
| 279 | 279 | $sth->execute(array(':ident' => $ident)); |
| 280 | - } catch(PDOException $e) { |
|
| 280 | + } catch (PDOException $e) { |
|
| 281 | 281 | echo $e->getMessage(); |
| 282 | 282 | die; |
| 283 | 283 | } |
@@ -298,12 +298,12 @@ discard block |
||
| 298 | 298 | date_default_timezone_set('UTC'); |
| 299 | 299 | |
| 300 | 300 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 301 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 301 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 302 | 302 | |
| 303 | 303 | try { |
| 304 | 304 | $sth = $this->db->prepare($query); |
| 305 | 305 | $sth->execute(array(':id' => $id)); |
| 306 | - } catch(PDOException $e) { |
|
| 306 | + } catch (PDOException $e) { |
|
| 307 | 307 | echo $e->getMessage(); |
| 308 | 308 | die; |
| 309 | 309 | } |
@@ -322,11 +322,11 @@ discard block |
||
| 322 | 322 | { |
| 323 | 323 | date_default_timezone_set('UTC'); |
| 324 | 324 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 325 | - $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | + $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -344,12 +344,12 @@ discard block |
||
| 344 | 344 | { |
| 345 | 345 | date_default_timezone_set('UTC'); |
| 346 | 346 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 347 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 347 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 348 | 348 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 349 | 349 | try { |
| 350 | 350 | $sth = $this->db->prepare($query); |
| 351 | 351 | $sth->execute(array(':ident' => $ident)); |
| 352 | - } catch(PDOException $e) { |
|
| 352 | + } catch (PDOException $e) { |
|
| 353 | 353 | echo $e->getMessage(); |
| 354 | 354 | die; |
| 355 | 355 | } |
@@ -365,12 +365,12 @@ discard block |
||
| 365 | 365 | * @return Array the spotter information |
| 366 | 366 | * |
| 367 | 367 | */ |
| 368 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 368 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 369 | 369 | { |
| 370 | 370 | $Spotter = new Spotter($this->db); |
| 371 | 371 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 372 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 372 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 374 | 374 | return $spotter_array; |
| 375 | 375 | } |
| 376 | 376 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | try { |
| 386 | 386 | $sth = $this->db->prepare($query); |
| 387 | 387 | $sth->execute(); |
| 388 | - } catch(PDOException $e) { |
|
| 388 | + } catch (PDOException $e) { |
|
| 389 | 389 | echo $e->getMessage(); |
| 390 | 390 | die; |
| 391 | 391 | } |
@@ -397,24 +397,24 @@ discard block |
||
| 397 | 397 | * @return Array the spotter information |
| 398 | 398 | * |
| 399 | 399 | */ |
| 400 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 400 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 401 | 401 | { |
| 402 | 402 | global $globalDBdriver, $globalLiveInterval; |
| 403 | 403 | date_default_timezone_set('UTC'); |
| 404 | 404 | |
| 405 | 405 | $filter_query = ''; |
| 406 | 406 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 407 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 407 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 408 | 408 | } |
| 409 | 409 | // Use spotter_output also ? |
| 410 | 410 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 411 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 412 | 412 | } |
| 413 | 413 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 414 | 414 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 415 | 415 | } |
| 416 | 416 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 417 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 417 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -433,14 +433,14 @@ discard block |
||
| 433 | 433 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 434 | 434 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 435 | 435 | */ |
| 436 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 436 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | 437 | FROM spotter_archive |
| 438 | 438 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 439 | 439 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 440 | 440 | '.$filter_query.' ORDER BY flightaware_id'; |
| 441 | 441 | } else { |
| 442 | 442 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 443 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 443 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 444 | 444 | FROM spotter_archive |
| 445 | 445 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 446 | 446 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | try { |
| 451 | 451 | $sth = $this->db->prepare($query); |
| 452 | 452 | $sth->execute(); |
| 453 | - } catch(PDOException $e) { |
|
| 453 | + } catch (PDOException $e) { |
|
| 454 | 454 | echo $e->getMessage(); |
| 455 | 455 | die; |
| 456 | 456 | } |
@@ -465,24 +465,24 @@ discard block |
||
| 465 | 465 | * @return Array the spotter information |
| 466 | 466 | * |
| 467 | 467 | */ |
| 468 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 468 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 469 | 469 | { |
| 470 | 470 | global $globalDBdriver, $globalLiveInterval; |
| 471 | 471 | date_default_timezone_set('UTC'); |
| 472 | 472 | |
| 473 | 473 | $filter_query = ''; |
| 474 | 474 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 475 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 475 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 476 | 476 | } |
| 477 | 477 | // Should use spotter_output also ? |
| 478 | 478 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 479 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 480 | 480 | } |
| 481 | 481 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 482 | 482 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 483 | 483 | } |
| 484 | 484 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 485 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 485 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | FROM spotter_archive |
| 493 | 493 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 494 | 494 | */ |
| 495 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 495 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 496 | 496 | FROM spotter_archive_output |
| 497 | 497 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 498 | 498 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 508 | 508 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 509 | 509 | */ |
| 510 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 510 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 511 | 511 | FROM spotter_archive_output |
| 512 | 512 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 513 | 513 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | try { |
| 520 | 520 | $sth = $this->db->prepare($query); |
| 521 | 521 | $sth->execute(); |
| 522 | - } catch(PDOException $e) { |
|
| 522 | + } catch (PDOException $e) { |
|
| 523 | 523 | echo $e->getMessage(); |
| 524 | 524 | die; |
| 525 | 525 | } |
@@ -534,23 +534,23 @@ discard block |
||
| 534 | 534 | * @return Array the spotter information |
| 535 | 535 | * |
| 536 | 536 | */ |
| 537 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 537 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 538 | 538 | { |
| 539 | 539 | global $globalDBdriver, $globalLiveInterval; |
| 540 | 540 | date_default_timezone_set('UTC'); |
| 541 | 541 | |
| 542 | 542 | $filter_query = ''; |
| 543 | 543 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 544 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 544 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 545 | 545 | } |
| 546 | 546 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 547 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 548 | 548 | } |
| 549 | 549 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 550 | 550 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 551 | 551 | } |
| 552 | 552 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 553 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 553 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | try { |
| 566 | 566 | $sth = $this->db->prepare($query); |
| 567 | 567 | $sth->execute(); |
| 568 | - } catch(PDOException $e) { |
|
| 568 | + } catch (PDOException $e) { |
|
| 569 | 569 | echo $e->getMessage(); |
| 570 | 570 | die; |
| 571 | 571 | } |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | * @return Array the spotter information |
| 586 | 586 | * |
| 587 | 587 | */ |
| 588 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 588 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 589 | 589 | { |
| 590 | 590 | global $globalTimezone, $globalDBdriver; |
| 591 | 591 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | |
| 608 | 608 | $q_array = explode(" ", $q); |
| 609 | 609 | |
| 610 | - foreach ($q_array as $q_item){ |
|
| 610 | + foreach ($q_array as $q_item) { |
|
| 611 | 611 | $additional_query .= " AND ("; |
| 612 | 612 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 613 | 613 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | |
| 640 | 640 | if ($registration != "") |
| 641 | 641 | { |
| 642 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 642 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 643 | 643 | if (!is_string($registration)) |
| 644 | 644 | { |
| 645 | 645 | return false; |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | if ($aircraft_icao != "") |
| 652 | 652 | { |
| 653 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 653 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 654 | 654 | if (!is_string($aircraft_icao)) |
| 655 | 655 | { |
| 656 | 656 | return false; |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | |
| 662 | 662 | if ($aircraft_manufacturer != "") |
| 663 | 663 | { |
| 664 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 664 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 665 | 665 | if (!is_string($aircraft_manufacturer)) |
| 666 | 666 | { |
| 667 | 667 | return false; |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | if ($airline_icao != "") |
| 684 | 684 | { |
| 685 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 685 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 686 | 686 | if (!is_string($airline_icao)) |
| 687 | 687 | { |
| 688 | 688 | return false; |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | |
| 694 | 694 | if ($airline_country != "") |
| 695 | 695 | { |
| 696 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 696 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 697 | 697 | if (!is_string($airline_country)) |
| 698 | 698 | { |
| 699 | 699 | return false; |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | |
| 705 | 705 | if ($airline_type != "") |
| 706 | 706 | { |
| 707 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 707 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 708 | 708 | if (!is_string($airline_type)) |
| 709 | 709 | { |
| 710 | 710 | return false; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | |
| 727 | 727 | if ($airport != "") |
| 728 | 728 | { |
| 729 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 729 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 730 | 730 | if (!is_string($airport)) |
| 731 | 731 | { |
| 732 | 732 | return false; |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | if ($airport_country != "") |
| 739 | 739 | { |
| 740 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 740 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 741 | 741 | if (!is_string($airport_country)) |
| 742 | 742 | { |
| 743 | 743 | return false; |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | if ($callsign != "") |
| 750 | 750 | { |
| 751 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 751 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 752 | 752 | if (!is_string($callsign)) |
| 753 | 753 | { |
| 754 | 754 | return false; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | $translate = $Translation->ident2icao($callsign); |
| 757 | 757 | if ($translate != $callsign) { |
| 758 | 758 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 759 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 759 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 760 | 760 | } else { |
| 761 | 761 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 762 | 762 | } |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | |
| 766 | 766 | if ($owner != "") |
| 767 | 767 | { |
| 768 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 768 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 769 | 769 | if (!is_string($owner)) |
| 770 | 770 | { |
| 771 | 771 | return false; |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | |
| 777 | 777 | if ($pilot_name != "") |
| 778 | 778 | { |
| 779 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 779 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 780 | 780 | if (!is_string($pilot_name)) |
| 781 | 781 | { |
| 782 | 782 | return false; |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | |
| 788 | 788 | if ($pilot_id != "") |
| 789 | 789 | { |
| 790 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 790 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 791 | 791 | if (!is_string($pilot_id)) |
| 792 | 792 | { |
| 793 | 793 | return false; |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | |
| 799 | 799 | if ($departure_airport_route != "") |
| 800 | 800 | { |
| 801 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 801 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 802 | 802 | if (!is_string($departure_airport_route)) |
| 803 | 803 | { |
| 804 | 804 | return false; |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | |
| 810 | 810 | if ($arrival_airport_route != "") |
| 811 | 811 | { |
| 812 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 812 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 813 | 813 | if (!is_string($arrival_airport_route)) |
| 814 | 814 | { |
| 815 | 815 | return false; |
@@ -822,8 +822,8 @@ discard block |
||
| 822 | 822 | { |
| 823 | 823 | $altitude_array = explode(",", $altitude); |
| 824 | 824 | |
| 825 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 825 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | 829 | if ($altitude_array[1] != "") |
@@ -840,8 +840,8 @@ discard block |
||
| 840 | 840 | if ($date_posted != "") |
| 841 | 841 | { |
| 842 | 842 | $date_array = explode(",", $date_posted); |
| 843 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 844 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 843 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 844 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 845 | 845 | if ($globalTimezone != '') { |
| 846 | 846 | date_default_timezone_set($globalTimezone); |
| 847 | 847 | $datetime = new DateTime(); |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | if ($limit != "") |
| 869 | 869 | { |
| 870 | 870 | $limit_array = explode(",", $limit); |
| 871 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 871 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 873 | 873 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 874 | 874 | { |
| 875 | 875 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -877,8 +877,8 @@ discard block |
||
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 880 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 881 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 880 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 881 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 882 | 882 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 883 | 883 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 884 | 884 | } else { |
@@ -894,12 +894,12 @@ discard block |
||
| 894 | 894 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 895 | 895 | } |
| 896 | 896 | |
| 897 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 897 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 898 | 898 | WHERE spotter_archive_output.ident <> '' |
| 899 | 899 | ".$additional_query." |
| 900 | 900 | ".$filter_query.$orderby_query; |
| 901 | 901 | } |
| 902 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 902 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 903 | 903 | return $spotter_array; |
| 904 | 904 | } |
| 905 | 905 | |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | try { |
| 915 | 915 | $sth = $this->db->prepare($query); |
| 916 | 916 | $sth->execute(); |
| 917 | - } catch(PDOException $e) { |
|
| 917 | + } catch (PDOException $e) { |
|
| 918 | 918 | return "error"; |
| 919 | 919 | } |
| 920 | 920 | } |
@@ -951,8 +951,8 @@ discard block |
||
| 951 | 951 | { |
| 952 | 952 | $limit_array = explode(",", $limit); |
| 953 | 953 | |
| 954 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 954 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 956 | 956 | |
| 957 | 957 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 958 | 958 | { |
@@ -993,7 +993,7 @@ discard block |
||
| 993 | 993 | $query_values = array(); |
| 994 | 994 | $limit_query = ''; |
| 995 | 995 | $additional_query = ''; |
| 996 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 996 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 997 | 997 | |
| 998 | 998 | if ($owner != "") |
| 999 | 999 | { |
@@ -1010,8 +1010,8 @@ discard block |
||
| 1010 | 1010 | { |
| 1011 | 1011 | $limit_array = explode(",", $limit); |
| 1012 | 1012 | |
| 1013 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1015 | 1015 | |
| 1016 | 1016 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1017 | 1017 | { |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | $query_values = array(); |
| 1052 | 1052 | $limit_query = ''; |
| 1053 | 1053 | $additional_query = ''; |
| 1054 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1054 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1055 | 1055 | |
| 1056 | 1056 | if ($pilot != "") |
| 1057 | 1057 | { |
@@ -1063,8 +1063,8 @@ discard block |
||
| 1063 | 1063 | { |
| 1064 | 1064 | $limit_array = explode(",", $limit); |
| 1065 | 1065 | |
| 1066 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1066 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1068 | 1068 | |
| 1069 | 1069 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1070 | 1070 | { |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | * @return Array the airline country list |
| 1095 | 1095 | * |
| 1096 | 1096 | */ |
| 1097 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1097 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1098 | 1098 | { |
| 1099 | 1099 | global $globalDBdriver; |
| 1100 | 1100 | /* |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $flight_array = array(); |
| 1124 | 1124 | $temp_array = array(); |
| 1125 | 1125 | |
| 1126 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1126 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1127 | 1127 | { |
| 1128 | 1128 | $temp_array['flight_count'] = $row['nb']; |
| 1129 | 1129 | $temp_array['flight_country'] = $row['name']; |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | * @return Array the airline country list |
| 1141 | 1141 | * |
| 1142 | 1142 | */ |
| 1143 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1143 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1144 | 1144 | { |
| 1145 | 1145 | global $globalDBdriver; |
| 1146 | 1146 | /* |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $flight_array = array(); |
| 1170 | 1170 | $temp_array = array(); |
| 1171 | 1171 | |
| 1172 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1172 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1173 | 1173 | { |
| 1174 | 1174 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1175 | 1175 | $temp_array['flight_count'] = $row['nb']; |
@@ -1187,14 +1187,14 @@ discard block |
||
| 1187 | 1187 | * @return Array the spotter information |
| 1188 | 1188 | * |
| 1189 | 1189 | */ |
| 1190 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1190 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $Spotter = new Spotter($this->db); |
| 1193 | 1193 | date_default_timezone_set('UTC'); |
| 1194 | 1194 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1195 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | - $date = date('c',$date); |
|
| 1197 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1195 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | + $date = date('c', $date); |
|
| 1197 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1198 | 1198 | return $spotter_array; |
| 1199 | 1199 | } |
| 1200 | 1200 | |
@@ -1204,14 +1204,14 @@ discard block |
||
| 1204 | 1204 | * @return Array the spotter information |
| 1205 | 1205 | * |
| 1206 | 1206 | */ |
| 1207 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1207 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1208 | 1208 | { |
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1212 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | - $date = date('c',$date); |
|
| 1214 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1212 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | + $date = date('c', $date); |
|
| 1214 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | * @return Array the spotter information |
| 1222 | 1222 | * |
| 1223 | 1223 | */ |
| 1224 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1224 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | global $global_query; |
| 1227 | 1227 | $Spotter = new Spotter($this->db); |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | $query_values = array(); |
| 1230 | 1230 | $limit_query = ''; |
| 1231 | 1231 | $additional_query = ''; |
| 1232 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1232 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1233 | 1233 | |
| 1234 | 1234 | if ($airport != "") |
| 1235 | 1235 | { |
@@ -1246,8 +1246,8 @@ discard block |
||
| 1246 | 1246 | { |
| 1247 | 1247 | $limit_array = explode(",", $limit); |
| 1248 | 1248 | |
| 1249 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1249 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1251 | 1251 | |
| 1252 | 1252 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1253 | 1253 | { |
@@ -6,7 +6,9 @@ discard block |
||
| 6 | 6 | public function __construct($dbc = null) { |
| 7 | 7 | $Connection = new Connection($dbc); |
| 8 | 8 | $this->db = $Connection->db; |
| 9 | - if ($this->db === null) die('Error: No DB connection. (SpotterArchive)'); |
|
| 9 | + if ($this->db === null) { |
|
| 10 | + die('Error: No DB connection. (SpotterArchive)'); |
|
| 11 | + } |
|
| 10 | 12 | } |
| 11 | 13 | |
| 12 | 14 | /** |
@@ -27,7 +29,9 @@ discard block |
||
| 27 | 29 | if (isset($filter[0]['source'])) { |
| 28 | 30 | $filters = array_merge($filters,$filter); |
| 29 | 31 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 31 | 35 | $filter_query_join = ''; |
| 32 | 36 | $filter_query_where = ''; |
| 33 | 37 | foreach($filters as $flt) { |
@@ -116,8 +120,11 @@ discard block |
||
| 116 | 120 | } |
| 117 | 121 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
| 118 | 122 | } |
| 119 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 120 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 123 | + if ($filter_query_where == '' && $where) { |
|
| 124 | + $filter_query_where = ' WHERE'; |
|
| 125 | + } elseif ($filter_query_where != '' && $and) { |
|
| 126 | + $filter_query_where .= ' AND'; |
|
| 127 | + } |
|
| 121 | 128 | if ($filter_query_where != '') { |
| 122 | 129 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 123 | 130 | } |
@@ -131,10 +138,17 @@ discard block |
||
| 131 | 138 | if ($over_country == '') { |
| 132 | 139 | $Spotter = new Spotter($this->db); |
| 133 | 140 | $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 134 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 135 | - else $country = ''; |
|
| 136 | - } else $country = $over_country; |
|
| 137 | - if ($airline_type === NULL) $airline_type =''; |
|
| 141 | + if (!empty($data_country)) { |
|
| 142 | + $country = $data_country['iso2']; |
|
| 143 | + } else { |
|
| 144 | + $country = ''; |
|
| 145 | + } |
|
| 146 | + } else { |
|
| 147 | + $country = $over_country; |
|
| 148 | + } |
|
| 149 | + if ($airline_type === NULL) { |
|
| 150 | + $airline_type =''; |
|
| 151 | + } |
|
| 138 | 152 | |
| 139 | 153 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 140 | 154 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
@@ -630,7 +644,9 @@ discard block |
||
| 630 | 644 | $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 631 | 645 | $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
| 632 | 646 | $translate = $Translation->ident2icao($q_item); |
| 633 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 647 | + if ($translate != $q_item) { |
|
| 648 | + $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 649 | + } |
|
| 634 | 650 | $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
| 635 | 651 | $additional_query .= ")"; |
| 636 | 652 | } |
@@ -846,7 +862,9 @@ discard block |
||
| 846 | 862 | date_default_timezone_set($globalTimezone); |
| 847 | 863 | $datetime = new DateTime(); |
| 848 | 864 | $offset = $datetime->format('P'); |
| 849 | - } else $offset = '+00:00'; |
|
| 865 | + } else { |
|
| 866 | + $offset = '+00:00'; |
|
| 867 | + } |
|
| 850 | 868 | if ($date_array[1] != "") |
| 851 | 869 | { |
| 852 | 870 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -1112,9 +1130,13 @@ discard block |
||
| 1112 | 1130 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1113 | 1131 | } |
| 1114 | 1132 | } |
| 1115 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1133 | + if ($sincedate != '') { |
|
| 1134 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1135 | + } |
|
| 1116 | 1136 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1117 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1137 | + if ($limit) { |
|
| 1138 | + $query .= " LIMIT 0,10"; |
|
| 1139 | + } |
|
| 1118 | 1140 | |
| 1119 | 1141 | |
| 1120 | 1142 | $sth = $this->db->prepare($query); |
@@ -1158,9 +1180,13 @@ discard block |
||
| 1158 | 1180 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1159 | 1181 | } |
| 1160 | 1182 | } |
| 1161 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1183 | + if ($sincedate != '') { |
|
| 1184 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1185 | + } |
|
| 1162 | 1186 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1163 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1187 | + if ($limit) { |
|
| 1188 | + $query .= " LIMIT 0,10"; |
|
| 1189 | + } |
|
| 1164 | 1190 | |
| 1165 | 1191 | |
| 1166 | 1192 | $sth = $this->db->prepare($query); |
@@ -405,17 +405,17 @@ discard block |
||
| 405 | 405 | } |
| 406 | 406 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 407 | 407 | } else $all = array(); |
| 408 | - if (empty($all)) { |
|
| 409 | - $Spotter = new Spotter($this->db); |
|
| 410 | - $filters = array(); |
|
| 408 | + if (empty($all)) { |
|
| 409 | + $Spotter = new Spotter($this->db); |
|
| 410 | + $filters = array(); |
|
| 411 | 411 | $filters = array('year' => $year,'month' => $month); |
| 412 | - if ($filter_name != '') { |
|
| 413 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 412 | + if ($filter_name != '') { |
|
| 413 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 414 | 414 | } |
| 415 | 415 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 416 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 417 | - } |
|
| 418 | - return $all; |
|
| 416 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 417 | + } |
|
| 418 | + return $all; |
|
| 419 | 419 | } |
| 420 | 420 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 421 | 421 | global $globalStatsFilters; |
@@ -1612,7 +1612,7 @@ discard block |
||
| 1612 | 1612 | return "error : ".$e->getMessage(); |
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | - /* |
|
| 1615 | + /* |
|
| 1616 | 1616 | public function getStatsSource($date,$stats_type = '') { |
| 1617 | 1617 | if ($stats_type == '') { |
| 1618 | 1618 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -2574,8 +2574,8 @@ discard block |
||
| 2574 | 2574 | } |
| 2575 | 2575 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2576 | 2576 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2577 | - foreach ($alldata as $number) { |
|
| 2578 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2577 | + foreach ($alldata as $number) { |
|
| 2578 | + $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2579 | 2579 | } |
| 2580 | 2580 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2581 | 2581 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
@@ -19,6 +19,10 @@ discard block |
||
| 19 | 19 | if ($this->db === null) die('Error: No DB connection. (Stats)'); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $type |
|
| 24 | + * @param string $stats_date |
|
| 25 | + */ |
|
| 22 | 26 | public function addLastStatsUpdate($type,$stats_date) { |
| 23 | 27 | $query = "DELETE FROM config WHERE name = :type; |
| 24 | 28 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
@@ -1369,6 +1373,10 @@ discard block |
||
| 1369 | 1373 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1370 | 1374 | return $all; |
| 1371 | 1375 | } |
| 1376 | + |
|
| 1377 | + /** |
|
| 1378 | + * @param string $type |
|
| 1379 | + */ |
|
| 1372 | 1380 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 1373 | 1381 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1374 | 1382 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1380,6 +1388,11 @@ discard block |
||
| 1380 | 1388 | echo "error : ".$e->getMessage(); |
| 1381 | 1389 | } |
| 1382 | 1390 | } |
| 1391 | + |
|
| 1392 | + /** |
|
| 1393 | + * @param string $type |
|
| 1394 | + * @param string $year |
|
| 1395 | + */ |
|
| 1383 | 1396 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 1384 | 1397 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1385 | 1398 | global $globalArchiveMonths, $globalDBdriver; |
@@ -1579,6 +1592,10 @@ discard block |
||
| 1579 | 1592 | else return 0; |
| 1580 | 1593 | } |
| 1581 | 1594 | |
| 1595 | + /** |
|
| 1596 | + * @param string $type |
|
| 1597 | + * @param string $stats_date |
|
| 1598 | + */ |
|
| 1582 | 1599 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1583 | 1600 | global $globalDBdriver; |
| 1584 | 1601 | if ($filter_name == '') $filter_name = $this->filter_name; |
@@ -1632,6 +1649,9 @@ discard block |
||
| 1632 | 1649 | } |
| 1633 | 1650 | */ |
| 1634 | 1651 | |
| 1652 | + /** |
|
| 1653 | + * @param string $stats_type |
|
| 1654 | + */ |
|
| 1635 | 1655 | public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
| 1636 | 1656 | global $globalDBdriver; |
| 1637 | 1657 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
@@ -1675,6 +1695,9 @@ discard block |
||
| 1675 | 1695 | return $all; |
| 1676 | 1696 | } |
| 1677 | 1697 | |
| 1698 | + /** |
|
| 1699 | + * @param string $stats_type |
|
| 1700 | + */ |
|
| 1678 | 1701 | public function addStatSource($data,$source_name,$stats_type,$date) { |
| 1679 | 1702 | global $globalDBdriver; |
| 1680 | 1703 | if ($globalDBdriver == 'mysql') { |
@@ -1690,6 +1713,10 @@ discard block |
||
| 1690 | 1713 | return "error : ".$e->getMessage(); |
| 1691 | 1714 | } |
| 1692 | 1715 | } |
| 1716 | + |
|
| 1717 | + /** |
|
| 1718 | + * @param string $type |
|
| 1719 | + */ |
|
| 1693 | 1720 | public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
| 1694 | 1721 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1695 | 1722 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
@@ -1956,6 +1983,10 @@ discard block |
||
| 1956 | 1983 | return "error : ".$e->getMessage(); |
| 1957 | 1984 | } |
| 1958 | 1985 | } |
| 1986 | + |
|
| 1987 | + /** |
|
| 1988 | + * @param string $type |
|
| 1989 | + */ |
|
| 1959 | 1990 | public function deleteStatFlight($type) { |
| 1960 | 1991 | $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
| 1961 | 1992 | $query_values = array(':type' => $type); |
@@ -1966,6 +1997,10 @@ discard block |
||
| 1966 | 1997 | return "error : ".$e->getMessage(); |
| 1967 | 1998 | } |
| 1968 | 1999 | } |
| 2000 | + |
|
| 2001 | + /** |
|
| 2002 | + * @param string $type |
|
| 2003 | + */ |
|
| 1969 | 2004 | public function deleteStatAirport($type) { |
| 1970 | 2005 | $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
| 1971 | 2006 | $query_values = array(':type' => $type); |
@@ -19,14 +19,14 @@ discard block |
||
| 19 | 19 | if ($this->db === null) die('Error: No DB connection. (Stats)'); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 22 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 23 | 23 | $query = "DELETE FROM config WHERE name = :type; |
| 24 | 24 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 25 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 26 | 26 | try { |
| 27 | 27 | $sth = $this->db->prepare($query); |
| 28 | 28 | $sth->execute($query_values); |
| 29 | - } catch(PDOException $e) { |
|
| 29 | + } catch (PDOException $e) { |
|
| 30 | 30 | return "error : ".$e->getMessage(); |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | try { |
| 37 | 37 | $sth = $this->db->prepare($query); |
| 38 | 38 | $sth->execute(array(':type' => $type)); |
| 39 | - } catch(PDOException $e) { |
|
| 39 | + } catch (PDOException $e) { |
|
| 40 | 40 | echo "error : ".$e->getMessage(); |
| 41 | 41 | } |
| 42 | 42 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | try { |
| 58 | 58 | $sth = $this->db->prepare($query); |
| 59 | 59 | $sth->execute(array(':filter_name' => $filter_name)); |
| 60 | - } catch(PDOException $e) { |
|
| 60 | + } catch (PDOException $e) { |
|
| 61 | 61 | return "error : ".$e->getMessage(); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -70,14 +70,14 @@ discard block |
||
| 70 | 70 | try { |
| 71 | 71 | $sth = $this->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error : ".$e->getMessage(); |
| 75 | 75 | } |
| 76 | 76 | $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute(array(':filter_name' => $filter_name)); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -89,77 +89,77 @@ discard block |
||
| 89 | 89 | try { |
| 90 | 90 | $sth = $this->db->prepare($query); |
| 91 | 91 | $sth->execute(array(':filter_name' => $filter_name)); |
| 92 | - } catch(PDOException $e) { |
|
| 92 | + } catch (PDOException $e) { |
|
| 93 | 93 | echo "error : ".$e->getMessage(); |
| 94 | 94 | } |
| 95 | 95 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 96 | 96 | if (empty($all)) { |
| 97 | 97 | $filters = array(); |
| 98 | 98 | if ($filter_name != '') { |
| 99 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 99 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 100 | 100 | } |
| 101 | 101 | $Spotter = new Spotter($this->db); |
| 102 | - $all = $Spotter->getAllAirlineNames('',NULL,$filters); |
|
| 102 | + $all = $Spotter->getAllAirlineNames('', NULL, $filters); |
|
| 103 | 103 | } |
| 104 | 104 | return $all; |
| 105 | 105 | } |
| 106 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 106 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 107 | 107 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 108 | 108 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 109 | 109 | try { |
| 110 | 110 | $sth = $this->db->prepare($query); |
| 111 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 112 | - } catch(PDOException $e) { |
|
| 111 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 112 | + } catch (PDOException $e) { |
|
| 113 | 113 | echo "error : ".$e->getMessage(); |
| 114 | 114 | } |
| 115 | 115 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 116 | 116 | return $all; |
| 117 | 117 | } |
| 118 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 118 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 119 | 119 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 120 | 120 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 121 | 121 | try { |
| 122 | 122 | $sth = $this->db->prepare($query); |
| 123 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 124 | - } catch(PDOException $e) { |
|
| 123 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 124 | + } catch (PDOException $e) { |
|
| 125 | 125 | echo "error : ".$e->getMessage(); |
| 126 | 126 | } |
| 127 | 127 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 128 | 128 | return $all; |
| 129 | 129 | } |
| 130 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 130 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 131 | 131 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 132 | 132 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 133 | 133 | try { |
| 134 | 134 | $sth = $this->db->prepare($query); |
| 135 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 136 | - } catch(PDOException $e) { |
|
| 135 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 136 | + } catch (PDOException $e) { |
|
| 137 | 137 | echo "error : ".$e->getMessage(); |
| 138 | 138 | } |
| 139 | 139 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 140 | 140 | return $all; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 143 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 144 | 144 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 145 | 145 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 146 | 146 | try { |
| 147 | 147 | $sth = $this->db->prepare($query); |
| 148 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 149 | - } catch(PDOException $e) { |
|
| 148 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 149 | + } catch (PDOException $e) { |
|
| 150 | 150 | echo "error : ".$e->getMessage(); |
| 151 | 151 | } |
| 152 | 152 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 153 | 153 | return $all; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 156 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 157 | 157 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 158 | 158 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 159 | 159 | try { |
| 160 | 160 | $sth = $this->db->prepare($query); |
| 161 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 162 | - } catch(PDOException $e) { |
|
| 161 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 162 | + } catch (PDOException $e) { |
|
| 163 | 163 | echo "error : ".$e->getMessage(); |
| 164 | 164 | } |
| 165 | 165 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -167,23 +167,23 @@ discard block |
||
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
| 170 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 170 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 171 | 171 | global $globalStatsFilters; |
| 172 | 172 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 173 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 173 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 174 | 174 | $Spotter = new Spotter($this->db); |
| 175 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 175 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 176 | 176 | $alliance_airlines = array(); |
| 177 | 177 | foreach ($airlines as $airline) { |
| 178 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 178 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 179 | 179 | } |
| 180 | 180 | if ($year == '' && $month == '') { |
| 181 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 182 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 181 | + if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 182 | + else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 183 | 183 | try { |
| 184 | 184 | $sth = $this->db->prepare($query); |
| 185 | 185 | $sth->execute(array(':filter_name' => $filter_name)); |
| 186 | - } catch(PDOException $e) { |
|
| 186 | + } catch (PDOException $e) { |
|
| 187 | 187 | echo "error : ".$e->getMessage(); |
| 188 | 188 | } |
| 189 | 189 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -194,29 +194,29 @@ discard block |
||
| 194 | 194 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
| 195 | 195 | try { |
| 196 | 196 | $sth = $this->db->prepare($query); |
| 197 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 198 | - } catch(PDOException $e) { |
|
| 197 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 198 | + } catch (PDOException $e) { |
|
| 199 | 199 | echo "error : ".$e->getMessage(); |
| 200 | 200 | } |
| 201 | 201 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 202 | 202 | } else $all = array(); |
| 203 | 203 | } |
| 204 | 204 | if (empty($all)) { |
| 205 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 206 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 205 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 206 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 207 | 207 | } else { |
| 208 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 208 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 209 | 209 | } |
| 210 | 210 | if ($filter_name != '') { |
| 211 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 211 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 212 | 212 | } |
| 213 | 213 | $Spotter = new Spotter($this->db); |
| 214 | 214 | //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
| 215 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 215 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 216 | 216 | } |
| 217 | 217 | return $all; |
| 218 | 218 | } |
| 219 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 219 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 220 | 220 | global $globalStatsFilters; |
| 221 | 221 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 222 | 222 | if ($year == '' && $month == '') { |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $this->db->prepare($query); |
| 227 | 227 | $sth->execute(array(':filter_name' => $filter_name)); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | echo "error : ".$e->getMessage(); |
| 230 | 230 | } |
| 231 | 231 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -233,32 +233,32 @@ discard block |
||
| 233 | 233 | if (empty($all)) { |
| 234 | 234 | $Spotter = new Spotter($this->db); |
| 235 | 235 | $filters = array(); |
| 236 | - $filters = array('year' => $year,'month' => $month); |
|
| 236 | + $filters = array('year' => $year, 'month' => $month); |
|
| 237 | 237 | if ($filter_name != '') { |
| 238 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 238 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 239 | 239 | } |
| 240 | 240 | //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
| 241 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 241 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 242 | 242 | } |
| 243 | 243 | return $all; |
| 244 | 244 | } |
| 245 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 245 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 246 | 246 | global $globalStatsFilters; |
| 247 | 247 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 248 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 248 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 249 | 249 | $Spotter = new Spotter($this->db); |
| 250 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 250 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 251 | 251 | $alliance_airlines = array(); |
| 252 | 252 | foreach ($airlines as $airline) { |
| 253 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 253 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 254 | 254 | } |
| 255 | 255 | if ($year == '' && $month == '') { |
| 256 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 257 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 256 | + if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 257 | + else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 258 | 258 | try { |
| 259 | 259 | $sth = $this->db->prepare($query); |
| 260 | 260 | $sth->execute(array(':filter_name' => $filter_name)); |
| 261 | - } catch(PDOException $e) { |
|
| 261 | + } catch (PDOException $e) { |
|
| 262 | 262 | echo "error : ".$e->getMessage(); |
| 263 | 263 | } |
| 264 | 264 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -269,21 +269,21 @@ discard block |
||
| 269 | 269 | else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
| 270 | 270 | try { |
| 271 | 271 | $sth = $this->db->prepare($query); |
| 272 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 273 | - } catch(PDOException $e) { |
|
| 272 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 273 | + } catch (PDOException $e) { |
|
| 274 | 274 | echo "error : ".$e->getMessage(); |
| 275 | 275 | } |
| 276 | 276 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 277 | 277 | } else $all = array(); |
| 278 | 278 | } |
| 279 | 279 | if (empty($all)) { |
| 280 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 281 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 280 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 281 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 282 | 282 | } else { |
| 283 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 283 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 284 | 284 | } |
| 285 | 285 | if ($filter_name != '') { |
| 286 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 286 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 287 | 287 | } |
| 288 | 288 | $Spotter = new Spotter($this->db); |
| 289 | 289 | //$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
@@ -292,23 +292,23 @@ discard block |
||
| 292 | 292 | return $all; |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 295 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 296 | 296 | global $globalStatsFilters; |
| 297 | 297 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 298 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 298 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 299 | 299 | $Spotter = new Spotter($this->db); |
| 300 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 300 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 301 | 301 | $alliance_airlines = array(); |
| 302 | 302 | foreach ($airlines as $airline) { |
| 303 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 303 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 304 | 304 | } |
| 305 | 305 | if ($year == '' && $month == '') { |
| 306 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 307 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 306 | + if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 307 | + else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 308 | 308 | try { |
| 309 | 309 | $sth = $this->db->prepare($query); |
| 310 | 310 | $sth->execute(array(':filter_name' => $filter_name)); |
| 311 | - } catch(PDOException $e) { |
|
| 311 | + } catch (PDOException $e) { |
|
| 312 | 312 | echo "error : ".$e->getMessage(); |
| 313 | 313 | } |
| 314 | 314 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -319,61 +319,61 @@ discard block |
||
| 319 | 319 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
| 320 | 320 | try { |
| 321 | 321 | $sth = $this->db->prepare($query); |
| 322 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 323 | - } catch(PDOException $e) { |
|
| 322 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | echo "error : ".$e->getMessage(); |
| 325 | 325 | } |
| 326 | 326 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 327 | 327 | } else $all = array(); |
| 328 | 328 | } |
| 329 | 329 | if (empty($all)) { |
| 330 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 331 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 330 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 331 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 332 | 332 | } else { |
| 333 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 333 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 334 | 334 | } |
| 335 | 335 | if ($filter_name != '') { |
| 336 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 336 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 337 | 337 | } |
| 338 | 338 | $Spotter = new Spotter($this->db); |
| 339 | 339 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 340 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 340 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 341 | 341 | } |
| 342 | 342 | return $all; |
| 343 | 343 | } |
| 344 | 344 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 345 | 345 | global $globalStatsFilters; |
| 346 | 346 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 347 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 347 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 348 | 348 | $Spotter = new Spotter($this->db); |
| 349 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 349 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 350 | 350 | $alliance_airlines = array(); |
| 351 | 351 | foreach ($airlines as $airline) { |
| 352 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 352 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 353 | 353 | } |
| 354 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 355 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 354 | + if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 355 | + else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 356 | 356 | $query_values = array(':filter_name' => $filter_name); |
| 357 | 357 | } else { |
| 358 | 358 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
| 359 | 359 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
| 360 | - $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 360 | + $query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 361 | 361 | } |
| 362 | 362 | try { |
| 363 | 363 | $sth = $this->db->prepare($query); |
| 364 | 364 | $sth->execute($query_values); |
| 365 | - } catch(PDOException $e) { |
|
| 365 | + } catch (PDOException $e) { |
|
| 366 | 366 | echo "error : ".$e->getMessage(); |
| 367 | 367 | } |
| 368 | 368 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 369 | 369 | if (empty($all)) { |
| 370 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 371 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 370 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 371 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 372 | 372 | } else { |
| 373 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 373 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 374 | 374 | } |
| 375 | 375 | if ($filter_name != '') { |
| 376 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 376 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 377 | 377 | } |
| 378 | 378 | $Spotter = new Spotter($this->db); |
| 379 | 379 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | return $all; |
| 383 | 383 | } |
| 384 | 384 | |
| 385 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 385 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 386 | 386 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 387 | 387 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 388 | 388 | if ($year == '' && $month == '') { |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | if (isset($forsource)) { |
| 392 | 392 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 393 | 393 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
| 394 | - $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
|
| 394 | + $query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource); |
|
| 395 | 395 | } else { |
| 396 | 396 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 397 | 397 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | try { |
| 401 | 401 | $sth = $this->db->prepare($query); |
| 402 | 402 | $sth->execute($query_values); |
| 403 | - } catch(PDOException $e) { |
|
| 403 | + } catch (PDOException $e) { |
|
| 404 | 404 | echo "error : ".$e->getMessage(); |
| 405 | 405 | } |
| 406 | 406 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -408,32 +408,32 @@ discard block |
||
| 408 | 408 | if (empty($all)) { |
| 409 | 409 | $Spotter = new Spotter($this->db); |
| 410 | 410 | $filters = array(); |
| 411 | - $filters = array('year' => $year,'month' => $month); |
|
| 411 | + $filters = array('year' => $year, 'month' => $month); |
|
| 412 | 412 | if ($filter_name != '') { |
| 413 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 413 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 414 | 414 | } |
| 415 | 415 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 416 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 416 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 417 | 417 | } |
| 418 | 418 | return $all; |
| 419 | 419 | } |
| 420 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 420 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 421 | 421 | global $globalStatsFilters; |
| 422 | 422 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 423 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 423 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 424 | 424 | $Spotter = new Spotter($this->db); |
| 425 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 425 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 426 | 426 | $alliance_airlines = array(); |
| 427 | 427 | foreach ($airlines as $airline) { |
| 428 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 428 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 429 | 429 | } |
| 430 | 430 | if ($year == '' && $month == '') { |
| 431 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 432 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 431 | + if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 432 | + else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 433 | 433 | try { |
| 434 | 434 | $sth = $this->db->prepare($query); |
| 435 | 435 | $sth->execute(array(':filter_name' => $filter_name)); |
| 436 | - } catch(PDOException $e) { |
|
| 436 | + } catch (PDOException $e) { |
|
| 437 | 437 | echo "error : ".$e->getMessage(); |
| 438 | 438 | } |
| 439 | 439 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -444,45 +444,45 @@ discard block |
||
| 444 | 444 | else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
| 445 | 445 | try { |
| 446 | 446 | $sth = $this->db->prepare($query); |
| 447 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 448 | - } catch(PDOException $e) { |
|
| 447 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 448 | + } catch (PDOException $e) { |
|
| 449 | 449 | echo "error : ".$e->getMessage(); |
| 450 | 450 | } |
| 451 | 451 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 452 | 452 | } else $all = array(); |
| 453 | 453 | } |
| 454 | 454 | if (empty($all)) { |
| 455 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 456 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 455 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 456 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 457 | 457 | } else { |
| 458 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 458 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 459 | 459 | } |
| 460 | 460 | if ($filter_name != '') { |
| 461 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 461 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 462 | 462 | } |
| 463 | 463 | $Spotter = new Spotter($this->db); |
| 464 | 464 | //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
| 465 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 465 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 466 | 466 | } |
| 467 | 467 | return $all; |
| 468 | 468 | } |
| 469 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 469 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 470 | 470 | global $globalStatsFilters; |
| 471 | 471 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 472 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 472 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 473 | 473 | $Spotter = new Spotter($this->db); |
| 474 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 474 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 475 | 475 | $alliance_airlines = array(); |
| 476 | 476 | foreach ($airlines as $airline) { |
| 477 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 477 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 478 | 478 | } |
| 479 | 479 | if ($year == '' && $month == '') { |
| 480 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 481 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 480 | + if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 481 | + else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 482 | 482 | try { |
| 483 | 483 | $sth = $this->db->prepare($query); |
| 484 | 484 | $sth->execute(array(':filter_name' => $filter_name)); |
| 485 | - } catch(PDOException $e) { |
|
| 485 | + } catch (PDOException $e) { |
|
| 486 | 486 | echo "error : ".$e->getMessage(); |
| 487 | 487 | } |
| 488 | 488 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -493,46 +493,46 @@ discard block |
||
| 493 | 493 | else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
| 494 | 494 | try { |
| 495 | 495 | $sth = $this->db->prepare($query); |
| 496 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 497 | - } catch(PDOException $e) { |
|
| 496 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 497 | + } catch (PDOException $e) { |
|
| 498 | 498 | echo "error : ".$e->getMessage(); |
| 499 | 499 | } |
| 500 | 500 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 501 | 501 | } else $all = array(); |
| 502 | 502 | } |
| 503 | 503 | if (empty($all)) { |
| 504 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 505 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 504 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 505 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 506 | 506 | } else { |
| 507 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 507 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 508 | 508 | } |
| 509 | 509 | if ($filter_name != '') { |
| 510 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 510 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 511 | 511 | } |
| 512 | 512 | $Spotter = new Spotter($this->db); |
| 513 | 513 | //$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
| 514 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 514 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 515 | 515 | } |
| 516 | 516 | return $all; |
| 517 | 517 | } |
| 518 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 518 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 519 | 519 | $Connection = new Connection($this->db); |
| 520 | 520 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 521 | 521 | if ($Connection->tableExists('countries')) { |
| 522 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 522 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 523 | 523 | $Spotter = new Spotter($this->db); |
| 524 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 524 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 525 | 525 | if ($year == '' && $month == '') { |
| 526 | 526 | $alliance_airlines = array(); |
| 527 | 527 | foreach ($airlines as $airline) { |
| 528 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 528 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 529 | 529 | } |
| 530 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 531 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 530 | + if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 531 | + else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 532 | 532 | try { |
| 533 | 533 | $sth = $this->db->prepare($query); |
| 534 | 534 | $sth->execute(array(':filter_name' => $filter_name)); |
| 535 | - } catch(PDOException $e) { |
|
| 535 | + } catch (PDOException $e) { |
|
| 536 | 536 | echo "error : ".$e->getMessage(); |
| 537 | 537 | } |
| 538 | 538 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -544,8 +544,8 @@ discard block |
||
| 544 | 544 | else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
| 545 | 545 | try { |
| 546 | 546 | $sth = $this->db->prepare($query); |
| 547 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 548 | - } catch(PDOException $e) { |
|
| 547 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 548 | + } catch (PDOException $e) { |
|
| 549 | 549 | echo "error : ".$e->getMessage(); |
| 550 | 550 | } |
| 551 | 551 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | return array(); |
| 563 | 563 | } |
| 564 | 564 | } |
| 565 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 565 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 566 | 566 | global $globalStatsFilters; |
| 567 | 567 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 568 | 568 | if ($year == '' && $month == '') { |
@@ -570,41 +570,41 @@ discard block |
||
| 570 | 570 | else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
| 571 | 571 | try { |
| 572 | 572 | $sth = $this->db->prepare($query); |
| 573 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 574 | - } catch(PDOException $e) { |
|
| 573 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | echo "error : ".$e->getMessage(); |
| 576 | 576 | } |
| 577 | 577 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 578 | 578 | } else $all = array(); |
| 579 | 579 | if (empty($all)) { |
| 580 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 580 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 581 | 581 | if ($filter_name != '') { |
| 582 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 582 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 583 | 583 | } |
| 584 | 584 | $Spotter = new Spotter($this->db); |
| 585 | 585 | //$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
| 586 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 586 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 587 | 587 | } |
| 588 | 588 | return $all; |
| 589 | 589 | } |
| 590 | 590 | |
| 591 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 591 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 592 | 592 | global $globalStatsFilters; |
| 593 | 593 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 594 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 594 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 595 | 595 | $Spotter = new Spotter($this->db); |
| 596 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 596 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 597 | 597 | if ($year == '' && $month == '') { |
| 598 | 598 | $alliance_airlines = array(); |
| 599 | 599 | foreach ($airlines as $airline) { |
| 600 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 600 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 601 | 601 | } |
| 602 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 603 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 602 | + if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 603 | + else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 604 | 604 | try { |
| 605 | 605 | $sth = $this->db->prepare($query); |
| 606 | 606 | $sth->execute(array(':filter_name' => $filter_name)); |
| 607 | - } catch(PDOException $e) { |
|
| 607 | + } catch (PDOException $e) { |
|
| 608 | 608 | echo "error : ".$e->getMessage(); |
| 609 | 609 | } |
| 610 | 610 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -615,45 +615,45 @@ discard block |
||
| 615 | 615 | else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
| 616 | 616 | try { |
| 617 | 617 | $sth = $this->db->prepare($query); |
| 618 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 619 | - } catch(PDOException $e) { |
|
| 618 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 619 | + } catch (PDOException $e) { |
|
| 620 | 620 | echo "error : ".$e->getMessage(); |
| 621 | 621 | } |
| 622 | 622 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 623 | 623 | } else $all = array(); |
| 624 | 624 | } |
| 625 | 625 | if (empty($all)) { |
| 626 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 627 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 626 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 627 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 628 | 628 | } else { |
| 629 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 629 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 630 | 630 | } |
| 631 | 631 | if ($filter_name != '') { |
| 632 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 632 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 633 | 633 | } |
| 634 | 634 | $Spotter = new Spotter($this->db); |
| 635 | 635 | //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
| 636 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 636 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 637 | 637 | } |
| 638 | 638 | return $all; |
| 639 | 639 | } |
| 640 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 640 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 641 | 641 | global $globalStatsFilters; |
| 642 | 642 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 643 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 643 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 644 | 644 | $Spotter = new Spotter($this->db); |
| 645 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 645 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 646 | 646 | if ($year == '' && $month == '') { |
| 647 | 647 | $alliance_airlines = array(); |
| 648 | 648 | foreach ($airlines as $airline) { |
| 649 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 649 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 650 | 650 | } |
| 651 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 652 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 651 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 652 | + else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 653 | 653 | try { |
| 654 | 654 | $sth = $this->db->prepare($query); |
| 655 | 655 | $sth->execute(array(':filter_name' => $filter_name)); |
| 656 | - } catch(PDOException $e) { |
|
| 656 | + } catch (PDOException $e) { |
|
| 657 | 657 | echo "error : ".$e->getMessage(); |
| 658 | 658 | } |
| 659 | 659 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -664,27 +664,27 @@ discard block |
||
| 664 | 664 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $this->db->prepare($query); |
| 667 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 668 | - } catch(PDOException $e) { |
|
| 667 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | echo "error : ".$e->getMessage(); |
| 670 | 670 | } |
| 671 | 671 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 672 | 672 | } else $all = array(); |
| 673 | 673 | } |
| 674 | 674 | if (empty($all)) { |
| 675 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 676 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 675 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 676 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 677 | 677 | } else { |
| 678 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 678 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 679 | 679 | } |
| 680 | 680 | if ($filter_name != '') { |
| 681 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 681 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 682 | 682 | } |
| 683 | 683 | $Spotter = new Spotter($this->db); |
| 684 | 684 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 685 | 685 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 686 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 687 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 686 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 687 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 688 | 688 | $all = array(); |
| 689 | 689 | foreach ($pall as $value) { |
| 690 | 690 | $icao = $value['airport_departure_icao']; |
@@ -700,27 +700,27 @@ discard block |
||
| 700 | 700 | foreach ($all as $key => $row) { |
| 701 | 701 | $count[$key] = $row['airport_departure_icao_count']; |
| 702 | 702 | } |
| 703 | - array_multisort($count,SORT_DESC,$all); |
|
| 703 | + array_multisort($count, SORT_DESC, $all); |
|
| 704 | 704 | } |
| 705 | 705 | return $all; |
| 706 | 706 | } |
| 707 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 707 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 708 | 708 | global $globalStatsFilters; |
| 709 | 709 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 710 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 710 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 711 | 711 | $Spotter = new Spotter($this->db); |
| 712 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 712 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 713 | 713 | if ($year == '' && $month == '') { |
| 714 | 714 | $alliance_airlines = array(); |
| 715 | 715 | foreach ($airlines as $airline) { |
| 716 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 716 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 717 | 717 | } |
| 718 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 719 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 718 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 719 | + else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 720 | 720 | try { |
| 721 | 721 | $sth = $this->db->prepare($query); |
| 722 | 722 | $sth->execute(array(':filter_name' => $filter_name)); |
| 723 | - } catch(PDOException $e) { |
|
| 723 | + } catch (PDOException $e) { |
|
| 724 | 724 | echo "error : ".$e->getMessage(); |
| 725 | 725 | } |
| 726 | 726 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -731,27 +731,27 @@ discard block |
||
| 731 | 731 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 732 | 732 | try { |
| 733 | 733 | $sth = $this->db->prepare($query); |
| 734 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 735 | - } catch(PDOException $e) { |
|
| 734 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 735 | + } catch (PDOException $e) { |
|
| 736 | 736 | echo "error : ".$e->getMessage(); |
| 737 | 737 | } |
| 738 | 738 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 739 | 739 | } else $all = array(); |
| 740 | 740 | } |
| 741 | 741 | if (empty($all)) { |
| 742 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 743 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 742 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 743 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 744 | 744 | } else { |
| 745 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 745 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 746 | 746 | } |
| 747 | 747 | if ($filter_name != '') { |
| 748 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 748 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 749 | 749 | } |
| 750 | 750 | $Spotter = new Spotter($this->db); |
| 751 | 751 | // $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 752 | 752 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 753 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 754 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 753 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 754 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 755 | 755 | $all = array(); |
| 756 | 756 | foreach ($pall as $value) { |
| 757 | 757 | $icao = $value['airport_arrival_icao']; |
@@ -767,26 +767,26 @@ discard block |
||
| 767 | 767 | foreach ($all as $key => $row) { |
| 768 | 768 | $count[$key] = $row['airport_arrival_icao_count']; |
| 769 | 769 | } |
| 770 | - array_multisort($count,SORT_DESC,$all); |
|
| 770 | + array_multisort($count, SORT_DESC, $all); |
|
| 771 | 771 | } |
| 772 | 772 | return $all; |
| 773 | 773 | } |
| 774 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 774 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 775 | 775 | global $globalDBdriver, $globalStatsFilters; |
| 776 | 776 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 777 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 777 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 778 | 778 | $Spotter = new Spotter($this->db); |
| 779 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 779 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 780 | 780 | $alliance_airlines = array(); |
| 781 | 781 | foreach ($airlines as $airline) { |
| 782 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 782 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 783 | 783 | } |
| 784 | 784 | if ($globalDBdriver == 'mysql') { |
| 785 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 786 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 785 | + if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 786 | + else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 787 | 787 | } else { |
| 788 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 789 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | + if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 789 | + else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 790 | 790 | } |
| 791 | 791 | $query_data = array(':filter_name' => $filter_name); |
| 792 | 792 | } else { |
@@ -797,23 +797,23 @@ discard block |
||
| 797 | 797 | if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 798 | 798 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 799 | 799 | } |
| 800 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 800 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 801 | 801 | } |
| 802 | 802 | try { |
| 803 | 803 | $sth = $this->db->prepare($query); |
| 804 | 804 | $sth->execute($query_data); |
| 805 | - } catch(PDOException $e) { |
|
| 805 | + } catch (PDOException $e) { |
|
| 806 | 806 | echo "error : ".$e->getMessage(); |
| 807 | 807 | } |
| 808 | 808 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 809 | 809 | if (empty($all)) { |
| 810 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 811 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 810 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 811 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 812 | 812 | } else { |
| 813 | 813 | $filters = array('airlines' => array($stats_airline)); |
| 814 | 814 | } |
| 815 | 815 | if ($filter_name != '') { |
| 816 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 816 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 817 | 817 | } |
| 818 | 818 | $Spotter = new Spotter($this->db); |
| 819 | 819 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -821,57 +821,57 @@ discard block |
||
| 821 | 821 | return $all; |
| 822 | 822 | } |
| 823 | 823 | |
| 824 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 824 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 825 | 825 | global $globalStatsFilters; |
| 826 | 826 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 827 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 827 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 828 | 828 | $Spotter = new Spotter($this->db); |
| 829 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 829 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 830 | 830 | $alliance_airlines = array(); |
| 831 | 831 | foreach ($airlines as $airline) { |
| 832 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 832 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 833 | 833 | } |
| 834 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 834 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 835 | 835 | $query_data = array(':filter_name' => $filter_name); |
| 836 | 836 | } else { |
| 837 | 837 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 838 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 838 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 839 | 839 | } |
| 840 | 840 | try { |
| 841 | 841 | $sth = $this->db->prepare($query); |
| 842 | 842 | $sth->execute($query_data); |
| 843 | - } catch(PDOException $e) { |
|
| 843 | + } catch (PDOException $e) { |
|
| 844 | 844 | echo "error : ".$e->getMessage(); |
| 845 | 845 | } |
| 846 | 846 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 847 | 847 | if (empty($all)) { |
| 848 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 849 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 848 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 849 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 850 | 850 | } else { |
| 851 | 851 | $filters = array('airlines' => array($stats_airline)); |
| 852 | 852 | } |
| 853 | 853 | if ($filter_name != '') { |
| 854 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 854 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 855 | 855 | } |
| 856 | 856 | $Spotter = new Spotter($this->db); |
| 857 | 857 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 858 | 858 | } |
| 859 | 859 | return $all; |
| 860 | 860 | } |
| 861 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 861 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 862 | 862 | global $globalDBdriver, $globalStatsFilters; |
| 863 | 863 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 864 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 864 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 865 | 865 | $Spotter = new Spotter($this->db); |
| 866 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 866 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 867 | 867 | $alliance_airlines = array(); |
| 868 | 868 | foreach ($airlines as $airline) { |
| 869 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 869 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 870 | 870 | } |
| 871 | 871 | if ($globalDBdriver == 'mysql') { |
| 872 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 872 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 873 | 873 | } else { |
| 874 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 874 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 875 | 875 | } |
| 876 | 876 | $query_data = array(':filter_name' => $filter_name); |
| 877 | 877 | } else { |
@@ -880,60 +880,60 @@ discard block |
||
| 880 | 880 | } else { |
| 881 | 881 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 882 | 882 | } |
| 883 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 883 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 884 | 884 | } |
| 885 | 885 | try { |
| 886 | 886 | $sth = $this->db->prepare($query); |
| 887 | 887 | $sth->execute($query_data); |
| 888 | - } catch(PDOException $e) { |
|
| 888 | + } catch (PDOException $e) { |
|
| 889 | 889 | echo "error : ".$e->getMessage(); |
| 890 | 890 | } |
| 891 | 891 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 892 | 892 | if (empty($all)) { |
| 893 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 894 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 893 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 894 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 895 | 895 | } else { |
| 896 | 896 | $filters = array('airlines' => array($stats_airline)); |
| 897 | 897 | } |
| 898 | 898 | if ($filter_name != '') { |
| 899 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 899 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 900 | 900 | } |
| 901 | 901 | $Spotter = new Spotter($this->db); |
| 902 | 902 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 903 | 903 | } |
| 904 | 904 | return $all; |
| 905 | 905 | } |
| 906 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 906 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 907 | 907 | global $globalStatsFilters; |
| 908 | 908 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 909 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 909 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 910 | 910 | $Spotter = new Spotter($this->db); |
| 911 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 911 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 912 | 912 | $alliance_airlines = array(); |
| 913 | 913 | foreach ($airlines as $airline) { |
| 914 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 914 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 915 | 915 | } |
| 916 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 916 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 917 | 917 | $query_data = array(':filter_name' => $filter_name); |
| 918 | 918 | } else { |
| 919 | 919 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 920 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 920 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 921 | 921 | } |
| 922 | 922 | try { |
| 923 | 923 | $sth = $this->db->prepare($query); |
| 924 | 924 | $sth->execute($query_data); |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | echo "error : ".$e->getMessage(); |
| 927 | 927 | } |
| 928 | 928 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 929 | 929 | if (empty($all)) { |
| 930 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 931 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 930 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 931 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 932 | 932 | } else { |
| 933 | 933 | $filters = array('airlines' => array($stats_airline)); |
| 934 | 934 | } |
| 935 | 935 | if ($filter_name != '') { |
| 936 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 936 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 937 | 937 | } |
| 938 | 938 | $Spotter = new Spotter($this->db); |
| 939 | 939 | $all = $Spotter->countAllDates($filters); |
@@ -948,34 +948,34 @@ discard block |
||
| 948 | 948 | try { |
| 949 | 949 | $sth = $this->db->prepare($query); |
| 950 | 950 | $sth->execute($query_data); |
| 951 | - } catch(PDOException $e) { |
|
| 951 | + } catch (PDOException $e) { |
|
| 952 | 952 | echo "error : ".$e->getMessage(); |
| 953 | 953 | } |
| 954 | 954 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 955 | 955 | if (empty($all)) { |
| 956 | 956 | $filters = array(); |
| 957 | 957 | if ($filter_name != '') { |
| 958 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 958 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 959 | 959 | } |
| 960 | 960 | $Spotter = new Spotter($this->db); |
| 961 | 961 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 962 | 962 | } |
| 963 | 963 | return $all; |
| 964 | 964 | } |
| 965 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 965 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 966 | 966 | global $globalStatsFilters, $globalDBdriver; |
| 967 | 967 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 968 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 968 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 969 | 969 | $Spotter = new Spotter($this->db); |
| 970 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 970 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 971 | 971 | $alliance_airlines = array(); |
| 972 | 972 | foreach ($airlines as $airline) { |
| 973 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 973 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 974 | 974 | } |
| 975 | 975 | if ($globalDBdriver == 'mysql') { |
| 976 | - $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 976 | + $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 977 | 977 | } else { |
| 978 | - $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 978 | + $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 979 | 979 | } |
| 980 | 980 | $query_data = array(':filter_name' => $filter_name); |
| 981 | 981 | } else { |
@@ -989,18 +989,18 @@ discard block |
||
| 989 | 989 | try { |
| 990 | 990 | $sth = $this->db->prepare($query); |
| 991 | 991 | $sth->execute($query_data); |
| 992 | - } catch(PDOException $e) { |
|
| 992 | + } catch (PDOException $e) { |
|
| 993 | 993 | echo "error : ".$e->getMessage(); |
| 994 | 994 | } |
| 995 | 995 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 996 | 996 | if (empty($all)) { |
| 997 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 998 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 997 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 998 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 999 | 999 | } else { |
| 1000 | 1000 | $filters = array('airlines' => array($stats_airline)); |
| 1001 | 1001 | } |
| 1002 | 1002 | if ($filter_name != '') { |
| 1003 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1003 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1004 | 1004 | } |
| 1005 | 1005 | $Spotter = new Spotter($this->db); |
| 1006 | 1006 | $all = $Spotter->countAllMonths($filters); |
@@ -1017,7 +1017,7 @@ discard block |
||
| 1017 | 1017 | try { |
| 1018 | 1018 | $sth = $this->db->prepare($query); |
| 1019 | 1019 | $sth->execute(); |
| 1020 | - } catch(PDOException $e) { |
|
| 1020 | + } catch (PDOException $e) { |
|
| 1021 | 1021 | echo "error : ".$e->getMessage(); |
| 1022 | 1022 | } |
| 1023 | 1023 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | try { |
| 1038 | 1038 | $sth = $this->db->prepare($query); |
| 1039 | 1039 | $sth->execute(); |
| 1040 | - } catch(PDOException $e) { |
|
| 1040 | + } catch (PDOException $e) { |
|
| 1041 | 1041 | echo "error : ".$e->getMessage(); |
| 1042 | 1042 | } |
| 1043 | 1043 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1054,32 +1054,32 @@ discard block |
||
| 1054 | 1054 | try { |
| 1055 | 1055 | $sth = $this->db->prepare($query); |
| 1056 | 1056 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1057 | - } catch(PDOException $e) { |
|
| 1057 | + } catch (PDOException $e) { |
|
| 1058 | 1058 | echo "error : ".$e->getMessage(); |
| 1059 | 1059 | } |
| 1060 | 1060 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1061 | 1061 | if (empty($all)) { |
| 1062 | 1062 | $filters = array(); |
| 1063 | 1063 | if ($filter_name != '') { |
| 1064 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1064 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1065 | 1065 | } |
| 1066 | 1066 | $Spotter = new Spotter($this->db); |
| 1067 | 1067 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 1068 | 1068 | } |
| 1069 | 1069 | return $all; |
| 1070 | 1070 | } |
| 1071 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 1071 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 1072 | 1072 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1073 | 1073 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1074 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1074 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1075 | 1075 | $Spotter = new Spotter($this->db); |
| 1076 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1076 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1077 | 1077 | $alliance_airlines = array(); |
| 1078 | 1078 | foreach ($airlines as $airline) { |
| 1079 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1079 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1080 | 1080 | } |
| 1081 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1082 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1081 | + if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1082 | + else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1083 | 1083 | $query_data = array(':filter_name' => $filter_name); |
| 1084 | 1084 | } else { |
| 1085 | 1085 | if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1097,37 +1097,37 @@ discard block |
||
| 1097 | 1097 | try { |
| 1098 | 1098 | $sth = $this->db->prepare($query); |
| 1099 | 1099 | $sth->execute($query_data); |
| 1100 | - } catch(PDOException $e) { |
|
| 1100 | + } catch (PDOException $e) { |
|
| 1101 | 1101 | echo "error : ".$e->getMessage(); |
| 1102 | 1102 | } |
| 1103 | 1103 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1104 | 1104 | if (empty($all)) { |
| 1105 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1106 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1105 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1106 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1107 | 1107 | } else { |
| 1108 | 1108 | $filters = array('airlines' => array($stats_airline)); |
| 1109 | 1109 | } |
| 1110 | 1110 | if ($filter_name != '') { |
| 1111 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1111 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1112 | 1112 | } |
| 1113 | 1113 | $Spotter = new Spotter($this->db); |
| 1114 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 1114 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 1115 | 1115 | } |
| 1116 | 1116 | return $all; |
| 1117 | 1117 | } |
| 1118 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 1118 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1119 | 1119 | global $globalStatsFilters; |
| 1120 | 1120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1121 | 1121 | if ($year == '') $year = date('Y'); |
| 1122 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1122 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1123 | 1123 | if (empty($all)) { |
| 1124 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1125 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1124 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1125 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1126 | 1126 | } else { |
| 1127 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1127 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1128 | 1128 | } |
| 1129 | 1129 | if ($filter_name != '') { |
| 1130 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1130 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1131 | 1131 | } |
| 1132 | 1132 | $Spotter = new Spotter($this->db); |
| 1133 | 1133 | //$all = $Spotter->countOverallFlights($filters,$year,$month); |
@@ -1135,16 +1135,16 @@ discard block |
||
| 1135 | 1135 | } |
| 1136 | 1136 | return $all; |
| 1137 | 1137 | } |
| 1138 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 1138 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 1139 | 1139 | global $globalStatsFilters; |
| 1140 | 1140 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1141 | 1141 | if ($year == '') $year = date('Y'); |
| 1142 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 1142 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 1143 | 1143 | if (empty($all)) { |
| 1144 | 1144 | $filters = array(); |
| 1145 | - $filters = array('year' => $year,'month' => $month); |
|
| 1145 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1146 | 1146 | if ($filter_name != '') { |
| 1147 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1147 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1148 | 1148 | } |
| 1149 | 1149 | $Spotter = new Spotter($this->db); |
| 1150 | 1150 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -1152,19 +1152,19 @@ discard block |
||
| 1152 | 1152 | } |
| 1153 | 1153 | return $all; |
| 1154 | 1154 | } |
| 1155 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 1155 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1156 | 1156 | global $globalStatsFilters; |
| 1157 | 1157 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1158 | 1158 | if ($year == '') $year = date('Y'); |
| 1159 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1159 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1160 | 1160 | if (empty($all)) { |
| 1161 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1162 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1161 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1162 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1163 | 1163 | } else { |
| 1164 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1164 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1165 | 1165 | } |
| 1166 | 1166 | if ($filter_name != '') { |
| 1167 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1167 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1168 | 1168 | } |
| 1169 | 1169 | $Spotter = new Spotter($this->db); |
| 1170 | 1170 | //$all = $Spotter->countOverallArrival($filters,$year,$month); |
@@ -1172,48 +1172,48 @@ discard block |
||
| 1172 | 1172 | } |
| 1173 | 1173 | return $all; |
| 1174 | 1174 | } |
| 1175 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1175 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1176 | 1176 | global $globalStatsFilters; |
| 1177 | 1177 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1178 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1178 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1179 | 1179 | $Spotter = new Spotter($this->db); |
| 1180 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1180 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1181 | 1181 | if ($year == '' && $month == '') { |
| 1182 | 1182 | $alliance_airlines = array(); |
| 1183 | 1183 | foreach ($airlines as $airline) { |
| 1184 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1184 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1185 | 1185 | } |
| 1186 | - $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1186 | + $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1187 | 1187 | try { |
| 1188 | 1188 | $sth = $this->db->prepare($query); |
| 1189 | 1189 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1190 | - } catch(PDOException $e) { |
|
| 1190 | + } catch (PDOException $e) { |
|
| 1191 | 1191 | echo "error : ".$e->getMessage(); |
| 1192 | 1192 | } |
| 1193 | 1193 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1194 | 1194 | $all = $result[0]['nb']; |
| 1195 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1195 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1196 | 1196 | } else { |
| 1197 | 1197 | if ($year == '' && $month == '') { |
| 1198 | 1198 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $this->db->prepare($query); |
| 1201 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 1202 | - } catch(PDOException $e) { |
|
| 1201 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | echo "error : ".$e->getMessage(); |
| 1204 | 1204 | } |
| 1205 | 1205 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1206 | 1206 | $all = $result[0]['nb']; |
| 1207 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1207 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1208 | 1208 | } |
| 1209 | 1209 | if (empty($all)) { |
| 1210 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1211 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1210 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1211 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1212 | 1212 | } else { |
| 1213 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1213 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1214 | 1214 | } |
| 1215 | 1215 | if ($filter_name != '') { |
| 1216 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1216 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1217 | 1217 | } |
| 1218 | 1218 | $Spotter = new Spotter($this->db); |
| 1219 | 1219 | //$all = $Spotter->countOverallAircrafts($filters,$year,$month); |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | } |
| 1222 | 1222 | return $all; |
| 1223 | 1223 | } |
| 1224 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 1224 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 1225 | 1225 | global $globalStatsFilters; |
| 1226 | 1226 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1227 | 1227 | if ($year == '' && $month == '') { |
@@ -1229,17 +1229,17 @@ discard block |
||
| 1229 | 1229 | try { |
| 1230 | 1230 | $sth = $this->db->prepare($query); |
| 1231 | 1231 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1232 | - } catch(PDOException $e) { |
|
| 1232 | + } catch (PDOException $e) { |
|
| 1233 | 1233 | echo "error : ".$e->getMessage(); |
| 1234 | 1234 | } |
| 1235 | 1235 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1236 | 1236 | $all = $result[0]['nb_airline']; |
| 1237 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1237 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 1238 | 1238 | if (empty($all)) { |
| 1239 | 1239 | $filters = array(); |
| 1240 | - $filters = array('year' => $year,'month' => $month); |
|
| 1240 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1241 | 1241 | if ($filter_name != '') { |
| 1242 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1242 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1243 | 1243 | } |
| 1244 | 1244 | $Spotter = new Spotter($this->db); |
| 1245 | 1245 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -1247,29 +1247,29 @@ discard block |
||
| 1247 | 1247 | } |
| 1248 | 1248 | return $all; |
| 1249 | 1249 | } |
| 1250 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1250 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1251 | 1251 | global $globalStatsFilters; |
| 1252 | 1252 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1253 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1253 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1254 | 1254 | $Spotter = new Spotter($this->db); |
| 1255 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1255 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1256 | 1256 | if ($year == '' && $month == '') { |
| 1257 | 1257 | $alliance_airlines = array(); |
| 1258 | 1258 | foreach ($airlines as $airline) { |
| 1259 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1259 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1260 | 1260 | } |
| 1261 | - $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1261 | + $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1262 | 1262 | $query_values = array(':filter_name' => $filter_name); |
| 1263 | 1263 | try { |
| 1264 | 1264 | $sth = $this->db->prepare($query); |
| 1265 | 1265 | $sth->execute($query_values); |
| 1266 | - } catch(PDOException $e) { |
|
| 1266 | + } catch (PDOException $e) { |
|
| 1267 | 1267 | echo "error : ".$e->getMessage(); |
| 1268 | 1268 | } |
| 1269 | 1269 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1270 | 1270 | $all = $result[0]['nb']; |
| 1271 | 1271 | } else { |
| 1272 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1272 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1273 | 1273 | } |
| 1274 | 1274 | } else { |
| 1275 | 1275 | if ($year == '' && $month == '') { |
@@ -1278,23 +1278,23 @@ discard block |
||
| 1278 | 1278 | try { |
| 1279 | 1279 | $sth = $this->db->prepare($query); |
| 1280 | 1280 | $sth->execute($query_values); |
| 1281 | - } catch(PDOException $e) { |
|
| 1281 | + } catch (PDOException $e) { |
|
| 1282 | 1282 | echo "error : ".$e->getMessage(); |
| 1283 | 1283 | } |
| 1284 | 1284 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1285 | 1285 | $all = $result[0]['nb']; |
| 1286 | 1286 | } else { |
| 1287 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1287 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1288 | 1288 | } |
| 1289 | 1289 | } |
| 1290 | 1290 | if (empty($all)) { |
| 1291 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1292 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1291 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1292 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1293 | 1293 | } else { |
| 1294 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1294 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1295 | 1295 | } |
| 1296 | 1296 | if ($filter_name != '') { |
| 1297 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1297 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1298 | 1298 | } |
| 1299 | 1299 | $Spotter = new Spotter($this->db); |
| 1300 | 1300 | //$all = $Spotter->countOverallOwners($filters,$year,$month); |
@@ -1302,7 +1302,7 @@ discard block |
||
| 1302 | 1302 | } |
| 1303 | 1303 | return $all; |
| 1304 | 1304 | } |
| 1305 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 1305 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1306 | 1306 | global $globalStatsFilters; |
| 1307 | 1307 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1308 | 1308 | //if ($year == '') $year = date('Y'); |
@@ -1312,18 +1312,18 @@ discard block |
||
| 1312 | 1312 | try { |
| 1313 | 1313 | $sth = $this->db->prepare($query); |
| 1314 | 1314 | $sth->execute($query_values); |
| 1315 | - } catch(PDOException $e) { |
|
| 1315 | + } catch (PDOException $e) { |
|
| 1316 | 1316 | echo "error : ".$e->getMessage(); |
| 1317 | 1317 | } |
| 1318 | 1318 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1319 | 1319 | $all = $result[0]['nb']; |
| 1320 | 1320 | } else { |
| 1321 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1321 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1322 | 1322 | } |
| 1323 | 1323 | if (empty($all)) { |
| 1324 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1324 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1325 | 1325 | if ($filter_name != '') { |
| 1326 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1326 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1327 | 1327 | } |
| 1328 | 1328 | $Spotter = new Spotter($this->db); |
| 1329 | 1329 | //$all = $Spotter->countOverallPilots($filters,$year,$month); |
@@ -1332,104 +1332,104 @@ discard block |
||
| 1332 | 1332 | return $all; |
| 1333 | 1333 | } |
| 1334 | 1334 | |
| 1335 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 1335 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 1336 | 1336 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1337 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1337 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1338 | 1338 | $Spotter = new Spotter($this->db); |
| 1339 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1339 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1340 | 1340 | $alliance_airlines = array(); |
| 1341 | 1341 | foreach ($airlines as $airline) { |
| 1342 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1342 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1343 | 1343 | } |
| 1344 | - $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1345 | - $query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name); |
|
| 1344 | + $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1345 | + $query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name); |
|
| 1346 | 1346 | } else { |
| 1347 | 1347 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 1348 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1348 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1349 | 1349 | } |
| 1350 | 1350 | try { |
| 1351 | 1351 | $sth = $this->db->prepare($query); |
| 1352 | 1352 | $sth->execute($query_values); |
| 1353 | - } catch(PDOException $e) { |
|
| 1353 | + } catch (PDOException $e) { |
|
| 1354 | 1354 | echo "error : ".$e->getMessage(); |
| 1355 | 1355 | } |
| 1356 | 1356 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1357 | 1357 | return $all; |
| 1358 | 1358 | } |
| 1359 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 1359 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 1360 | 1360 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1361 | 1361 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1362 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1362 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1363 | 1363 | try { |
| 1364 | 1364 | $sth = $this->db->prepare($query); |
| 1365 | 1365 | $sth->execute($query_values); |
| 1366 | - } catch(PDOException $e) { |
|
| 1366 | + } catch (PDOException $e) { |
|
| 1367 | 1367 | echo "error : ".$e->getMessage(); |
| 1368 | 1368 | } |
| 1369 | 1369 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1370 | 1370 | return $all; |
| 1371 | 1371 | } |
| 1372 | - public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
|
| 1372 | + public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') { |
|
| 1373 | 1373 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1374 | 1374 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1375 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1375 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1376 | 1376 | try { |
| 1377 | 1377 | $sth = $this->db->prepare($query); |
| 1378 | 1378 | $sth->execute($query_values); |
| 1379 | - } catch(PDOException $e) { |
|
| 1379 | + } catch (PDOException $e) { |
|
| 1380 | 1380 | echo "error : ".$e->getMessage(); |
| 1381 | 1381 | } |
| 1382 | 1382 | } |
| 1383 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 1383 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 1384 | 1384 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1385 | 1385 | global $globalArchiveMonths, $globalDBdriver; |
| 1386 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1386 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1387 | 1387 | $Spotter = new Spotter($this->db); |
| 1388 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1388 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1389 | 1389 | $alliance_airlines = array(); |
| 1390 | 1390 | foreach ($airlines as $airline) { |
| 1391 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1391 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1392 | 1392 | } |
| 1393 | 1393 | if ($globalDBdriver == 'mysql') { |
| 1394 | 1394 | if ($month == '') { |
| 1395 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1395 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1396 | 1396 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1397 | 1397 | } else { |
| 1398 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1399 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1398 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1399 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1400 | 1400 | } |
| 1401 | 1401 | } else { |
| 1402 | 1402 | if ($month == '') { |
| 1403 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1403 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1404 | 1404 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1405 | 1405 | } else { |
| 1406 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1407 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1406 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1407 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1408 | 1408 | } |
| 1409 | 1409 | } |
| 1410 | 1410 | } else { |
| 1411 | 1411 | if ($globalDBdriver == 'mysql') { |
| 1412 | 1412 | if ($month == '') { |
| 1413 | 1413 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1414 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1414 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1415 | 1415 | } else { |
| 1416 | 1416 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1417 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1417 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1418 | 1418 | } |
| 1419 | 1419 | } else { |
| 1420 | 1420 | if ($month == '') { |
| 1421 | 1421 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1422 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1422 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1423 | 1423 | } else { |
| 1424 | 1424 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1425 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1425 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1426 | 1426 | } |
| 1427 | 1427 | } |
| 1428 | 1428 | } |
| 1429 | 1429 | try { |
| 1430 | 1430 | $sth = $this->db->prepare($query); |
| 1431 | 1431 | $sth->execute($query_values); |
| 1432 | - } catch(PDOException $e) { |
|
| 1432 | + } catch (PDOException $e) { |
|
| 1433 | 1433 | echo "error : ".$e->getMessage(); |
| 1434 | 1434 | } |
| 1435 | 1435 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1438,17 +1438,17 @@ discard block |
||
| 1438 | 1438 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1439 | 1439 | global $globalArchiveMonths, $globalDBdriver; |
| 1440 | 1440 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1441 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1441 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1442 | 1442 | $Spotter = new Spotter($this->db); |
| 1443 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1443 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1444 | 1444 | $alliance_airlines = array(); |
| 1445 | 1445 | foreach ($airlines as $airline) { |
| 1446 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1446 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1447 | 1447 | } |
| 1448 | 1448 | if ($globalDBdriver == 'mysql') { |
| 1449 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1449 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1450 | 1450 | } else { |
| 1451 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1451 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1452 | 1452 | } |
| 1453 | 1453 | $query_values = array(':type' => $type, ':filter_name' => $filter_name); |
| 1454 | 1454 | } else { |
@@ -1462,7 +1462,7 @@ discard block |
||
| 1462 | 1462 | try { |
| 1463 | 1463 | $sth = $this->db->prepare($query); |
| 1464 | 1464 | $sth->execute($query_values); |
| 1465 | - } catch(PDOException $e) { |
|
| 1465 | + } catch (PDOException $e) { |
|
| 1466 | 1466 | echo "error : ".$e->getMessage(); |
| 1467 | 1467 | } |
| 1468 | 1468 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1471,17 +1471,17 @@ discard block |
||
| 1471 | 1471 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1472 | 1472 | global $globalArchiveMonths, $globalDBdriver; |
| 1473 | 1473 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1474 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1474 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1475 | 1475 | $Spotter = new Spotter($this->db); |
| 1476 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1476 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1477 | 1477 | $alliance_airlines = array(); |
| 1478 | 1478 | foreach ($airlines as $airline) { |
| 1479 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1479 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1480 | 1480 | } |
| 1481 | 1481 | if ($globalDBdriver == 'mysql') { |
| 1482 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1482 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1483 | 1483 | } else { |
| 1484 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1484 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1485 | 1485 | } |
| 1486 | 1486 | } else { |
| 1487 | 1487 | if ($globalDBdriver == 'mysql') { |
@@ -1493,7 +1493,7 @@ discard block |
||
| 1493 | 1493 | try { |
| 1494 | 1494 | $sth = $this->db->prepare($query); |
| 1495 | 1495 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 1496 | - } catch(PDOException $e) { |
|
| 1496 | + } catch (PDOException $e) { |
|
| 1497 | 1497 | echo "error : ".$e->getMessage(); |
| 1498 | 1498 | } |
| 1499 | 1499 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1510,7 +1510,7 @@ discard block |
||
| 1510 | 1510 | try { |
| 1511 | 1511 | $sth = $this->db->prepare($query); |
| 1512 | 1512 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1513 | - } catch(PDOException $e) { |
|
| 1513 | + } catch (PDOException $e) { |
|
| 1514 | 1514 | echo "error : ".$e->getMessage(); |
| 1515 | 1515 | } |
| 1516 | 1516 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1527,20 +1527,20 @@ discard block |
||
| 1527 | 1527 | try { |
| 1528 | 1528 | $sth = $this->db->prepare($query); |
| 1529 | 1529 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1530 | - } catch(PDOException $e) { |
|
| 1530 | + } catch (PDOException $e) { |
|
| 1531 | 1531 | echo "error : ".$e->getMessage(); |
| 1532 | 1532 | } |
| 1533 | 1533 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1534 | 1534 | return $all[0]['total']; |
| 1535 | 1535 | } |
| 1536 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 1536 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 1537 | 1537 | global $globalArchiveMonths, $globalDBdriver; |
| 1538 | 1538 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1539 | 1539 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1540 | 1540 | try { |
| 1541 | 1541 | $sth = $this->db->prepare($query); |
| 1542 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1543 | - } catch(PDOException $e) { |
|
| 1542 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 1543 | + } catch (PDOException $e) { |
|
| 1544 | 1544 | echo "error : ".$e->getMessage(); |
| 1545 | 1545 | } |
| 1546 | 1546 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1558,20 +1558,20 @@ discard block |
||
| 1558 | 1558 | try { |
| 1559 | 1559 | $sth = $this->db->prepare($query); |
| 1560 | 1560 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1561 | - } catch(PDOException $e) { |
|
| 1561 | + } catch (PDOException $e) { |
|
| 1562 | 1562 | echo "error : ".$e->getMessage(); |
| 1563 | 1563 | } |
| 1564 | 1564 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1565 | 1565 | return $all[0]['total']; |
| 1566 | 1566 | } |
| 1567 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1567 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1568 | 1568 | global $globalArchiveMonths, $globalDBdriver; |
| 1569 | 1569 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1570 | 1570 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1571 | 1571 | try { |
| 1572 | 1572 | $sth = $this->db->prepare($query); |
| 1573 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1574 | - } catch(PDOException $e) { |
|
| 1573 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1574 | + } catch (PDOException $e) { |
|
| 1575 | 1575 | echo "error : ".$e->getMessage(); |
| 1576 | 1576 | } |
| 1577 | 1577 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1579,7 +1579,7 @@ discard block |
||
| 1579 | 1579 | else return 0; |
| 1580 | 1580 | } |
| 1581 | 1581 | |
| 1582 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1582 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1583 | 1583 | global $globalDBdriver; |
| 1584 | 1584 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1585 | 1585 | if ($globalDBdriver == 'mysql') { |
@@ -1587,15 +1587,15 @@ discard block |
||
| 1587 | 1587 | } else { |
| 1588 | 1588 | $query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1589 | 1589 | } |
| 1590 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1590 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1591 | 1591 | try { |
| 1592 | 1592 | $sth = $this->db->prepare($query); |
| 1593 | 1593 | $sth->execute($query_values); |
| 1594 | - } catch(PDOException $e) { |
|
| 1594 | + } catch (PDOException $e) { |
|
| 1595 | 1595 | return "error : ".$e->getMessage(); |
| 1596 | 1596 | } |
| 1597 | 1597 | } |
| 1598 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1598 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1599 | 1599 | global $globalDBdriver; |
| 1600 | 1600 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1601 | 1601 | if ($globalDBdriver == 'mysql') { |
@@ -1604,11 +1604,11 @@ discard block |
||
| 1604 | 1604 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1605 | 1605 | $query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1606 | 1606 | } |
| 1607 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1607 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1608 | 1608 | try { |
| 1609 | 1609 | $sth = $this->db->prepare($query); |
| 1610 | 1610 | $sth->execute($query_values); |
| 1611 | - } catch(PDOException $e) { |
|
| 1611 | + } catch (PDOException $e) { |
|
| 1612 | 1612 | return "error : ".$e->getMessage(); |
| 1613 | 1613 | } |
| 1614 | 1614 | } |
@@ -1632,75 +1632,75 @@ discard block |
||
| 1632 | 1632 | } |
| 1633 | 1633 | */ |
| 1634 | 1634 | |
| 1635 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1635 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1636 | 1636 | global $globalDBdriver; |
| 1637 | 1637 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1638 | 1638 | $query_values = array(); |
| 1639 | 1639 | if ($globalDBdriver == 'mysql') { |
| 1640 | 1640 | if ($year != '') { |
| 1641 | 1641 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1642 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1642 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1643 | 1643 | } |
| 1644 | 1644 | if ($month != '') { |
| 1645 | 1645 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1646 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1646 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1647 | 1647 | } |
| 1648 | 1648 | if ($day != '') { |
| 1649 | 1649 | $query .= ' AND DAY(stats_date) = :day'; |
| 1650 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1650 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1651 | 1651 | } |
| 1652 | 1652 | } else { |
| 1653 | 1653 | if ($year != '') { |
| 1654 | 1654 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1655 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1655 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1656 | 1656 | } |
| 1657 | 1657 | if ($month != '') { |
| 1658 | 1658 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1659 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1659 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1660 | 1660 | } |
| 1661 | 1661 | if ($day != '') { |
| 1662 | 1662 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1663 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1663 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1664 | 1664 | } |
| 1665 | 1665 | } |
| 1666 | 1666 | $query .= " ORDER BY source_name"; |
| 1667 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1667 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1668 | 1668 | try { |
| 1669 | 1669 | $sth = $this->db->prepare($query); |
| 1670 | 1670 | $sth->execute($query_values); |
| 1671 | - } catch(PDOException $e) { |
|
| 1671 | + } catch (PDOException $e) { |
|
| 1672 | 1672 | echo "error : ".$e->getMessage(); |
| 1673 | 1673 | } |
| 1674 | 1674 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1675 | 1675 | return $all; |
| 1676 | 1676 | } |
| 1677 | 1677 | |
| 1678 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1678 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1679 | 1679 | global $globalDBdriver; |
| 1680 | 1680 | if ($globalDBdriver == 'mysql') { |
| 1681 | 1681 | $query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data"; |
| 1682 | 1682 | } else { |
| 1683 | 1683 | $query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; |
| 1684 | 1684 | } |
| 1685 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1685 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1686 | 1686 | try { |
| 1687 | 1687 | $sth = $this->db->prepare($query); |
| 1688 | 1688 | $sth->execute($query_values); |
| 1689 | - } catch(PDOException $e) { |
|
| 1689 | + } catch (PDOException $e) { |
|
| 1690 | 1690 | return "error : ".$e->getMessage(); |
| 1691 | 1691 | } |
| 1692 | 1692 | } |
| 1693 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1693 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1694 | 1694 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1695 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1695 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1696 | 1696 | try { |
| 1697 | 1697 | $sth = $this->db->prepare($query); |
| 1698 | 1698 | $sth->execute($query_values); |
| 1699 | - } catch(PDOException $e) { |
|
| 1699 | + } catch (PDOException $e) { |
|
| 1700 | 1700 | return "error : ".$e->getMessage(); |
| 1701 | 1701 | } |
| 1702 | 1702 | } |
| 1703 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1703 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1704 | 1704 | global $globalDBdriver; |
| 1705 | 1705 | if ($globalDBdriver == 'mysql') { |
| 1706 | 1706 | if ($reset) { |
@@ -1715,15 +1715,15 @@ discard block |
||
| 1715 | 1715 | $query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1716 | 1716 | } |
| 1717 | 1717 | } |
| 1718 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1718 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1719 | 1719 | try { |
| 1720 | 1720 | $sth = $this->db->prepare($query); |
| 1721 | 1721 | $sth->execute($query_values); |
| 1722 | - } catch(PDOException $e) { |
|
| 1722 | + } catch (PDOException $e) { |
|
| 1723 | 1723 | return "error : ".$e->getMessage(); |
| 1724 | 1724 | } |
| 1725 | 1725 | } |
| 1726 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1726 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1727 | 1727 | global $globalDBdriver; |
| 1728 | 1728 | if ($globalDBdriver == 'mysql') { |
| 1729 | 1729 | if ($reset) { |
@@ -1738,15 +1738,15 @@ discard block |
||
| 1738 | 1738 | $query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; |
| 1739 | 1739 | } |
| 1740 | 1740 | } |
| 1741 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1741 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1742 | 1742 | try { |
| 1743 | 1743 | $sth = $this->db->prepare($query); |
| 1744 | 1744 | $sth->execute($query_values); |
| 1745 | - } catch(PDOException $e) { |
|
| 1745 | + } catch (PDOException $e) { |
|
| 1746 | 1746 | return "error : ".$e->getMessage(); |
| 1747 | 1747 | } |
| 1748 | 1748 | } |
| 1749 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1749 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1750 | 1750 | global $globalDBdriver; |
| 1751 | 1751 | if ($globalDBdriver == 'mysql') { |
| 1752 | 1752 | if ($reset) { |
@@ -1761,15 +1761,15 @@ discard block |
||
| 1761 | 1761 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; |
| 1762 | 1762 | } |
| 1763 | 1763 | } |
| 1764 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1764 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1765 | 1765 | try { |
| 1766 | 1766 | $sth = $this->db->prepare($query); |
| 1767 | 1767 | $sth->execute($query_values); |
| 1768 | - } catch(PDOException $e) { |
|
| 1768 | + } catch (PDOException $e) { |
|
| 1769 | 1769 | return "error : ".$e->getMessage(); |
| 1770 | 1770 | } |
| 1771 | 1771 | } |
| 1772 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1772 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1773 | 1773 | global $globalDBdriver; |
| 1774 | 1774 | if ($globalDBdriver == 'mysql') { |
| 1775 | 1775 | if ($reset) { |
@@ -1784,15 +1784,15 @@ discard block |
||
| 1784 | 1784 | $query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1785 | 1785 | } |
| 1786 | 1786 | } |
| 1787 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1787 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1788 | 1788 | try { |
| 1789 | 1789 | $sth = $this->db->prepare($query); |
| 1790 | 1790 | $sth->execute($query_values); |
| 1791 | - } catch(PDOException $e) { |
|
| 1791 | + } catch (PDOException $e) { |
|
| 1792 | 1792 | return "error : ".$e->getMessage(); |
| 1793 | 1793 | } |
| 1794 | 1794 | } |
| 1795 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1795 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1796 | 1796 | global $globalDBdriver; |
| 1797 | 1797 | if ($globalDBdriver == 'mysql') { |
| 1798 | 1798 | if ($reset) { |
@@ -1807,15 +1807,15 @@ discard block |
||
| 1807 | 1807 | $query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; |
| 1808 | 1808 | } |
| 1809 | 1809 | } |
| 1810 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1810 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1811 | 1811 | try { |
| 1812 | 1812 | $sth = $this->db->prepare($query); |
| 1813 | 1813 | $sth->execute($query_values); |
| 1814 | - } catch(PDOException $e) { |
|
| 1814 | + } catch (PDOException $e) { |
|
| 1815 | 1815 | return "error : ".$e->getMessage(); |
| 1816 | 1816 | } |
| 1817 | 1817 | } |
| 1818 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1818 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1819 | 1819 | global $globalDBdriver; |
| 1820 | 1820 | if ($globalDBdriver == 'mysql') { |
| 1821 | 1821 | if ($reset) { |
@@ -1830,15 +1830,15 @@ discard block |
||
| 1830 | 1830 | $query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1831 | 1831 | } |
| 1832 | 1832 | } |
| 1833 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1833 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1834 | 1834 | try { |
| 1835 | 1835 | $sth = $this->db->prepare($query); |
| 1836 | 1836 | $sth->execute($query_values); |
| 1837 | - } catch(PDOException $e) { |
|
| 1837 | + } catch (PDOException $e) { |
|
| 1838 | 1838 | return "error : ".$e->getMessage(); |
| 1839 | 1839 | } |
| 1840 | 1840 | } |
| 1841 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1841 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1842 | 1842 | global $globalDBdriver; |
| 1843 | 1843 | if ($globalDBdriver == 'mysql') { |
| 1844 | 1844 | if ($reset) { |
@@ -1853,15 +1853,15 @@ discard block |
||
| 1853 | 1853 | $query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; |
| 1854 | 1854 | } |
| 1855 | 1855 | } |
| 1856 | - $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source); |
|
| 1856 | + $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source); |
|
| 1857 | 1857 | try { |
| 1858 | 1858 | $sth = $this->db->prepare($query); |
| 1859 | 1859 | $sth->execute($query_values); |
| 1860 | - } catch(PDOException $e) { |
|
| 1860 | + } catch (PDOException $e) { |
|
| 1861 | 1861 | return "error : ".$e->getMessage(); |
| 1862 | 1862 | } |
| 1863 | 1863 | } |
| 1864 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1864 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1865 | 1865 | global $globalDBdriver; |
| 1866 | 1866 | if ($airport_icao != '') { |
| 1867 | 1867 | if ($globalDBdriver == 'mysql') { |
@@ -1877,16 +1877,16 @@ discard block |
||
| 1877 | 1877 | $query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1878 | 1878 | } |
| 1879 | 1879 | } |
| 1880 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1880 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1881 | 1881 | try { |
| 1882 | 1882 | $sth = $this->db->prepare($query); |
| 1883 | 1883 | $sth->execute($query_values); |
| 1884 | - } catch(PDOException $e) { |
|
| 1884 | + } catch (PDOException $e) { |
|
| 1885 | 1885 | return "error : ".$e->getMessage(); |
| 1886 | 1886 | } |
| 1887 | 1887 | } |
| 1888 | 1888 | } |
| 1889 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 1889 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 1890 | 1890 | global $globalDBdriver; |
| 1891 | 1891 | if ($airport_icao != '') { |
| 1892 | 1892 | if ($globalDBdriver == 'mysql') { |
@@ -1894,16 +1894,16 @@ discard block |
||
| 1894 | 1894 | } else { |
| 1895 | 1895 | $query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1896 | 1896 | } |
| 1897 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1897 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1898 | 1898 | try { |
| 1899 | 1899 | $sth = $this->db->prepare($query); |
| 1900 | 1900 | $sth->execute($query_values); |
| 1901 | - } catch(PDOException $e) { |
|
| 1901 | + } catch (PDOException $e) { |
|
| 1902 | 1902 | return "error : ".$e->getMessage(); |
| 1903 | 1903 | } |
| 1904 | 1904 | } |
| 1905 | 1905 | } |
| 1906 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1906 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1907 | 1907 | global $globalDBdriver; |
| 1908 | 1908 | if ($airport_icao != '') { |
| 1909 | 1909 | if ($globalDBdriver == 'mysql') { |
@@ -1919,16 +1919,16 @@ discard block |
||
| 1919 | 1919 | $query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1920 | 1920 | } |
| 1921 | 1921 | } |
| 1922 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1922 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1923 | 1923 | try { |
| 1924 | 1924 | $sth = $this->db->prepare($query); |
| 1925 | 1925 | $sth->execute($query_values); |
| 1926 | - } catch(PDOException $e) { |
|
| 1926 | + } catch (PDOException $e) { |
|
| 1927 | 1927 | return "error : ".$e->getMessage(); |
| 1928 | 1928 | } |
| 1929 | 1929 | } |
| 1930 | 1930 | } |
| 1931 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 1931 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 1932 | 1932 | global $globalDBdriver; |
| 1933 | 1933 | if ($airport_icao != '') { |
| 1934 | 1934 | if ($globalDBdriver == 'mysql') { |
@@ -1936,11 +1936,11 @@ discard block |
||
| 1936 | 1936 | } else { |
| 1937 | 1937 | $query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1938 | 1938 | } |
| 1939 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1939 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1940 | 1940 | try { |
| 1941 | 1941 | $sth = $this->db->prepare($query); |
| 1942 | 1942 | $sth->execute($query_values); |
| 1943 | - } catch(PDOException $e) { |
|
| 1943 | + } catch (PDOException $e) { |
|
| 1944 | 1944 | return "error : ".$e->getMessage(); |
| 1945 | 1945 | } |
| 1946 | 1946 | } |
@@ -1952,7 +1952,7 @@ discard block |
||
| 1952 | 1952 | try { |
| 1953 | 1953 | $sth = $this->db->prepare($query); |
| 1954 | 1954 | $sth->execute($query_values); |
| 1955 | - } catch(PDOException $e) { |
|
| 1955 | + } catch (PDOException $e) { |
|
| 1956 | 1956 | return "error : ".$e->getMessage(); |
| 1957 | 1957 | } |
| 1958 | 1958 | } |
@@ -1962,7 +1962,7 @@ discard block |
||
| 1962 | 1962 | try { |
| 1963 | 1963 | $sth = $this->db->prepare($query); |
| 1964 | 1964 | $sth->execute($query_values); |
| 1965 | - } catch(PDOException $e) { |
|
| 1965 | + } catch (PDOException $e) { |
|
| 1966 | 1966 | return "error : ".$e->getMessage(); |
| 1967 | 1967 | } |
| 1968 | 1968 | } |
@@ -1972,13 +1972,13 @@ discard block |
||
| 1972 | 1972 | try { |
| 1973 | 1973 | $sth = $this->db->prepare($query); |
| 1974 | 1974 | $sth->execute($query_values); |
| 1975 | - } catch(PDOException $e) { |
|
| 1975 | + } catch (PDOException $e) { |
|
| 1976 | 1976 | return "error : ".$e->getMessage(); |
| 1977 | 1977 | } |
| 1978 | 1978 | } |
| 1979 | 1979 | |
| 1980 | 1980 | public function addOldStats() { |
| 1981 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents; |
|
| 1981 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents; |
|
| 1982 | 1982 | $Common = new Common(); |
| 1983 | 1983 | $Connection = new Connection($this->db); |
| 1984 | 1984 | date_default_timezone_set('UTC'); |
@@ -1996,41 +1996,41 @@ discard block |
||
| 1996 | 1996 | $Spotter = new Spotter($this->db); |
| 1997 | 1997 | |
| 1998 | 1998 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 1999 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 1999 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 2000 | 2000 | foreach ($alldata as $number) { |
| 2001 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 2001 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 2002 | 2002 | } |
| 2003 | 2003 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2004 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 2004 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 2005 | 2005 | foreach ($alldata as $number) { |
| 2006 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 2006 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 2007 | 2007 | } |
| 2008 | 2008 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 2009 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 2009 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 2010 | 2010 | foreach ($alldata as $number) { |
| 2011 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 2011 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 2012 | 2012 | } |
| 2013 | 2013 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2014 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 2014 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 2015 | 2015 | foreach ($alldata as $number) { |
| 2016 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2016 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2017 | 2017 | } |
| 2018 | 2018 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2019 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 2019 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 2020 | 2020 | foreach ($alldata as $number) { |
| 2021 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 2021 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 2022 | 2022 | } |
| 2023 | 2023 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2024 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 2024 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 2025 | 2025 | foreach ($alldata as $number) { |
| 2026 | 2026 | if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
| 2027 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 2027 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 2028 | 2028 | } |
| 2029 | 2029 | |
| 2030 | 2030 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 2031 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 2031 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 2032 | 2032 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 2033 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 2033 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 2034 | 2034 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 2035 | 2035 | $alldata = array(); |
| 2036 | 2036 | foreach ($pall as $value) { |
@@ -2047,14 +2047,14 @@ discard block |
||
| 2047 | 2047 | foreach ($alldata as $key => $row) { |
| 2048 | 2048 | $count[$key] = $row['airport_departure_icao_count']; |
| 2049 | 2049 | } |
| 2050 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2050 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2051 | 2051 | foreach ($alldata as $number) { |
| 2052 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
|
| 2052 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset); |
|
| 2053 | 2053 | } |
| 2054 | 2054 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2055 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 2055 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 2056 | 2056 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 2057 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 2057 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 2058 | 2058 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 2059 | 2059 | $alldata = array(); |
| 2060 | 2060 | foreach ($pall as $value) { |
@@ -2071,18 +2071,18 @@ discard block |
||
| 2071 | 2071 | foreach ($alldata as $key => $row) { |
| 2072 | 2072 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2073 | 2073 | } |
| 2074 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2074 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2075 | 2075 | foreach ($alldata as $number) { |
| 2076 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
|
| 2076 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset); |
|
| 2077 | 2077 | } |
| 2078 | 2078 | if ($Connection->tableExists('countries')) { |
| 2079 | 2079 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 2080 | 2080 | //$SpotterArchive = new SpotterArchive(); |
| 2081 | 2081 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2082 | 2082 | $Spotter = new Spotter($this->db); |
| 2083 | - $alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 2083 | + $alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 2084 | 2084 | foreach ($alldata as $number) { |
| 2085 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 2085 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 2086 | 2086 | } |
| 2087 | 2087 | } |
| 2088 | 2088 | |
@@ -2092,12 +2092,12 @@ discard block |
||
| 2092 | 2092 | $this->deleteStatsByType('fatalities_byyear'); |
| 2093 | 2093 | $alldata = $Accident->countFatalitiesByYear(); |
| 2094 | 2094 | foreach ($alldata as $number) { |
| 2095 | - $this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year']))); |
|
| 2095 | + $this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year']))); |
|
| 2096 | 2096 | } |
| 2097 | 2097 | $this->deleteStatsByType('fatalities_bymonth'); |
| 2098 | 2098 | $alldata = $Accident->countFatalitiesLast12Months(); |
| 2099 | 2099 | foreach ($alldata as $number) { |
| 2100 | - $this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year']))); |
|
| 2100 | + $this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year']))); |
|
| 2101 | 2101 | } |
| 2102 | 2102 | } |
| 2103 | 2103 | |
@@ -2111,37 +2111,37 @@ discard block |
||
| 2111 | 2111 | $lastyear = false; |
| 2112 | 2112 | foreach ($alldata as $number) { |
| 2113 | 2113 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2114 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2114 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2115 | 2115 | } |
| 2116 | 2116 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 2117 | 2117 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2118 | 2118 | foreach ($alldata as $number) { |
| 2119 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2119 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2120 | 2120 | } |
| 2121 | 2121 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2122 | 2122 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2123 | 2123 | foreach ($alldata as $number) { |
| 2124 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2124 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2125 | 2125 | } |
| 2126 | 2126 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2127 | 2127 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2128 | 2128 | foreach ($alldata as $number) { |
| 2129 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2129 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2130 | 2130 | } |
| 2131 | 2131 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 2132 | 2132 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2133 | 2133 | foreach ($alldata as $number) { |
| 2134 | - $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2134 | + $this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2135 | 2135 | } |
| 2136 | 2136 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2137 | 2137 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2138 | 2138 | foreach ($alldata as $number) { |
| 2139 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2139 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2140 | 2140 | } |
| 2141 | 2141 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2142 | 2142 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2143 | 2143 | foreach ($alldata as $number) { |
| 2144 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2144 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2145 | 2145 | } |
| 2146 | 2146 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 2147 | 2147 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -2186,7 +2186,7 @@ discard block |
||
| 2186 | 2186 | } |
| 2187 | 2187 | $alldata = $pall; |
| 2188 | 2188 | foreach ($alldata as $number) { |
| 2189 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 2189 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 2190 | 2190 | } |
| 2191 | 2191 | echo '...Arrival'."\n"; |
| 2192 | 2192 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -2227,7 +2227,7 @@ discard block |
||
| 2227 | 2227 | } |
| 2228 | 2228 | $alldata = $pall; |
| 2229 | 2229 | foreach ($alldata as $number) { |
| 2230 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 2230 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 2231 | 2231 | } |
| 2232 | 2232 | |
| 2233 | 2233 | echo 'Flights data...'."\n"; |
@@ -2235,28 +2235,28 @@ discard block |
||
| 2235 | 2235 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2236 | 2236 | $alldata = $Spotter->countAllDatesLastMonth($filter_last_month); |
| 2237 | 2237 | foreach ($alldata as $number) { |
| 2238 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 2238 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 2239 | 2239 | } |
| 2240 | 2240 | echo '-> countAllDates...'."\n"; |
| 2241 | 2241 | $previousdata = $this->countAllDates(); |
| 2242 | 2242 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 2243 | 2243 | $this->deleteStatFlight('date'); |
| 2244 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month)); |
|
| 2244 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month)); |
|
| 2245 | 2245 | $values = array(); |
| 2246 | 2246 | foreach ($alldata as $cnt) { |
| 2247 | 2247 | $values[] = $cnt['date_count']; |
| 2248 | 2248 | } |
| 2249 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2250 | - array_splice($alldata,11); |
|
| 2249 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2250 | + array_splice($alldata, 11); |
|
| 2251 | 2251 | foreach ($alldata as $number) { |
| 2252 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 2252 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 2253 | 2253 | } |
| 2254 | 2254 | |
| 2255 | 2255 | $this->deleteStatFlight('hour'); |
| 2256 | 2256 | echo '-> countAllHours...'."\n"; |
| 2257 | - $alldata = $Spotter->countAllHours('hour',$filter_last_month); |
|
| 2257 | + $alldata = $Spotter->countAllHours('hour', $filter_last_month); |
|
| 2258 | 2258 | foreach ($alldata as $number) { |
| 2259 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 2259 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 2260 | 2260 | } |
| 2261 | 2261 | |
| 2262 | 2262 | // Count by airlines |
@@ -2265,42 +2265,42 @@ discard block |
||
| 2265 | 2265 | if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
| 2266 | 2266 | $SpotterArchive = new SpotterArchive($this->db); |
| 2267 | 2267 | //$Spotter = new Spotter($this->db); |
| 2268 | - $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 2268 | + $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 2269 | 2269 | //$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 2270 | 2270 | foreach ($alldata as $number) { |
| 2271 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 2271 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 2272 | 2272 | } |
| 2273 | 2273 | } |
| 2274 | 2274 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 2275 | 2275 | $Spotter = new Spotter($this->db); |
| 2276 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 2276 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 2277 | 2277 | foreach ($alldata as $number) { |
| 2278 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 2278 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 2279 | 2279 | } |
| 2280 | 2280 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 2281 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 2281 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 2282 | 2282 | foreach ($alldata as $number) { |
| 2283 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 2283 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 2284 | 2284 | } |
| 2285 | 2285 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 2286 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 2286 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 2287 | 2287 | foreach ($alldata as $number) { |
| 2288 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2288 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2289 | 2289 | } |
| 2290 | 2290 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 2291 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 2291 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 2292 | 2292 | foreach ($alldata as $number) { |
| 2293 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 2293 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 2294 | 2294 | } |
| 2295 | 2295 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 2296 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 2296 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 2297 | 2297 | foreach ($alldata as $number) { |
| 2298 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 2298 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 2299 | 2299 | } |
| 2300 | 2300 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 2301 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2301 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2302 | 2302 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 2303 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2303 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2304 | 2304 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 2305 | 2305 | //$alldata = array(); |
| 2306 | 2306 | foreach ($dall as $value) { |
@@ -2320,12 +2320,12 @@ discard block |
||
| 2320 | 2320 | } |
| 2321 | 2321 | $alldata = $pall; |
| 2322 | 2322 | foreach ($alldata as $number) { |
| 2323 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2323 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2324 | 2324 | } |
| 2325 | 2325 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 2326 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2326 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2327 | 2327 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 2328 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2328 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2329 | 2329 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 2330 | 2330 | //$alldata = array(); |
| 2331 | 2331 | foreach ($dall as $value) { |
@@ -2345,7 +2345,7 @@ discard block |
||
| 2345 | 2345 | } |
| 2346 | 2346 | $alldata = $pall; |
| 2347 | 2347 | foreach ($alldata as $number) { |
| 2348 | - if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2348 | + if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2349 | 2349 | } |
| 2350 | 2350 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 2351 | 2351 | $Spotter = new Spotter($this->db); |
@@ -2353,27 +2353,27 @@ discard block |
||
| 2353 | 2353 | $lastyear = false; |
| 2354 | 2354 | foreach ($alldata as $number) { |
| 2355 | 2355 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2356 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2356 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2357 | 2357 | } |
| 2358 | 2358 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 2359 | 2359 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2360 | 2360 | foreach ($alldata as $number) { |
| 2361 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2361 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2362 | 2362 | } |
| 2363 | 2363 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 2364 | 2364 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2365 | 2365 | foreach ($alldata as $number) { |
| 2366 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2366 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2367 | 2367 | } |
| 2368 | 2368 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 2369 | 2369 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2370 | 2370 | foreach ($alldata as $number) { |
| 2371 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2371 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2372 | 2372 | } |
| 2373 | 2373 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 2374 | 2374 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2375 | 2375 | foreach ($alldata as $number) { |
| 2376 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2376 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2377 | 2377 | } |
| 2378 | 2378 | if ($globalDebug) echo '...Departure'."\n"; |
| 2379 | 2379 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -2396,7 +2396,7 @@ discard block |
||
| 2396 | 2396 | } |
| 2397 | 2397 | $alldata = $pall; |
| 2398 | 2398 | foreach ($alldata as $number) { |
| 2399 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
|
| 2399 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']); |
|
| 2400 | 2400 | } |
| 2401 | 2401 | if ($globalDebug) echo '...Arrival'."\n"; |
| 2402 | 2402 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -2419,32 +2419,32 @@ discard block |
||
| 2419 | 2419 | } |
| 2420 | 2420 | $alldata = $pall; |
| 2421 | 2421 | foreach ($alldata as $number) { |
| 2422 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
|
| 2422 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']); |
|
| 2423 | 2423 | } |
| 2424 | 2424 | |
| 2425 | 2425 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 2426 | 2426 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 2427 | 2427 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2428 | 2428 | foreach ($alldata as $number) { |
| 2429 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 2429 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2430 | 2430 | } |
| 2431 | 2431 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 2432 | 2432 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2433 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2433 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2434 | 2434 | $values = array(); |
| 2435 | 2435 | foreach ($alldata as $cnt) { |
| 2436 | 2436 | $values[] = $cnt['date_count']; |
| 2437 | 2437 | } |
| 2438 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2439 | - array_splice($alldata,11); |
|
| 2438 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2439 | + array_splice($alldata, 11); |
|
| 2440 | 2440 | foreach ($alldata as $number) { |
| 2441 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 2441 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2442 | 2442 | } |
| 2443 | 2443 | |
| 2444 | 2444 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 2445 | - $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
|
| 2445 | + $alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month); |
|
| 2446 | 2446 | foreach ($alldata as $number) { |
| 2447 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 2447 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 2448 | 2448 | } |
| 2449 | 2449 | |
| 2450 | 2450 | // Stats by filters |
@@ -2468,7 +2468,7 @@ discard block |
||
| 2468 | 2468 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2469 | 2469 | } |
| 2470 | 2470 | } |
| 2471 | - if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2471 | + if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2472 | 2472 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2473 | 2473 | $reset = true; |
| 2474 | 2474 | } |
@@ -2476,38 +2476,38 @@ discard block |
||
| 2476 | 2476 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 2477 | 2477 | $Spotter = new Spotter($this->db); |
| 2478 | 2478 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 2479 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 2479 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 2480 | 2480 | foreach ($alldata as $number) { |
| 2481 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 2481 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 2482 | 2482 | } |
| 2483 | 2483 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2484 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 2484 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 2485 | 2485 | foreach ($alldata as $number) { |
| 2486 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 2486 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 2487 | 2487 | } |
| 2488 | 2488 | if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
| 2489 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 2489 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 2490 | 2490 | foreach ($alldata as $number) { |
| 2491 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 2491 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 2492 | 2492 | } |
| 2493 | 2493 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2494 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 2494 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 2495 | 2495 | foreach ($alldata as $number) { |
| 2496 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 2496 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 2497 | 2497 | } |
| 2498 | 2498 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2499 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 2499 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 2500 | 2500 | foreach ($alldata as $number) { |
| 2501 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 2501 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 2502 | 2502 | } |
| 2503 | 2503 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2504 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 2504 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 2505 | 2505 | foreach ($alldata as $number) { |
| 2506 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 2506 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 2507 | 2507 | } |
| 2508 | 2508 | if ($globalDebug) echo 'Count departure airports...'."\n"; |
| 2509 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2510 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2509 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2510 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2511 | 2511 | $alldata = array(); |
| 2512 | 2512 | foreach ($pall as $value) { |
| 2513 | 2513 | $icao = $value['airport_departure_icao']; |
@@ -2523,13 +2523,13 @@ discard block |
||
| 2523 | 2523 | foreach ($alldata as $key => $row) { |
| 2524 | 2524 | $count[$key] = $row['airport_departure_icao_count']; |
| 2525 | 2525 | } |
| 2526 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2526 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2527 | 2527 | foreach ($alldata as $number) { |
| 2528 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
|
| 2528 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2531 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2532 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2531 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2532 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2533 | 2533 | $alldata = array(); |
| 2534 | 2534 | foreach ($pall as $value) { |
| 2535 | 2535 | $icao = $value['airport_arrival_icao']; |
@@ -2545,9 +2545,9 @@ discard block |
||
| 2545 | 2545 | foreach ($alldata as $key => $row) { |
| 2546 | 2546 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2547 | 2547 | } |
| 2548 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2548 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2549 | 2549 | foreach ($alldata as $number) { |
| 2550 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
|
| 2550 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset); |
|
| 2551 | 2551 | } |
| 2552 | 2552 | if ($globalDebug) echo 'Count all months...'."\n"; |
| 2553 | 2553 | $Spotter = new Spotter($this->db); |
@@ -2555,36 +2555,36 @@ discard block |
||
| 2555 | 2555 | $lastyear = false; |
| 2556 | 2556 | foreach ($alldata as $number) { |
| 2557 | 2557 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2558 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2558 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2559 | 2559 | } |
| 2560 | 2560 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2561 | 2561 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2562 | 2562 | foreach ($alldata as $number) { |
| 2563 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2563 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2564 | 2564 | } |
| 2565 | 2565 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2566 | 2566 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2567 | 2567 | foreach ($alldata as $number) { |
| 2568 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2568 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2569 | 2569 | } |
| 2570 | 2570 | if ($globalDebug) echo 'Count all military by months...'."\n"; |
| 2571 | 2571 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2572 | 2572 | foreach ($alldata as $number) { |
| 2573 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2573 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2574 | 2574 | } |
| 2575 | 2575 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2576 | 2576 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2577 | 2577 | foreach ($alldata as $number) { |
| 2578 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2578 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2579 | 2579 | } |
| 2580 | 2580 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2581 | 2581 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2582 | 2582 | foreach ($alldata as $number) { |
| 2583 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2583 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2584 | 2584 | } |
| 2585 | 2585 | echo '...Departure'."\n"; |
| 2586 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 2587 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2586 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 2587 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 2588 | 2588 | foreach ($dall as $value) { |
| 2589 | 2589 | $icao = $value['departure_airport_icao']; |
| 2590 | 2590 | $ddate = $value['date']; |
@@ -2602,11 +2602,11 @@ discard block |
||
| 2602 | 2602 | } |
| 2603 | 2603 | $alldata = $pall; |
| 2604 | 2604 | foreach ($alldata as $number) { |
| 2605 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name); |
|
| 2605 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name); |
|
| 2606 | 2606 | } |
| 2607 | 2607 | echo '...Arrival'."\n"; |
| 2608 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2609 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2608 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2609 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2610 | 2610 | foreach ($dall as $value) { |
| 2611 | 2611 | $icao = $value['arrival_airport_icao']; |
| 2612 | 2612 | $ddate = $value['date']; |
@@ -2624,39 +2624,39 @@ discard block |
||
| 2624 | 2624 | } |
| 2625 | 2625 | $alldata = $pall; |
| 2626 | 2626 | foreach ($alldata as $number) { |
| 2627 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name); |
|
| 2627 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name); |
|
| 2628 | 2628 | } |
| 2629 | 2629 | echo 'Flights data...'."\n"; |
| 2630 | 2630 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2631 | 2631 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2632 | 2632 | foreach ($alldata as $number) { |
| 2633 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2633 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2634 | 2634 | } |
| 2635 | 2635 | echo '-> countAllDates...'."\n"; |
| 2636 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2637 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2636 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2637 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2638 | 2638 | $values = array(); |
| 2639 | 2639 | foreach ($alldata as $cnt) { |
| 2640 | 2640 | $values[] = $cnt['date_count']; |
| 2641 | 2641 | } |
| 2642 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2643 | - array_splice($alldata,11); |
|
| 2642 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2643 | + array_splice($alldata, 11); |
|
| 2644 | 2644 | foreach ($alldata as $number) { |
| 2645 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2645 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2646 | 2646 | } |
| 2647 | 2647 | |
| 2648 | 2648 | echo '-> countAllHours...'."\n"; |
| 2649 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2649 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2650 | 2650 | foreach ($alldata as $number) { |
| 2651 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2651 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2652 | 2652 | } |
| 2653 | 2653 | echo 'Insert last stats update date...'."\n"; |
| 2654 | 2654 | date_default_timezone_set('UTC'); |
| 2655 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2655 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2656 | 2656 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2657 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2657 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2658 | 2658 | $this->deleteOldStats($filter_name); |
| 2659 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2659 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2660 | 2660 | } |
| 2661 | 2661 | } |
| 2662 | 2662 | } |
@@ -2668,16 +2668,16 @@ discard block |
||
| 2668 | 2668 | // SUM all previous month to put as year |
| 2669 | 2669 | $previous_year = date('Y'); |
| 2670 | 2670 | $previous_year--; |
| 2671 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2672 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2673 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2674 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2671 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2672 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2673 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2674 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2675 | 2675 | $allairlines = $this->getAllAirlineNames(); |
| 2676 | 2676 | foreach ($allairlines as $data) { |
| 2677 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2678 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2679 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2680 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2677 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2678 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2679 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2680 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2681 | 2681 | } |
| 2682 | 2682 | |
| 2683 | 2683 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2686,21 +2686,21 @@ discard block |
||
| 2686 | 2686 | try { |
| 2687 | 2687 | $sth = $this->db->prepare($query); |
| 2688 | 2688 | $sth->execute(); |
| 2689 | - } catch(PDOException $e) { |
|
| 2689 | + } catch (PDOException $e) { |
|
| 2690 | 2690 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2691 | 2691 | } |
| 2692 | 2692 | $query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2693 | 2693 | try { |
| 2694 | 2694 | $sth = $this->db->prepare($query); |
| 2695 | 2695 | $sth->execute(); |
| 2696 | - } catch(PDOException $e) { |
|
| 2696 | + } catch (PDOException $e) { |
|
| 2697 | 2697 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2698 | 2698 | } |
| 2699 | 2699 | $query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2700 | 2700 | try { |
| 2701 | 2701 | $sth = $this->db->prepare($query); |
| 2702 | 2702 | $sth->execute(); |
| 2703 | - } catch(PDOException $e) { |
|
| 2703 | + } catch (PDOException $e) { |
|
| 2704 | 2704 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2705 | 2705 | } |
| 2706 | 2706 | } |
@@ -2713,7 +2713,7 @@ discard block |
||
| 2713 | 2713 | try { |
| 2714 | 2714 | $sth = $this->db->prepare($query); |
| 2715 | 2715 | $sth->execute(); |
| 2716 | - } catch(PDOException $e) { |
|
| 2716 | + } catch (PDOException $e) { |
|
| 2717 | 2717 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2718 | 2718 | } |
| 2719 | 2719 | if ($globalDBdriver == 'mysql') { |
@@ -2724,7 +2724,7 @@ discard block |
||
| 2724 | 2724 | try { |
| 2725 | 2725 | $sth = $this->db->prepare($query); |
| 2726 | 2726 | $sth->execute(); |
| 2727 | - } catch(PDOException $e) { |
|
| 2727 | + } catch (PDOException $e) { |
|
| 2728 | 2728 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2729 | 2729 | } |
| 2730 | 2730 | if ($globalDBdriver == 'mysql') { |
@@ -2735,15 +2735,15 @@ discard block |
||
| 2735 | 2735 | try { |
| 2736 | 2736 | $sth = $this->db->prepare($query); |
| 2737 | 2737 | $sth->execute(); |
| 2738 | - } catch(PDOException $e) { |
|
| 2738 | + } catch (PDOException $e) { |
|
| 2739 | 2739 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2740 | 2740 | } |
| 2741 | 2741 | } |
| 2742 | 2742 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2743 | 2743 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2744 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2744 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2745 | 2745 | $this->deleteOldStats(); |
| 2746 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2746 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2747 | 2747 | $lastyearupdate = true; |
| 2748 | 2748 | } |
| 2749 | 2749 | } |
@@ -2765,7 +2765,7 @@ discard block |
||
| 2765 | 2765 | try { |
| 2766 | 2766 | $sth = $this->db->prepare($query); |
| 2767 | 2767 | $sth->execute(); |
| 2768 | - } catch(PDOException $e) { |
|
| 2768 | + } catch (PDOException $e) { |
|
| 2769 | 2769 | return "error : ".$e->getMessage(); |
| 2770 | 2770 | } |
| 2771 | 2771 | echo 'Archive old tracker data...'."\n"; |
@@ -2781,7 +2781,7 @@ discard block |
||
| 2781 | 2781 | try { |
| 2782 | 2782 | $sth = $this->db->prepare($query); |
| 2783 | 2783 | $sth->execute(); |
| 2784 | - } catch(PDOException $e) { |
|
| 2784 | + } catch (PDOException $e) { |
|
| 2785 | 2785 | return "error : ".$e->getMessage(); |
| 2786 | 2786 | } |
| 2787 | 2787 | echo 'Archive old marine data...'."\n"; |
@@ -2797,7 +2797,7 @@ discard block |
||
| 2797 | 2797 | try { |
| 2798 | 2798 | $sth = $this->db->prepare($query); |
| 2799 | 2799 | $sth->execute(); |
| 2800 | - } catch(PDOException $e) { |
|
| 2800 | + } catch (PDOException $e) { |
|
| 2801 | 2801 | return "error : ".$e->getMessage(); |
| 2802 | 2802 | } |
| 2803 | 2803 | } |
@@ -2810,7 +2810,7 @@ discard block |
||
| 2810 | 2810 | try { |
| 2811 | 2811 | $sth = $this->db->prepare($query); |
| 2812 | 2812 | $sth->execute(); |
| 2813 | - } catch(PDOException $e) { |
|
| 2813 | + } catch (PDOException $e) { |
|
| 2814 | 2814 | return "error : ".$e->getMessage(); |
| 2815 | 2815 | } |
| 2816 | 2816 | echo 'Deleting old tracker data...'."\n"; |
@@ -2822,7 +2822,7 @@ discard block |
||
| 2822 | 2822 | try { |
| 2823 | 2823 | $sth = $this->db->prepare($query); |
| 2824 | 2824 | $sth->execute(); |
| 2825 | - } catch(PDOException $e) { |
|
| 2825 | + } catch (PDOException $e) { |
|
| 2826 | 2826 | return "error : ".$e->getMessage(); |
| 2827 | 2827 | } |
| 2828 | 2828 | echo 'Deleting old marine data...'."\n"; |
@@ -2834,14 +2834,14 @@ discard block |
||
| 2834 | 2834 | try { |
| 2835 | 2835 | $sth = $this->db->prepare($query); |
| 2836 | 2836 | $sth->execute(); |
| 2837 | - } catch(PDOException $e) { |
|
| 2837 | + } catch (PDOException $e) { |
|
| 2838 | 2838 | return "error : ".$e->getMessage(); |
| 2839 | 2839 | } |
| 2840 | 2840 | } |
| 2841 | 2841 | if (!isset($lastyearupdate)) { |
| 2842 | 2842 | echo 'Insert last stats update date...'."\n"; |
| 2843 | 2843 | date_default_timezone_set('UTC'); |
| 2844 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 2844 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 2845 | 2845 | } |
| 2846 | 2846 | if ($globalStatsResetYear) { |
| 2847 | 2847 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -13,10 +13,14 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | public function __construct($dbc = null) { |
| 15 | 15 | global $globalFilterName; |
| 16 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 16 | + if (isset($globalFilterName)) { |
|
| 17 | + $this->filter_name = $globalFilterName; |
|
| 18 | + } |
|
| 17 | 19 | $Connection = new Connection($dbc); |
| 18 | 20 | $this->db = $Connection->db(); |
| 19 | - if ($this->db === null) die('Error: No DB connection. (Stats)'); |
|
| 21 | + if ($this->db === null) { |
|
| 22 | + die('Error: No DB connection. (Stats)'); |
|
| 23 | + } |
|
| 20 | 24 | } |
| 21 | 25 | |
| 22 | 26 | public function addLastStatsUpdate($type,$stats_date) { |
@@ -84,7 +88,9 @@ discard block |
||
| 84 | 88 | |
| 85 | 89 | public function getAllAirlineNames($filter_name = '') { |
| 86 | 90 | global $globalStatsFilters; |
| 87 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 91 | + if ($filter_name == '') { |
|
| 92 | + $filter_name = $this->filter_name; |
|
| 93 | + } |
|
| 88 | 94 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 89 | 95 | try { |
| 90 | 96 | $sth = $this->db->prepare($query); |
@@ -104,7 +110,9 @@ discard block |
||
| 104 | 110 | return $all; |
| 105 | 111 | } |
| 106 | 112 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 107 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 113 | + if ($filter_name == '') { |
|
| 114 | + $filter_name = $this->filter_name; |
|
| 115 | + } |
|
| 108 | 116 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 109 | 117 | try { |
| 110 | 118 | $sth = $this->db->prepare($query); |
@@ -116,7 +124,9 @@ discard block |
||
| 116 | 124 | return $all; |
| 117 | 125 | } |
| 118 | 126 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 119 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 127 | + if ($filter_name == '') { |
|
| 128 | + $filter_name = $this->filter_name; |
|
| 129 | + } |
|
| 120 | 130 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 121 | 131 | try { |
| 122 | 132 | $sth = $this->db->prepare($query); |
@@ -128,7 +138,9 @@ discard block |
||
| 128 | 138 | return $all; |
| 129 | 139 | } |
| 130 | 140 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 131 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 141 | + if ($filter_name == '') { |
|
| 142 | + $filter_name = $this->filter_name; |
|
| 143 | + } |
|
| 132 | 144 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 133 | 145 | try { |
| 134 | 146 | $sth = $this->db->prepare($query); |
@@ -141,7 +153,9 @@ discard block |
||
| 141 | 153 | } |
| 142 | 154 | |
| 143 | 155 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 144 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 156 | + if ($filter_name == '') { |
|
| 157 | + $filter_name = $this->filter_name; |
|
| 158 | + } |
|
| 145 | 159 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 146 | 160 | try { |
| 147 | 161 | $sth = $this->db->prepare($query); |
@@ -154,7 +168,9 @@ discard block |
||
| 154 | 168 | } |
| 155 | 169 | |
| 156 | 170 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 157 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 171 | + if ($filter_name == '') { |
|
| 172 | + $filter_name = $this->filter_name; |
|
| 173 | + } |
|
| 158 | 174 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 159 | 175 | try { |
| 160 | 176 | $sth = $this->db->prepare($query); |
@@ -169,7 +185,9 @@ discard block |
||
| 169 | 185 | |
| 170 | 186 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 171 | 187 | global $globalStatsFilters; |
| 172 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 188 | + if ($filter_name == '') { |
|
| 189 | + $filter_name = $this->filter_name; |
|
| 190 | + } |
|
| 173 | 191 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 174 | 192 | $Spotter = new Spotter($this->db); |
| 175 | 193 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -178,8 +196,11 @@ discard block |
||
| 178 | 196 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 179 | 197 | } |
| 180 | 198 | if ($year == '' && $month == '') { |
| 181 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 182 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 199 | + if ($limit) { |
|
| 200 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 201 | + } else { |
|
| 202 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 203 | + } |
|
| 183 | 204 | try { |
| 184 | 205 | $sth = $this->db->prepare($query); |
| 185 | 206 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -187,11 +208,16 @@ discard block |
||
| 187 | 208 | echo "error : ".$e->getMessage(); |
| 188 | 209 | } |
| 189 | 210 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 190 | - } else $all = array(); |
|
| 211 | + } else { |
|
| 212 | + $all = array(); |
|
| 213 | + } |
|
| 191 | 214 | } else { |
| 192 | 215 | if ($year == '' && $month == '') { |
| 193 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 194 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 216 | + if ($limit) { |
|
| 217 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 218 | + } else { |
|
| 219 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 220 | + } |
|
| 195 | 221 | try { |
| 196 | 222 | $sth = $this->db->prepare($query); |
| 197 | 223 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -199,7 +225,9 @@ discard block |
||
| 199 | 225 | echo "error : ".$e->getMessage(); |
| 200 | 226 | } |
| 201 | 227 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 202 | - } else $all = array(); |
|
| 228 | + } else { |
|
| 229 | + $all = array(); |
|
| 230 | + } |
|
| 203 | 231 | } |
| 204 | 232 | if (empty($all)) { |
| 205 | 233 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -218,10 +246,15 @@ discard block |
||
| 218 | 246 | } |
| 219 | 247 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 220 | 248 | global $globalStatsFilters; |
| 221 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 249 | + if ($filter_name == '') { |
|
| 250 | + $filter_name = $this->filter_name; |
|
| 251 | + } |
|
| 222 | 252 | if ($year == '' && $month == '') { |
| 223 | - if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 224 | - else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 253 | + if ($limit) { |
|
| 254 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 255 | + } else { |
|
| 256 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 257 | + } |
|
| 225 | 258 | try { |
| 226 | 259 | $sth = $this->db->prepare($query); |
| 227 | 260 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -229,7 +262,9 @@ discard block |
||
| 229 | 262 | echo "error : ".$e->getMessage(); |
| 230 | 263 | } |
| 231 | 264 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 232 | - } else $all = array(); |
|
| 265 | + } else { |
|
| 266 | + $all = array(); |
|
| 267 | + } |
|
| 233 | 268 | if (empty($all)) { |
| 234 | 269 | $Spotter = new Spotter($this->db); |
| 235 | 270 | $filters = array(); |
@@ -244,7 +279,9 @@ discard block |
||
| 244 | 279 | } |
| 245 | 280 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 246 | 281 | global $globalStatsFilters; |
| 247 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 282 | + if ($filter_name == '') { |
|
| 283 | + $filter_name = $this->filter_name; |
|
| 284 | + } |
|
| 248 | 285 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 249 | 286 | $Spotter = new Spotter($this->db); |
| 250 | 287 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -253,8 +290,11 @@ discard block |
||
| 253 | 290 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 254 | 291 | } |
| 255 | 292 | if ($year == '' && $month == '') { |
| 256 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 257 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 293 | + if ($limit) { |
|
| 294 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 295 | + } else { |
|
| 296 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 297 | + } |
|
| 258 | 298 | try { |
| 259 | 299 | $sth = $this->db->prepare($query); |
| 260 | 300 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -262,11 +302,16 @@ discard block |
||
| 262 | 302 | echo "error : ".$e->getMessage(); |
| 263 | 303 | } |
| 264 | 304 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 265 | - } else $all = array(); |
|
| 305 | + } else { |
|
| 306 | + $all = array(); |
|
| 307 | + } |
|
| 266 | 308 | } else { |
| 267 | 309 | if ($year == '' && $month == '') { |
| 268 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 269 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 310 | + if ($limit) { |
|
| 311 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 312 | + } else { |
|
| 313 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 314 | + } |
|
| 270 | 315 | try { |
| 271 | 316 | $sth = $this->db->prepare($query); |
| 272 | 317 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -274,7 +319,9 @@ discard block |
||
| 274 | 319 | echo "error : ".$e->getMessage(); |
| 275 | 320 | } |
| 276 | 321 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 277 | - } else $all = array(); |
|
| 322 | + } else { |
|
| 323 | + $all = array(); |
|
| 324 | + } |
|
| 278 | 325 | } |
| 279 | 326 | if (empty($all)) { |
| 280 | 327 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -294,7 +341,9 @@ discard block |
||
| 294 | 341 | |
| 295 | 342 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 296 | 343 | global $globalStatsFilters; |
| 297 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 344 | + if ($filter_name == '') { |
|
| 345 | + $filter_name = $this->filter_name; |
|
| 346 | + } |
|
| 298 | 347 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 299 | 348 | $Spotter = new Spotter($this->db); |
| 300 | 349 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -303,8 +352,11 @@ discard block |
||
| 303 | 352 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 304 | 353 | } |
| 305 | 354 | if ($year == '' && $month == '') { |
| 306 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 307 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 355 | + if ($limit) { |
|
| 356 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | + } else { |
|
| 358 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 359 | + } |
|
| 308 | 360 | try { |
| 309 | 361 | $sth = $this->db->prepare($query); |
| 310 | 362 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -312,11 +364,16 @@ discard block |
||
| 312 | 364 | echo "error : ".$e->getMessage(); |
| 313 | 365 | } |
| 314 | 366 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 315 | - } else $all = array(); |
|
| 367 | + } else { |
|
| 368 | + $all = array(); |
|
| 369 | + } |
|
| 316 | 370 | } else { |
| 317 | 371 | if ($year == '' && $month == '') { |
| 318 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 319 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 372 | + if ($limit) { |
|
| 373 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 374 | + } else { |
|
| 375 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 376 | + } |
|
| 320 | 377 | try { |
| 321 | 378 | $sth = $this->db->prepare($query); |
| 322 | 379 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -324,7 +381,9 @@ discard block |
||
| 324 | 381 | echo "error : ".$e->getMessage(); |
| 325 | 382 | } |
| 326 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 327 | - } else $all = array(); |
|
| 384 | + } else { |
|
| 385 | + $all = array(); |
|
| 386 | + } |
|
| 328 | 387 | } |
| 329 | 388 | if (empty($all)) { |
| 330 | 389 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -343,7 +402,9 @@ discard block |
||
| 343 | 402 | } |
| 344 | 403 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 345 | 404 | global $globalStatsFilters; |
| 346 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 405 | + if ($filter_name == '') { |
|
| 406 | + $filter_name = $this->filter_name; |
|
| 407 | + } |
|
| 347 | 408 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 348 | 409 | $Spotter = new Spotter($this->db); |
| 349 | 410 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -351,12 +412,18 @@ discard block |
||
| 351 | 412 | foreach ($airlines as $airline) { |
| 352 | 413 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 353 | 414 | } |
| 354 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 355 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 415 | + if ($limit) { |
|
| 416 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 417 | + } else { |
|
| 418 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 419 | + } |
|
| 356 | 420 | $query_values = array(':filter_name' => $filter_name); |
| 357 | 421 | } else { |
| 358 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 359 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 422 | + if ($limit) { |
|
| 423 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 424 | + } else { |
|
| 425 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 426 | + } |
|
| 360 | 427 | $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 361 | 428 | } |
| 362 | 429 | try { |
@@ -384,17 +451,29 @@ discard block |
||
| 384 | 451 | |
| 385 | 452 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
| 386 | 453 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 387 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 454 | + if ($filter_name == '') { |
|
| 455 | + $filter_name = $this->filter_name; |
|
| 456 | + } |
|
| 388 | 457 | if ($year == '' && $month == '') { |
| 389 | - if ($globalVATSIM) $forsource = 'vatsim'; |
|
| 390 | - if ($globalIVAO) $forsource = 'ivao'; |
|
| 458 | + if ($globalVATSIM) { |
|
| 459 | + $forsource = 'vatsim'; |
|
| 460 | + } |
|
| 461 | + if ($globalIVAO) { |
|
| 462 | + $forsource = 'ivao'; |
|
| 463 | + } |
|
| 391 | 464 | if (isset($forsource)) { |
| 392 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 393 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 465 | + if ($limit) { |
|
| 466 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 467 | + } else { |
|
| 468 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 469 | + } |
|
| 394 | 470 | $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
| 395 | 471 | } else { |
| 396 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 397 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 472 | + if ($limit) { |
|
| 473 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 474 | + } else { |
|
| 475 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 476 | + } |
|
| 398 | 477 | $query_values = array(':filter_name' => $filter_name); |
| 399 | 478 | } |
| 400 | 479 | try { |
@@ -404,7 +483,9 @@ discard block |
||
| 404 | 483 | echo "error : ".$e->getMessage(); |
| 405 | 484 | } |
| 406 | 485 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 407 | - } else $all = array(); |
|
| 486 | + } else { |
|
| 487 | + $all = array(); |
|
| 488 | + } |
|
| 408 | 489 | if (empty($all)) { |
| 409 | 490 | $Spotter = new Spotter($this->db); |
| 410 | 491 | $filters = array(); |
@@ -419,7 +500,9 @@ discard block |
||
| 419 | 500 | } |
| 420 | 501 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 421 | 502 | global $globalStatsFilters; |
| 422 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 503 | + if ($filter_name == '') { |
|
| 504 | + $filter_name = $this->filter_name; |
|
| 505 | + } |
|
| 423 | 506 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 424 | 507 | $Spotter = new Spotter($this->db); |
| 425 | 508 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -428,8 +511,11 @@ discard block |
||
| 428 | 511 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 429 | 512 | } |
| 430 | 513 | if ($year == '' && $month == '') { |
| 431 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 432 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 514 | + if ($limit) { |
|
| 515 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 516 | + } else { |
|
| 517 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 518 | + } |
|
| 433 | 519 | try { |
| 434 | 520 | $sth = $this->db->prepare($query); |
| 435 | 521 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -437,11 +523,16 @@ discard block |
||
| 437 | 523 | echo "error : ".$e->getMessage(); |
| 438 | 524 | } |
| 439 | 525 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 440 | - } else $all = array(); |
|
| 526 | + } else { |
|
| 527 | + $all = array(); |
|
| 528 | + } |
|
| 441 | 529 | } else { |
| 442 | 530 | if ($year == '' && $month == '') { |
| 443 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 444 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 531 | + if ($limit) { |
|
| 532 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 533 | + } else { |
|
| 534 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 535 | + } |
|
| 445 | 536 | try { |
| 446 | 537 | $sth = $this->db->prepare($query); |
| 447 | 538 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -449,7 +540,9 @@ discard block |
||
| 449 | 540 | echo "error : ".$e->getMessage(); |
| 450 | 541 | } |
| 451 | 542 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 452 | - } else $all = array(); |
|
| 543 | + } else { |
|
| 544 | + $all = array(); |
|
| 545 | + } |
|
| 453 | 546 | } |
| 454 | 547 | if (empty($all)) { |
| 455 | 548 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -468,7 +561,9 @@ discard block |
||
| 468 | 561 | } |
| 469 | 562 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 470 | 563 | global $globalStatsFilters; |
| 471 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 564 | + if ($filter_name == '') { |
|
| 565 | + $filter_name = $this->filter_name; |
|
| 566 | + } |
|
| 472 | 567 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 473 | 568 | $Spotter = new Spotter($this->db); |
| 474 | 569 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -477,8 +572,11 @@ discard block |
||
| 477 | 572 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 478 | 573 | } |
| 479 | 574 | if ($year == '' && $month == '') { |
| 480 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 481 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 575 | + if ($limit) { |
|
| 576 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 577 | + } else { |
|
| 578 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 579 | + } |
|
| 482 | 580 | try { |
| 483 | 581 | $sth = $this->db->prepare($query); |
| 484 | 582 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -486,11 +584,16 @@ discard block |
||
| 486 | 584 | echo "error : ".$e->getMessage(); |
| 487 | 585 | } |
| 488 | 586 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 489 | - } else $all = array(); |
|
| 587 | + } else { |
|
| 588 | + $all = array(); |
|
| 589 | + } |
|
| 490 | 590 | } else { |
| 491 | 591 | if ($year == '' && $month == '') { |
| 492 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 493 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 592 | + if ($limit) { |
|
| 593 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 594 | + } else { |
|
| 595 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 596 | + } |
|
| 494 | 597 | try { |
| 495 | 598 | $sth = $this->db->prepare($query); |
| 496 | 599 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -498,7 +601,9 @@ discard block |
||
| 498 | 601 | echo "error : ".$e->getMessage(); |
| 499 | 602 | } |
| 500 | 603 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 501 | - } else $all = array(); |
|
| 604 | + } else { |
|
| 605 | + $all = array(); |
|
| 606 | + } |
|
| 502 | 607 | } |
| 503 | 608 | if (empty($all)) { |
| 504 | 609 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -517,7 +622,9 @@ discard block |
||
| 517 | 622 | } |
| 518 | 623 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 519 | 624 | $Connection = new Connection($this->db); |
| 520 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 625 | + if ($filter_name == '') { |
|
| 626 | + $filter_name = $this->filter_name; |
|
| 627 | + } |
|
| 521 | 628 | if ($Connection->tableExists('countries')) { |
| 522 | 629 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 523 | 630 | $Spotter = new Spotter($this->db); |
@@ -527,8 +634,11 @@ discard block |
||
| 527 | 634 | foreach ($airlines as $airline) { |
| 528 | 635 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 529 | 636 | } |
| 530 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 531 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 637 | + if ($limit) { |
|
| 638 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 639 | + } else { |
|
| 640 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 641 | + } |
|
| 532 | 642 | try { |
| 533 | 643 | $sth = $this->db->prepare($query); |
| 534 | 644 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -537,11 +647,16 @@ discard block |
||
| 537 | 647 | } |
| 538 | 648 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 539 | 649 | return $all; |
| 540 | - } else return array(); |
|
| 650 | + } else { |
|
| 651 | + return array(); |
|
| 652 | + } |
|
| 541 | 653 | } else { |
| 542 | 654 | if ($year == '' && $month == '') { |
| 543 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 544 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 655 | + if ($limit) { |
|
| 656 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 657 | + } else { |
|
| 658 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 659 | + } |
|
| 545 | 660 | try { |
| 546 | 661 | $sth = $this->db->prepare($query); |
| 547 | 662 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -550,7 +665,9 @@ discard block |
||
| 550 | 665 | } |
| 551 | 666 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 552 | 667 | return $all; |
| 553 | - } else return array(); |
|
| 668 | + } else { |
|
| 669 | + return array(); |
|
| 670 | + } |
|
| 554 | 671 | } |
| 555 | 672 | } else { |
| 556 | 673 | /* |
@@ -564,10 +681,15 @@ discard block |
||
| 564 | 681 | } |
| 565 | 682 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
| 566 | 683 | global $globalStatsFilters; |
| 567 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 684 | + if ($filter_name == '') { |
|
| 685 | + $filter_name = $this->filter_name; |
|
| 686 | + } |
|
| 568 | 687 | if ($year == '' && $month == '') { |
| 569 | - if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 570 | - else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 688 | + if ($limit) { |
|
| 689 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 690 | + } else { |
|
| 691 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 692 | + } |
|
| 571 | 693 | try { |
| 572 | 694 | $sth = $this->db->prepare($query); |
| 573 | 695 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -575,7 +697,9 @@ discard block |
||
| 575 | 697 | echo "error : ".$e->getMessage(); |
| 576 | 698 | } |
| 577 | 699 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 578 | - } else $all = array(); |
|
| 700 | + } else { |
|
| 701 | + $all = array(); |
|
| 702 | + } |
|
| 579 | 703 | if (empty($all)) { |
| 580 | 704 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 581 | 705 | if ($filter_name != '') { |
@@ -590,7 +714,9 @@ discard block |
||
| 590 | 714 | |
| 591 | 715 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 592 | 716 | global $globalStatsFilters; |
| 593 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 717 | + if ($filter_name == '') { |
|
| 718 | + $filter_name = $this->filter_name; |
|
| 719 | + } |
|
| 594 | 720 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 595 | 721 | $Spotter = new Spotter($this->db); |
| 596 | 722 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -599,8 +725,11 @@ discard block |
||
| 599 | 725 | foreach ($airlines as $airline) { |
| 600 | 726 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 601 | 727 | } |
| 602 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 603 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 728 | + if ($limit) { |
|
| 729 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 730 | + } else { |
|
| 731 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 732 | + } |
|
| 604 | 733 | try { |
| 605 | 734 | $sth = $this->db->prepare($query); |
| 606 | 735 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -608,11 +737,16 @@ discard block |
||
| 608 | 737 | echo "error : ".$e->getMessage(); |
| 609 | 738 | } |
| 610 | 739 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 611 | - } else $all = array(); |
|
| 740 | + } else { |
|
| 741 | + $all = array(); |
|
| 742 | + } |
|
| 612 | 743 | } else { |
| 613 | 744 | if ($year == '' && $month == '') { |
| 614 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 615 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 745 | + if ($limit) { |
|
| 746 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 747 | + } else { |
|
| 748 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 749 | + } |
|
| 616 | 750 | try { |
| 617 | 751 | $sth = $this->db->prepare($query); |
| 618 | 752 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -620,7 +754,9 @@ discard block |
||
| 620 | 754 | echo "error : ".$e->getMessage(); |
| 621 | 755 | } |
| 622 | 756 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 623 | - } else $all = array(); |
|
| 757 | + } else { |
|
| 758 | + $all = array(); |
|
| 759 | + } |
|
| 624 | 760 | } |
| 625 | 761 | if (empty($all)) { |
| 626 | 762 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -639,7 +775,9 @@ discard block |
||
| 639 | 775 | } |
| 640 | 776 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 641 | 777 | global $globalStatsFilters; |
| 642 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 778 | + if ($filter_name == '') { |
|
| 779 | + $filter_name = $this->filter_name; |
|
| 780 | + } |
|
| 643 | 781 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 644 | 782 | $Spotter = new Spotter($this->db); |
| 645 | 783 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -648,8 +786,11 @@ discard block |
||
| 648 | 786 | foreach ($airlines as $airline) { |
| 649 | 787 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 650 | 788 | } |
| 651 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 652 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 789 | + if ($limit) { |
|
| 790 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 791 | + } else { |
|
| 792 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 793 | + } |
|
| 653 | 794 | try { |
| 654 | 795 | $sth = $this->db->prepare($query); |
| 655 | 796 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -657,11 +798,16 @@ discard block |
||
| 657 | 798 | echo "error : ".$e->getMessage(); |
| 658 | 799 | } |
| 659 | 800 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 660 | - } else $all = array(); |
|
| 801 | + } else { |
|
| 802 | + $all = array(); |
|
| 803 | + } |
|
| 661 | 804 | } else { |
| 662 | 805 | if ($year == '' && $month == '') { |
| 663 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 664 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 806 | + if ($limit) { |
|
| 807 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 808 | + } else { |
|
| 809 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 810 | + } |
|
| 665 | 811 | try { |
| 666 | 812 | $sth = $this->db->prepare($query); |
| 667 | 813 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -669,7 +815,9 @@ discard block |
||
| 669 | 815 | echo "error : ".$e->getMessage(); |
| 670 | 816 | } |
| 671 | 817 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 672 | - } else $all = array(); |
|
| 818 | + } else { |
|
| 819 | + $all = array(); |
|
| 820 | + } |
|
| 673 | 821 | } |
| 674 | 822 | if (empty($all)) { |
| 675 | 823 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -694,7 +842,9 @@ discard block |
||
| 694 | 842 | $icao = $value['airport_departure_icao']; |
| 695 | 843 | if (isset($all[$icao])) { |
| 696 | 844 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 697 | - } else $all[$icao] = $value; |
|
| 845 | + } else { |
|
| 846 | + $all[$icao] = $value; |
|
| 847 | + } |
|
| 698 | 848 | } |
| 699 | 849 | $count = array(); |
| 700 | 850 | foreach ($all as $key => $row) { |
@@ -706,7 +856,9 @@ discard block |
||
| 706 | 856 | } |
| 707 | 857 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 708 | 858 | global $globalStatsFilters; |
| 709 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 859 | + if ($filter_name == '') { |
|
| 860 | + $filter_name = $this->filter_name; |
|
| 861 | + } |
|
| 710 | 862 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 711 | 863 | $Spotter = new Spotter($this->db); |
| 712 | 864 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -715,8 +867,11 @@ discard block |
||
| 715 | 867 | foreach ($airlines as $airline) { |
| 716 | 868 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 717 | 869 | } |
| 718 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 719 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 870 | + if ($limit) { |
|
| 871 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 872 | + } else { |
|
| 873 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 874 | + } |
|
| 720 | 875 | try { |
| 721 | 876 | $sth = $this->db->prepare($query); |
| 722 | 877 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -724,11 +879,16 @@ discard block |
||
| 724 | 879 | echo "error : ".$e->getMessage(); |
| 725 | 880 | } |
| 726 | 881 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 727 | - } else $all = array(); |
|
| 882 | + } else { |
|
| 883 | + $all = array(); |
|
| 884 | + } |
|
| 728 | 885 | } else { |
| 729 | 886 | if ($year == '' && $month == '') { |
| 730 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 731 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 887 | + if ($limit) { |
|
| 888 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 889 | + } else { |
|
| 890 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 891 | + } |
|
| 732 | 892 | try { |
| 733 | 893 | $sth = $this->db->prepare($query); |
| 734 | 894 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -736,7 +896,9 @@ discard block |
||
| 736 | 896 | echo "error : ".$e->getMessage(); |
| 737 | 897 | } |
| 738 | 898 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 739 | - } else $all = array(); |
|
| 899 | + } else { |
|
| 900 | + $all = array(); |
|
| 901 | + } |
|
| 740 | 902 | } |
| 741 | 903 | if (empty($all)) { |
| 742 | 904 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -761,7 +923,9 @@ discard block |
||
| 761 | 923 | $icao = $value['airport_arrival_icao']; |
| 762 | 924 | if (isset($all[$icao])) { |
| 763 | 925 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 764 | - } else $all[$icao] = $value; |
|
| 926 | + } else { |
|
| 927 | + $all[$icao] = $value; |
|
| 928 | + } |
|
| 765 | 929 | } |
| 766 | 930 | $count = array(); |
| 767 | 931 | foreach ($all as $key => $row) { |
@@ -773,7 +937,9 @@ discard block |
||
| 773 | 937 | } |
| 774 | 938 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 775 | 939 | global $globalDBdriver, $globalStatsFilters; |
| 776 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 940 | + if ($filter_name == '') { |
|
| 941 | + $filter_name = $this->filter_name; |
|
| 942 | + } |
|
| 777 | 943 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 778 | 944 | $Spotter = new Spotter($this->db); |
| 779 | 945 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -782,20 +948,32 @@ discard block |
||
| 782 | 948 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 783 | 949 | } |
| 784 | 950 | if ($globalDBdriver == 'mysql') { |
| 785 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 786 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 951 | + if ($limit) { |
|
| 952 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 953 | + } else { |
|
| 954 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 955 | + } |
|
| 787 | 956 | } else { |
| 788 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 789 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 957 | + if ($limit) { |
|
| 958 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 959 | + } else { |
|
| 960 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 961 | + } |
|
| 790 | 962 | } |
| 791 | 963 | $query_data = array(':filter_name' => $filter_name); |
| 792 | 964 | } else { |
| 793 | 965 | if ($globalDBdriver == 'mysql') { |
| 794 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 795 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 966 | + if ($limit) { |
|
| 967 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 968 | + } else { |
|
| 969 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 970 | + } |
|
| 796 | 971 | } else { |
| 797 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 798 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 972 | + if ($limit) { |
|
| 973 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 974 | + } else { |
|
| 975 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 976 | + } |
|
| 799 | 977 | } |
| 800 | 978 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 801 | 979 | } |
@@ -823,7 +1001,9 @@ discard block |
||
| 823 | 1001 | |
| 824 | 1002 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 825 | 1003 | global $globalStatsFilters; |
| 826 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1004 | + if ($filter_name == '') { |
|
| 1005 | + $filter_name = $this->filter_name; |
|
| 1006 | + } |
|
| 827 | 1007 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 828 | 1008 | $Spotter = new Spotter($this->db); |
| 829 | 1009 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -860,7 +1040,9 @@ discard block |
||
| 860 | 1040 | } |
| 861 | 1041 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 862 | 1042 | global $globalDBdriver, $globalStatsFilters; |
| 863 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1043 | + if ($filter_name == '') { |
|
| 1044 | + $filter_name = $this->filter_name; |
|
| 1045 | + } |
|
| 864 | 1046 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 865 | 1047 | $Spotter = new Spotter($this->db); |
| 866 | 1048 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -905,7 +1087,9 @@ discard block |
||
| 905 | 1087 | } |
| 906 | 1088 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 907 | 1089 | global $globalStatsFilters; |
| 908 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1090 | + if ($filter_name == '') { |
|
| 1091 | + $filter_name = $this->filter_name; |
|
| 1092 | + } |
|
| 909 | 1093 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 910 | 1094 | $Spotter = new Spotter($this->db); |
| 911 | 1095 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -942,7 +1126,9 @@ discard block |
||
| 942 | 1126 | } |
| 943 | 1127 | public function countAllDatesByAirlines($filter_name = '') { |
| 944 | 1128 | global $globalStatsFilters; |
| 945 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1129 | + if ($filter_name == '') { |
|
| 1130 | + $filter_name = $this->filter_name; |
|
| 1131 | + } |
|
| 946 | 1132 | $query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name"; |
| 947 | 1133 | $query_data = array('filter_name' => $filter_name); |
| 948 | 1134 | try { |
@@ -964,7 +1150,9 @@ discard block |
||
| 964 | 1150 | } |
| 965 | 1151 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 966 | 1152 | global $globalStatsFilters, $globalDBdriver; |
| 967 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1153 | + if ($filter_name == '') { |
|
| 1154 | + $filter_name = $this->filter_name; |
|
| 1155 | + } |
|
| 968 | 1156 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 969 | 1157 | $Spotter = new Spotter($this->db); |
| 970 | 1158 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1049,7 +1237,9 @@ discard block |
||
| 1049 | 1237 | } |
| 1050 | 1238 | public function countAllMilitaryMonths($filter_name = '') { |
| 1051 | 1239 | global $globalStatsFilters; |
| 1052 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1240 | + if ($filter_name == '') { |
|
| 1241 | + $filter_name = $this->filter_name; |
|
| 1242 | + } |
|
| 1053 | 1243 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
| 1054 | 1244 | try { |
| 1055 | 1245 | $sth = $this->db->prepare($query); |
@@ -1070,7 +1260,9 @@ discard block |
||
| 1070 | 1260 | } |
| 1071 | 1261 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 1072 | 1262 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1073 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1263 | + if ($filter_name == '') { |
|
| 1264 | + $filter_name = $this->filter_name; |
|
| 1265 | + } |
|
| 1074 | 1266 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1075 | 1267 | $Spotter = new Spotter($this->db); |
| 1076 | 1268 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1078,12 +1270,18 @@ discard block |
||
| 1078 | 1270 | foreach ($airlines as $airline) { |
| 1079 | 1271 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 1080 | 1272 | } |
| 1081 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1082 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1273 | + if ($limit) { |
|
| 1274 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1275 | + } else { |
|
| 1276 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1277 | + } |
|
| 1083 | 1278 | $query_data = array(':filter_name' => $filter_name); |
| 1084 | 1279 | } else { |
| 1085 | - if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1086 | - else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1280 | + if ($limit) { |
|
| 1281 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1282 | + } else { |
|
| 1283 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1284 | + } |
|
| 1087 | 1285 | $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 1088 | 1286 | } |
| 1089 | 1287 | if ($orderby == 'hour') { |
@@ -1093,7 +1291,9 @@ discard block |
||
| 1093 | 1291 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 1094 | 1292 | } |
| 1095 | 1293 | } |
| 1096 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 1294 | + if ($orderby == 'count') { |
|
| 1295 | + $query .= " ORDER BY hour_count DESC"; |
|
| 1296 | + } |
|
| 1097 | 1297 | try { |
| 1098 | 1298 | $sth = $this->db->prepare($query); |
| 1099 | 1299 | $sth->execute($query_data); |
@@ -1117,8 +1317,12 @@ discard block |
||
| 1117 | 1317 | } |
| 1118 | 1318 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 1119 | 1319 | global $globalStatsFilters; |
| 1120 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1121 | - if ($year == '') $year = date('Y'); |
|
| 1320 | + if ($filter_name == '') { |
|
| 1321 | + $filter_name = $this->filter_name; |
|
| 1322 | + } |
|
| 1323 | + if ($year == '') { |
|
| 1324 | + $year = date('Y'); |
|
| 1325 | + } |
|
| 1122 | 1326 | $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1123 | 1327 | if (empty($all)) { |
| 1124 | 1328 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1137,8 +1341,12 @@ discard block |
||
| 1137 | 1341 | } |
| 1138 | 1342 | public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
| 1139 | 1343 | global $globalStatsFilters; |
| 1140 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1141 | - if ($year == '') $year = date('Y'); |
|
| 1344 | + if ($filter_name == '') { |
|
| 1345 | + $filter_name = $this->filter_name; |
|
| 1346 | + } |
|
| 1347 | + if ($year == '') { |
|
| 1348 | + $year = date('Y'); |
|
| 1349 | + } |
|
| 1142 | 1350 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 1143 | 1351 | if (empty($all)) { |
| 1144 | 1352 | $filters = array(); |
@@ -1154,8 +1362,12 @@ discard block |
||
| 1154 | 1362 | } |
| 1155 | 1363 | public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
| 1156 | 1364 | global $globalStatsFilters; |
| 1157 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1158 | - if ($year == '') $year = date('Y'); |
|
| 1365 | + if ($filter_name == '') { |
|
| 1366 | + $filter_name = $this->filter_name; |
|
| 1367 | + } |
|
| 1368 | + if ($year == '') { |
|
| 1369 | + $year = date('Y'); |
|
| 1370 | + } |
|
| 1159 | 1371 | $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1160 | 1372 | if (empty($all)) { |
| 1161 | 1373 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1174,7 +1386,9 @@ discard block |
||
| 1174 | 1386 | } |
| 1175 | 1387 | public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1176 | 1388 | global $globalStatsFilters; |
| 1177 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1389 | + if ($filter_name == '') { |
|
| 1390 | + $filter_name = $this->filter_name; |
|
| 1391 | + } |
|
| 1178 | 1392 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1179 | 1393 | $Spotter = new Spotter($this->db); |
| 1180 | 1394 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1192,7 +1406,9 @@ discard block |
||
| 1192 | 1406 | } |
| 1193 | 1407 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1194 | 1408 | $all = $result[0]['nb']; |
| 1195 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1409 | + } else { |
|
| 1410 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1411 | + } |
|
| 1196 | 1412 | } else { |
| 1197 | 1413 | if ($year == '' && $month == '') { |
| 1198 | 1414 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1204,7 +1420,9 @@ discard block |
||
| 1204 | 1420 | } |
| 1205 | 1421 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1206 | 1422 | $all = $result[0]['nb']; |
| 1207 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1423 | + } else { |
|
| 1424 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1425 | + } |
|
| 1208 | 1426 | } |
| 1209 | 1427 | if (empty($all)) { |
| 1210 | 1428 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1223,7 +1441,9 @@ discard block |
||
| 1223 | 1441 | } |
| 1224 | 1442 | public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
| 1225 | 1443 | global $globalStatsFilters; |
| 1226 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1444 | + if ($filter_name == '') { |
|
| 1445 | + $filter_name = $this->filter_name; |
|
| 1446 | + } |
|
| 1227 | 1447 | if ($year == '' && $month == '') { |
| 1228 | 1448 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 1229 | 1449 | try { |
@@ -1234,7 +1454,9 @@ discard block |
||
| 1234 | 1454 | } |
| 1235 | 1455 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1236 | 1456 | $all = $result[0]['nb_airline']; |
| 1237 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1457 | + } else { |
|
| 1458 | + $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1459 | + } |
|
| 1238 | 1460 | if (empty($all)) { |
| 1239 | 1461 | $filters = array(); |
| 1240 | 1462 | $filters = array('year' => $year,'month' => $month); |
@@ -1249,7 +1471,9 @@ discard block |
||
| 1249 | 1471 | } |
| 1250 | 1472 | public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1251 | 1473 | global $globalStatsFilters; |
| 1252 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1474 | + if ($filter_name == '') { |
|
| 1475 | + $filter_name = $this->filter_name; |
|
| 1476 | + } |
|
| 1253 | 1477 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1254 | 1478 | $Spotter = new Spotter($this->db); |
| 1255 | 1479 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1304,7 +1528,9 @@ discard block |
||
| 1304 | 1528 | } |
| 1305 | 1529 | public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 1306 | 1530 | global $globalStatsFilters; |
| 1307 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1531 | + if ($filter_name == '') { |
|
| 1532 | + $filter_name = $this->filter_name; |
|
| 1533 | + } |
|
| 1308 | 1534 | //if ($year == '') $year = date('Y'); |
| 1309 | 1535 | if ($year == '' && $month == '') { |
| 1310 | 1536 | $query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1333,7 +1559,9 @@ discard block |
||
| 1333 | 1559 | } |
| 1334 | 1560 | |
| 1335 | 1561 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 1336 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1562 | + if ($filter_name == '') { |
|
| 1563 | + $filter_name = $this->filter_name; |
|
| 1564 | + } |
|
| 1337 | 1565 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1338 | 1566 | $Spotter = new Spotter($this->db); |
| 1339 | 1567 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1357,7 +1585,9 @@ discard block |
||
| 1357 | 1585 | return $all; |
| 1358 | 1586 | } |
| 1359 | 1587 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 1360 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1588 | + if ($filter_name == '') { |
|
| 1589 | + $filter_name = $this->filter_name; |
|
| 1590 | + } |
|
| 1361 | 1591 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1362 | 1592 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1363 | 1593 | try { |
@@ -1370,7 +1600,9 @@ discard block |
||
| 1370 | 1600 | return $all; |
| 1371 | 1601 | } |
| 1372 | 1602 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 1373 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1603 | + if ($filter_name == '') { |
|
| 1604 | + $filter_name = $this->filter_name; |
|
| 1605 | + } |
|
| 1374 | 1606 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1375 | 1607 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1376 | 1608 | try { |
@@ -1381,7 +1613,9 @@ discard block |
||
| 1381 | 1613 | } |
| 1382 | 1614 | } |
| 1383 | 1615 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 1384 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1616 | + if ($filter_name == '') { |
|
| 1617 | + $filter_name = $this->filter_name; |
|
| 1618 | + } |
|
| 1385 | 1619 | global $globalArchiveMonths, $globalDBdriver; |
| 1386 | 1620 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1387 | 1621 | $Spotter = new Spotter($this->db); |
@@ -1437,7 +1671,9 @@ discard block |
||
| 1437 | 1671 | } |
| 1438 | 1672 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1439 | 1673 | global $globalArchiveMonths, $globalDBdriver; |
| 1440 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1674 | + if ($filter_name == '') { |
|
| 1675 | + $filter_name = $this->filter_name; |
|
| 1676 | + } |
|
| 1441 | 1677 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1442 | 1678 | $Spotter = new Spotter($this->db); |
| 1443 | 1679 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1470,7 +1706,9 @@ discard block |
||
| 1470 | 1706 | } |
| 1471 | 1707 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1472 | 1708 | global $globalArchiveMonths, $globalDBdriver; |
| 1473 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1709 | + if ($filter_name == '') { |
|
| 1710 | + $filter_name = $this->filter_name; |
|
| 1711 | + } |
|
| 1474 | 1712 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1475 | 1713 | $Spotter = new Spotter($this->db); |
| 1476 | 1714 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1501,7 +1739,9 @@ discard block |
||
| 1501 | 1739 | } |
| 1502 | 1740 | public function getStatsAirlineTotal($filter_name = '') { |
| 1503 | 1741 | global $globalArchiveMonths, $globalDBdriver; |
| 1504 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1742 | + if ($filter_name == '') { |
|
| 1743 | + $filter_name = $this->filter_name; |
|
| 1744 | + } |
|
| 1505 | 1745 | if ($globalDBdriver == 'mysql') { |
| 1506 | 1746 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1507 | 1747 | } else { |
@@ -1518,7 +1758,9 @@ discard block |
||
| 1518 | 1758 | } |
| 1519 | 1759 | public function getStatsOwnerTotal($filter_name = '') { |
| 1520 | 1760 | global $globalArchiveMonths, $globalDBdriver; |
| 1521 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1761 | + if ($filter_name == '') { |
|
| 1762 | + $filter_name = $this->filter_name; |
|
| 1763 | + } |
|
| 1522 | 1764 | if ($globalDBdriver == 'mysql') { |
| 1523 | 1765 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1524 | 1766 | } else { |
@@ -1535,7 +1777,9 @@ discard block |
||
| 1535 | 1777 | } |
| 1536 | 1778 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1537 | 1779 | global $globalArchiveMonths, $globalDBdriver; |
| 1538 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1780 | + if ($filter_name == '') { |
|
| 1781 | + $filter_name = $this->filter_name; |
|
| 1782 | + } |
|
| 1539 | 1783 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1540 | 1784 | try { |
| 1541 | 1785 | $sth = $this->db->prepare($query); |
@@ -1544,12 +1788,17 @@ discard block |
||
| 1544 | 1788 | echo "error : ".$e->getMessage(); |
| 1545 | 1789 | } |
| 1546 | 1790 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1547 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1548 | - else return 0; |
|
| 1791 | + if (isset($all[0]['cnt'])) { |
|
| 1792 | + return $all[0]['cnt']; |
|
| 1793 | + } else { |
|
| 1794 | + return 0; |
|
| 1795 | + } |
|
| 1549 | 1796 | } |
| 1550 | 1797 | public function getStatsPilotTotal($filter_name = '') { |
| 1551 | 1798 | global $globalArchiveMonths, $globalDBdriver; |
| 1552 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1799 | + if ($filter_name == '') { |
|
| 1800 | + $filter_name = $this->filter_name; |
|
| 1801 | + } |
|
| 1553 | 1802 | if ($globalDBdriver == 'mysql') { |
| 1554 | 1803 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 1555 | 1804 | } else { |
@@ -1566,7 +1815,9 @@ discard block |
||
| 1566 | 1815 | } |
| 1567 | 1816 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1568 | 1817 | global $globalArchiveMonths, $globalDBdriver; |
| 1569 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1818 | + if ($filter_name == '') { |
|
| 1819 | + $filter_name = $this->filter_name; |
|
| 1820 | + } |
|
| 1570 | 1821 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1571 | 1822 | try { |
| 1572 | 1823 | $sth = $this->db->prepare($query); |
@@ -1575,13 +1826,18 @@ discard block |
||
| 1575 | 1826 | echo "error : ".$e->getMessage(); |
| 1576 | 1827 | } |
| 1577 | 1828 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1578 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1579 | - else return 0; |
|
| 1829 | + if (isset($all[0]['cnt'])) { |
|
| 1830 | + return $all[0]['cnt']; |
|
| 1831 | + } else { |
|
| 1832 | + return 0; |
|
| 1833 | + } |
|
| 1580 | 1834 | } |
| 1581 | 1835 | |
| 1582 | 1836 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1583 | 1837 | global $globalDBdriver; |
| 1584 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1838 | + if ($filter_name == '') { |
|
| 1839 | + $filter_name = $this->filter_name; |
|
| 1840 | + } |
|
| 1585 | 1841 | if ($globalDBdriver == 'mysql') { |
| 1586 | 1842 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt"; |
| 1587 | 1843 | } else { |
@@ -1597,7 +1853,9 @@ discard block |
||
| 1597 | 1853 | } |
| 1598 | 1854 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1599 | 1855 | global $globalDBdriver; |
| 1600 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1856 | + if ($filter_name == '') { |
|
| 1857 | + $filter_name = $this->filter_name; |
|
| 1858 | + } |
|
| 1601 | 1859 | if ($globalDBdriver == 'mysql') { |
| 1602 | 1860 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1603 | 1861 | } else { |
@@ -1983,10 +2241,14 @@ discard block |
||
| 1983 | 2241 | $Connection = new Connection($this->db); |
| 1984 | 2242 | date_default_timezone_set('UTC'); |
| 1985 | 2243 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 1986 | - if ($globalDebug) echo 'Update stats !'."\n"; |
|
| 2244 | + if ($globalDebug) { |
|
| 2245 | + echo 'Update stats !'."\n"; |
|
| 2246 | + } |
|
| 1987 | 2247 | if (isset($last_update[0]['value'])) { |
| 1988 | 2248 | $last_update_day = $last_update[0]['value']; |
| 1989 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2249 | + } else { |
|
| 2250 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2251 | + } |
|
| 1990 | 2252 | $reset = false; |
| 1991 | 2253 | //if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) { |
| 1992 | 2254 | if ($globalStatsResetYear) { |
@@ -1995,43 +2257,63 @@ discard block |
||
| 1995 | 2257 | } |
| 1996 | 2258 | $Spotter = new Spotter($this->db); |
| 1997 | 2259 | |
| 1998 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 2260 | + if ($globalDebug) { |
|
| 2261 | + echo 'Count all aircraft types...'."\n"; |
|
| 2262 | + } |
|
| 1999 | 2263 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 2000 | 2264 | foreach ($alldata as $number) { |
| 2001 | 2265 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 2002 | 2266 | } |
| 2003 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 2267 | + if ($globalDebug) { |
|
| 2268 | + echo 'Count all airlines...'."\n"; |
|
| 2269 | + } |
|
| 2004 | 2270 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 2005 | 2271 | foreach ($alldata as $number) { |
| 2006 | 2272 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 2007 | 2273 | } |
| 2008 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 2274 | + if ($globalDebug) { |
|
| 2275 | + echo 'Count all registrations...'."\n"; |
|
| 2276 | + } |
|
| 2009 | 2277 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 2010 | 2278 | foreach ($alldata as $number) { |
| 2011 | 2279 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 2012 | 2280 | } |
| 2013 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 2281 | + if ($globalDebug) { |
|
| 2282 | + echo 'Count all callsigns...'."\n"; |
|
| 2283 | + } |
|
| 2014 | 2284 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 2015 | 2285 | foreach ($alldata as $number) { |
| 2016 | 2286 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2017 | 2287 | } |
| 2018 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 2288 | + if ($globalDebug) { |
|
| 2289 | + echo 'Count all owners...'."\n"; |
|
| 2290 | + } |
|
| 2019 | 2291 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 2020 | 2292 | foreach ($alldata as $number) { |
| 2021 | 2293 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 2022 | 2294 | } |
| 2023 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 2295 | + if ($globalDebug) { |
|
| 2296 | + echo 'Count all pilots...'."\n"; |
|
| 2297 | + } |
|
| 2024 | 2298 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 2025 | 2299 | foreach ($alldata as $number) { |
| 2026 | - if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
|
| 2300 | + if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') { |
|
| 2301 | + $number['pilot_id'] = $number['pilot_name']; |
|
| 2302 | + } |
|
| 2027 | 2303 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 2028 | 2304 | } |
| 2029 | 2305 | |
| 2030 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 2306 | + if ($globalDebug) { |
|
| 2307 | + echo 'Count all departure airports...'."\n"; |
|
| 2308 | + } |
|
| 2031 | 2309 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 2032 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 2310 | + if ($globalDebug) { |
|
| 2311 | + echo 'Count all detected departure airports...'."\n"; |
|
| 2312 | + } |
|
| 2033 | 2313 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 2034 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 2314 | + if ($globalDebug) { |
|
| 2315 | + echo 'Order departure airports...'."\n"; |
|
| 2316 | + } |
|
| 2035 | 2317 | $alldata = array(); |
| 2036 | 2318 | foreach ($pall as $value) { |
| 2037 | 2319 | $icao = $value['airport_departure_icao']; |
@@ -2041,7 +2323,9 @@ discard block |
||
| 2041 | 2323 | $icao = $value['airport_departure_icao']; |
| 2042 | 2324 | if (isset($alldata[$icao])) { |
| 2043 | 2325 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2044 | - } else $alldata[$icao] = $value; |
|
| 2326 | + } else { |
|
| 2327 | + $alldata[$icao] = $value; |
|
| 2328 | + } |
|
| 2045 | 2329 | } |
| 2046 | 2330 | $count = array(); |
| 2047 | 2331 | foreach ($alldata as $key => $row) { |
@@ -2051,11 +2335,17 @@ discard block |
||
| 2051 | 2335 | foreach ($alldata as $number) { |
| 2052 | 2336 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
| 2053 | 2337 | } |
| 2054 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 2338 | + if ($globalDebug) { |
|
| 2339 | + echo 'Count all arrival airports...'."\n"; |
|
| 2340 | + } |
|
| 2055 | 2341 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 2056 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 2342 | + if ($globalDebug) { |
|
| 2343 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 2344 | + } |
|
| 2057 | 2345 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 2058 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 2346 | + if ($globalDebug) { |
|
| 2347 | + echo 'Order arrival airports...'."\n"; |
|
| 2348 | + } |
|
| 2059 | 2349 | $alldata = array(); |
| 2060 | 2350 | foreach ($pall as $value) { |
| 2061 | 2351 | $icao = $value['airport_arrival_icao']; |
@@ -2065,7 +2355,9 @@ discard block |
||
| 2065 | 2355 | $icao = $value['airport_arrival_icao']; |
| 2066 | 2356 | if (isset($alldata[$icao])) { |
| 2067 | 2357 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2068 | - } else $alldata[$icao] = $value; |
|
| 2358 | + } else { |
|
| 2359 | + $alldata[$icao] = $value; |
|
| 2360 | + } |
|
| 2069 | 2361 | } |
| 2070 | 2362 | $count = array(); |
| 2071 | 2363 | foreach ($alldata as $key => $row) { |
@@ -2076,7 +2368,9 @@ discard block |
||
| 2076 | 2368 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
| 2077 | 2369 | } |
| 2078 | 2370 | if ($Connection->tableExists('countries')) { |
| 2079 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 2371 | + if ($globalDebug) { |
|
| 2372 | + echo 'Count all flights by countries...'."\n"; |
|
| 2373 | + } |
|
| 2080 | 2374 | //$SpotterArchive = new SpotterArchive(); |
| 2081 | 2375 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2082 | 2376 | $Spotter = new Spotter($this->db); |
@@ -2087,7 +2381,9 @@ discard block |
||
| 2087 | 2381 | } |
| 2088 | 2382 | |
| 2089 | 2383 | if (isset($globalAccidents) && $globalAccidents) { |
| 2090 | - if ($globalDebug) echo 'Count fatalities stats...'."\n"; |
|
| 2384 | + if ($globalDebug) { |
|
| 2385 | + echo 'Count fatalities stats...'."\n"; |
|
| 2386 | + } |
|
| 2091 | 2387 | $Accident = new Accident($this->db); |
| 2092 | 2388 | $this->deleteStatsByType('fatalities_byyear'); |
| 2093 | 2389 | $alldata = $Accident->countFatalitiesByYear(); |
@@ -2103,48 +2399,68 @@ discard block |
||
| 2103 | 2399 | |
| 2104 | 2400 | // Add by month using getstat if month finish... |
| 2105 | 2401 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 2106 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 2402 | + if ($globalDebug) { |
|
| 2403 | + echo 'Count all flights by months...'."\n"; |
|
| 2404 | + } |
|
| 2107 | 2405 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2108 | 2406 | $filter_last_month = array('since_date' => $last_month); |
| 2109 | 2407 | $Spotter = new Spotter($this->db); |
| 2110 | 2408 | $alldata = $Spotter->countAllMonths($filter_last_month); |
| 2111 | 2409 | $lastyear = false; |
| 2112 | 2410 | foreach ($alldata as $number) { |
| 2113 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2411 | + if ($number['year_name'] != date('Y')) { |
|
| 2412 | + $lastyear = true; |
|
| 2413 | + } |
|
| 2114 | 2414 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2115 | 2415 | } |
| 2116 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 2416 | + if ($globalDebug) { |
|
| 2417 | + echo 'Count all military flights by months...'."\n"; |
|
| 2418 | + } |
|
| 2117 | 2419 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2118 | 2420 | foreach ($alldata as $number) { |
| 2119 | 2421 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2120 | 2422 | } |
| 2121 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 2423 | + if ($globalDebug) { |
|
| 2424 | + echo 'Count all owners by months...'."\n"; |
|
| 2425 | + } |
|
| 2122 | 2426 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2123 | 2427 | foreach ($alldata as $number) { |
| 2124 | 2428 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2125 | 2429 | } |
| 2126 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 2430 | + if ($globalDebug) { |
|
| 2431 | + echo 'Count all pilots by months...'."\n"; |
|
| 2432 | + } |
|
| 2127 | 2433 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2128 | 2434 | foreach ($alldata as $number) { |
| 2129 | 2435 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2130 | 2436 | } |
| 2131 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 2437 | + if ($globalDebug) { |
|
| 2438 | + echo 'Count all airlines by months...'."\n"; |
|
| 2439 | + } |
|
| 2132 | 2440 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2133 | 2441 | foreach ($alldata as $number) { |
| 2134 | 2442 | $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2135 | 2443 | } |
| 2136 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 2444 | + if ($globalDebug) { |
|
| 2445 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 2446 | + } |
|
| 2137 | 2447 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2138 | 2448 | foreach ($alldata as $number) { |
| 2139 | 2449 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2140 | 2450 | } |
| 2141 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 2451 | + if ($globalDebug) { |
|
| 2452 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 2453 | + } |
|
| 2142 | 2454 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2143 | 2455 | foreach ($alldata as $number) { |
| 2144 | 2456 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2145 | 2457 | } |
| 2146 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 2147 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2458 | + if ($globalDebug) { |
|
| 2459 | + echo 'Airports data...'."\n"; |
|
| 2460 | + } |
|
| 2461 | + if ($globalDebug) { |
|
| 2462 | + echo '...Departure'."\n"; |
|
| 2463 | + } |
|
| 2148 | 2464 | $this->deleteStatAirport('daily'); |
| 2149 | 2465 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 2150 | 2466 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -2262,7 +2578,9 @@ discard block |
||
| 2262 | 2578 | // Count by airlines |
| 2263 | 2579 | echo '--- Stats by airlines ---'."\n"; |
| 2264 | 2580 | if ($Connection->tableExists('countries')) { |
| 2265 | - if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2581 | + if ($globalDebug) { |
|
| 2582 | + echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2583 | + } |
|
| 2266 | 2584 | $SpotterArchive = new SpotterArchive($this->db); |
| 2267 | 2585 | //$Spotter = new Spotter($this->db); |
| 2268 | 2586 | $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
@@ -2271,37 +2589,53 @@ discard block |
||
| 2271 | 2589 | $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
| 2272 | 2590 | } |
| 2273 | 2591 | } |
| 2274 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2592 | + if ($globalDebug) { |
|
| 2593 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2594 | + } |
|
| 2275 | 2595 | $Spotter = new Spotter($this->db); |
| 2276 | 2596 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 2277 | 2597 | foreach ($alldata as $number) { |
| 2278 | 2598 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 2279 | 2599 | } |
| 2280 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2600 | + if ($globalDebug) { |
|
| 2601 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2602 | + } |
|
| 2281 | 2603 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 2282 | 2604 | foreach ($alldata as $number) { |
| 2283 | 2605 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 2284 | 2606 | } |
| 2285 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 2607 | + if ($globalDebug) { |
|
| 2608 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 2609 | + } |
|
| 2286 | 2610 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 2287 | 2611 | foreach ($alldata as $number) { |
| 2288 | 2612 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2289 | 2613 | } |
| 2290 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 2614 | + if ($globalDebug) { |
|
| 2615 | + echo 'Count all owners by airlines...'."\n"; |
|
| 2616 | + } |
|
| 2291 | 2617 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 2292 | 2618 | foreach ($alldata as $number) { |
| 2293 | 2619 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 2294 | 2620 | } |
| 2295 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 2621 | + if ($globalDebug) { |
|
| 2622 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 2623 | + } |
|
| 2296 | 2624 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 2297 | 2625 | foreach ($alldata as $number) { |
| 2298 | 2626 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 2299 | 2627 | } |
| 2300 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 2628 | + if ($globalDebug) { |
|
| 2629 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 2630 | + } |
|
| 2301 | 2631 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2302 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2632 | + if ($globalDebug) { |
|
| 2633 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2634 | + } |
|
| 2303 | 2635 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2304 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2636 | + if ($globalDebug) { |
|
| 2637 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2638 | + } |
|
| 2305 | 2639 | //$alldata = array(); |
| 2306 | 2640 | foreach ($dall as $value) { |
| 2307 | 2641 | $icao = $value['airport_departure_icao']; |
@@ -2322,11 +2656,17 @@ discard block |
||
| 2322 | 2656 | foreach ($alldata as $number) { |
| 2323 | 2657 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
| 2324 | 2658 | } |
| 2325 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2659 | + if ($globalDebug) { |
|
| 2660 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2661 | + } |
|
| 2326 | 2662 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2327 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2663 | + if ($globalDebug) { |
|
| 2664 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2665 | + } |
|
| 2328 | 2666 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2329 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 2667 | + if ($globalDebug) { |
|
| 2668 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 2669 | + } |
|
| 2330 | 2670 | //$alldata = array(); |
| 2331 | 2671 | foreach ($dall as $value) { |
| 2332 | 2672 | $icao = $value['airport_arrival_icao']; |
@@ -2345,37 +2685,53 @@ discard block |
||
| 2345 | 2685 | } |
| 2346 | 2686 | $alldata = $pall; |
| 2347 | 2687 | foreach ($alldata as $number) { |
| 2348 | - if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2688 | + if ($number['airline_icao'] != '') { |
|
| 2689 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2690 | + } |
|
| 2691 | + } |
|
| 2692 | + if ($globalDebug) { |
|
| 2693 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 2349 | 2694 | } |
| 2350 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 2351 | 2695 | $Spotter = new Spotter($this->db); |
| 2352 | 2696 | $alldata = $Spotter->countAllMonthsByAirlines($filter_last_month); |
| 2353 | 2697 | $lastyear = false; |
| 2354 | 2698 | foreach ($alldata as $number) { |
| 2355 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2699 | + if ($number['year_name'] != date('Y')) { |
|
| 2700 | + $lastyear = true; |
|
| 2701 | + } |
|
| 2356 | 2702 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2357 | 2703 | } |
| 2358 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 2704 | + if ($globalDebug) { |
|
| 2705 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 2706 | + } |
|
| 2359 | 2707 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2360 | 2708 | foreach ($alldata as $number) { |
| 2361 | 2709 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2362 | 2710 | } |
| 2363 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2711 | + if ($globalDebug) { |
|
| 2712 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2713 | + } |
|
| 2364 | 2714 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2365 | 2715 | foreach ($alldata as $number) { |
| 2366 | 2716 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2367 | 2717 | } |
| 2368 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2718 | + if ($globalDebug) { |
|
| 2719 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2720 | + } |
|
| 2369 | 2721 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2370 | 2722 | foreach ($alldata as $number) { |
| 2371 | 2723 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2372 | 2724 | } |
| 2373 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2725 | + if ($globalDebug) { |
|
| 2726 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2727 | + } |
|
| 2374 | 2728 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2375 | 2729 | foreach ($alldata as $number) { |
| 2376 | 2730 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2377 | 2731 | } |
| 2378 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2732 | + if ($globalDebug) { |
|
| 2733 | + echo '...Departure'."\n"; |
|
| 2734 | + } |
|
| 2379 | 2735 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 2380 | 2736 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 2381 | 2737 | foreach ($dall as $value) { |
@@ -2398,7 +2754,9 @@ discard block |
||
| 2398 | 2754 | foreach ($alldata as $number) { |
| 2399 | 2755 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
| 2400 | 2756 | } |
| 2401 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 2757 | + if ($globalDebug) { |
|
| 2758 | + echo '...Arrival'."\n"; |
|
| 2759 | + } |
|
| 2402 | 2760 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 2403 | 2761 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 2404 | 2762 | foreach ($dall as $value) { |
@@ -2422,13 +2780,19 @@ discard block |
||
| 2422 | 2780 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
| 2423 | 2781 | } |
| 2424 | 2782 | |
| 2425 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 2426 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2783 | + if ($globalDebug) { |
|
| 2784 | + echo 'Flights data...'."\n"; |
|
| 2785 | + } |
|
| 2786 | + if ($globalDebug) { |
|
| 2787 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2788 | + } |
|
| 2427 | 2789 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2428 | 2790 | foreach ($alldata as $number) { |
| 2429 | 2791 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 2430 | 2792 | } |
| 2431 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 2793 | + if ($globalDebug) { |
|
| 2794 | + echo '-> countAllDates...'."\n"; |
|
| 2795 | + } |
|
| 2432 | 2796 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2433 | 2797 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
| 2434 | 2798 | $values = array(); |
@@ -2441,14 +2805,18 @@ discard block |
||
| 2441 | 2805 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 2442 | 2806 | } |
| 2443 | 2807 | |
| 2444 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 2808 | + if ($globalDebug) { |
|
| 2809 | + echo '-> countAllHours...'."\n"; |
|
| 2810 | + } |
|
| 2445 | 2811 | $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
| 2446 | 2812 | foreach ($alldata as $number) { |
| 2447 | 2813 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
| 2448 | 2814 | } |
| 2449 | 2815 | |
| 2450 | 2816 | // Stats by filters |
| 2451 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 2817 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 2818 | + $globalStatsFilters = array(); |
|
| 2819 | + } |
|
| 2452 | 2820 | foreach ($globalStatsFilters as $name => $filter) { |
| 2453 | 2821 | if (!empty($filter)) { |
| 2454 | 2822 | //$filter_name = $filter['name']; |
@@ -2456,7 +2824,9 @@ discard block |
||
| 2456 | 2824 | $reset = false; |
| 2457 | 2825 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 2458 | 2826 | if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) { |
| 2459 | - if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 2827 | + if ($globalDebug) { |
|
| 2828 | + echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 2829 | + } |
|
| 2460 | 2830 | $this->deleteOldStats($filter_name); |
| 2461 | 2831 | unset($last_update); |
| 2462 | 2832 | } |
@@ -2473,39 +2843,55 @@ discard block |
||
| 2473 | 2843 | $reset = true; |
| 2474 | 2844 | } |
| 2475 | 2845 | // Count by filter |
| 2476 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2846 | + if ($globalDebug) { |
|
| 2847 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2848 | + } |
|
| 2477 | 2849 | $Spotter = new Spotter($this->db); |
| 2478 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 2850 | + if ($globalDebug) { |
|
| 2851 | + echo 'Count all aircraft types...'."\n"; |
|
| 2852 | + } |
|
| 2479 | 2853 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 2480 | 2854 | foreach ($alldata as $number) { |
| 2481 | 2855 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
| 2482 | 2856 | } |
| 2483 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 2857 | + if ($globalDebug) { |
|
| 2858 | + echo 'Count all airlines...'."\n"; |
|
| 2859 | + } |
|
| 2484 | 2860 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
| 2485 | 2861 | foreach ($alldata as $number) { |
| 2486 | 2862 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
| 2487 | 2863 | } |
| 2488 | - if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
|
| 2864 | + if ($globalDebug) { |
|
| 2865 | + echo 'Count all aircraft registrations...'."\n"; |
|
| 2866 | + } |
|
| 2489 | 2867 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
| 2490 | 2868 | foreach ($alldata as $number) { |
| 2491 | 2869 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
| 2492 | 2870 | } |
| 2493 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 2871 | + if ($globalDebug) { |
|
| 2872 | + echo 'Count all callsigns...'."\n"; |
|
| 2873 | + } |
|
| 2494 | 2874 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
| 2495 | 2875 | foreach ($alldata as $number) { |
| 2496 | 2876 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
| 2497 | 2877 | } |
| 2498 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 2878 | + if ($globalDebug) { |
|
| 2879 | + echo 'Count all owners...'."\n"; |
|
| 2880 | + } |
|
| 2499 | 2881 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
| 2500 | 2882 | foreach ($alldata as $number) { |
| 2501 | 2883 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
| 2502 | 2884 | } |
| 2503 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 2885 | + if ($globalDebug) { |
|
| 2886 | + echo 'Count all pilots...'."\n"; |
|
| 2887 | + } |
|
| 2504 | 2888 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
| 2505 | 2889 | foreach ($alldata as $number) { |
| 2506 | 2890 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2507 | 2891 | } |
| 2508 | - if ($globalDebug) echo 'Count departure airports...'."\n"; |
|
| 2892 | + if ($globalDebug) { |
|
| 2893 | + echo 'Count departure airports...'."\n"; |
|
| 2894 | + } |
|
| 2509 | 2895 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2510 | 2896 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
| 2511 | 2897 | $alldata = array(); |
@@ -2517,7 +2903,9 @@ discard block |
||
| 2517 | 2903 | $icao = $value['airport_departure_icao']; |
| 2518 | 2904 | if (isset($alldata[$icao])) { |
| 2519 | 2905 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2520 | - } else $alldata[$icao] = $value; |
|
| 2906 | + } else { |
|
| 2907 | + $alldata[$icao] = $value; |
|
| 2908 | + } |
|
| 2521 | 2909 | } |
| 2522 | 2910 | $count = array(); |
| 2523 | 2911 | foreach ($alldata as $key => $row) { |
@@ -2527,7 +2915,9 @@ discard block |
||
| 2527 | 2915 | foreach ($alldata as $number) { |
| 2528 | 2916 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
| 2529 | 2917 | } |
| 2530 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 2918 | + if ($globalDebug) { |
|
| 2919 | + echo 'Count all arrival airports...'."\n"; |
|
| 2920 | + } |
|
| 2531 | 2921 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2532 | 2922 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2533 | 2923 | $alldata = array(); |
@@ -2539,7 +2929,9 @@ discard block |
||
| 2539 | 2929 | $icao = $value['airport_arrival_icao']; |
| 2540 | 2930 | if (isset($alldata[$icao])) { |
| 2541 | 2931 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2542 | - } else $alldata[$icao] = $value; |
|
| 2932 | + } else { |
|
| 2933 | + $alldata[$icao] = $value; |
|
| 2934 | + } |
|
| 2543 | 2935 | } |
| 2544 | 2936 | $count = array(); |
| 2545 | 2937 | foreach ($alldata as $key => $row) { |
@@ -2549,35 +2941,49 @@ discard block |
||
| 2549 | 2941 | foreach ($alldata as $number) { |
| 2550 | 2942 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
| 2551 | 2943 | } |
| 2552 | - if ($globalDebug) echo 'Count all months...'."\n"; |
|
| 2944 | + if ($globalDebug) { |
|
| 2945 | + echo 'Count all months...'."\n"; |
|
| 2946 | + } |
|
| 2553 | 2947 | $Spotter = new Spotter($this->db); |
| 2554 | 2948 | $alldata = $Spotter->countAllMonths($filter); |
| 2555 | 2949 | $lastyear = false; |
| 2556 | 2950 | foreach ($alldata as $number) { |
| 2557 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2951 | + if ($number['year_name'] != date('Y')) { |
|
| 2952 | + $lastyear = true; |
|
| 2953 | + } |
|
| 2558 | 2954 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2559 | 2955 | } |
| 2560 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 2956 | + if ($globalDebug) { |
|
| 2957 | + echo 'Count all owners by months...'."\n"; |
|
| 2958 | + } |
|
| 2561 | 2959 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2562 | 2960 | foreach ($alldata as $number) { |
| 2563 | 2961 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2564 | 2962 | } |
| 2565 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 2963 | + if ($globalDebug) { |
|
| 2964 | + echo 'Count all pilots by months...'."\n"; |
|
| 2965 | + } |
|
| 2566 | 2966 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2567 | 2967 | foreach ($alldata as $number) { |
| 2568 | 2968 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2569 | 2969 | } |
| 2570 | - if ($globalDebug) echo 'Count all military by months...'."\n"; |
|
| 2970 | + if ($globalDebug) { |
|
| 2971 | + echo 'Count all military by months...'."\n"; |
|
| 2972 | + } |
|
| 2571 | 2973 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2572 | 2974 | foreach ($alldata as $number) { |
| 2573 | 2975 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2574 | 2976 | } |
| 2575 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 2977 | + if ($globalDebug) { |
|
| 2978 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 2979 | + } |
|
| 2576 | 2980 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2577 | 2981 | foreach ($alldata as $number) { |
| 2578 | 2982 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2579 | 2983 | } |
| 2580 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 2984 | + if ($globalDebug) { |
|
| 2985 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 2986 | + } |
|
| 2581 | 2987 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2582 | 2988 | foreach ($alldata as $number) { |
| 2583 | 2989 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | try { |
| 17 | 17 | $sth = $this->db->prepare($query); |
| 18 | 18 | $sth->execute($query_values); |
| 19 | - } catch(PDOException $e) { |
|
| 19 | + } catch (PDOException $e) { |
|
| 20 | 20 | return "error : ".$e->getMessage(); |
| 21 | 21 | } |
| 22 | 22 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -29,20 +29,20 @@ discard block |
||
| 29 | 29 | try { |
| 30 | 30 | $sth = $this->db->prepare($query); |
| 31 | 31 | $sth->execute($query_values); |
| 32 | - } catch(PDOException $e) { |
|
| 32 | + } catch (PDOException $e) { |
|
| 33 | 33 | return "error : ".$e->getMessage(); |
| 34 | 34 | } |
| 35 | 35 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 36 | 36 | return $all; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public function getLocationInfobyNameType($name,$type) { |
|
| 39 | + public function getLocationInfobyNameType($name, $type) { |
|
| 40 | 40 | $query = "SELECT * FROM source_location WHERE name = :name AND type = :type"; |
| 41 | - $query_values = array(':name' => $name,':type' => $type); |
|
| 41 | + $query_values = array(':name' => $name, ':type' => $type); |
|
| 42 | 42 | try { |
| 43 | 43 | $sth = $this->db->prepare($query); |
| 44 | 44 | $sth->execute($query_values); |
| 45 | - } catch(PDOException $e) { |
|
| 45 | + } catch (PDOException $e) { |
|
| 46 | 46 | return "error : ".$e->getMessage(); |
| 47 | 47 | } |
| 48 | 48 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | try { |
| 56 | 56 | $sth = $this->db->prepare($query); |
| 57 | 57 | $sth->execute($query_values); |
| 58 | - } catch(PDOException $e) { |
|
| 58 | + } catch (PDOException $e) { |
|
| 59 | 59 | return "error : ".$e->getMessage(); |
| 60 | 60 | } |
| 61 | 61 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | public function getLocationInfoByType($type, $coord = array(), $limit = false) { |
| 66 | 66 | $query = "SELECT * FROM source_location WHERE type = :type"; |
| 67 | 67 | if (is_array($coord) && !empty($coord)) { |
| 68 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 69 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 70 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 71 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 68 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 69 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 70 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 71 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 72 | 72 | $query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0"; |
| 73 | 73 | } |
| 74 | 74 | $query .= " ORDER BY last_seen DESC"; |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute($query_values); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | try { |
| 91 | 91 | $sth = $this->db->prepare($query); |
| 92 | 92 | $sth->execute($query_values); |
| 93 | - } catch(PDOException $e) { |
|
| 93 | + } catch (PDOException $e) { |
|
| 94 | 94 | return "error : ".$e->getMessage(); |
| 95 | 95 | } |
| 96 | 96 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -103,56 +103,56 @@ discard block |
||
| 103 | 103 | try { |
| 104 | 104 | $sth = $this->db->prepare($query); |
| 105 | 105 | $sth->execute($query_values); |
| 106 | - } catch(PDOException $e) { |
|
| 106 | + } catch (PDOException $e) { |
|
| 107 | 107 | return "error : ".$e->getMessage(); |
| 108 | 108 | } |
| 109 | 109 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 110 | 110 | return $all; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') { |
|
| 113 | + public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') { |
|
| 114 | 114 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 115 | 115 | $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)"; |
| 116 | - $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 116 | + $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 117 | 117 | try { |
| 118 | 118 | $sth = $this->db->prepare($query); |
| 119 | 119 | $sth->execute($query_values); |
| 120 | - } catch(PDOException $e) { |
|
| 120 | + } catch (PDOException $e) { |
|
| 121 | 121 | echo "error : ".$e->getMessage(); |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') { |
|
| 125 | + public function updateLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') { |
|
| 126 | 126 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 127 | 127 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source"; |
| 128 | - $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 128 | + $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 129 | 129 | try { |
| 130 | 130 | $sth = $this->db->prepare($query); |
| 131 | 131 | $sth->execute($query_values); |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | return "error : ".$e->getMessage(); |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - public function updateLocationDescByName($name,$source,$source_id = 0,$description = '') { |
|
| 137 | + public function updateLocationDescByName($name, $source, $source_id = 0, $description = '') { |
|
| 138 | 138 | $query = "UPDATE source_location SET description = :description WHERE source_id = :source_id AND name = :name AND source = :source"; |
| 139 | - $query_values = array(':name' => $name,':source' => $source,':source_id' => $source_id,':description' => $description); |
|
| 139 | + $query_values = array(':name' => $name, ':source' => $source, ':source_id' => $source_id, ':description' => $description); |
|
| 140 | 140 | try { |
| 141 | 141 | $sth = $this->db->prepare($query); |
| 142 | 142 | $sth->execute($query_values); |
| 143 | - } catch(PDOException $e) { |
|
| 143 | + } catch (PDOException $e) { |
|
| 144 | 144 | return "error : ".$e->getMessage(); |
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') { |
|
| 148 | + public function updateLocationByLocationID($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id, $last_seen = '', $description = '') { |
|
| 149 | 149 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 150 | 150 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id"; |
| 151 | - $query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 151 | + $query_values = array(':source_id' => $source_id, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 152 | 152 | try { |
| 153 | 153 | $sth = $this->db->prepare($query); |
| 154 | 154 | $sth->execute($query_values); |
| 155 | - } catch(PDOException $e) { |
|
| 155 | + } catch (PDOException $e) { |
|
| 156 | 156 | echo "error : ".$e->getMessage(); |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | try { |
| 164 | 164 | $sth = $this->db->prepare($query); |
| 165 | 165 | $sth->execute($query_values); |
| 166 | - } catch(PDOException $e) { |
|
| 166 | + } catch (PDOException $e) { |
|
| 167 | 167 | return "error : ".$e->getMessage(); |
| 168 | 168 | } |
| 169 | 169 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | try { |
| 175 | 175 | $sth = $this->db->prepare($query); |
| 176 | 176 | $sth->execute($query_values); |
| 177 | - } catch(PDOException $e) { |
|
| 177 | + } catch (PDOException $e) { |
|
| 178 | 178 | return "error : ".$e->getMessage(); |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | try { |
| 186 | 186 | $sth = $this->db->prepare($query); |
| 187 | 187 | $sth->execute($query_values); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | return "error : ".$e->getMessage(); |
| 190 | 190 | } |
| 191 | 191 | } |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | try { |
| 196 | 196 | $sth = $this->db->prepare($query); |
| 197 | 197 | $sth->execute(); |
| 198 | - } catch(PDOException $e) { |
|
| 198 | + } catch (PDOException $e) { |
|
| 199 | 199 | return "error : ".$e->getMessage(); |
| 200 | 200 | } |
| 201 | 201 | } |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | try { |
| 225 | 225 | $sth = $this->db->prepare($query); |
| 226 | 226 | $sth->execute(array(':type' => $type)); |
| 227 | - } catch(PDOException $e) { |
|
| 227 | + } catch (PDOException $e) { |
|
| 228 | 228 | return "error"; |
| 229 | 229 | } |
| 230 | 230 | return "success"; |
@@ -110,6 +110,12 @@ discard block |
||
| 110 | 110 | return $all; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | + /** |
|
| 114 | + * @param string $name |
|
| 115 | + * @param string $city |
|
| 116 | + * @param string $country |
|
| 117 | + * @param string $source |
|
| 118 | + */ |
|
| 113 | 119 | public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') { |
| 114 | 120 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 115 | 121 | $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)"; |
@@ -168,6 +174,9 @@ discard block |
||
| 168 | 174 | } |
| 169 | 175 | } |
| 170 | 176 | |
| 177 | + /** |
|
| 178 | + * @param string $type |
|
| 179 | + */ |
|
| 171 | 180 | public function deleteLocationByType($type) { |
| 172 | 181 | $query = "DELETE FROM source_location WHERE type = :type"; |
| 173 | 182 | $query_values = array(':type' => $type); |
@@ -7,7 +7,9 @@ discard block |
||
| 7 | 7 | public function __construct($dbc = null) { |
| 8 | 8 | $Connection = new Connection($dbc); |
| 9 | 9 | $this->db = $Connection->db; |
| 10 | - if ($this->db === null) die('Error: No DB connection. (Source)'); |
|
| 10 | + if ($this->db === null) { |
|
| 11 | + die('Error: No DB connection. (Source)'); |
|
| 12 | + } |
|
| 11 | 13 | } |
| 12 | 14 | |
| 13 | 15 | public function getAllLocationInfo() { |
@@ -72,7 +74,9 @@ discard block |
||
| 72 | 74 | $query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0"; |
| 73 | 75 | } |
| 74 | 76 | $query .= " ORDER BY last_seen DESC"; |
| 75 | - if ($limit) $query .= " LIMIT 400"; |
|
| 77 | + if ($limit) { |
|
| 78 | + $query .= " LIMIT 400"; |
|
| 79 | + } |
|
| 76 | 80 | $query_values = array(':type' => $type); |
| 77 | 81 | try { |
| 78 | 82 | $sth = $this->db->prepare($query); |
@@ -111,7 +115,9 @@ discard block |
||
| 111 | 115 | } |
| 112 | 116 | |
| 113 | 117 | public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') { |
| 114 | - if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
|
| 118 | + if ($last_seen == '') { |
|
| 119 | + $last_seen = date('Y-m-d H:i:s'); |
|
| 120 | + } |
|
| 115 | 121 | $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)"; |
| 116 | 122 | $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
| 117 | 123 | try { |
@@ -123,7 +129,9 @@ discard block |
||
| 123 | 129 | } |
| 124 | 130 | |
| 125 | 131 | public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') { |
| 126 | - if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
|
| 132 | + if ($last_seen == '') { |
|
| 133 | + $last_seen = date('Y-m-d H:i:s'); |
|
| 134 | + } |
|
| 127 | 135 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source"; |
| 128 | 136 | $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
| 129 | 137 | try { |
@@ -146,7 +154,9 @@ discard block |
||
| 146 | 154 | } |
| 147 | 155 | |
| 148 | 156 | public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') { |
| 149 | - if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
|
| 157 | + if ($last_seen == '') { |
|
| 158 | + $last_seen = date('Y-m-d H:i:s'); |
|
| 159 | + } |
|
| 150 | 160 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id"; |
| 151 | 161 | $query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
| 152 | 162 | try { |
@@ -79,7 +79,9 @@ |
||
| 79 | 79 | $output .= '"type": "'.$spotter_item['type'].'",'; |
| 80 | 80 | if ($spotter_item['type'] == 'wx') { |
| 81 | 81 | $weather = json_decode($spotter_item['description'],true); |
| 82 | - if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 82 | + if (isset($weather['temp'])) { |
|
| 83 | + $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 84 | + } |
|
| 83 | 85 | } |
| 84 | 86 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 85 | 87 | $output .= '},'; |
@@ -14,40 +14,40 @@ |
||
| 14 | 14 | { |
| 15 | 15 | $coords = explode(',',$_GET['coord']); |
| 16 | 16 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 17 | - || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 17 | + || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 18 | 18 | //$spotter_array = $Source->getAllLocationInfo(); |
| 19 | 19 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords)); |
| 20 | 20 | } |
| 21 | 21 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 22 | - || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 22 | + || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 23 | 23 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords)); |
| 24 | 24 | } |
| 25 | 25 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 26 | - || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 26 | + || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 27 | 27 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords)); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 31 | - || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 31 | + || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 32 | 32 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true)); |
| 33 | 33 | } |
| 34 | 34 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
| 35 | 35 | } else { |
| 36 | 36 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 37 | - || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 37 | + || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 38 | 38 | //$spotter_array = $Source->getAllLocationInfo(); |
| 39 | 39 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
| 40 | 40 | } |
| 41 | 41 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 42 | - || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 42 | + || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 43 | 43 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
| 44 | 44 | } |
| 45 | 45 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 46 | - || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 46 | + || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 47 | 47 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
| 48 | 48 | } |
| 49 | 49 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 50 | - || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 50 | + || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 51 | 51 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true)); |
| 52 | 52 | } |
| 53 | 53 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
@@ -12,52 +12,52 @@ discard block |
||
| 12 | 12 | if (!isset($globalDemo)) { |
| 13 | 13 | if (isset($_GET['coord'])) |
| 14 | 14 | { |
| 15 | - $coords = explode(',',$_GET['coord']); |
|
| 15 | + $coords = explode(',', $_GET['coord']); |
|
| 16 | 16 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 17 | 17 | || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
| 18 | 18 | //$spotter_array = $Source->getAllLocationInfo(); |
| 19 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords)); |
|
| 19 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords)); |
|
| 20 | 20 | } |
| 21 | 21 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 22 | 22 | || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
| 23 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords)); |
|
| 23 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords)); |
|
| 24 | 24 | } |
| 25 | 25 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 26 | 26 | || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
| 27 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords)); |
|
| 27 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords)); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 31 | 31 | || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
| 32 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true)); |
|
| 32 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true)); |
|
| 33 | 33 | } |
| 34 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
|
| 34 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('')); |
|
| 35 | 35 | } else { |
| 36 | 36 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 37 | 37 | || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
| 38 | 38 | //$spotter_array = $Source->getAllLocationInfo(); |
| 39 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
|
| 39 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs')); |
|
| 40 | 40 | } |
| 41 | 41 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 42 | 42 | || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
| 43 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
|
| 43 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx')); |
|
| 44 | 44 | } |
| 45 | 45 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 46 | 46 | || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
| 47 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
|
| 47 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning')); |
|
| 48 | 48 | } |
| 49 | 49 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 50 | 50 | || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
| 51 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true)); |
|
| 51 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true)); |
|
| 52 | 52 | } |
| 53 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
|
| 53 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('')); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $output = '{"type": "FeatureCollection","features": ['; |
| 58 | 58 | if (!empty($spotter_array) && count($spotter_array) > 0) |
| 59 | 59 | { |
| 60 | - foreach($spotter_array as $spotter_item) |
|
| 60 | + foreach ($spotter_array as $spotter_item) |
|
| 61 | 61 | { |
| 62 | 62 | date_default_timezone_set('UTC'); |
| 63 | 63 | $output .= '{"type": "Feature",'; |
@@ -76,8 +76,8 @@ discard block |
||
| 76 | 76 | $output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",'; |
| 77 | 77 | $output .= '"type": "'.$spotter_item['type'].'",'; |
| 78 | 78 | if ($spotter_item['type'] == 'wx') { |
| 79 | - $weather = json_decode($spotter_item['description'],true); |
|
| 80 | - if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 79 | + $weather = json_decode($spotter_item['description'], true); |
|
| 80 | + if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",'; |
|
| 81 | 81 | } |
| 82 | 82 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 83 | 83 | $output .= '},'; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $output .= '}'; |
| 88 | 88 | $output .= '},'; |
| 89 | 89 | } |
| 90 | - $output = substr($output, 0, -1); |
|
| 90 | + $output = substr($output, 0, -1); |
|
| 91 | 91 | } |
| 92 | 92 | $output .= ']}'; |
| 93 | 93 | print $output; |
@@ -39,30 +39,30 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | function quaternionrotate($heading, $attitude = 0, $bank = 0) { |
| 42 | - // Assuming the angles are in radians. |
|
| 43 | - $c1 = cos($heading/2); |
|
| 44 | - $s1 = sin($heading/2); |
|
| 45 | - $c2 = cos($attitude/2); |
|
| 46 | - $s2 = sin($attitude/2); |
|
| 47 | - $c3 = cos($bank/2); |
|
| 48 | - $s3 = sin($bank/2); |
|
| 49 | - $c1c2 = $c1*$c2; |
|
| 50 | - $s1s2 = $s1*$s2; |
|
| 51 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 42 | + // Assuming the angles are in radians. |
|
| 43 | + $c1 = cos($heading/2); |
|
| 44 | + $s1 = sin($heading/2); |
|
| 45 | + $c2 = cos($attitude/2); |
|
| 46 | + $s2 = sin($attitude/2); |
|
| 47 | + $c3 = cos($bank/2); |
|
| 48 | + $s3 = sin($bank/2); |
|
| 49 | + $c1c2 = $c1*$c2; |
|
| 50 | + $s1s2 = $s1*$s2; |
|
| 51 | + $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | + $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | + $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | + $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | + return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 56 | 56 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | if (isset($_GET['download'])) { |
| 62 | - if ($_GET['download'] == "true") |
|
| 63 | - { |
|
| 62 | + if ($_GET['download'] == "true") |
|
| 63 | + { |
|
| 64 | 64 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 65 | - } |
|
| 65 | + } |
|
| 66 | 66 | } |
| 67 | 67 | header('Content-Type: text/javascript'); |
| 68 | 68 | |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | $image = "images/placeholder_thumb.png"; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 243 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 244 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 245 | - if ($prev_flightaware_id != $id) { |
|
| 242 | + if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 243 | + elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 244 | + elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 245 | + if ($prev_flightaware_id != $id) { |
|
| 246 | 246 | if ($prev_flightaware_id != '') { |
| 247 | 247 | if ($nblatlong == 1) { |
| 248 | 248 | $output .= ',"'.date("c").'", '; |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 302 | 302 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 303 | 303 | } else $aircraft_shadow = ''; |
| 304 | - $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 304 | + $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 305 | 305 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 306 | 306 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 307 | 307 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 332 | 332 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
| 333 | 333 | } |
| 334 | - $output .= '},'; |
|
| 334 | + $output .= '},'; |
|
| 335 | 335 | } elseif ($aircraft_icao != '') { |
| 336 | 336 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 337 | 337 | if (isset($aircraft_info[0]['engine_type'])) { |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | $s3 = sin($bank/2); |
| 49 | 49 | $c1c2 = $c1*$c2; |
| 50 | 50 | $s1s2 = $s1*$s2; |
| 51 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 51 | + $w = $c1c2*$c3 - $s1s2*$s3; |
|
| 52 | + $x = $c1c2*$s3 + $s1s2*$c3; |
|
| 53 | + $y = $s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | + $z = $c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | + return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w); |
|
| 56 | 56 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 57 | 57 | |
| 58 | 58 | } |
@@ -73,16 +73,16 @@ discard block |
||
| 73 | 73 | $min = false; |
| 74 | 74 | $allhistory = false; |
| 75 | 75 | $filter['source'] = array(); |
| 76 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 77 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 78 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 79 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 80 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 81 | -if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 82 | -if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 83 | -if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 84 | -if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 85 | -if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 76 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt')); |
|
| 77 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup')); |
|
| 78 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars')); |
|
| 79 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs')); |
|
| 80 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs')); |
|
| 81 | +if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING); |
|
| 82 | +if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING); |
|
| 83 | +if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING); |
|
| 84 | +if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING); |
|
| 85 | +if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING); |
|
| 86 | 86 | /* |
| 87 | 87 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
| 88 | 88 | $min = true; |
@@ -129,12 +129,12 @@ discard block |
||
| 129 | 129 | $from_archive = true; |
| 130 | 130 | // $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~'))); |
| 131 | 131 | // $enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~'))); |
| 132 | - $begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT); |
|
| 133 | - $enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT); |
|
| 134 | - $archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT); |
|
| 135 | - $begindate = date('Y-m-d H:i:s',$begindate); |
|
| 136 | - $enddate = date('Y-m-d H:i:s',$enddate); |
|
| 137 | - $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter); |
|
| 132 | + $begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT); |
|
| 133 | + $enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT); |
|
| 134 | + $archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT); |
|
| 135 | + $begindate = date('Y-m-d H:i:s', $begindate); |
|
| 136 | + $enddate = date('Y-m-d H:i:s', $enddate); |
|
| 137 | + $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter); |
|
| 138 | 138 | } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) { |
| 139 | 139 | $from_archive = true; |
| 140 | 140 | // $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~'))); |
@@ -144,34 +144,34 @@ discard block |
||
| 144 | 144 | $begindate = $_COOKIE['archive_begin']; |
| 145 | 145 | $enddate = $_COOKIE['archive_end']; |
| 146 | 146 | |
| 147 | - $archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | - $begindate = date('Y-m-d H:i:s',$begindate); |
|
| 149 | - $enddate = date('Y-m-d H:i:s',$enddate); |
|
| 147 | + $archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $begindate = date('Y-m-d H:i:s', $begindate); |
|
| 149 | + $enddate = date('Y-m-d H:i:s', $enddate); |
|
| 150 | 150 | // echo 'Begin : '.$begindate.' - End : '.$enddate."\n"; |
| 151 | - $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter); |
|
| 151 | + $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter); |
|
| 152 | 152 | } elseif ($tracker) { |
| 153 | 153 | $coord = array(); |
| 154 | 154 | if (isset($_GET['coord']) && $_GET['coord'] != '') { |
| 155 | - $coord = explode(',',$_GET['coord']); |
|
| 155 | + $coord = explode(',', $_GET['coord']); |
|
| 156 | 156 | } |
| 157 | - $spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true); |
|
| 157 | + $spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, true); |
|
| 158 | 158 | } elseif ($marine) { |
| 159 | 159 | $coord = array(); |
| 160 | 160 | if (isset($_GET['coord']) && $_GET['coord'] != '') { |
| 161 | - $coord = explode(',',$_GET['coord']); |
|
| 161 | + $coord = explode(',', $_GET['coord']); |
|
| 162 | 162 | } |
| 163 | - $spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,true); |
|
| 163 | + $spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, true); |
|
| 164 | 164 | } else { |
| 165 | 165 | $coord = array(); |
| 166 | 166 | if (isset($_GET['coord']) && $_GET['coord'] != '') { |
| 167 | - $coord = explode(',',$_GET['coord']); |
|
| 167 | + $coord = explode(',', $_GET['coord']); |
|
| 168 | 168 | } |
| 169 | - $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true); |
|
| 169 | + $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true); |
|
| 170 | 170 | } |
| 171 | 171 | //print_r($spotter_array); |
| 172 | 172 | if (!empty($spotter_array) && isset($coord)) { |
| 173 | 173 | if (isset($_GET['archive'])) { |
| 174 | - $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter); |
|
| 174 | + $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter); |
|
| 175 | 175 | } elseif ($tracker) { |
| 176 | 176 | $flightcnt = $TrackerLive->getLiveTrackerCount($filter); |
| 177 | 177 | } elseif ($marine) { |
@@ -182,15 +182,15 @@ discard block |
||
| 182 | 182 | if ($flightcnt == '') $flightcnt = 0; |
| 183 | 183 | } else $flightcnt = 0; |
| 184 | 184 | |
| 185 | -$sqltime = round(microtime(true)-$begintime,2); |
|
| 185 | +$sqltime = round(microtime(true) - $begintime, 2); |
|
| 186 | 186 | $minitime = time(); |
| 187 | 187 | $maxitime = 0; |
| 188 | -$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT); |
|
| 188 | +$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT); |
|
| 189 | 189 | $modelsdb = array(); |
| 190 | 190 | if (file_exists(dirname(__FILE__).'/models/modelsdb')) { |
| 191 | - if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) { |
|
| 192 | - while (($row = fgetcsv($handle,1000)) !== FALSE) { |
|
| 193 | - if (isset($row[1]) ){ |
|
| 191 | + if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) { |
|
| 192 | + while (($row = fgetcsv($handle, 1000)) !== FALSE) { |
|
| 193 | + if (isset($row[1])) { |
|
| 194 | 194 | $model = $row[0]; |
| 195 | 195 | $modelsdb[$model] = $row[1]; |
| 196 | 196 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | if (!empty($spotter_array) && is_array($spotter_array)) |
| 228 | 228 | { |
| 229 | 229 | $nblatlong = 0; |
| 230 | - foreach($spotter_array as $spotter_item) |
|
| 230 | + foreach ($spotter_array as $spotter_item) |
|
| 231 | 231 | { |
| 232 | 232 | $j++; |
| 233 | 233 | //if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND'; |
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | $output .= '"lastupdate": "'.$lastupdate.'",'; |
| 268 | 268 | $output .= '"format": "'.$spotter_item['format_source'].'",'; |
| 269 | 269 | if ($tracker) { |
| 270 | - $output.= '"type": "tracker"'; |
|
| 270 | + $output .= '"type": "tracker"'; |
|
| 271 | 271 | } elseif ($marine) { |
| 272 | - $output.= '"type": "marine"'; |
|
| 272 | + $output .= '"type": "marine"'; |
|
| 273 | 273 | } else { |
| 274 | - $output.= '"type": "flight"'; |
|
| 274 | + $output .= '"type": "flight"'; |
|
| 275 | 275 | } |
| 276 | 276 | $output .= '},'; |
| 277 | 277 | |
@@ -615,8 +615,8 @@ discard block |
||
| 615 | 615 | $output .= '},'; |
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | - if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output); |
|
| 619 | - else $output = str_replace('%onground%','false',$output); |
|
| 618 | + if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output); |
|
| 619 | + else $output = str_replace('%onground%', 'false', $output); |
|
| 620 | 620 | |
| 621 | 621 | // $output .= '"heightReference": "CLAMP_TO_GROUND",'; |
| 622 | 622 | //$output .= '"heightReference": "'.$heightrelative.'",'; |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | $output .= '"cartographicDegrees": ['; |
| 632 | 632 | if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']); |
| 633 | 633 | if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
| 634 | - $output .= '"'.date("c",strtotime($spotter_item['date'])).'", '; |
|
| 634 | + $output .= '"'.date("c", strtotime($spotter_item['date'])).'", '; |
|
| 635 | 635 | $output .= $spotter_item['longitude'].', '; |
| 636 | 636 | $output .= $spotter_item['latitude']; |
| 637 | 637 | $prevlong = $spotter_item['longitude']; |
@@ -659,8 +659,8 @@ discard block |
||
| 659 | 659 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 660 | 660 | //$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
| 661 | 661 | } else { |
| 662 | - $nblatlong = $nblatlong+1; |
|
| 663 | - $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", '; |
|
| 662 | + $nblatlong = $nblatlong + 1; |
|
| 663 | + $output .= ',"'.date("c", strtotime($spotter_item['date'])).'", '; |
|
| 664 | 664 | if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
| 665 | 665 | if ($spotter_item['ground_speed'] == 0) { |
| 666 | 666 | $output .= $prevlong.', '; |
@@ -700,15 +700,15 @@ discard block |
||
| 700 | 700 | } |
| 701 | 701 | $output .= ']'; |
| 702 | 702 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 703 | - if ((time()-$globalLiveInterval) > $minitime) { |
|
| 704 | - if (time()-$globalLiveInterval > $maxitime) { |
|
| 705 | - $output = str_replace('%minitime%',date("c",$maxitime),$output); |
|
| 703 | + if ((time() - $globalLiveInterval) > $minitime) { |
|
| 704 | + if (time() - $globalLiveInterval > $maxitime) { |
|
| 705 | + $output = str_replace('%minitime%', date("c", $maxitime), $output); |
|
| 706 | 706 | } else { |
| 707 | - $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output); |
|
| 707 | + $output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output); |
|
| 708 | 708 | } |
| 709 | 709 | } |
| 710 | - else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 711 | -} else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 712 | -$output = str_replace('%maxitime%',date("c",$maxitime),$output); |
|
| 710 | + else $output = str_replace('%minitime%', date("c", $minitime), $output); |
|
| 711 | +} else $output = str_replace('%minitime%', date("c", $minitime), $output); |
|
| 712 | +$output = str_replace('%maxitime%', date("c", $maxitime), $output); |
|
| 713 | 713 | print $output; |
| 714 | 714 | ?> |
@@ -8,8 +8,12 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | $tracker = false; |
| 10 | 10 | $marine = false; |
| 11 | -if (isset($_GET['tracker'])) $tracker = true; |
|
| 12 | -if (isset($_GET['marine'])) $marine = true; |
|
| 11 | +if (isset($_GET['tracker'])) { |
|
| 12 | + $tracker = true; |
|
| 13 | +} |
|
| 14 | +if (isset($_GET['marine'])) { |
|
| 15 | + $marine = true; |
|
| 16 | +} |
|
| 13 | 17 | if ($tracker) { |
| 14 | 18 | require_once('require/class.Tracker.php'); |
| 15 | 19 | require_once('require/class.TrackerLive.php'); |
@@ -66,23 +70,46 @@ discard block |
||
| 66 | 70 | } |
| 67 | 71 | header('Content-Type: text/javascript'); |
| 68 | 72 | |
| 69 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 70 | -else $compress = $globalJsonCompress; |
|
| 73 | +if (!isset($globalJsonCompress)) { |
|
| 74 | + $compress = true; |
|
| 75 | +} else { |
|
| 76 | + $compress = $globalJsonCompress; |
|
| 77 | +} |
|
| 71 | 78 | |
| 72 | 79 | $from_archive = false; |
| 73 | 80 | $min = false; |
| 74 | 81 | $allhistory = false; |
| 75 | 82 | $filter['source'] = array(); |
| 76 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 77 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 78 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 79 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 80 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 81 | -if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 82 | -if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 83 | -if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 84 | -if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 85 | -if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 83 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') { |
|
| 84 | + $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 85 | +} |
|
| 86 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') { |
|
| 87 | + $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 88 | +} |
|
| 89 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') { |
|
| 90 | + $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 91 | +} |
|
| 92 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') { |
|
| 93 | + $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 94 | +} |
|
| 95 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') { |
|
| 96 | + $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 97 | +} |
|
| 98 | +if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') { |
|
| 99 | + $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 100 | +} |
|
| 101 | +if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') { |
|
| 102 | + $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 103 | +} |
|
| 104 | +if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') { |
|
| 105 | + $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 106 | +} |
|
| 107 | +if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') { |
|
| 108 | + $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 109 | +} |
|
| 110 | +if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') { |
|
| 111 | + $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 112 | +} |
|
| 86 | 113 | /* |
| 87 | 114 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
| 88 | 115 | $min = true; |
@@ -179,8 +206,12 @@ discard block |
||
| 179 | 206 | } else { |
| 180 | 207 | $flightcnt = $SpotterLive->getLiveSpotterCount($filter); |
| 181 | 208 | } |
| 182 | - if ($flightcnt == '') $flightcnt = 0; |
|
| 183 | -} else $flightcnt = 0; |
|
| 209 | + if ($flightcnt == '') { |
|
| 210 | + $flightcnt = 0; |
|
| 211 | + } |
|
| 212 | + } else { |
|
| 213 | + $flightcnt = 0; |
|
| 214 | +} |
|
| 184 | 215 | |
| 185 | 216 | $sqltime = round(microtime(true)-$begintime,2); |
| 186 | 217 | $minitime = time(); |
@@ -203,7 +234,9 @@ discard block |
||
| 203 | 234 | $j = 0; |
| 204 | 235 | $prev_flightaware_id = ''; |
| 205 | 236 | $speed = 1; |
| 206 | -if (isset($archivespeed)) $speed = $archivespeed; |
|
| 237 | +if (isset($archivespeed)) { |
|
| 238 | + $speed = $archivespeed; |
|
| 239 | +} |
|
| 207 | 240 | $output = '['; |
| 208 | 241 | if ($tracker) { |
| 209 | 242 | $output .= '{"id" : "document", "name" : "tracker","version" : "1.0"'; |
@@ -239,17 +272,24 @@ discard block |
||
| 239 | 272 | $image = "images/placeholder_thumb.png"; |
| 240 | 273 | } |
| 241 | 274 | |
| 242 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 243 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 244 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 275 | + if (isset($spotter_item['flightaware_id'])) { |
|
| 276 | + $id = $spotter_item['flightaware_id']; |
|
| 277 | + } elseif (isset($spotter_item['famtrackid'])) { |
|
| 278 | + $id = $spotter_item['famtrackid']; |
|
| 279 | + } elseif (isset($spotter_item['fammarine_id'])) { |
|
| 280 | + $id = $spotter_item['fammarine_id']; |
|
| 281 | + } |
|
| 245 | 282 | if ($prev_flightaware_id != $id) { |
| 246 | 283 | if ($prev_flightaware_id != '') { |
| 247 | 284 | if ($nblatlong == 1) { |
| 248 | 285 | $output .= ',"'.date("c").'", '; |
| 249 | 286 | $output .= $prevlong.', '; |
| 250 | 287 | $output .= $prevlat; |
| 251 | - if (!$marine) $output .= ', '.$prevalt; |
|
| 252 | - else $output .= ', 0'; |
|
| 288 | + if (!$marine) { |
|
| 289 | + $output .= ', '.$prevalt; |
|
| 290 | + } else { |
|
| 291 | + $output .= ', 0'; |
|
| 292 | + } |
|
| 253 | 293 | } |
| 254 | 294 | $output .= ']'; |
| 255 | 295 | $output .= '}'; |
@@ -300,7 +340,9 @@ discard block |
||
| 300 | 340 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 301 | 341 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 302 | 342 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 303 | - } else $aircraft_shadow = ''; |
|
| 343 | + } else { |
|
| 344 | + $aircraft_shadow = ''; |
|
| 345 | + } |
|
| 304 | 346 | $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
| 305 | 347 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 306 | 348 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
@@ -308,7 +350,9 @@ discard block |
||
| 308 | 350 | } |
| 309 | 351 | $output .= '},'; |
| 310 | 352 | } |
| 311 | - } else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},'; |
|
| 353 | + } else { |
|
| 354 | + $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},'; |
|
| 355 | + } |
|
| 312 | 356 | } elseif ($one3dmodel) { |
| 313 | 357 | if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') { |
| 314 | 358 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -339,7 +383,9 @@ discard block |
||
| 339 | 383 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 340 | 384 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 341 | 385 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 342 | - } else $aircraft_shadow = ''; |
|
| 386 | + } else { |
|
| 387 | + $aircraft_shadow = ''; |
|
| 388 | + } |
|
| 343 | 389 | if ($aircraft_shadow != '') { |
| 344 | 390 | if (isset($modelsdb[$aircraft_shadow])) { |
| 345 | 391 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -476,7 +522,9 @@ discard block |
||
| 476 | 522 | } |
| 477 | 523 | $output .= '},'; |
| 478 | 524 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 479 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 525 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 526 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 527 | + } |
|
| 480 | 528 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 481 | 529 | } |
| 482 | 530 | } elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') { |
@@ -498,7 +546,9 @@ discard block |
||
| 498 | 546 | } |
| 499 | 547 | $output .= '},'; |
| 500 | 548 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 501 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 549 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 550 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 551 | + } |
|
| 502 | 552 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 503 | 553 | } |
| 504 | 554 | } else { |
@@ -511,7 +561,9 @@ discard block |
||
| 511 | 561 | } |
| 512 | 562 | $output .= '},'; |
| 513 | 563 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 514 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 564 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 565 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 566 | + } |
|
| 515 | 567 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 516 | 568 | } |
| 517 | 569 | } elseif ($tracker && isset($spotter_item['type'])) { |
@@ -615,8 +667,11 @@ discard block |
||
| 615 | 667 | $output .= '},'; |
| 616 | 668 | } |
| 617 | 669 | } |
| 618 | - if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output); |
|
| 619 | - else $output = str_replace('%onground%','false',$output); |
|
| 670 | + if (isset($onground) && $onground) { |
|
| 671 | + $output = str_replace('%onground%','true',$output); |
|
| 672 | + } else { |
|
| 673 | + $output = str_replace('%onground%','false',$output); |
|
| 674 | + } |
|
| 620 | 675 | |
| 621 | 676 | // $output .= '"heightReference": "CLAMP_TO_GROUND",'; |
| 622 | 677 | //$output .= '"heightReference": "'.$heightrelative.'",'; |
@@ -629,8 +684,12 @@ discard block |
||
| 629 | 684 | // $output .= '"interpolationDegree" : 5,'; |
| 630 | 685 | // $output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", '; |
| 631 | 686 | $output .= '"cartographicDegrees": ['; |
| 632 | - if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']); |
|
| 633 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 687 | + if ($minitime > strtotime($spotter_item['date'])) { |
|
| 688 | + $minitime = strtotime($spotter_item['date']); |
|
| 689 | + } |
|
| 690 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 691 | + $maxitime = strtotime($spotter_item['date']); |
|
| 692 | + } |
|
| 634 | 693 | $output .= '"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 635 | 694 | $output .= $spotter_item['longitude'].', '; |
| 636 | 695 | $output .= $spotter_item['latitude']; |
@@ -653,7 +712,9 @@ discard block |
||
| 653 | 712 | $output .= ', '.round($spotter_item['altitude']*30.48); |
| 654 | 713 | $prevalt = round($spotter_item['altitude']*30.48); |
| 655 | 714 | } |
| 656 | - } else $output .= ', 0'; |
|
| 715 | + } else { |
|
| 716 | + $output .= ', 0'; |
|
| 717 | + } |
|
| 657 | 718 | //$orientation = '"orientation" : { '; |
| 658 | 719 | //$orientation .= '"unitQuaternion": ['; |
| 659 | 720 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
@@ -661,13 +722,18 @@ discard block |
||
| 661 | 722 | } else { |
| 662 | 723 | $nblatlong = $nblatlong+1; |
| 663 | 724 | $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 664 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 725 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 726 | + $maxitime = strtotime($spotter_item['date']); |
|
| 727 | + } |
|
| 665 | 728 | if ($spotter_item['ground_speed'] == 0) { |
| 666 | 729 | $output .= $prevlong.', '; |
| 667 | 730 | $output .= $prevlat; |
| 668 | 731 | //if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt; |
| 669 | - if (!$marine) $output .= ', '.$prevalt; |
|
| 670 | - else $output .= ', 0'; |
|
| 732 | + if (!$marine) { |
|
| 733 | + $output .= ', '.$prevalt; |
|
| 734 | + } else { |
|
| 735 | + $output .= ', 0'; |
|
| 736 | + } |
|
| 671 | 737 | } else { |
| 672 | 738 | $output .= $spotter_item['longitude'].', '; |
| 673 | 739 | $output .= $spotter_item['latitude']; |
@@ -680,14 +746,17 @@ discard block |
||
| 680 | 746 | $output .= ', 0'; |
| 681 | 747 | } |
| 682 | 748 | } else { |
| 683 | - if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048); |
|
| 684 | - elseif ($tracker) { |
|
| 749 | + if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') { |
|
| 750 | + $output .= ', '.round($spotter_item['real_altitude']*0.3048); |
|
| 751 | + } elseif ($tracker) { |
|
| 685 | 752 | $output .= ', '.round($spotter_item['altitude']*0.3048); |
| 686 | 753 | } else { |
| 687 | 754 | $output .= ', '.round($spotter_item['altitude']*30.48); |
| 688 | 755 | } |
| 689 | 756 | } |
| 690 | - } else $output .= ', 0'; |
|
| 757 | + } else { |
|
| 758 | + $output .= ', 0'; |
|
| 759 | + } |
|
| 691 | 760 | } |
| 692 | 761 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 693 | 762 | //$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
@@ -706,9 +775,12 @@ discard block |
||
| 706 | 775 | } else { |
| 707 | 776 | $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output); |
| 708 | 777 | } |
| 778 | + } else { |
|
| 779 | + $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 709 | 780 | } |
| 710 | - else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 711 | -} else $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 781 | + } else { |
|
| 782 | + $output = str_replace('%minitime%',date("c",$minitime),$output); |
|
| 783 | +} |
|
| 712 | 784 | $output = str_replace('%maxitime%',date("c",$maxitime),$output); |
| 713 | 785 | print $output; |
| 714 | 786 | ?> |
@@ -329,15 +329,15 @@ |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 332 | + if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 333 | 333 | ?> |
| 334 | 334 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox()); |
| 335 | 335 | <?php |
| 336 | - } else { |
|
| 336 | + } else { |
|
| 337 | 337 | ?> |
| 338 | 338 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php"); |
| 339 | 339 | <?php |
| 340 | - } |
|
| 340 | + } |
|
| 341 | 341 | ?> |
| 342 | 342 | loc_geojson.then(function(geojsondata) { |
| 343 | 343 | loc = new Cesium.CustomDataSource('location'); |
@@ -5,21 +5,30 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | document.cookie = 'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/' |
| 7 | 7 | <?php |
| 8 | - if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType']; |
|
| 9 | - else $MapType = $globalMapProvider; |
|
| 8 | + if (isset($_COOKIE['MapType'])) { |
|
| 9 | + $MapType = $_COOKIE['MapType']; |
|
| 10 | + } else { |
|
| 11 | + $MapType = $globalMapProvider; |
|
| 12 | + } |
|
| 10 | 13 | |
| 11 | 14 | // unset($_COOKIE['MapType']); |
| 12 | 15 | if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road') { |
| 13 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial'; |
|
| 14 | - else $MapType = 'OpenStreetMap'; |
|
| 16 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
| 17 | + $MapType = 'Bing-Aerial'; |
|
| 18 | + } else { |
|
| 19 | + $MapType = 'OpenStreetMap'; |
|
| 20 | + } |
|
| 15 | 21 | } |
| 16 | 22 | if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) { |
| 17 | 23 | $MapType = 'OpenStreetMap'; |
| 18 | 24 | } |
| 19 | 25 | if ($MapType == 'Mapbox') { |
| 20 | - if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId; |
|
| 21 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 22 | -?> |
|
| 26 | + if ($_COOKIE['MapTypeId'] == 'default') { |
|
| 27 | + $MapBoxId = $globalMapboxId; |
|
| 28 | + } else { |
|
| 29 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 30 | + } |
|
| 31 | + ?> |
|
| 23 | 32 | var imProv = Cesium.MapboxImageryProvider({ |
| 24 | 33 | credit: 'Map data © OpenStreetMap contributors, ' + |
| 25 | 34 | 'CC-BY-SA, ' + |
@@ -124,13 +133,23 @@ discard block |
||
| 124 | 133 | */ |
| 125 | 134 | ?> |
| 126 | 135 | <?php |
| 127 | - } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 136 | + } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 128 | 137 | $customid = $MapType; |
| 129 | 138 | ?> |
| 130 | 139 | var imProv = Cesium.createOpenStreetMapImageryProvider({ |
| 131 | 140 | url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>', |
| 132 | - maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>, |
|
| 133 | - minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>, |
|
| 141 | + maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) { |
|
| 142 | + print $globalMapCustomLayer[$customid]['maxZoom']; |
|
| 143 | +} else { |
|
| 144 | + print '99'; |
|
| 145 | +} |
|
| 146 | +?>, |
|
| 147 | + minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) { |
|
| 148 | + print $globalMapCustomLayer[$customid]['minZoom']; |
|
| 149 | +} else { |
|
| 150 | + print '0'; |
|
| 151 | +} |
|
| 152 | +?>, |
|
| 134 | 153 | credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
| 135 | 154 | }); |
| 136 | 155 | <?php |
@@ -507,7 +526,12 @@ discard block |
||
| 507 | 526 | } |
| 508 | 527 | |
| 509 | 528 | update_locationsLayer(); |
| 510 | -setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
| 529 | +setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) { |
|
| 530 | + print $globalMapRefresh*1000*2; |
|
| 531 | +} else { |
|
| 532 | + print '60000'; |
|
| 533 | +} |
|
| 534 | +?>); |
|
| 511 | 535 | /* |
| 512 | 536 | var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false); |
| 513 | 537 | handlera.setInputAction( |
@@ -10,6 +10,9 @@ discard block |
||
| 10 | 10 | class update_db { |
| 11 | 11 | public static $db_sqlite; |
| 12 | 12 | |
| 13 | + /** |
|
| 14 | + * @param string $file |
|
| 15 | + */ |
|
| 13 | 16 | public static function download($url, $file, $referer = '') { |
| 14 | 17 | global $globalProxy, $globalForceIPv4; |
| 15 | 18 | $fp = fopen($file, 'w'); |
@@ -34,6 +37,9 @@ discard block |
||
| 34 | 37 | fclose($fp); |
| 35 | 38 | } |
| 36 | 39 | |
| 40 | + /** |
|
| 41 | + * @param string $in_file |
|
| 42 | + */ |
|
| 37 | 43 | public static function gunzip($in_file,$out_file_name = '') { |
| 38 | 44 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 39 | 45 | $buffer_size = 4096; // read 4kb at a time |
@@ -55,6 +61,9 @@ discard block |
||
| 55 | 61 | } |
| 56 | 62 | } |
| 57 | 63 | |
| 64 | + /** |
|
| 65 | + * @param string $in_file |
|
| 66 | + */ |
|
| 58 | 67 | public static function unzip($in_file) { |
| 59 | 68 | if ($in_file != '' && file_exists($in_file)) { |
| 60 | 69 | $path = pathinfo(realpath($in_file), PATHINFO_DIRNAME); |
@@ -76,6 +85,9 @@ discard block |
||
| 76 | 85 | } |
| 77 | 86 | } |
| 78 | 87 | |
| 88 | + /** |
|
| 89 | + * @param string $database_file |
|
| 90 | + */ |
|
| 79 | 91 | public static function retrieve_route_sqlite_to_dest($database_file) { |
| 80 | 92 | global $globalDebug, $globalTransaction; |
| 81 | 93 | //$query = 'TRUNCATE TABLE routes'; |
@@ -118,6 +130,10 @@ discard block |
||
| 118 | 130 | } |
| 119 | 131 | return ''; |
| 120 | 132 | } |
| 133 | + |
|
| 134 | + /** |
|
| 135 | + * @param string $database_file |
|
| 136 | + */ |
|
| 121 | 137 | public static function retrieve_route_oneworld($database_file) { |
| 122 | 138 | global $globalDebug, $globalTransaction; |
| 123 | 139 | //$query = 'TRUNCATE TABLE routes'; |
@@ -159,6 +175,9 @@ discard block |
||
| 159 | 175 | return ''; |
| 160 | 176 | } |
| 161 | 177 | |
| 178 | + /** |
|
| 179 | + * @param string $database_file |
|
| 180 | + */ |
|
| 162 | 181 | public static function retrieve_route_skyteam($database_file) { |
| 163 | 182 | global $globalDebug, $globalTransaction; |
| 164 | 183 | //$query = 'TRUNCATE TABLE routes'; |
@@ -201,6 +220,10 @@ discard block |
||
| 201 | 220 | } |
| 202 | 221 | return ''; |
| 203 | 222 | } |
| 223 | + |
|
| 224 | + /** |
|
| 225 | + * @param string $database_file |
|
| 226 | + */ |
|
| 204 | 227 | public static function retrieve_modes_sqlite_to_dest($database_file) { |
| 205 | 228 | global $globalTransaction; |
| 206 | 229 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -267,6 +290,9 @@ discard block |
||
| 267 | 290 | return ''; |
| 268 | 291 | } |
| 269 | 292 | |
| 293 | + /** |
|
| 294 | + * @param string $database_file |
|
| 295 | + */ |
|
| 270 | 296 | public static function retrieve_modes_flarmnet($database_file) { |
| 271 | 297 | global $globalTransaction; |
| 272 | 298 | $Common = new Common(); |
@@ -337,6 +363,9 @@ discard block |
||
| 337 | 363 | return ''; |
| 338 | 364 | } |
| 339 | 365 | |
| 366 | + /** |
|
| 367 | + * @param string $database_file |
|
| 368 | + */ |
|
| 340 | 369 | public static function retrieve_modes_ogn($database_file) { |
| 341 | 370 | global $globalTransaction; |
| 342 | 371 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -406,6 +435,9 @@ discard block |
||
| 406 | 435 | return ''; |
| 407 | 436 | } |
| 408 | 437 | |
| 438 | + /** |
|
| 439 | + * @param string $database_file |
|
| 440 | + */ |
|
| 409 | 441 | public static function retrieve_owner($database_file,$country = 'F') { |
| 410 | 442 | global $globalTransaction, $globalMasterSource; |
| 411 | 443 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -1393,6 +1425,10 @@ discard block |
||
| 1393 | 1425 | return ''; |
| 1394 | 1426 | } |
| 1395 | 1427 | |
| 1428 | + /** |
|
| 1429 | + * @param string $filename |
|
| 1430 | + * @param string $tletype |
|
| 1431 | + */ |
|
| 1396 | 1432 | public static function tle($filename,$tletype) { |
| 1397 | 1433 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1398 | 1434 | global $tmp_dir, $globalTransaction; |
@@ -1442,6 +1478,9 @@ discard block |
||
| 1442 | 1478 | return ''; |
| 1443 | 1479 | } |
| 1444 | 1480 | |
| 1481 | + /** |
|
| 1482 | + * @param string $filename |
|
| 1483 | + */ |
|
| 1445 | 1484 | public static function satellite_ucsdb($filename) { |
| 1446 | 1485 | global $tmp_dir, $globalTransaction; |
| 1447 | 1486 | $query = "DELETE FROM satellite"; |
@@ -1488,6 +1527,9 @@ discard block |
||
| 1488 | 1527 | return ''; |
| 1489 | 1528 | } |
| 1490 | 1529 | |
| 1530 | + /** |
|
| 1531 | + * @param string $filename |
|
| 1532 | + */ |
|
| 1491 | 1533 | public static function satellite_celestrak($filename) { |
| 1492 | 1534 | global $tmp_dir, $globalTransaction; |
| 1493 | 1535 | $satcat_sources = array( |
@@ -1815,6 +1857,9 @@ discard block |
||
| 1815 | 1857 | |
| 1816 | 1858 | } |
| 1817 | 1859 | */ |
| 1860 | + /** |
|
| 1861 | + * @param string $filename |
|
| 1862 | + */ |
|
| 1818 | 1863 | public static function waypoints($filename) { |
| 1819 | 1864 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1820 | 1865 | global $tmp_dir, $globalTransaction; |
@@ -1883,6 +1928,9 @@ discard block |
||
| 1883 | 1928 | } |
| 1884 | 1929 | } |
| 1885 | 1930 | |
| 1931 | + /** |
|
| 1932 | + * @param string $filename |
|
| 1933 | + */ |
|
| 1886 | 1934 | public static function ivao_airlines($filename) { |
| 1887 | 1935 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1888 | 1936 | global $tmp_dir, $globalTransaction; |
@@ -85,38 +85,38 @@ discard block |
||
| 85 | 85 | try { |
| 86 | 86 | //$Connection = new Connection(); |
| 87 | 87 | $sth = $Connection->db->prepare($query); |
| 88 | - $sth->execute(array(':source' => $database_file)); |
|
| 89 | - } catch(PDOException $e) { |
|
| 90 | - return "error : ".$e->getMessage(); |
|
| 91 | - } |
|
| 88 | + $sth->execute(array(':source' => $database_file)); |
|
| 89 | + } catch(PDOException $e) { |
|
| 90 | + return "error : ".$e->getMessage(); |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 94 | - update_db::connect_sqlite($database_file); |
|
| 93 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 94 | + update_db::connect_sqlite($database_file); |
|
| 95 | 95 | //$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID'; |
| 96 | 96 | $query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID"; |
| 97 | 97 | try { |
| 98 | - $sth = update_db::$db_sqlite->prepare($query); |
|
| 99 | - $sth->execute(); |
|
| 100 | - } catch(PDOException $e) { |
|
| 101 | - return "error : ".$e->getMessage(); |
|
| 102 | - } |
|
| 98 | + $sth = update_db::$db_sqlite->prepare($query); |
|
| 99 | + $sth->execute(); |
|
| 100 | + } catch(PDOException $e) { |
|
| 101 | + return "error : ".$e->getMessage(); |
|
| 102 | + } |
|
| 103 | 103 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
| 104 | 104 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
| 105 | 105 | $Connection = new Connection(); |
| 106 | 106 | $sth_dest = $Connection->db->prepare($query_dest); |
| 107 | 107 | try { |
| 108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 109 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 109 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 110 | 110 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 111 | 111 | $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 112 | 112 | $sth_dest->execute($query_dest_values); |
| 113 | - } |
|
| 113 | + } |
|
| 114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
| 115 | 115 | } catch(PDOException $e) { |
| 116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
| 117 | 117 | return "error : ".$e->getMessage(); |
| 118 | 118 | } |
| 119 | - return ''; |
|
| 119 | + return ''; |
|
| 120 | 120 | } |
| 121 | 121 | public static function retrieve_route_oneworld($database_file) { |
| 122 | 122 | global $globalDebug, $globalTransaction; |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | try { |
| 128 | 128 | //$Connection = new Connection(); |
| 129 | 129 | $sth = $Connection->db->prepare($query); |
| 130 | - $sth->execute(array(':source' => 'oneworld')); |
|
| 131 | - } catch(PDOException $e) { |
|
| 132 | - return "error : ".$e->getMessage(); |
|
| 133 | - } |
|
| 130 | + $sth->execute(array(':source' => 'oneworld')); |
|
| 131 | + } catch(PDOException $e) { |
|
| 132 | + return "error : ".$e->getMessage(); |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 135 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 137 | $Spotter = new Spotter(); |
| 138 | 138 | if ($fh = fopen($database_file,"r")) { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | if ($globalTransaction) $Connection->db->commit(); |
| 158 | 158 | } |
| 159 | - return ''; |
|
| 159 | + return ''; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | public static function retrieve_route_skyteam($database_file) { |
@@ -168,12 +168,12 @@ discard block |
||
| 168 | 168 | try { |
| 169 | 169 | //$Connection = new Connection(); |
| 170 | 170 | $sth = $Connection->db->prepare($query); |
| 171 | - $sth->execute(array(':source' => 'skyteam')); |
|
| 172 | - } catch(PDOException $e) { |
|
| 173 | - return "error : ".$e->getMessage(); |
|
| 174 | - } |
|
| 171 | + $sth->execute(array(':source' => 'skyteam')); |
|
| 172 | + } catch(PDOException $e) { |
|
| 173 | + return "error : ".$e->getMessage(); |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 176 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 177 | 177 | |
| 178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 179 | $Spotter = new Spotter(); |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | return "error : ".$e->getMessage(); |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | - return ''; |
|
| 202 | + return ''; |
|
| 203 | 203 | } |
| 204 | 204 | public static function retrieve_modes_sqlite_to_dest($database_file) { |
| 205 | 205 | global $globalTransaction; |
@@ -208,27 +208,27 @@ discard block |
||
| 208 | 208 | try { |
| 209 | 209 | $Connection = new Connection(); |
| 210 | 210 | $sth = $Connection->db->prepare($query); |
| 211 | - $sth->execute(array(':source' => $database_file)); |
|
| 212 | - } catch(PDOException $e) { |
|
| 213 | - return "error : ".$e->getMessage(); |
|
| 214 | - } |
|
| 211 | + $sth->execute(array(':source' => $database_file)); |
|
| 212 | + } catch(PDOException $e) { |
|
| 213 | + return "error : ".$e->getMessage(); |
|
| 214 | + } |
|
| 215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
| 216 | 216 | try { |
| 217 | 217 | $Connection = new Connection(); |
| 218 | 218 | $sth = $Connection->db->prepare($query); |
| 219 | - $sth->execute(array(':source' => $database_file)); |
|
| 220 | - } catch(PDOException $e) { |
|
| 221 | - return "error : ".$e->getMessage(); |
|
| 222 | - } |
|
| 219 | + $sth->execute(array(':source' => $database_file)); |
|
| 220 | + } catch(PDOException $e) { |
|
| 221 | + return "error : ".$e->getMessage(); |
|
| 222 | + } |
|
| 223 | 223 | |
| 224 | - update_db::connect_sqlite($database_file); |
|
| 224 | + update_db::connect_sqlite($database_file); |
|
| 225 | 225 | $query = 'select * from Aircraft'; |
| 226 | 226 | try { |
| 227 | - $sth = update_db::$db_sqlite->prepare($query); |
|
| 228 | - $sth->execute(); |
|
| 229 | - } catch(PDOException $e) { |
|
| 230 | - return "error : ".$e->getMessage(); |
|
| 231 | - } |
|
| 227 | + $sth = update_db::$db_sqlite->prepare($query); |
|
| 228 | + $sth->execute(); |
|
| 229 | + } catch(PDOException $e) { |
|
| 230 | + return "error : ".$e->getMessage(); |
|
| 231 | + } |
|
| 232 | 232 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 233 | 233 | $query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)'; |
| 234 | 234 | |
@@ -239,17 +239,17 @@ discard block |
||
| 239 | 239 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
| 240 | 240 | try { |
| 241 | 241 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 242 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 242 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 243 | 243 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 244 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 245 | 245 | else $type = null; |
| 246 | 246 | $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
| 247 | 247 | $sth_dest->execute($query_dest_values); |
| 248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 250 | - $sth_dest_owner->execute($query_dest_owner_values); |
|
| 249 | + $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 250 | + $sth_dest_owner->execute($query_dest_owner_values); |
|
| 251 | 251 | } |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
| 254 | 254 | } catch(PDOException $e) { |
| 255 | 255 | return "error : ".$e->getMessage(); |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | try { |
| 261 | 261 | $Connection = new Connection(); |
| 262 | 262 | $sth = $Connection->db->prepare($query); |
| 263 | - $sth->execute(array(':source' => $database_file)); |
|
| 264 | - } catch(PDOException $e) { |
|
| 265 | - return "error : ".$e->getMessage(); |
|
| 266 | - } |
|
| 263 | + $sth->execute(array(':source' => $database_file)); |
|
| 264 | + } catch(PDOException $e) { |
|
| 265 | + return "error : ".$e->getMessage(); |
|
| 266 | + } |
|
| 267 | 267 | return ''; |
| 268 | 268 | } |
| 269 | 269 | |
@@ -275,10 +275,10 @@ discard block |
||
| 275 | 275 | try { |
| 276 | 276 | $Connection = new Connection(); |
| 277 | 277 | $sth = $Connection->db->prepare($query); |
| 278 | - $sth->execute(array(':source' => $database_file)); |
|
| 279 | - } catch(PDOException $e) { |
|
| 280 | - return "error : ".$e->getMessage(); |
|
| 281 | - } |
|
| 278 | + $sth->execute(array(':source' => $database_file)); |
|
| 279 | + } catch(PDOException $e) { |
|
| 280 | + return "error : ".$e->getMessage(); |
|
| 281 | + } |
|
| 282 | 282 | |
| 283 | 283 | if ($fh = fopen($database_file,"r")) { |
| 284 | 284 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -288,26 +288,26 @@ discard block |
||
| 288 | 288 | $sth_dest = $Connection->db->prepare($query_dest); |
| 289 | 289 | try { |
| 290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 291 | - while (!feof($fh)) { |
|
| 292 | - $values = array(); |
|
| 293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 291 | + while (!feof($fh)) { |
|
| 292 | + $values = array(); |
|
| 293 | + $line = $Common->hex2str(fgets($fh,9999)); |
|
| 294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 295 | - $values['ModeS'] = substr($line,0,6); |
|
| 296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 298 | - // Check if we can find ICAO, else set it to GLID |
|
| 299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 300 | - $search_more = ''; |
|
| 301 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 302 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 303 | - $sth_search = $Connection->db->prepare($query_search); |
|
| 295 | + $values['ModeS'] = substr($line,0,6); |
|
| 296 | + $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | + $aircraft_name = trim(substr($line,48,6)); |
|
| 298 | + // Check if we can find ICAO, else set it to GLID |
|
| 299 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 300 | + $search_more = ''; |
|
| 301 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 302 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 303 | + $sth_search = $Connection->db->prepare($query_search); |
|
| 304 | 304 | try { |
| 305 | - $sth_search->execute(); |
|
| 306 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 307 | - //if (count($result) > 0) { |
|
| 308 | - if (isset($result['icao']) && $result['icao'] != '') { |
|
| 309 | - $values['ICAOTypeCode'] = $result['icao']; |
|
| 310 | - } |
|
| 305 | + $sth_search->execute(); |
|
| 306 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 307 | + //if (count($result) > 0) { |
|
| 308 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
| 309 | + $values['ICAOTypeCode'] = $result['icao']; |
|
| 310 | + } |
|
| 311 | 311 | } catch(PDOException $e) { |
| 312 | 312 | return "error : ".$e->getMessage(); |
| 313 | 313 | } |
@@ -330,10 +330,10 @@ discard block |
||
| 330 | 330 | try { |
| 331 | 331 | $Connection = new Connection(); |
| 332 | 332 | $sth = $Connection->db->prepare($query); |
| 333 | - $sth->execute(array(':source' => $database_file)); |
|
| 334 | - } catch(PDOException $e) { |
|
| 335 | - return "error : ".$e->getMessage(); |
|
| 336 | - } |
|
| 333 | + $sth->execute(array(':source' => $database_file)); |
|
| 334 | + } catch(PDOException $e) { |
|
| 335 | + return "error : ".$e->getMessage(); |
|
| 336 | + } |
|
| 337 | 337 | return ''; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -344,10 +344,10 @@ discard block |
||
| 344 | 344 | try { |
| 345 | 345 | $Connection = new Connection(); |
| 346 | 346 | $sth = $Connection->db->prepare($query); |
| 347 | - $sth->execute(array(':source' => $database_file)); |
|
| 348 | - } catch(PDOException $e) { |
|
| 349 | - return "error : ".$e->getMessage(); |
|
| 350 | - } |
|
| 347 | + $sth->execute(array(':source' => $database_file)); |
|
| 348 | + } catch(PDOException $e) { |
|
| 349 | + return "error : ".$e->getMessage(); |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | 352 | if ($fh = fopen($database_file,"r")) { |
| 353 | 353 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -358,25 +358,25 @@ discard block |
||
| 358 | 358 | try { |
| 359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 360 | 360 | $tmp = fgetcsv($fh,9999,',',"'"); |
| 361 | - while (!feof($fh)) { |
|
| 362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 361 | + while (!feof($fh)) { |
|
| 362 | + $line = fgetcsv($fh,9999,',',"'"); |
|
| 363 | 363 | |
| 364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 365 | 365 | //print_r($line); |
| 366 | - $values['ModeS'] = $line[1]; |
|
| 367 | - $values['Registration'] = $line[3]; |
|
| 368 | - $values['ICAOTypeCode'] = ''; |
|
| 369 | - $aircraft_name = $line[2]; |
|
| 370 | - // Check if we can find ICAO, else set it to GLID |
|
| 371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 372 | - $search_more = ''; |
|
| 373 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 374 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 375 | - $sth_search = $Connection->db->prepare($query_search); |
|
| 366 | + $values['ModeS'] = $line[1]; |
|
| 367 | + $values['Registration'] = $line[3]; |
|
| 368 | + $values['ICAOTypeCode'] = ''; |
|
| 369 | + $aircraft_name = $line[2]; |
|
| 370 | + // Check if we can find ICAO, else set it to GLID |
|
| 371 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 372 | + $search_more = ''; |
|
| 373 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 374 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 375 | + $sth_search = $Connection->db->prepare($query_search); |
|
| 376 | 376 | try { |
| 377 | - $sth_search->execute(); |
|
| 378 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 379 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 377 | + $sth_search->execute(); |
|
| 378 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 379 | + if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 380 | 380 | } catch(PDOException $e) { |
| 381 | 381 | return "error : ".$e->getMessage(); |
| 382 | 382 | } |
@@ -399,10 +399,10 @@ discard block |
||
| 399 | 399 | try { |
| 400 | 400 | $Connection = new Connection(); |
| 401 | 401 | $sth = $Connection->db->prepare($query); |
| 402 | - $sth->execute(array(':source' => $database_file)); |
|
| 403 | - } catch(PDOException $e) { |
|
| 404 | - return "error : ".$e->getMessage(); |
|
| 405 | - } |
|
| 402 | + $sth->execute(array(':source' => $database_file)); |
|
| 403 | + } catch(PDOException $e) { |
|
| 404 | + return "error : ".$e->getMessage(); |
|
| 405 | + } |
|
| 406 | 406 | return ''; |
| 407 | 407 | } |
| 408 | 408 | |
@@ -413,16 +413,16 @@ discard block |
||
| 413 | 413 | try { |
| 414 | 414 | $Connection = new Connection(); |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | - $sth->execute(array(':source' => $database_file)); |
|
| 417 | - } catch(PDOException $e) { |
|
| 418 | - return "error : ".$e->getMessage(); |
|
| 419 | - } |
|
| 416 | + $sth->execute(array(':source' => $database_file)); |
|
| 417 | + } catch(PDOException $e) { |
|
| 418 | + return "error : ".$e->getMessage(); |
|
| 419 | + } |
|
| 420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 421 | 421 | $Spotter = new Spotter(); |
| 422 | 422 | if ($fh = fopen($database_file,"r")) { |
| 423 | 423 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 425 | - $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
| 425 | + $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
| 426 | 426 | |
| 427 | 427 | $Connection = new Connection(); |
| 428 | 428 | $sth_dest = $Connection->db->prepare($query_dest); |
@@ -430,126 +430,126 @@ discard block |
||
| 430 | 430 | try { |
| 431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 432 | 432 | $tmp = fgetcsv($fh,9999,',','"'); |
| 433 | - while (!feof($fh)) { |
|
| 434 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 435 | - $values = array(); |
|
| 436 | - //print_r($line); |
|
| 437 | - if ($country == 'F') { |
|
| 438 | - $values['registration'] = $line[0]; |
|
| 439 | - $values['base'] = $line[4]; |
|
| 440 | - $values['owner'] = $line[5]; |
|
| 441 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 443 | - $values['cancel'] = $line[7]; |
|
| 433 | + while (!feof($fh)) { |
|
| 434 | + $line = fgetcsv($fh,9999,',','"'); |
|
| 435 | + $values = array(); |
|
| 436 | + //print_r($line); |
|
| 437 | + if ($country == 'F') { |
|
| 438 | + $values['registration'] = $line[0]; |
|
| 439 | + $values['base'] = $line[4]; |
|
| 440 | + $values['owner'] = $line[5]; |
|
| 441 | + if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 443 | + $values['cancel'] = $line[7]; |
|
| 444 | 444 | } elseif ($country == 'EI') { |
| 445 | - // TODO : add modeS & reg to aircraft_modes |
|
| 446 | - $values['registration'] = $line[0]; |
|
| 447 | - $values['base'] = $line[3]; |
|
| 448 | - $values['owner'] = $line[2]; |
|
| 449 | - if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 451 | - $values['cancel'] = ''; |
|
| 452 | - $values['modes'] = $line[7]; |
|
| 453 | - $values['icao'] = $line[8]; |
|
| 445 | + // TODO : add modeS & reg to aircraft_modes |
|
| 446 | + $values['registration'] = $line[0]; |
|
| 447 | + $values['base'] = $line[3]; |
|
| 448 | + $values['owner'] = $line[2]; |
|
| 449 | + if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 451 | + $values['cancel'] = ''; |
|
| 452 | + $values['modes'] = $line[7]; |
|
| 453 | + $values['icao'] = $line[8]; |
|
| 454 | 454 | |
| 455 | 455 | } elseif ($country == 'HB') { |
| 456 | - // TODO : add modeS & reg to aircraft_modes |
|
| 457 | - $values['registration'] = $line[0]; |
|
| 458 | - $values['base'] = null; |
|
| 459 | - $values['owner'] = $line[5]; |
|
| 460 | - $values['date_first_reg'] = null; |
|
| 461 | - $values['cancel'] = ''; |
|
| 462 | - $values['modes'] = $line[4]; |
|
| 463 | - $values['icao'] = $line[7]; |
|
| 456 | + // TODO : add modeS & reg to aircraft_modes |
|
| 457 | + $values['registration'] = $line[0]; |
|
| 458 | + $values['base'] = null; |
|
| 459 | + $values['owner'] = $line[5]; |
|
| 460 | + $values['date_first_reg'] = null; |
|
| 461 | + $values['cancel'] = ''; |
|
| 462 | + $values['modes'] = $line[4]; |
|
| 463 | + $values['icao'] = $line[7]; |
|
| 464 | 464 | } elseif ($country == 'OK') { |
| 465 | - // TODO : add modeS & reg to aircraft_modes |
|
| 466 | - $values['registration'] = $line[3]; |
|
| 467 | - $values['base'] = null; |
|
| 468 | - $values['owner'] = $line[5]; |
|
| 469 | - if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 471 | - $values['cancel'] = ''; |
|
| 465 | + // TODO : add modeS & reg to aircraft_modes |
|
| 466 | + $values['registration'] = $line[3]; |
|
| 467 | + $values['base'] = null; |
|
| 468 | + $values['owner'] = $line[5]; |
|
| 469 | + if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 471 | + $values['cancel'] = ''; |
|
| 472 | 472 | } elseif ($country == 'VH') { |
| 473 | - // TODO : add modeS & reg to aircraft_modes |
|
| 474 | - $values['registration'] = $line[0]; |
|
| 475 | - $values['base'] = null; |
|
| 476 | - $values['owner'] = $line[12]; |
|
| 477 | - if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 479 | - |
|
| 480 | - $values['cancel'] = $line[39]; |
|
| 473 | + // TODO : add modeS & reg to aircraft_modes |
|
| 474 | + $values['registration'] = $line[0]; |
|
| 475 | + $values['base'] = null; |
|
| 476 | + $values['owner'] = $line[12]; |
|
| 477 | + if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 479 | + |
|
| 480 | + $values['cancel'] = $line[39]; |
|
| 481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
| 482 | - $values['registration'] = $line[0]; |
|
| 483 | - $values['base'] = null; |
|
| 484 | - $values['owner'] = $line[4]; |
|
| 485 | - $values['date_first_reg'] = null; |
|
| 486 | - $values['cancel'] = ''; |
|
| 482 | + $values['registration'] = $line[0]; |
|
| 483 | + $values['base'] = null; |
|
| 484 | + $values['owner'] = $line[4]; |
|
| 485 | + $values['date_first_reg'] = null; |
|
| 486 | + $values['cancel'] = ''; |
|
| 487 | 487 | } elseif ($country == 'CC') { |
| 488 | - $values['registration'] = $line[0]; |
|
| 489 | - $values['base'] = null; |
|
| 490 | - $values['owner'] = $line[6]; |
|
| 491 | - $values['date_first_reg'] = null; |
|
| 492 | - $values['cancel'] = ''; |
|
| 488 | + $values['registration'] = $line[0]; |
|
| 489 | + $values['base'] = null; |
|
| 490 | + $values['owner'] = $line[6]; |
|
| 491 | + $values['date_first_reg'] = null; |
|
| 492 | + $values['cancel'] = ''; |
|
| 493 | 493 | } elseif ($country == 'HJ') { |
| 494 | - $values['registration'] = $line[0]; |
|
| 495 | - $values['base'] = null; |
|
| 496 | - $values['owner'] = $line[8]; |
|
| 497 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 499 | - $values['cancel'] = ''; |
|
| 494 | + $values['registration'] = $line[0]; |
|
| 495 | + $values['base'] = null; |
|
| 496 | + $values['owner'] = $line[8]; |
|
| 497 | + if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 499 | + $values['cancel'] = ''; |
|
| 500 | 500 | } elseif ($country == 'PP') { |
| 501 | - $values['registration'] = $line[0]; |
|
| 502 | - $values['base'] = null; |
|
| 503 | - $values['owner'] = $line[4]; |
|
| 504 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | - $values['cancel'] = $line[7]; |
|
| 501 | + $values['registration'] = $line[0]; |
|
| 502 | + $values['base'] = null; |
|
| 503 | + $values['owner'] = $line[4]; |
|
| 504 | + if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | + $values['cancel'] = $line[7]; |
|
| 507 | 507 | } elseif ($country == 'E7') { |
| 508 | - $values['registration'] = $line[0]; |
|
| 509 | - $values['base'] = null; |
|
| 510 | - $values['owner'] = $line[4]; |
|
| 511 | - if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 513 | - $values['cancel'] = ''; |
|
| 508 | + $values['registration'] = $line[0]; |
|
| 509 | + $values['base'] = null; |
|
| 510 | + $values['owner'] = $line[4]; |
|
| 511 | + if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 513 | + $values['cancel'] = ''; |
|
| 514 | 514 | } elseif ($country == '8Q') { |
| 515 | - $values['registration'] = $line[0]; |
|
| 516 | - $values['base'] = null; |
|
| 517 | - $values['owner'] = $line[3]; |
|
| 518 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 520 | - $values['cancel'] = ''; |
|
| 515 | + $values['registration'] = $line[0]; |
|
| 516 | + $values['base'] = null; |
|
| 517 | + $values['owner'] = $line[3]; |
|
| 518 | + if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 520 | + $values['cancel'] = ''; |
|
| 521 | 521 | } elseif ($country == 'ZK') { |
| 522 | - $values['registration'] = $line[0]; |
|
| 523 | - $values['base'] = null; |
|
| 524 | - $values['owner'] = $line[3]; |
|
| 525 | - $values['date_first_reg'] = null; |
|
| 526 | - $values['cancel'] = ''; |
|
| 527 | - $values['modes'] = $line[5]; |
|
| 528 | - $values['icao'] = $line[9]; |
|
| 522 | + $values['registration'] = $line[0]; |
|
| 523 | + $values['base'] = null; |
|
| 524 | + $values['owner'] = $line[3]; |
|
| 525 | + $values['date_first_reg'] = null; |
|
| 526 | + $values['cancel'] = ''; |
|
| 527 | + $values['modes'] = $line[5]; |
|
| 528 | + $values['icao'] = $line[9]; |
|
| 529 | 529 | } elseif ($country == 'M') { |
| 530 | - $values['registration'] = $line[0]; |
|
| 531 | - $values['base'] = null; |
|
| 532 | - $values['owner'] = $line[6]; |
|
| 533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 535 | - $values['modes'] = $line[4]; |
|
| 536 | - $values['icao'] = $line[10]; |
|
| 530 | + $values['registration'] = $line[0]; |
|
| 531 | + $values['base'] = null; |
|
| 532 | + $values['owner'] = $line[6]; |
|
| 533 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | + $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 535 | + $values['modes'] = $line[4]; |
|
| 536 | + $values['icao'] = $line[10]; |
|
| 537 | 537 | } elseif ($country == 'OY') { |
| 538 | - $values['registration'] = $line[0]; |
|
| 539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 540 | - $values['modes'] = $line[5]; |
|
| 541 | - $values['icao'] = $line[6]; |
|
| 538 | + $values['registration'] = $line[0]; |
|
| 539 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 540 | + $values['modes'] = $line[5]; |
|
| 541 | + $values['icao'] = $line[6]; |
|
| 542 | 542 | } elseif ($country == 'PH') { |
| 543 | - $values['registration'] = $line[0]; |
|
| 544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 545 | - $values['modes'] = $line[4]; |
|
| 546 | - $values['icao'] = $line[5]; |
|
| 543 | + $values['registration'] = $line[0]; |
|
| 544 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 545 | + $values['modes'] = $line[4]; |
|
| 546 | + $values['icao'] = $line[5]; |
|
| 547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
| 548 | - $values['registration'] = $line[0]; |
|
| 549 | - $values['base'] = null; |
|
| 550 | - $values['owner'] = $line[3]; |
|
| 551 | - $values['date_first_reg'] = null; |
|
| 552 | - $values['cancel'] = ''; |
|
| 548 | + $values['registration'] = $line[0]; |
|
| 549 | + $values['base'] = null; |
|
| 550 | + $values['owner'] = $line[3]; |
|
| 551 | + $values['date_first_reg'] = null; |
|
| 552 | + $values['cancel'] = ''; |
|
| 553 | 553 | } |
| 554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 555 | 555 | $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | return "error : ".$e->getMessage(); |
| 683 | 683 | } |
| 684 | 684 | */ |
| 685 | - /* |
|
| 685 | + /* |
|
| 686 | 686 | $query = 'ALTER TABLE airport DROP INDEX icaoidx'; |
| 687 | 687 | try { |
| 688 | 688 | $Connection = new Connection(); |
@@ -927,10 +927,10 @@ discard block |
||
| 927 | 927 | try { |
| 928 | 928 | $Connection = new Connection(); |
| 929 | 929 | $sth = $Connection->db->prepare($query); |
| 930 | - $sth->execute(array(':source' => 'translation.csv')); |
|
| 931 | - } catch(PDOException $e) { |
|
| 932 | - return "error : ".$e->getMessage(); |
|
| 933 | - } |
|
| 930 | + $sth->execute(array(':source' => 'translation.csv')); |
|
| 931 | + } catch(PDOException $e) { |
|
| 932 | + return "error : ".$e->getMessage(); |
|
| 933 | + } |
|
| 934 | 934 | |
| 935 | 935 | |
| 936 | 936 | //update_db::unzip($out_file); |
@@ -949,21 +949,21 @@ discard block |
||
| 949 | 949 | $data = $row; |
| 950 | 950 | $operator = $data[2]; |
| 951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
| 952 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
| 953 | - //echo substr($operator, 0, 2)."\n";; |
|
| 954 | - if (count($airline_array) > 0) { |
|
| 952 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
| 953 | + //echo substr($operator, 0, 2)."\n";; |
|
| 954 | + if (count($airline_array) > 0) { |
|
| 955 | 955 | //print_r($airline_array); |
| 956 | 956 | $operator = $airline_array[0]['icao'].substr($operator,2); |
| 957 | - } |
|
| 958 | - } |
|
| 957 | + } |
|
| 958 | + } |
|
| 959 | 959 | |
| 960 | 960 | $operator_correct = $data[3]; |
| 961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 962 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
| 963 | - if (count($airline_array) > 0) { |
|
| 964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 965 | - } |
|
| 966 | - } |
|
| 962 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
| 963 | + if (count($airline_array) > 0) { |
|
| 964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 965 | + } |
|
| 966 | + } |
|
| 967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 968 | 968 | try { |
| 969 | 969 | $sth = $Connection->db->prepare($query); |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | //$Connection->db->commit(); |
| 978 | 978 | } |
| 979 | 979 | return ''; |
| 980 | - } |
|
| 980 | + } |
|
| 981 | 981 | |
| 982 | 982 | public static function translation_fam() { |
| 983 | 983 | global $tmp_dir, $globalTransaction; |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | //$Connection->db->commit(); |
| 1016 | 1016 | } |
| 1017 | 1017 | return ''; |
| 1018 | - } |
|
| 1018 | + } |
|
| 1019 | 1019 | |
| 1020 | 1020 | /* |
| 1021 | 1021 | * This function use FAA public data. |
@@ -1027,19 +1027,19 @@ discard block |
||
| 1027 | 1027 | try { |
| 1028 | 1028 | $Connection = new Connection(); |
| 1029 | 1029 | $sth = $Connection->db->prepare($query); |
| 1030 | - $sth->execute(array(':source' => 'website_faa')); |
|
| 1031 | - } catch(PDOException $e) { |
|
| 1032 | - return "error : ".$e->getMessage(); |
|
| 1033 | - } |
|
| 1030 | + $sth->execute(array(':source' => 'website_faa')); |
|
| 1031 | + } catch(PDOException $e) { |
|
| 1032 | + return "error : ".$e->getMessage(); |
|
| 1033 | + } |
|
| 1034 | 1034 | |
| 1035 | 1035 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source"; |
| 1036 | 1036 | try { |
| 1037 | 1037 | $Connection = new Connection(); |
| 1038 | 1038 | $sth = $Connection->db->prepare($query); |
| 1039 | - $sth->execute(array(':source' => 'website_faa')); |
|
| 1040 | - } catch(PDOException $e) { |
|
| 1041 | - return "error : ".$e->getMessage(); |
|
| 1042 | - } |
|
| 1039 | + $sth->execute(array(':source' => 'website_faa')); |
|
| 1040 | + } catch(PDOException $e) { |
|
| 1041 | + return "error : ".$e->getMessage(); |
|
| 1042 | + } |
|
| 1043 | 1043 | |
| 1044 | 1044 | $delimiter = ","; |
| 1045 | 1045 | $mfr = array(); |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | } |
| 1208 | 1208 | */ |
| 1209 | 1209 | return ''; |
| 1210 | - } |
|
| 1210 | + } |
|
| 1211 | 1211 | |
| 1212 | 1212 | public static function owner_fam() { |
| 1213 | 1213 | global $tmp_dir, $globalTransaction; |
@@ -1215,10 +1215,10 @@ discard block |
||
| 1215 | 1215 | try { |
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | - $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | - } catch(PDOException $e) { |
|
| 1220 | - return "error : ".$e->getMessage(); |
|
| 1221 | - } |
|
| 1218 | + $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | + } catch(PDOException $e) { |
|
| 1220 | + return "error : ".$e->getMessage(); |
|
| 1221 | + } |
|
| 1222 | 1222 | |
| 1223 | 1223 | $delimiter = "\t"; |
| 1224 | 1224 | $Connection = new Connection(); |
@@ -1244,7 +1244,7 @@ discard block |
||
| 1244 | 1244 | if ($globalTransaction) $Connection->db->commit(); |
| 1245 | 1245 | } |
| 1246 | 1246 | return ''; |
| 1247 | - } |
|
| 1247 | + } |
|
| 1248 | 1248 | |
| 1249 | 1249 | public static function routes_fam() { |
| 1250 | 1250 | global $tmp_dir, $globalTransaction, $globalDebug; |
@@ -1279,7 +1279,7 @@ discard block |
||
| 1279 | 1279 | if ($globalTransaction) $Connection->db->commit(); |
| 1280 | 1280 | } |
| 1281 | 1281 | return ''; |
| 1282 | - } |
|
| 1282 | + } |
|
| 1283 | 1283 | |
| 1284 | 1284 | public static function marine_identity_fam() { |
| 1285 | 1285 | global $tmp_dir, $globalTransaction; |
@@ -1287,10 +1287,10 @@ discard block |
||
| 1287 | 1287 | try { |
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | - $sth->execute(); |
|
| 1291 | - } catch(PDOException $e) { |
|
| 1292 | - return "error : ".$e->getMessage(); |
|
| 1293 | - } |
|
| 1290 | + $sth->execute(); |
|
| 1291 | + } catch(PDOException $e) { |
|
| 1292 | + return "error : ".$e->getMessage(); |
|
| 1293 | + } |
|
| 1294 | 1294 | |
| 1295 | 1295 | |
| 1296 | 1296 | //update_db::unzip($out_file); |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | if ($globalTransaction) $Connection->db->commit(); |
| 1321 | 1321 | } |
| 1322 | 1322 | return ''; |
| 1323 | - } |
|
| 1323 | + } |
|
| 1324 | 1324 | |
| 1325 | 1325 | public static function satellite_fam() { |
| 1326 | 1326 | global $tmp_dir, $globalTransaction; |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | if ($globalTransaction) $Connection->db->commit(); |
| 1392 | 1392 | } |
| 1393 | 1393 | return ''; |
| 1394 | - } |
|
| 1394 | + } |
|
| 1395 | 1395 | |
| 1396 | 1396 | public static function tle($filename,$tletype) { |
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
@@ -1402,10 +1402,10 @@ discard block |
||
| 1402 | 1402 | try { |
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | - $sth->execute(array(':source' => $filename)); |
|
| 1406 | - } catch(PDOException $e) { |
|
| 1407 | - return "error : ".$e->getMessage(); |
|
| 1408 | - } |
|
| 1405 | + $sth->execute(array(':source' => $filename)); |
|
| 1406 | + } catch(PDOException $e) { |
|
| 1407 | + return "error : ".$e->getMessage(); |
|
| 1408 | + } |
|
| 1409 | 1409 | |
| 1410 | 1410 | $Connection = new Connection(); |
| 1411 | 1411 | if (($handle = fopen($filename, 'r')) !== FALSE) |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | //$Connection->db->commit(); |
| 1441 | 1441 | } |
| 1442 | 1442 | return ''; |
| 1443 | - } |
|
| 1443 | + } |
|
| 1444 | 1444 | |
| 1445 | 1445 | public static function satellite_ucsdb($filename) { |
| 1446 | 1446 | global $tmp_dir, $globalTransaction; |
@@ -1699,11 +1699,11 @@ discard block |
||
| 1699 | 1699 | try { |
| 1700 | 1700 | $sth = $Connection->db->prepare($query); |
| 1701 | 1701 | $sth->execute(array( |
| 1702 | - ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | - ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | - ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | - ) |
|
| 1702 | + ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | + ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | + ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | + ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | + ) |
|
| 1707 | 1707 | ); |
| 1708 | 1708 | } catch(PDOException $e) { |
| 1709 | 1709 | return "error : ".$e->getMessage(); |
@@ -1727,13 +1727,13 @@ discard block |
||
| 1727 | 1727 | //$Connection->db->commit(); |
| 1728 | 1728 | } |
| 1729 | 1729 | return ''; |
| 1730 | - } |
|
| 1730 | + } |
|
| 1731 | 1731 | |
| 1732 | 1732 | /** |
| 1733 | - * Convert a HTML table to an array |
|
| 1734 | - * @param String $data HTML page |
|
| 1735 | - * @return Array array of the tables in HTML page |
|
| 1736 | - */ |
|
| 1733 | + * Convert a HTML table to an array |
|
| 1734 | + * @param String $data HTML page |
|
| 1735 | + * @return Array array of the tables in HTML page |
|
| 1736 | + */ |
|
| 1737 | 1737 | /* |
| 1738 | 1738 | private static function table2array($data) { |
| 1739 | 1739 | $html = str_get_html($data); |
@@ -1763,11 +1763,11 @@ discard block |
||
| 1763 | 1763 | return(array_filter($tabledata)); |
| 1764 | 1764 | } |
| 1765 | 1765 | */ |
| 1766 | - /** |
|
| 1767 | - * Get data from form result |
|
| 1768 | - * @param String $url form URL |
|
| 1769 | - * @return String the result |
|
| 1770 | - */ |
|
| 1766 | + /** |
|
| 1767 | + * Get data from form result |
|
| 1768 | + * @param String $url form URL |
|
| 1769 | + * @return String the result |
|
| 1770 | + */ |
|
| 1771 | 1771 | /* |
| 1772 | 1772 | private static function getData($url) { |
| 1773 | 1773 | $ch = curl_init(); |
@@ -1917,7 +1917,7 @@ discard block |
||
| 1917 | 1917 | if ($globalTransaction) $Connection->db->commit(); |
| 1918 | 1918 | } |
| 1919 | 1919 | return ''; |
| 1920 | - } |
|
| 1920 | + } |
|
| 1921 | 1921 | |
| 1922 | 1922 | public static function update_airspace() { |
| 1923 | 1923 | global $tmp_dir, $globalDBdriver; |
@@ -1927,11 +1927,11 @@ discard block |
||
| 1927 | 1927 | $query = 'DROP TABLE airspace'; |
| 1928 | 1928 | try { |
| 1929 | 1929 | $sth = $Connection->db->prepare($query); |
| 1930 | - $sth->execute(); |
|
| 1931 | - } catch(PDOException $e) { |
|
| 1930 | + $sth->execute(); |
|
| 1931 | + } catch(PDOException $e) { |
|
| 1932 | 1932 | return "error : ".$e->getMessage(); |
| 1933 | - } |
|
| 1934 | - } |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | 1935 | |
| 1936 | 1936 | |
| 1937 | 1937 | if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
@@ -1996,10 +1996,10 @@ discard block |
||
| 1996 | 1996 | $query = 'DROP TABLE countries'; |
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | - $sth->execute(); |
|
| 2000 | - } catch(PDOException $e) { |
|
| 2001 | - echo "error : ".$e->getMessage(); |
|
| 2002 | - } |
|
| 1999 | + $sth->execute(); |
|
| 2000 | + } catch(PDOException $e) { |
|
| 2001 | + echo "error : ".$e->getMessage(); |
|
| 2002 | + } |
|
| 2003 | 2003 | } |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
| 2005 | 2005 | update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
@@ -2458,7 +2458,7 @@ discard block |
||
| 2458 | 2458 | $error = update_db::airlines_fam(); |
| 2459 | 2459 | update_db::insert_airlines_version($airlines_md5); |
| 2460 | 2460 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
| 2461 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2461 | + } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2462 | 2462 | } elseif ($globalDebug) echo "No update."; |
| 2463 | 2463 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
| 2464 | 2464 | if ($error != '') { |
@@ -2832,12 +2832,12 @@ discard block |
||
| 2832 | 2832 | echo $data; |
| 2833 | 2833 | */ |
| 2834 | 2834 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2835 | - //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | - $result = fread($fh,100000000); |
|
| 2838 | - //echo $result; |
|
| 2839 | - //var_dump(str_get_html($result)); |
|
| 2840 | - //print_r(self::table2array($result)); |
|
| 2835 | + //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | + $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | + $result = fread($fh,100000000); |
|
| 2838 | + //echo $result; |
|
| 2839 | + //var_dump(str_get_html($result)); |
|
| 2840 | + //print_r(self::table2array($result)); |
|
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | } |
@@ -2851,10 +2851,10 @@ discard block |
||
| 2851 | 2851 | try { |
| 2852 | 2852 | $Connection = new Connection(); |
| 2853 | 2853 | $sth = $Connection->db->prepare($query); |
| 2854 | - $sth->execute(); |
|
| 2855 | - } catch(PDOException $e) { |
|
| 2856 | - return "error : ".$e->getMessage(); |
|
| 2857 | - } |
|
| 2854 | + $sth->execute(); |
|
| 2855 | + } catch(PDOException $e) { |
|
| 2856 | + return "error : ".$e->getMessage(); |
|
| 2857 | + } |
|
| 2858 | 2858 | |
| 2859 | 2859 | $error = ''; |
| 2860 | 2860 | if ($globalDebug) echo "Notam : Download..."; |
@@ -2910,8 +2910,8 @@ discard block |
||
| 2910 | 2910 | $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
| 2911 | 2911 | $data['permanent'] = 0; |
| 2912 | 2912 | } else { |
| 2913 | - $data['date_end'] = NULL; |
|
| 2914 | - $data['permanent'] = 1; |
|
| 2913 | + $data['date_end'] = NULL; |
|
| 2914 | + $data['permanent'] = 1; |
|
| 2915 | 2915 | } |
| 2916 | 2916 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2917 | 2917 | $NOTAM = new NOTAM(); |
@@ -2985,13 +2985,13 @@ discard block |
||
| 2985 | 2985 | try { |
| 2986 | 2986 | $Connection = new Connection(); |
| 2987 | 2987 | $sth = $Connection->db->prepare($query); |
| 2988 | - $sth->execute(); |
|
| 2989 | - } catch(PDOException $e) { |
|
| 2990 | - return "error : ".$e->getMessage(); |
|
| 2991 | - } |
|
| 2992 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | - if ($row['nb'] > 0) return false; |
|
| 2994 | - else return true; |
|
| 2988 | + $sth->execute(); |
|
| 2989 | + } catch(PDOException $e) { |
|
| 2990 | + return "error : ".$e->getMessage(); |
|
| 2991 | + } |
|
| 2992 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | + if ($row['nb'] > 0) return false; |
|
| 2994 | + else return true; |
|
| 2995 | 2995 | } |
| 2996 | 2996 | |
| 2997 | 2997 | public static function insert_last_update() { |
@@ -3000,10 +3000,10 @@ discard block |
||
| 3000 | 3000 | try { |
| 3001 | 3001 | $Connection = new Connection(); |
| 3002 | 3002 | $sth = $Connection->db->prepare($query); |
| 3003 | - $sth->execute(); |
|
| 3004 | - } catch(PDOException $e) { |
|
| 3005 | - return "error : ".$e->getMessage(); |
|
| 3006 | - } |
|
| 3003 | + $sth->execute(); |
|
| 3004 | + } catch(PDOException $e) { |
|
| 3005 | + return "error : ".$e->getMessage(); |
|
| 3006 | + } |
|
| 3007 | 3007 | } |
| 3008 | 3008 | |
| 3009 | 3009 | public static function check_airspace_version($version) { |
@@ -3011,13 +3011,13 @@ discard block |
||
| 3011 | 3011 | try { |
| 3012 | 3012 | $Connection = new Connection(); |
| 3013 | 3013 | $sth = $Connection->db->prepare($query); |
| 3014 | - $sth->execute(array(':version' => $version)); |
|
| 3015 | - } catch(PDOException $e) { |
|
| 3016 | - return "error : ".$e->getMessage(); |
|
| 3017 | - } |
|
| 3018 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | - if ($row['nb'] > 0) return true; |
|
| 3020 | - else return false; |
|
| 3014 | + $sth->execute(array(':version' => $version)); |
|
| 3015 | + } catch(PDOException $e) { |
|
| 3016 | + return "error : ".$e->getMessage(); |
|
| 3017 | + } |
|
| 3018 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | + if ($row['nb'] > 0) return true; |
|
| 3020 | + else return false; |
|
| 3021 | 3021 | } |
| 3022 | 3022 | |
| 3023 | 3023 | public static function check_geoid_version($version) { |
@@ -3025,13 +3025,13 @@ discard block |
||
| 3025 | 3025 | try { |
| 3026 | 3026 | $Connection = new Connection(); |
| 3027 | 3027 | $sth = $Connection->db->prepare($query); |
| 3028 | - $sth->execute(array(':version' => $version)); |
|
| 3029 | - } catch(PDOException $e) { |
|
| 3030 | - return "error : ".$e->getMessage(); |
|
| 3031 | - } |
|
| 3032 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | - if ($row['nb'] > 0) return true; |
|
| 3034 | - else return false; |
|
| 3028 | + $sth->execute(array(':version' => $version)); |
|
| 3029 | + } catch(PDOException $e) { |
|
| 3030 | + return "error : ".$e->getMessage(); |
|
| 3031 | + } |
|
| 3032 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | + if ($row['nb'] > 0) return true; |
|
| 3034 | + else return false; |
|
| 3035 | 3035 | } |
| 3036 | 3036 | |
| 3037 | 3037 | public static function check_marine_identity_version($version) { |
@@ -3132,10 +3132,10 @@ discard block |
||
| 3132 | 3132 | try { |
| 3133 | 3133 | $Connection = new Connection(); |
| 3134 | 3134 | $sth = $Connection->db->prepare($query); |
| 3135 | - $sth->execute(array(':version' => $version)); |
|
| 3136 | - } catch(PDOException $e) { |
|
| 3137 | - return "error : ".$e->getMessage(); |
|
| 3138 | - } |
|
| 3135 | + $sth->execute(array(':version' => $version)); |
|
| 3136 | + } catch(PDOException $e) { |
|
| 3137 | + return "error : ".$e->getMessage(); |
|
| 3138 | + } |
|
| 3139 | 3139 | } |
| 3140 | 3140 | |
| 3141 | 3141 | public static function insert_marine_identity_version($version) { |
@@ -3172,13 +3172,13 @@ discard block |
||
| 3172 | 3172 | try { |
| 3173 | 3173 | $Connection = new Connection(); |
| 3174 | 3174 | $sth = $Connection->db->prepare($query); |
| 3175 | - $sth->execute(); |
|
| 3176 | - } catch(PDOException $e) { |
|
| 3177 | - return "error : ".$e->getMessage(); |
|
| 3178 | - } |
|
| 3179 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | - if ($row['nb'] > 0) return false; |
|
| 3181 | - else return true; |
|
| 3175 | + $sth->execute(); |
|
| 3176 | + } catch(PDOException $e) { |
|
| 3177 | + return "error : ".$e->getMessage(); |
|
| 3178 | + } |
|
| 3179 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | + if ($row['nb'] > 0) return false; |
|
| 3181 | + else return true; |
|
| 3182 | 3182 | } |
| 3183 | 3183 | |
| 3184 | 3184 | public static function insert_last_notam_update() { |
@@ -3187,10 +3187,10 @@ discard block |
||
| 3187 | 3187 | try { |
| 3188 | 3188 | $Connection = new Connection(); |
| 3189 | 3189 | $sth = $Connection->db->prepare($query); |
| 3190 | - $sth->execute(); |
|
| 3191 | - } catch(PDOException $e) { |
|
| 3192 | - return "error : ".$e->getMessage(); |
|
| 3193 | - } |
|
| 3190 | + $sth->execute(); |
|
| 3191 | + } catch(PDOException $e) { |
|
| 3192 | + return "error : ".$e->getMessage(); |
|
| 3193 | + } |
|
| 3194 | 3194 | } |
| 3195 | 3195 | |
| 3196 | 3196 | public static function check_last_airspace_update() { |
@@ -3203,13 +3203,13 @@ discard block |
||
| 3203 | 3203 | try { |
| 3204 | 3204 | $Connection = new Connection(); |
| 3205 | 3205 | $sth = $Connection->db->prepare($query); |
| 3206 | - $sth->execute(); |
|
| 3207 | - } catch(PDOException $e) { |
|
| 3208 | - return "error : ".$e->getMessage(); |
|
| 3209 | - } |
|
| 3210 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | - if ($row['nb'] > 0) return false; |
|
| 3212 | - else return true; |
|
| 3206 | + $sth->execute(); |
|
| 3207 | + } catch(PDOException $e) { |
|
| 3208 | + return "error : ".$e->getMessage(); |
|
| 3209 | + } |
|
| 3210 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | + if ($row['nb'] > 0) return false; |
|
| 3212 | + else return true; |
|
| 3213 | 3213 | } |
| 3214 | 3214 | |
| 3215 | 3215 | public static function insert_last_airspace_update() { |
@@ -3218,10 +3218,10 @@ discard block |
||
| 3218 | 3218 | try { |
| 3219 | 3219 | $Connection = new Connection(); |
| 3220 | 3220 | $sth = $Connection->db->prepare($query); |
| 3221 | - $sth->execute(); |
|
| 3222 | - } catch(PDOException $e) { |
|
| 3223 | - return "error : ".$e->getMessage(); |
|
| 3224 | - } |
|
| 3221 | + $sth->execute(); |
|
| 3222 | + } catch(PDOException $e) { |
|
| 3223 | + return "error : ".$e->getMessage(); |
|
| 3224 | + } |
|
| 3225 | 3225 | } |
| 3226 | 3226 | |
| 3227 | 3227 | public static function check_last_geoid_update() { |
@@ -3234,13 +3234,13 @@ discard block |
||
| 3234 | 3234 | try { |
| 3235 | 3235 | $Connection = new Connection(); |
| 3236 | 3236 | $sth = $Connection->db->prepare($query); |
| 3237 | - $sth->execute(); |
|
| 3238 | - } catch(PDOException $e) { |
|
| 3239 | - return "error : ".$e->getMessage(); |
|
| 3240 | - } |
|
| 3241 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | - if ($row['nb'] > 0) return false; |
|
| 3243 | - else return true; |
|
| 3237 | + $sth->execute(); |
|
| 3238 | + } catch(PDOException $e) { |
|
| 3239 | + return "error : ".$e->getMessage(); |
|
| 3240 | + } |
|
| 3241 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | + if ($row['nb'] > 0) return false; |
|
| 3243 | + else return true; |
|
| 3244 | 3244 | } |
| 3245 | 3245 | |
| 3246 | 3246 | public static function insert_last_geoid_update() { |
@@ -3249,10 +3249,10 @@ discard block |
||
| 3249 | 3249 | try { |
| 3250 | 3250 | $Connection = new Connection(); |
| 3251 | 3251 | $sth = $Connection->db->prepare($query); |
| 3252 | - $sth->execute(); |
|
| 3253 | - } catch(PDOException $e) { |
|
| 3254 | - return "error : ".$e->getMessage(); |
|
| 3255 | - } |
|
| 3252 | + $sth->execute(); |
|
| 3253 | + } catch(PDOException $e) { |
|
| 3254 | + return "error : ".$e->getMessage(); |
|
| 3255 | + } |
|
| 3256 | 3256 | } |
| 3257 | 3257 | |
| 3258 | 3258 | public static function check_last_owner_update() { |
@@ -3358,13 +3358,13 @@ discard block |
||
| 3358 | 3358 | try { |
| 3359 | 3359 | $Connection = new Connection(); |
| 3360 | 3360 | $sth = $Connection->db->prepare($query); |
| 3361 | - $sth->execute(); |
|
| 3362 | - } catch(PDOException $e) { |
|
| 3363 | - return "error : ".$e->getMessage(); |
|
| 3364 | - } |
|
| 3365 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | - if ($row['nb'] > 0) return false; |
|
| 3367 | - else return true; |
|
| 3361 | + $sth->execute(); |
|
| 3362 | + } catch(PDOException $e) { |
|
| 3363 | + return "error : ".$e->getMessage(); |
|
| 3364 | + } |
|
| 3365 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | + if ($row['nb'] > 0) return false; |
|
| 3367 | + else return true; |
|
| 3368 | 3368 | } |
| 3369 | 3369 | |
| 3370 | 3370 | public static function insert_last_schedules_update() { |
@@ -3544,10 +3544,10 @@ discard block |
||
| 3544 | 3544 | try { |
| 3545 | 3545 | $Connection = new Connection(); |
| 3546 | 3546 | $sth = $Connection->db->prepare($query); |
| 3547 | - $sth->execute(); |
|
| 3548 | - } catch(PDOException $e) { |
|
| 3549 | - return "error : ".$e->getMessage(); |
|
| 3550 | - } |
|
| 3547 | + $sth->execute(); |
|
| 3548 | + } catch(PDOException $e) { |
|
| 3549 | + return "error : ".$e->getMessage(); |
|
| 3550 | + } |
|
| 3551 | 3551 | } |
| 3552 | 3552 | public static function delete_duplicateowner() { |
| 3553 | 3553 | global $globalDBdriver; |
@@ -3559,10 +3559,10 @@ discard block |
||
| 3559 | 3559 | try { |
| 3560 | 3560 | $Connection = new Connection(); |
| 3561 | 3561 | $sth = $Connection->db->prepare($query); |
| 3562 | - $sth->execute(); |
|
| 3563 | - } catch(PDOException $e) { |
|
| 3564 | - return "error : ".$e->getMessage(); |
|
| 3565 | - } |
|
| 3562 | + $sth->execute(); |
|
| 3563 | + } catch(PDOException $e) { |
|
| 3564 | + return "error : ".$e->getMessage(); |
|
| 3565 | + } |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | 3568 | public static function update_all() { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $ch = curl_init(); |
| 17 | 17 | curl_setopt($ch, CURLOPT_URL, $url); |
| 18 | 18 | if (isset($globalForceIPv4) && $globalForceIPv4) { |
| 19 | - if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){ |
|
| 19 | + if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) { |
|
| 20 | 20 | curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); |
| 21 | 21 | } |
| 22 | 22 | } |
@@ -34,20 +34,20 @@ discard block |
||
| 34 | 34 | fclose($fp); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 37 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 38 | 38 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 39 | 39 | $buffer_size = 4096; // read 4kb at a time |
| 40 | 40 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 41 | 41 | if ($in_file != '' && file_exists($in_file)) { |
| 42 | 42 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 43 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 44 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 43 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 44 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 45 | 45 | else { |
| 46 | 46 | echo 'gzopen not available'; |
| 47 | 47 | die; |
| 48 | 48 | } |
| 49 | 49 | $out_file = fopen($out_file_name, 'wb'); |
| 50 | - while(!gzeof($file)) { |
|
| 50 | + while (!gzeof($file)) { |
|
| 51 | 51 | fwrite($out_file, gzread($file, $buffer_size)); |
| 52 | 52 | } |
| 53 | 53 | fclose($out_file); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | try { |
| 72 | 72 | self::$db_sqlite = new PDO('sqlite:'.$database); |
| 73 | 73 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 74 | - } catch(PDOException $e) { |
|
| 74 | + } catch (PDOException $e) { |
|
| 75 | 75 | return "error : ".$e->getMessage(); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | //$Connection = new Connection(); |
| 87 | 87 | $sth = $Connection->db->prepare($query); |
| 88 | 88 | $sth->execute(array(':source' => $database_file)); |
| 89 | - } catch(PDOException $e) { |
|
| 89 | + } catch (PDOException $e) { |
|
| 90 | 90 | return "error : ".$e->getMessage(); |
| 91 | 91 | } |
| 92 | 92 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | try { |
| 98 | 98 | $sth = update_db::$db_sqlite->prepare($query); |
| 99 | 99 | $sth->execute(); |
| 100 | - } catch(PDOException $e) { |
|
| 100 | + } catch (PDOException $e) { |
|
| 101 | 101 | return "error : ".$e->getMessage(); |
| 102 | 102 | } |
| 103 | 103 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 109 | 109 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 110 | 110 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 111 | - $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
|
| 111 | + $query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file); |
|
| 112 | 112 | $sth_dest->execute($query_dest_values); |
| 113 | 113 | } |
| 114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
| 115 | - } catch(PDOException $e) { |
|
| 115 | + } catch (PDOException $e) { |
|
| 116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
| 117 | 117 | return "error : ".$e->getMessage(); |
| 118 | 118 | } |
@@ -128,26 +128,26 @@ discard block |
||
| 128 | 128 | //$Connection = new Connection(); |
| 129 | 129 | $sth = $Connection->db->prepare($query); |
| 130 | 130 | $sth->execute(array(':source' => 'oneworld')); |
| 131 | - } catch(PDOException $e) { |
|
| 131 | + } catch (PDOException $e) { |
|
| 132 | 132 | return "error : ".$e->getMessage(); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | if ($globalDebug) echo " - Add routes to DB -"; |
| 136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 137 | $Spotter = new Spotter(); |
| 138 | - if ($fh = fopen($database_file,"r")) { |
|
| 138 | + if ($fh = fopen($database_file, "r")) { |
|
| 139 | 139 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 140 | 140 | $Connection = new Connection(); |
| 141 | 141 | $sth_dest = $Connection->db->prepare($query_dest); |
| 142 | 142 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 143 | 143 | while (!feof($fh)) { |
| 144 | - $line = fgetcsv($fh,9999,','); |
|
| 144 | + $line = fgetcsv($fh, 9999, ','); |
|
| 145 | 145 | if ($line[0] != '') { |
| 146 | 146 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
| 147 | 147 | try { |
| 148 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld'); |
|
| 148 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld'); |
|
| 149 | 149 | $sth_dest->execute($query_dest_values); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | if ($globalTransaction) $Connection->db->rollBack(); |
| 152 | 152 | return "error : ".$e->getMessage(); |
| 153 | 153 | } |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | //$Connection = new Connection(); |
| 170 | 170 | $sth = $Connection->db->prepare($query); |
| 171 | 171 | $sth->execute(array(':source' => 'skyteam')); |
| 172 | - } catch(PDOException $e) { |
|
| 172 | + } catch (PDOException $e) { |
|
| 173 | 173 | return "error : ".$e->getMessage(); |
| 174 | 174 | } |
| 175 | 175 | |
@@ -177,24 +177,24 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 179 | $Spotter = new Spotter(); |
| 180 | - if ($fh = fopen($database_file,"r")) { |
|
| 180 | + if ($fh = fopen($database_file, "r")) { |
|
| 181 | 181 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 182 | 182 | $Connection = new Connection(); |
| 183 | 183 | $sth_dest = $Connection->db->prepare($query_dest); |
| 184 | 184 | try { |
| 185 | 185 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 186 | 186 | while (!feof($fh)) { |
| 187 | - $line = fgetcsv($fh,9999,','); |
|
| 187 | + $line = fgetcsv($fh, 9999, ','); |
|
| 188 | 188 | if ($line[0] != '') { |
| 189 | - $datebe = explode(' - ',$line[2]); |
|
| 189 | + $datebe = explode(' - ', $line[2]); |
|
| 190 | 190 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
| 191 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam'); |
|
| 191 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam'); |
|
| 192 | 192 | $sth_dest->execute($query_dest_values); |
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | if ($globalTransaction) $Connection->db->commit(); |
| 197 | - } catch(PDOException $e) { |
|
| 197 | + } catch (PDOException $e) { |
|
| 198 | 198 | if ($globalTransaction) $Connection->db->rollBack(); |
| 199 | 199 | return "error : ".$e->getMessage(); |
| 200 | 200 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $Connection = new Connection(); |
| 210 | 210 | $sth = $Connection->db->prepare($query); |
| 211 | 211 | $sth->execute(array(':source' => $database_file)); |
| 212 | - } catch(PDOException $e) { |
|
| 212 | + } catch (PDOException $e) { |
|
| 213 | 213 | return "error : ".$e->getMessage(); |
| 214 | 214 | } |
| 215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | $Connection = new Connection(); |
| 218 | 218 | $sth = $Connection->db->prepare($query); |
| 219 | 219 | $sth->execute(array(':source' => $database_file)); |
| 220 | - } catch(PDOException $e) { |
|
| 220 | + } catch (PDOException $e) { |
|
| 221 | 221 | return "error : ".$e->getMessage(); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | try { |
| 227 | 227 | $sth = update_db::$db_sqlite->prepare($query); |
| 228 | 228 | $sth->execute(); |
| 229 | - } catch(PDOException $e) { |
|
| 229 | + } catch (PDOException $e) { |
|
| 230 | 230 | return "error : ".$e->getMessage(); |
| 231 | 231 | } |
| 232 | 232 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -243,15 +243,15 @@ discard block |
||
| 243 | 243 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 244 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 245 | 245 | else $type = null; |
| 246 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
| 246 | + $query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type); |
|
| 247 | 247 | $sth_dest->execute($query_dest_values); |
| 248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 249 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
| 250 | 250 | $sth_dest_owner->execute($query_dest_owner_values); |
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
| 254 | - } catch(PDOException $e) { |
|
| 254 | + } catch (PDOException $e) { |
|
| 255 | 255 | return "error : ".$e->getMessage(); |
| 256 | 256 | } |
| 257 | 257 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | $Connection = new Connection(); |
| 262 | 262 | $sth = $Connection->db->prepare($query); |
| 263 | 263 | $sth->execute(array(':source' => $database_file)); |
| 264 | - } catch(PDOException $e) { |
|
| 264 | + } catch (PDOException $e) { |
|
| 265 | 265 | return "error : ".$e->getMessage(); |
| 266 | 266 | } |
| 267 | 267 | return ''; |
@@ -276,11 +276,11 @@ discard block |
||
| 276 | 276 | $Connection = new Connection(); |
| 277 | 277 | $sth = $Connection->db->prepare($query); |
| 278 | 278 | $sth->execute(array(':source' => $database_file)); |
| 279 | - } catch(PDOException $e) { |
|
| 279 | + } catch (PDOException $e) { |
|
| 280 | 280 | return "error : ".$e->getMessage(); |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if ($fh = fopen($database_file,"r")) { |
|
| 283 | + if ($fh = fopen($database_file, "r")) { |
|
| 284 | 284 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 285 | 285 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 286 | 286 | |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 291 | 291 | while (!feof($fh)) { |
| 292 | 292 | $values = array(); |
| 293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 293 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
| 294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 295 | - $values['ModeS'] = substr($line,0,6); |
|
| 296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 295 | + $values['ModeS'] = substr($line, 0, 6); |
|
| 296 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
| 297 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
| 298 | 298 | // Check if we can find ICAO, else set it to GLID |
| 299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 299 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 300 | 300 | $search_more = ''; |
| 301 | 301 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 302 | 302 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -308,20 +308,20 @@ discard block |
||
| 308 | 308 | if (isset($result['icao']) && $result['icao'] != '') { |
| 309 | 309 | $values['ICAOTypeCode'] = $result['icao']; |
| 310 | 310 | } |
| 311 | - } catch(PDOException $e) { |
|
| 311 | + } catch (PDOException $e) { |
|
| 312 | 312 | return "error : ".$e->getMessage(); |
| 313 | 313 | } |
| 314 | 314 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 315 | 315 | // Add data to db |
| 316 | 316 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 317 | 317 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 318 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 318 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 319 | 319 | //print_r($query_dest_values); |
| 320 | 320 | $sth_dest->execute($query_dest_values); |
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | if ($globalTransaction) $Connection->db->commit(); |
| 324 | - } catch(PDOException $e) { |
|
| 324 | + } catch (PDOException $e) { |
|
| 325 | 325 | return "error : ".$e->getMessage(); |
| 326 | 326 | } |
| 327 | 327 | } |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $Connection = new Connection(); |
| 332 | 332 | $sth = $Connection->db->prepare($query); |
| 333 | 333 | $sth->execute(array(':source' => $database_file)); |
| 334 | - } catch(PDOException $e) { |
|
| 334 | + } catch (PDOException $e) { |
|
| 335 | 335 | return "error : ".$e->getMessage(); |
| 336 | 336 | } |
| 337 | 337 | return ''; |
@@ -345,11 +345,11 @@ discard block |
||
| 345 | 345 | $Connection = new Connection(); |
| 346 | 346 | $sth = $Connection->db->prepare($query); |
| 347 | 347 | $sth->execute(array(':source' => $database_file)); |
| 348 | - } catch(PDOException $e) { |
|
| 348 | + } catch (PDOException $e) { |
|
| 349 | 349 | return "error : ".$e->getMessage(); |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - if ($fh = fopen($database_file,"r")) { |
|
| 352 | + if ($fh = fopen($database_file, "r")) { |
|
| 353 | 353 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 354 | 354 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 355 | 355 | |
@@ -357,9 +357,9 @@ discard block |
||
| 357 | 357 | $sth_dest = $Connection->db->prepare($query_dest); |
| 358 | 358 | try { |
| 359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 360 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
| 360 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
| 361 | 361 | while (!feof($fh)) { |
| 362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 362 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
| 363 | 363 | |
| 364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 365 | 365 | //print_r($line); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | $values['ICAOTypeCode'] = ''; |
| 369 | 369 | $aircraft_name = $line[2]; |
| 370 | 370 | // Check if we can find ICAO, else set it to GLID |
| 371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 371 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 372 | 372 | $search_more = ''; |
| 373 | 373 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 374 | 374 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -377,20 +377,20 @@ discard block |
||
| 377 | 377 | $sth_search->execute(); |
| 378 | 378 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 379 | 379 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
| 380 | - } catch(PDOException $e) { |
|
| 380 | + } catch (PDOException $e) { |
|
| 381 | 381 | return "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 384 | 384 | // Add data to db |
| 385 | 385 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
| 386 | 386 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 387 | - $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 387 | + $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 388 | 388 | //print_r($query_dest_values); |
| 389 | 389 | $sth_dest->execute($query_dest_values); |
| 390 | 390 | } |
| 391 | 391 | } |
| 392 | 392 | if ($globalTransaction) $Connection->db->commit(); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | return "error : ".$e->getMessage(); |
| 395 | 395 | } |
| 396 | 396 | } |
@@ -400,13 +400,13 @@ discard block |
||
| 400 | 400 | $Connection = new Connection(); |
| 401 | 401 | $sth = $Connection->db->prepare($query); |
| 402 | 402 | $sth->execute(array(':source' => $database_file)); |
| 403 | - } catch(PDOException $e) { |
|
| 403 | + } catch (PDOException $e) { |
|
| 404 | 404 | return "error : ".$e->getMessage(); |
| 405 | 405 | } |
| 406 | 406 | return ''; |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
| 409 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
| 410 | 410 | global $globalTransaction, $globalMasterSource; |
| 411 | 411 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
| 412 | 412 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -414,12 +414,12 @@ discard block |
||
| 414 | 414 | $Connection = new Connection(); |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(array(':source' => $database_file)); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error : ".$e->getMessage(); |
| 419 | 419 | } |
| 420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 421 | 421 | $Spotter = new Spotter(); |
| 422 | - if ($fh = fopen($database_file,"r")) { |
|
| 422 | + if ($fh = fopen($database_file, "r")) { |
|
| 423 | 423 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 425 | 425 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -429,9 +429,9 @@ discard block |
||
| 429 | 429 | $sth_modes = $Connection->db->prepare($query_modes); |
| 430 | 430 | try { |
| 431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 432 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
| 432 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
| 433 | 433 | while (!feof($fh)) { |
| 434 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 434 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
| 435 | 435 | $values = array(); |
| 436 | 436 | //print_r($line); |
| 437 | 437 | if ($country == 'F') { |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | $values['base'] = $line[4]; |
| 440 | 440 | $values['owner'] = $line[5]; |
| 441 | 441 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 442 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 443 | 443 | $values['cancel'] = $line[7]; |
| 444 | 444 | } elseif ($country == 'EI') { |
| 445 | 445 | // TODO : add modeS & reg to aircraft_modes |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | $values['base'] = $line[3]; |
| 448 | 448 | $values['owner'] = $line[2]; |
| 449 | 449 | if ($line[1] == '') $values['date_first_reg'] = null; |
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 450 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
| 451 | 451 | $values['cancel'] = ''; |
| 452 | 452 | $values['modes'] = $line[7]; |
| 453 | 453 | $values['icao'] = $line[8]; |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | $values['base'] = null; |
| 468 | 468 | $values['owner'] = $line[5]; |
| 469 | 469 | if ($line[18] == '') $values['date_first_reg'] = null; |
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 470 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
| 471 | 471 | $values['cancel'] = ''; |
| 472 | 472 | } elseif ($country == 'VH') { |
| 473 | 473 | // TODO : add modeS & reg to aircraft_modes |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | $values['base'] = null; |
| 476 | 476 | $values['owner'] = $line[12]; |
| 477 | 477 | if ($line[28] == '') $values['date_first_reg'] = null; |
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 478 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
| 479 | 479 | |
| 480 | 480 | $values['cancel'] = $line[39]; |
| 481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -495,28 +495,28 @@ discard block |
||
| 495 | 495 | $values['base'] = null; |
| 496 | 496 | $values['owner'] = $line[8]; |
| 497 | 497 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 498 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 499 | 499 | $values['cancel'] = ''; |
| 500 | 500 | } elseif ($country == 'PP') { |
| 501 | 501 | $values['registration'] = $line[0]; |
| 502 | 502 | $values['base'] = null; |
| 503 | 503 | $values['owner'] = $line[4]; |
| 504 | 504 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 505 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 506 | 506 | $values['cancel'] = $line[7]; |
| 507 | 507 | } elseif ($country == 'E7') { |
| 508 | 508 | $values['registration'] = $line[0]; |
| 509 | 509 | $values['base'] = null; |
| 510 | 510 | $values['owner'] = $line[4]; |
| 511 | 511 | if ($line[5] == '') $values['date_first_reg'] = null; |
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 512 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 513 | 513 | $values['cancel'] = ''; |
| 514 | 514 | } elseif ($country == '8Q') { |
| 515 | 515 | $values['registration'] = $line[0]; |
| 516 | 516 | $values['base'] = null; |
| 517 | 517 | $values['owner'] = $line[3]; |
| 518 | 518 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 519 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 520 | 520 | $values['cancel'] = ''; |
| 521 | 521 | } elseif ($country == 'ZK') { |
| 522 | 522 | $values['registration'] = $line[0]; |
@@ -530,18 +530,18 @@ discard block |
||
| 530 | 530 | $values['registration'] = $line[0]; |
| 531 | 531 | $values['base'] = null; |
| 532 | 532 | $values['owner'] = $line[6]; |
| 533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 533 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 534 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
| 535 | 535 | $values['modes'] = $line[4]; |
| 536 | 536 | $values['icao'] = $line[10]; |
| 537 | 537 | } elseif ($country == 'OY') { |
| 538 | 538 | $values['registration'] = $line[0]; |
| 539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 539 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
| 540 | 540 | $values['modes'] = $line[5]; |
| 541 | 541 | $values['icao'] = $line[6]; |
| 542 | 542 | } elseif ($country == 'PH') { |
| 543 | 543 | $values['registration'] = $line[0]; |
| 544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 544 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
| 545 | 545 | $values['modes'] = $line[4]; |
| 546 | 546 | $values['icao'] = $line[5]; |
| 547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -552,17 +552,17 @@ discard block |
||
| 552 | 552 | $values['cancel'] = ''; |
| 553 | 553 | } |
| 554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 555 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
| 555 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
| 556 | 556 | $sth_dest->execute($query_dest_values); |
| 557 | 557 | } |
| 558 | 558 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
| 559 | 559 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
| 560 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
| 560 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
| 561 | 561 | $sth_modes->execute($query_modes_values); |
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | if ($globalTransaction) $Connection->db->commit(); |
| 565 | - } catch(PDOException $e) { |
|
| 565 | + } catch (PDOException $e) { |
|
| 566 | 566 | return "error : ".$e->getMessage(); |
| 567 | 567 | } |
| 568 | 568 | } |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 701 | 701 | |
| 702 | 702 | $i = 0; |
| 703 | - while($row = sparql_fetch_array($result)) |
|
| 703 | + while ($row = sparql_fetch_array($result)) |
|
| 704 | 704 | { |
| 705 | 705 | if ($i >= 1) { |
| 706 | 706 | //print_r($row); |
@@ -720,33 +720,33 @@ discard block |
||
| 720 | 720 | $row['image'] = ''; |
| 721 | 721 | $row['image_thumb'] = ''; |
| 722 | 722 | } else { |
| 723 | - $image = str_replace(' ','_',$row['image']); |
|
| 723 | + $image = str_replace(' ', '_', $row['image']); |
|
| 724 | 724 | $digest = md5($image); |
| 725 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
| 726 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
| 727 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
| 728 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
| 725 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
| 726 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
| 727 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
| 728 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
| 729 | 729 | } |
| 730 | 730 | |
| 731 | - $country = explode('-',$row['country']); |
|
| 731 | + $country = explode('-', $row['country']); |
|
| 732 | 732 | $row['country'] = $country[0]; |
| 733 | 733 | |
| 734 | 734 | $row['type'] = trim($row['type']); |
| 735 | - if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) { |
|
| 735 | + if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) { |
|
| 736 | 736 | $row['type'] = 'military'; |
| 737 | 737 | } elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') { |
| 738 | 738 | $row['type'] = 'small_airport'; |
| 739 | 739 | } |
| 740 | 740 | |
| 741 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
| 742 | - $query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']); |
|
| 741 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
| 742 | + $query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']); |
|
| 743 | 743 | //print_r($query_dest_values); |
| 744 | 744 | |
| 745 | 745 | if ($row['icao'] != '') { |
| 746 | 746 | try { |
| 747 | 747 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 748 | 748 | $sth->execute(array(':icao' => $row['icao'])); |
| 749 | - } catch(PDOException $e) { |
|
| 749 | + } catch (PDOException $e) { |
|
| 750 | 750 | return "error : ".$e->getMessage(); |
| 751 | 751 | } |
| 752 | 752 | if ($sth->fetchColumn() > 0) { |
@@ -754,15 +754,15 @@ discard block |
||
| 754 | 754 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 755 | 755 | try { |
| 756 | 756 | $sth = $Connection->db->prepare($query); |
| 757 | - $sth->execute(array(':icao' => $row['icao'],':type' => $row['type'])); |
|
| 758 | - } catch(PDOException $e) { |
|
| 757 | + $sth->execute(array(':icao' => $row['icao'], ':type' => $row['type'])); |
|
| 758 | + } catch (PDOException $e) { |
|
| 759 | 759 | return "error : ".$e->getMessage(); |
| 760 | 760 | } |
| 761 | 761 | echo $row['icao'].' : '.$row['type']."\n"; |
| 762 | 762 | } else { |
| 763 | 763 | try { |
| 764 | 764 | $sth_dest->execute($query_dest_values); |
| 765 | - } catch(PDOException $e) { |
|
| 765 | + } catch (PDOException $e) { |
|
| 766 | 766 | return "error : ".$e->getMessage(); |
| 767 | 767 | } |
| 768 | 768 | } |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | echo "Download data from ourairports.com...\n"; |
| 814 | 814 | $delimiter = ','; |
| 815 | 815 | $out_file = $tmp_dir.'airports.csv'; |
| 816 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
| 816 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
| 817 | 817 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 818 | 818 | echo "Add data from ourairports.com...\n"; |
| 819 | 819 | |
@@ -824,33 +824,33 @@ discard block |
||
| 824 | 824 | //$Connection->db->beginTransaction(); |
| 825 | 825 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 826 | 826 | { |
| 827 | - if(!$header) $header = $row; |
|
| 827 | + if (!$header) $header = $row; |
|
| 828 | 828 | else { |
| 829 | 829 | $data = array(); |
| 830 | 830 | $data = array_combine($header, $row); |
| 831 | 831 | try { |
| 832 | 832 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
| 833 | 833 | $sth->execute(array(':icao' => $data['ident'])); |
| 834 | - } catch(PDOException $e) { |
|
| 834 | + } catch (PDOException $e) { |
|
| 835 | 835 | return "error : ".$e->getMessage(); |
| 836 | 836 | } |
| 837 | 837 | if ($sth->fetchColumn() > 0) { |
| 838 | 838 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 839 | 839 | try { |
| 840 | 840 | $sth = $Connection->db->prepare($query); |
| 841 | - $sth->execute(array(':icao' => $data['ident'],':type' => $data['type'])); |
|
| 842 | - } catch(PDOException $e) { |
|
| 841 | + $sth->execute(array(':icao' => $data['ident'], ':type' => $data['type'])); |
|
| 842 | + } catch (PDOException $e) { |
|
| 843 | 843 | return "error : ".$e->getMessage(); |
| 844 | 844 | } |
| 845 | 845 | } else { |
| 846 | 846 | if ($data['gps_code'] == $data['ident']) { |
| 847 | 847 | $query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link) |
| 848 | 848 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
| 849 | - $query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']); |
|
| 849 | + $query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']); |
|
| 850 | 850 | try { |
| 851 | 851 | $sth = $Connection->db->prepare($query); |
| 852 | 852 | $sth->execute($query_values); |
| 853 | - } catch(PDOException $e) { |
|
| 853 | + } catch (PDOException $e) { |
|
| 854 | 854 | return "error : ".$e->getMessage(); |
| 855 | 855 | } |
| 856 | 856 | $i++; |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | |
| 866 | 866 | echo "Download data from another free database...\n"; |
| 867 | 867 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 868 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
| 868 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
| 869 | 869 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 870 | 870 | update_db::unzip($out_file); |
| 871 | 871 | $header = NULL; |
@@ -877,15 +877,15 @@ discard block |
||
| 877 | 877 | //$Connection->db->beginTransaction(); |
| 878 | 878 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 879 | 879 | { |
| 880 | - if(!$header) $header = $row; |
|
| 880 | + if (!$header) $header = $row; |
|
| 881 | 881 | else { |
| 882 | 882 | $data = $row; |
| 883 | 883 | |
| 884 | 884 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
| 885 | 885 | try { |
| 886 | 886 | $sth = $Connection->db->prepare($query); |
| 887 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
| 888 | - } catch(PDOException $e) { |
|
| 887 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
| 888 | + } catch (PDOException $e) { |
|
| 889 | 889 | return "error : ".$e->getMessage(); |
| 890 | 890 | } |
| 891 | 891 | } |
@@ -899,15 +899,15 @@ discard block |
||
| 899 | 899 | try { |
| 900 | 900 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'"); |
| 901 | 901 | $sth->execute(); |
| 902 | - } catch(PDOException $e) { |
|
| 902 | + } catch (PDOException $e) { |
|
| 903 | 903 | return "error : ".$e->getMessage(); |
| 904 | 904 | } |
| 905 | 905 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 906 | 906 | $query2 = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
| 907 | 907 | try { |
| 908 | 908 | $sth2 = $Connection->db->prepare($query2); |
| 909 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
| 910 | - } catch(PDOException $e) { |
|
| 909 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
| 910 | + } catch (PDOException $e) { |
|
| 911 | 911 | return "error : ".$e->getMessage(); |
| 912 | 912 | } |
| 913 | 913 | } |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | $Connection = new Connection(); |
| 929 | 929 | $sth = $Connection->db->prepare($query); |
| 930 | 930 | $sth->execute(array(':source' => 'translation.csv')); |
| 931 | - } catch(PDOException $e) { |
|
| 931 | + } catch (PDOException $e) { |
|
| 932 | 932 | return "error : ".$e->getMessage(); |
| 933 | 933 | } |
| 934 | 934 | |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 946 | 946 | { |
| 947 | 947 | $i++; |
| 948 | - if($i > 12) { |
|
| 948 | + if ($i > 12) { |
|
| 949 | 949 | $data = $row; |
| 950 | 950 | $operator = $data[2]; |
| 951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | //echo substr($operator, 0, 2)."\n";; |
| 954 | 954 | if (count($airline_array) > 0) { |
| 955 | 955 | //print_r($airline_array); |
| 956 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
| 956 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
| 957 | 957 | } |
| 958 | 958 | } |
| 959 | 959 | |
@@ -961,14 +961,14 @@ discard block |
||
| 961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 962 | 962 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
| 963 | 963 | if (count($airline_array) > 0) { |
| 964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
| 965 | 965 | } |
| 966 | 966 | } |
| 967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 968 | 968 | try { |
| 969 | 969 | $sth = $Connection->db->prepare($query); |
| 970 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 971 | - } catch(PDOException $e) { |
|
| 970 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 971 | + } catch (PDOException $e) { |
|
| 972 | 972 | return "error : ".$e->getMessage(); |
| 973 | 973 | } |
| 974 | 974 | } |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | $Connection = new Connection(); |
| 987 | 987 | $sth = $Connection->db->prepare($query); |
| 988 | 988 | $sth->execute(array(':source' => 'website_fam')); |
| 989 | - } catch(PDOException $e) { |
|
| 989 | + } catch (PDOException $e) { |
|
| 990 | 990 | return "error : ".$e->getMessage(); |
| 991 | 991 | } |
| 992 | 992 | //update_db::unzip($out_file); |
@@ -1004,8 +1004,8 @@ discard block |
||
| 1004 | 1004 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 1005 | 1005 | try { |
| 1006 | 1006 | $sth = $Connection->db->prepare($query); |
| 1007 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1008 | - } catch(PDOException $e) { |
|
| 1007 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 1008 | + } catch (PDOException $e) { |
|
| 1009 | 1009 | return "error : ".$e->getMessage(); |
| 1010 | 1010 | } |
| 1011 | 1011 | } |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | $Connection = new Connection(); |
| 1029 | 1029 | $sth = $Connection->db->prepare($query); |
| 1030 | 1030 | $sth->execute(array(':source' => 'website_faa')); |
| 1031 | - } catch(PDOException $e) { |
|
| 1031 | + } catch (PDOException $e) { |
|
| 1032 | 1032 | return "error : ".$e->getMessage(); |
| 1033 | 1033 | } |
| 1034 | 1034 | |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | $Connection = new Connection(); |
| 1038 | 1038 | $sth = $Connection->db->prepare($query); |
| 1039 | 1039 | $sth->execute(array(':source' => 'website_faa')); |
| 1040 | - } catch(PDOException $e) { |
|
| 1040 | + } catch (PDOException $e) { |
|
| 1041 | 1041 | return "error : ".$e->getMessage(); |
| 1042 | 1042 | } |
| 1043 | 1043 | |
@@ -1054,8 +1054,8 @@ discard block |
||
| 1054 | 1054 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
| 1055 | 1055 | try { |
| 1056 | 1056 | $sths = $Connection->db->prepare($query_search); |
| 1057 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
| 1058 | - } catch(PDOException $e) { |
|
| 1057 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
| 1058 | + } catch (PDOException $e) { |
|
| 1059 | 1059 | return "error s : ".$e->getMessage(); |
| 1060 | 1060 | } |
| 1061 | 1061 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1068,8 +1068,8 @@ discard block |
||
| 1068 | 1068 | //} |
| 1069 | 1069 | try { |
| 1070 | 1070 | $sthi = $Connection->db->prepare($queryi); |
| 1071 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
| 1072 | - } catch(PDOException $e) { |
|
| 1071 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
| 1072 | + } catch (PDOException $e) { |
|
| 1073 | 1073 | return "error u : ".$e->getMessage(); |
| 1074 | 1074 | } |
| 1075 | 1075 | } else { |
@@ -1077,7 +1077,7 @@ discard block |
||
| 1077 | 1077 | try { |
| 1078 | 1078 | $sthsm = $Connection->db->prepare($query_search_mfr); |
| 1079 | 1079 | $sthsm->execute(array(':mfr' => $data[2])); |
| 1080 | - } catch(PDOException $e) { |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | return "error mfr : ".$e->getMessage(); |
| 1082 | 1082 | } |
| 1083 | 1083 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1087,8 +1087,8 @@ discard block |
||
| 1087 | 1087 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1088 | 1088 | try { |
| 1089 | 1089 | $sthf = $Connection->db->prepare($queryf); |
| 1090 | - $sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa')); |
|
| 1091 | - } catch(PDOException $e) { |
|
| 1090 | + $sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa')); |
|
| 1091 | + } catch (PDOException $e) { |
|
| 1092 | 1092 | return "error f : ".$e->getMessage(); |
| 1093 | 1093 | } |
| 1094 | 1094 | } |
@@ -1098,13 +1098,13 @@ discard block |
||
| 1098 | 1098 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1099 | 1099 | try { |
| 1100 | 1100 | $sth = $Connection->db->prepare($query); |
| 1101 | - $sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1102 | - } catch(PDOException $e) { |
|
| 1101 | + $sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1102 | + } catch (PDOException $e) { |
|
| 1103 | 1103 | return "error i : ".$e->getMessage(); |
| 1104 | 1104 | } |
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | - if ($i % 90 == 0) { |
|
| 1107 | + if ($i%90 == 0) { |
|
| 1108 | 1108 | if ($globalTransaction) $Connection->db->commit(); |
| 1109 | 1109 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1110 | 1110 | } |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $Connection = new Connection(); |
| 1124 | 1124 | $sth = $Connection->db->prepare($query); |
| 1125 | 1125 | $sth->execute(array(':source' => 'website_fam')); |
| 1126 | - } catch(PDOException $e) { |
|
| 1126 | + } catch (PDOException $e) { |
|
| 1127 | 1127 | return "error : ".$e->getMessage(); |
| 1128 | 1128 | } |
| 1129 | 1129 | $delimiter = "\t"; |
@@ -1139,8 +1139,8 @@ discard block |
||
| 1139 | 1139 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1140 | 1140 | try { |
| 1141 | 1141 | $sth = $Connection->db->prepare($query); |
| 1142 | - $sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam')); |
|
| 1143 | - } catch(PDOException $e) { |
|
| 1142 | + $sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam')); |
|
| 1143 | + } catch (PDOException $e) { |
|
| 1144 | 1144 | return "error : ".$e->getMessage(); |
| 1145 | 1145 | } |
| 1146 | 1146 | } |
@@ -1172,7 +1172,7 @@ discard block |
||
| 1172 | 1172 | try { |
| 1173 | 1173 | $sth = $Connection->db->prepare($query); |
| 1174 | 1174 | $sth->execute(); |
| 1175 | - } catch(PDOException $e) { |
|
| 1175 | + } catch (PDOException $e) { |
|
| 1176 | 1176 | return "error : ".$e->getMessage(); |
| 1177 | 1177 | } |
| 1178 | 1178 | $delimiter = "\t"; |
@@ -1187,8 +1187,8 @@ discard block |
||
| 1187 | 1187 | $query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)'; |
| 1188 | 1188 | try { |
| 1189 | 1189 | $sth = $Connection->db->prepare($query); |
| 1190 | - $sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11])); |
|
| 1191 | - } catch(PDOException $e) { |
|
| 1190 | + $sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11])); |
|
| 1191 | + } catch (PDOException $e) { |
|
| 1192 | 1192 | return "error : ".$e->getMessage(); |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | 1218 | $sth->execute(array(':source' => 'website_fam')); |
| 1219 | - } catch(PDOException $e) { |
|
| 1219 | + } catch (PDOException $e) { |
|
| 1220 | 1220 | return "error : ".$e->getMessage(); |
| 1221 | 1221 | } |
| 1222 | 1222 | |
@@ -1232,8 +1232,8 @@ discard block |
||
| 1232 | 1232 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $Connection->db->prepare($query); |
| 1235 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | - } catch(PDOException $e) { |
|
| 1235 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | //print_r($data); |
| 1238 | 1238 | return "error : ".$e->getMessage(); |
| 1239 | 1239 | } |
@@ -1253,7 +1253,7 @@ discard block |
||
| 1253 | 1253 | $Connection = new Connection(); |
| 1254 | 1254 | $sth = $Connection->db->prepare($query); |
| 1255 | 1255 | $sth->execute(array(':source' => 'website_fam')); |
| 1256 | - } catch(PDOException $e) { |
|
| 1256 | + } catch (PDOException $e) { |
|
| 1257 | 1257 | return "error : ".$e->getMessage(); |
| 1258 | 1258 | } |
| 1259 | 1259 | $delimiter = "\t"; |
@@ -1268,9 +1268,9 @@ discard block |
||
| 1268 | 1268 | $query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)'; |
| 1269 | 1269 | try { |
| 1270 | 1270 | $sth = $Connection->db->prepare($query); |
| 1271 | - $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
|
| 1272 | - } catch(PDOException $e) { |
|
| 1273 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1271 | + $sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam')); |
|
| 1272 | + } catch (PDOException $e) { |
|
| 1273 | + if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data); |
|
| 1274 | 1274 | } |
| 1275 | 1275 | } |
| 1276 | 1276 | $i++; |
@@ -1288,7 +1288,7 @@ discard block |
||
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | 1290 | $sth->execute(); |
| 1291 | - } catch(PDOException $e) { |
|
| 1291 | + } catch (PDOException $e) { |
|
| 1292 | 1292 | return "error : ".$e->getMessage(); |
| 1293 | 1293 | } |
| 1294 | 1294 | |
@@ -1309,8 +1309,8 @@ discard block |
||
| 1309 | 1309 | $query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)'; |
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | - $sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10])); |
|
| 1313 | - } catch(PDOException $e) { |
|
| 1312 | + $sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10])); |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error : ".$e->getMessage(); |
| 1315 | 1315 | } |
| 1316 | 1316 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | $Connection = new Connection(); |
| 1330 | 1330 | $sth = $Connection->db->prepare($query); |
| 1331 | 1331 | $sth->execute(); |
| 1332 | - } catch(PDOException $e) { |
|
| 1332 | + } catch (PDOException $e) { |
|
| 1333 | 1333 | return "error : ".$e->getMessage(); |
| 1334 | 1334 | } |
| 1335 | 1335 | $delimiter = "\t"; |
@@ -1346,8 +1346,8 @@ discard block |
||
| 1346 | 1346 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
| 1347 | 1347 | try { |
| 1348 | 1348 | $sth = $Connection->db->prepare($query); |
| 1349 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
| 1350 | - } catch(PDOException $e) { |
|
| 1349 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
| 1350 | + } catch (PDOException $e) { |
|
| 1351 | 1351 | return "error : ".$e->getMessage(); |
| 1352 | 1352 | } |
| 1353 | 1353 | } |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | $Connection = new Connection(); |
| 1367 | 1367 | $sth = $Connection->db->prepare($query); |
| 1368 | 1368 | $sth->execute(); |
| 1369 | - } catch(PDOException $e) { |
|
| 1369 | + } catch (PDOException $e) { |
|
| 1370 | 1370 | return "error : ".$e->getMessage(); |
| 1371 | 1371 | } |
| 1372 | 1372 | |
@@ -1382,7 +1382,7 @@ discard block |
||
| 1382 | 1382 | try { |
| 1383 | 1383 | $sth = $Connection->db->prepare($query); |
| 1384 | 1384 | $sth->execute(array(':icao' => $icao)); |
| 1385 | - } catch(PDOException $e) { |
|
| 1385 | + } catch (PDOException $e) { |
|
| 1386 | 1386 | return "error : ".$e->getMessage(); |
| 1387 | 1387 | } |
| 1388 | 1388 | } |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | return ''; |
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | - public static function tle($filename,$tletype) { |
|
| 1396 | + public static function tle($filename, $tletype) { |
|
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1398 | 1398 | global $tmp_dir, $globalTransaction; |
| 1399 | 1399 | //$Spotter = new Spotter(); |
@@ -1403,7 +1403,7 @@ discard block |
||
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | 1405 | $sth->execute(array(':source' => $filename)); |
| 1406 | - } catch(PDOException $e) { |
|
| 1406 | + } catch (PDOException $e) { |
|
| 1407 | 1407 | return "error : ".$e->getMessage(); |
| 1408 | 1408 | } |
| 1409 | 1409 | |
@@ -1428,8 +1428,8 @@ discard block |
||
| 1428 | 1428 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1429 | 1429 | try { |
| 1430 | 1430 | $sth = $Connection->db->prepare($query); |
| 1431 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1432 | - } catch(PDOException $e) { |
|
| 1431 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1432 | + } catch (PDOException $e) { |
|
| 1433 | 1433 | return "error : ".$e->getMessage(); |
| 1434 | 1434 | } |
| 1435 | 1435 | |
@@ -1449,7 +1449,7 @@ discard block |
||
| 1449 | 1449 | $Connection = new Connection(); |
| 1450 | 1450 | $sth = $Connection->db->prepare($query); |
| 1451 | 1451 | $sth->execute(array(':source' => $filename)); |
| 1452 | - } catch(PDOException $e) { |
|
| 1452 | + } catch (PDOException $e) { |
|
| 1453 | 1453 | return "error : ".$e->getMessage(); |
| 1454 | 1454 | } |
| 1455 | 1455 | |
@@ -1459,13 +1459,13 @@ discard block |
||
| 1459 | 1459 | $i = 0; |
| 1460 | 1460 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1461 | 1461 | //$Connection->db->beginTransaction(); |
| 1462 | - while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE) |
|
| 1462 | + while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) |
|
| 1463 | 1463 | { |
| 1464 | 1464 | if ($i > 0 && $data[0] != '') { |
| 1465 | 1465 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
| 1466 | - $period = str_replace(',','',$data[14]); |
|
| 1467 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
| 1468 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1466 | + $period = str_replace(',', '', $data[14]); |
|
| 1467 | + if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60; |
|
| 1468 | + if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18])); |
|
| 1469 | 1469 | else $launch_date = NULL; |
| 1470 | 1470 | $data = array_map(function($value) { |
| 1471 | 1471 | return trim($value) === '' ? null : $value; |
@@ -1475,8 +1475,8 @@ discard block |
||
| 1475 | 1475 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
| 1476 | 1476 | try { |
| 1477 | 1477 | $sth = $Connection->db->prepare($query); |
| 1478 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
| 1479 | - } catch(PDOException $e) { |
|
| 1478 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
| 1479 | + } catch (PDOException $e) { |
|
| 1480 | 1480 | return "error : ".$e->getMessage(); |
| 1481 | 1481 | } |
| 1482 | 1482 | } |
@@ -1516,7 +1516,7 @@ discard block |
||
| 1516 | 1516 | 'EGYP' => array('country' => 'Egypt', 'owner' => ''), |
| 1517 | 1517 | 'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'), |
| 1518 | 1518 | 'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'), |
| 1519 | - 'EST' => array('country' => 'Estonia','owner' => ''), |
|
| 1519 | + 'EST' => array('country' => 'Estonia', 'owner' => ''), |
|
| 1520 | 1520 | 'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'), |
| 1521 | 1521 | 'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'), |
| 1522 | 1522 | 'FGER' => array('country' => 'France/Germany', 'owner' => ''), |
@@ -1640,10 +1640,10 @@ discard block |
||
| 1640 | 1640 | { |
| 1641 | 1641 | if ($data != '') { |
| 1642 | 1642 | $result = array(); |
| 1643 | - $result['cospar'] = trim(substr($data,0,11)); |
|
| 1644 | - $result['norad'] = trim(substr($data,13,6)); |
|
| 1645 | - $result['operational'] = trim(substr($data,21,1)); |
|
| 1646 | - $result['name'] = trim(substr($data,23,24)); |
|
| 1643 | + $result['cospar'] = trim(substr($data, 0, 11)); |
|
| 1644 | + $result['norad'] = trim(substr($data, 13, 6)); |
|
| 1645 | + $result['operational'] = trim(substr($data, 21, 1)); |
|
| 1646 | + $result['name'] = trim(substr($data, 23, 24)); |
|
| 1647 | 1647 | /* |
| 1648 | 1648 | * R/B(1) = Rocket body, first stage |
| 1649 | 1649 | * R/B(2) = Rocket body, second stage |
@@ -1655,29 +1655,29 @@ discard block |
||
| 1655 | 1655 | * An ampersand (&) indicates two or more objects are attached |
| 1656 | 1656 | */ |
| 1657 | 1657 | |
| 1658 | - $owner_code = trim(substr($data,49,5)); |
|
| 1658 | + $owner_code = trim(substr($data, 49, 5)); |
|
| 1659 | 1659 | |
| 1660 | 1660 | if (!isset($satcat_sources[$owner_code])) { |
| 1661 | 1661 | echo $data; |
| 1662 | 1662 | echo 'owner_code: '.$owner_code."\n"; |
| 1663 | 1663 | } |
| 1664 | - if (!isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1665 | - echo 'launch_site_code: '.trim(substr($data,68,5))."\n"; |
|
| 1664 | + if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1665 | + echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n"; |
|
| 1666 | 1666 | } |
| 1667 | 1667 | |
| 1668 | - if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1668 | + if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1669 | 1669 | $result['country_owner'] = $satcat_sources[$owner_code]['country']; |
| 1670 | 1670 | $result['owner'] = $satcat_sources[$owner_code]['owner']; |
| 1671 | - $result['launch_date'] = trim(substr($data,56,10)); |
|
| 1672 | - $launch_site_code = trim(substr($data,68,5)); |
|
| 1671 | + $result['launch_date'] = trim(substr($data, 56, 10)); |
|
| 1672 | + $launch_site_code = trim(substr($data, 68, 5)); |
|
| 1673 | 1673 | $result['launch_site'] = $satcat_launch_site[$launch_site_code]; |
| 1674 | - $result['lifetime'] = trim(substr($data,75,10)); |
|
| 1675 | - $result['period'] = trim(substr($data,87,7)); |
|
| 1676 | - $result['inclination'] = trim(substr($data,96,5)); |
|
| 1677 | - $result['apogee'] = trim(substr($data,103,6)); |
|
| 1678 | - $result['perigee'] = trim(substr($data,111,6)); |
|
| 1674 | + $result['lifetime'] = trim(substr($data, 75, 10)); |
|
| 1675 | + $result['period'] = trim(substr($data, 87, 7)); |
|
| 1676 | + $result['inclination'] = trim(substr($data, 96, 5)); |
|
| 1677 | + $result['apogee'] = trim(substr($data, 103, 6)); |
|
| 1678 | + $result['perigee'] = trim(substr($data, 111, 6)); |
|
| 1679 | 1679 | //$result['radarcross'] = trim(substr($data,119,8)); |
| 1680 | - $result['status'] = trim(substr($data,129,3)); |
|
| 1680 | + $result['status'] = trim(substr($data, 129, 3)); |
|
| 1681 | 1681 | //print_r($result); |
| 1682 | 1682 | $result = array_map(function($value) { |
| 1683 | 1683 | return trim($value) === '' ? null : $value; |
@@ -1690,7 +1690,7 @@ discard block |
||
| 1690 | 1690 | $sth = $Connection->db->prepare($query); |
| 1691 | 1691 | $sth->execute(array(':cospar' => $result['cospar'])); |
| 1692 | 1692 | $exist = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1693 | - } catch(PDOException $e) { |
|
| 1693 | + } catch (PDOException $e) { |
|
| 1694 | 1694 | return "error : ".$e->getMessage(); |
| 1695 | 1695 | } |
| 1696 | 1696 | if (empty($exist)) { |
@@ -1702,10 +1702,10 @@ discard block |
||
| 1702 | 1702 | ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
| 1703 | 1703 | ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
| 1704 | 1704 | ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1705 | + ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | 1706 | ) |
| 1707 | 1707 | ); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error : ".$e->getMessage(); |
| 1710 | 1710 | } |
| 1711 | 1711 | } elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) { |
@@ -1713,8 +1713,8 @@ discard block |
||
| 1713 | 1713 | try { |
| 1714 | 1714 | $Connection = new Connection(); |
| 1715 | 1715 | $sth = $Connection->db->prepare($query); |
| 1716 | - $sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar'])); |
|
| 1717 | - } catch(PDOException $e) { |
|
| 1716 | + $sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar'])); |
|
| 1717 | + } catch (PDOException $e) { |
|
| 1718 | 1718 | return "error : ".$e->getMessage(); |
| 1719 | 1719 | } |
| 1720 | 1720 | } |
@@ -1833,13 +1833,13 @@ discard block |
||
| 1833 | 1833 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1834 | 1834 | { |
| 1835 | 1835 | $i++; |
| 1836 | - if($i > 3 && count($row) > 2) { |
|
| 1836 | + if ($i > 3 && count($row) > 2) { |
|
| 1837 | 1837 | $data = array_values(array_filter($row)); |
| 1838 | 1838 | $cntdata = count($data); |
| 1839 | 1839 | if ($cntdata > 10) { |
| 1840 | 1840 | $value = $data[9]; |
| 1841 | 1841 | |
| 1842 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1842 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1843 | 1843 | $value .= ' '.$data[$i]; |
| 1844 | 1844 | } |
| 1845 | 1845 | $data[9] = $value; |
@@ -1849,8 +1849,8 @@ discard block |
||
| 1849 | 1849 | $query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)'; |
| 1850 | 1850 | try { |
| 1851 | 1851 | $sth = $Connection->db->prepare($query); |
| 1852 | - $sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1853 | - } catch(PDOException $e) { |
|
| 1852 | + $sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1853 | + } catch (PDOException $e) { |
|
| 1854 | 1854 | return "error : ".$e->getMessage(); |
| 1855 | 1855 | } |
| 1856 | 1856 | } |
@@ -1867,16 +1867,16 @@ discard block |
||
| 1867 | 1867 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 1868 | 1868 | $delimiter = ','; |
| 1869 | 1869 | $Common = new Common(); |
| 1870 | - $Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv',$tmp_dir.'fires.csv'); |
|
| 1870 | + $Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv', $tmp_dir.'fires.csv'); |
|
| 1871 | 1871 | $Connection = new Connection(); |
| 1872 | 1872 | $Source = new Source(); |
| 1873 | 1873 | $Source->deleteLocationByType('fires'); |
| 1874 | 1874 | $i = 0; |
| 1875 | - if (($handle = fopen($tmp_dir.'fires.csv','r')) !== false) { |
|
| 1876 | - while (($row = fgetcsv($handle,1000)) !== false) { |
|
| 1875 | + if (($handle = fopen($tmp_dir.'fires.csv', 'r')) !== false) { |
|
| 1876 | + while (($row = fgetcsv($handle, 1000)) !== false) { |
|
| 1877 | 1877 | if ($i > 0 && $row[0] != '' && $row[8] != 'low') { |
| 1878 | - $description = array('bright_t14' => $row[2],'scan' => $row[3],'track' => $row[4],'sat' => $row[7],'confidence' => $row[8],'version' => $row[9],'bright_t15' => $row[10],'frp' => $row[11],'daynight' => $row[12]); |
|
| 1879 | - $Source->addLocation('',$row[0],$row[1],null,'','','fires','fire.png','fires',0,0,$row[5].' '.substr($row[6],0,2).':'.substr($row[6],2,2),json_encode($description)); |
|
| 1878 | + $description = array('bright_t14' => $row[2], 'scan' => $row[3], 'track' => $row[4], 'sat' => $row[7], 'confidence' => $row[8], 'version' => $row[9], 'bright_t15' => $row[10], 'frp' => $row[11], 'daynight' => $row[12]); |
|
| 1879 | + $Source->addLocation('', $row[0], $row[1], null, '', '', 'fires', 'fire.png', 'fires', 0, 0, $row[5].' '.substr($row[6], 0, 2).':'.substr($row[6], 2, 2), json_encode($description)); |
|
| 1880 | 1880 | } |
| 1881 | 1881 | $i++; |
| 1882 | 1882 | } |
@@ -1892,7 +1892,7 @@ discard block |
||
| 1892 | 1892 | $Connection = new Connection(); |
| 1893 | 1893 | $sth = $Connection->db->prepare($query); |
| 1894 | 1894 | $sth->execute(); |
| 1895 | - } catch(PDOException $e) { |
|
| 1895 | + } catch (PDOException $e) { |
|
| 1896 | 1896 | return "error : ".$e->getMessage(); |
| 1897 | 1897 | } |
| 1898 | 1898 | $header = NULL; |
@@ -1903,12 +1903,12 @@ discard block |
||
| 1903 | 1903 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1904 | 1904 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1905 | 1905 | { |
| 1906 | - if(count($row) > 1) { |
|
| 1906 | + if (count($row) > 1) { |
|
| 1907 | 1907 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1908 | 1908 | try { |
| 1909 | 1909 | $sth = $Connection->db->prepare($query); |
| 1910 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1911 | - } catch(PDOException $e) { |
|
| 1910 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1911 | + } catch (PDOException $e) { |
|
| 1912 | 1912 | return "error : ".$e->getMessage(); |
| 1913 | 1913 | } |
| 1914 | 1914 | } |
@@ -1928,21 +1928,21 @@ discard block |
||
| 1928 | 1928 | try { |
| 1929 | 1929 | $sth = $Connection->db->prepare($query); |
| 1930 | 1930 | $sth->execute(); |
| 1931 | - } catch(PDOException $e) { |
|
| 1931 | + } catch (PDOException $e) { |
|
| 1932 | 1932 | return "error : ".$e->getMessage(); |
| 1933 | 1933 | } |
| 1934 | 1934 | } |
| 1935 | 1935 | |
| 1936 | 1936 | |
| 1937 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1937 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1938 | 1938 | else { |
| 1939 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1939 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1940 | 1940 | $query = "CREATE EXTENSION postgis"; |
| 1941 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1941 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1942 | 1942 | try { |
| 1943 | 1943 | $sth = $Connection->db->prepare($query); |
| 1944 | 1944 | $sth->execute(); |
| 1945 | - } catch(PDOException $e) { |
|
| 1945 | + } catch (PDOException $e) { |
|
| 1946 | 1946 | return "error : ".$e->getMessage(); |
| 1947 | 1947 | } |
| 1948 | 1948 | } |
@@ -1955,13 +1955,13 @@ discard block |
||
| 1955 | 1955 | include_once('class.create_db.php'); |
| 1956 | 1956 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1957 | 1957 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1958 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
|
| 1958 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5', $tmp_dir.'notam.txt.gz.md5'); |
|
| 1959 | 1959 | $error = ''; |
| 1960 | 1960 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
| 1961 | - $notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1961 | + $notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1962 | 1962 | $notam_md5 = $notam_md5_file[0]; |
| 1963 | 1963 | if (!update_db::check_notam_version($notam_md5)) { |
| 1964 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1964 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1965 | 1965 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1966 | 1966 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
| 1967 | 1967 | if ($globalDebug) echo "Gunzip..."; |
@@ -1997,14 +1997,14 @@ discard block |
||
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | 1999 | $sth->execute(); |
| 2000 | - } catch(PDOException $e) { |
|
| 2000 | + } catch (PDOException $e) { |
|
| 2001 | 2001 | echo "error : ".$e->getMessage(); |
| 2002 | 2002 | } |
| 2003 | 2003 | } |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
| 2005 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 2005 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 2006 | 2006 | } else { |
| 2007 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 2007 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 2008 | 2008 | } |
| 2009 | 2009 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 2010 | 2010 | return $error; |
@@ -2017,7 +2017,7 @@ discard block |
||
| 2017 | 2017 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 2018 | 2018 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 2019 | 2019 | // update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
| 2020 | - update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
|
| 2020 | + update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net'); |
|
| 2021 | 2021 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 2022 | 2022 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 2023 | 2023 | return $error; |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 2039 | 2039 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 2040 | 2040 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 2041 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2041 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2042 | 2042 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 2043 | 2043 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 2044 | 2044 | } else $error = "ZIP module not loaded but required for IVAO."; |
@@ -2052,7 +2052,7 @@ discard block |
||
| 2052 | 2052 | global $tmp_dir, $globalDebug; |
| 2053 | 2053 | $error = ''; |
| 2054 | 2054 | if ($globalDebug) echo "Routes : Download..."; |
| 2055 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 2055 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 2056 | 2056 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 2057 | 2057 | if ($globalDebug) echo "Gunzip..."; |
| 2058 | 2058 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -2068,7 +2068,7 @@ discard block |
||
| 2068 | 2068 | global $tmp_dir, $globalDebug; |
| 2069 | 2069 | $error = ''; |
| 2070 | 2070 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 2071 | - update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 2071 | + update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 2072 | 2072 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 2073 | 2073 | if ($globalDebug) echo "Gunzip..."; |
| 2074 | 2074 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -2084,7 +2084,7 @@ discard block |
||
| 2084 | 2084 | global $tmp_dir, $globalDebug; |
| 2085 | 2085 | $error = ''; |
| 2086 | 2086 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 2087 | - update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 2087 | + update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 2088 | 2088 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 2089 | 2089 | if ($globalDebug) echo "Gunzip..."; |
| 2090 | 2090 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -2112,7 +2112,7 @@ discard block |
||
| 2112 | 2112 | */ |
| 2113 | 2113 | if ($globalDebug) echo "Modes : Download..."; |
| 2114 | 2114 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 2115 | - update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 2115 | + update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 2116 | 2116 | |
| 2117 | 2117 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 2118 | 2118 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -2132,7 +2132,7 @@ discard block |
||
| 2132 | 2132 | public static function update_ModeS_faa() { |
| 2133 | 2133 | global $tmp_dir, $globalDebug; |
| 2134 | 2134 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 2135 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 2135 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 2136 | 2136 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 2137 | 2137 | if ($globalDebug) echo "Unzip..."; |
| 2138 | 2138 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -2148,7 +2148,7 @@ discard block |
||
| 2148 | 2148 | public static function update_ModeS_flarm() { |
| 2149 | 2149 | global $tmp_dir, $globalDebug; |
| 2150 | 2150 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 2151 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 2151 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 2152 | 2152 | if (file_exists($tmp_dir.'data.fln')) { |
| 2153 | 2153 | if ($globalDebug) echo "Add to DB..."; |
| 2154 | 2154 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -2162,7 +2162,7 @@ discard block |
||
| 2162 | 2162 | public static function update_ModeS_ogn() { |
| 2163 | 2163 | global $tmp_dir, $globalDebug; |
| 2164 | 2164 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 2165 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 2165 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 2166 | 2166 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 2167 | 2167 | if ($globalDebug) echo "Add to DB..."; |
| 2168 | 2168 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -2177,201 +2177,201 @@ discard block |
||
| 2177 | 2177 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 2178 | 2178 | |
| 2179 | 2179 | if ($globalDebug) echo "Owner France: Download..."; |
| 2180 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 2180 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 2181 | 2181 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 2182 | 2182 | if ($globalDebug) echo "Add to DB..."; |
| 2183 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 2183 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 2184 | 2184 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 2185 | 2185 | if ($error != '') { |
| 2186 | 2186 | return $error; |
| 2187 | 2187 | } elseif ($globalDebug) echo "Done\n"; |
| 2188 | 2188 | |
| 2189 | 2189 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 2190 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 2190 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 2191 | 2191 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 2192 | 2192 | if ($globalDebug) echo "Add to DB..."; |
| 2193 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 2193 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 2194 | 2194 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 2195 | 2195 | if ($error != '') { |
| 2196 | 2196 | return $error; |
| 2197 | 2197 | } elseif ($globalDebug) echo "Done\n"; |
| 2198 | 2198 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 2199 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 2199 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 2200 | 2200 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 2201 | 2201 | if ($globalDebug) echo "Add to DB..."; |
| 2202 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 2202 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 2203 | 2203 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 2204 | 2204 | if ($error != '') { |
| 2205 | 2205 | return $error; |
| 2206 | 2206 | } elseif ($globalDebug) echo "Done\n"; |
| 2207 | 2207 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 2208 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 2208 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 2209 | 2209 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 2210 | 2210 | if ($globalDebug) echo "Add to DB..."; |
| 2211 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 2211 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 2212 | 2212 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 2213 | 2213 | if ($error != '') { |
| 2214 | 2214 | return $error; |
| 2215 | 2215 | } elseif ($globalDebug) echo "Done\n"; |
| 2216 | 2216 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 2217 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 2217 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 2218 | 2218 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 2219 | 2219 | if ($globalDebug) echo "Add to DB..."; |
| 2220 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 2220 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 2221 | 2221 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 2222 | 2222 | if ($error != '') { |
| 2223 | 2223 | return $error; |
| 2224 | 2224 | } elseif ($globalDebug) echo "Done\n"; |
| 2225 | 2225 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 2226 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 2226 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 2227 | 2227 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 2228 | 2228 | if ($globalDebug) echo "Add to DB..."; |
| 2229 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 2229 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 2230 | 2230 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 2231 | 2231 | if ($error != '') { |
| 2232 | 2232 | return $error; |
| 2233 | 2233 | } elseif ($globalDebug) echo "Done\n"; |
| 2234 | 2234 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 2235 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 2235 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 2236 | 2236 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 2237 | 2237 | if ($globalDebug) echo "Add to DB..."; |
| 2238 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 2238 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 2239 | 2239 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 2240 | 2240 | if ($error != '') { |
| 2241 | 2241 | return $error; |
| 2242 | 2242 | } elseif ($globalDebug) echo "Done\n"; |
| 2243 | 2243 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 2244 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 2244 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 2245 | 2245 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 2246 | 2246 | if ($globalDebug) echo "Add to DB..."; |
| 2247 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 2247 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 2248 | 2248 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 2249 | 2249 | if ($error != '') { |
| 2250 | 2250 | return $error; |
| 2251 | 2251 | } elseif ($globalDebug) echo "Done\n"; |
| 2252 | 2252 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 2253 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 2253 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 2254 | 2254 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 2255 | 2255 | if ($globalDebug) echo "Add to DB..."; |
| 2256 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 2256 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 2257 | 2257 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 2258 | 2258 | if ($error != '') { |
| 2259 | 2259 | return $error; |
| 2260 | 2260 | } elseif ($globalDebug) echo "Done\n"; |
| 2261 | 2261 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 2262 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 2262 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 2263 | 2263 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 2264 | 2264 | if ($globalDebug) echo "Add to DB..."; |
| 2265 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 2265 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 2266 | 2266 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 2267 | 2267 | if ($error != '') { |
| 2268 | 2268 | return $error; |
| 2269 | 2269 | } elseif ($globalDebug) echo "Done\n"; |
| 2270 | 2270 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 2271 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 2271 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 2272 | 2272 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 2273 | 2273 | if ($globalDebug) echo "Add to DB..."; |
| 2274 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 2274 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 2275 | 2275 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 2276 | 2276 | if ($error != '') { |
| 2277 | 2277 | return $error; |
| 2278 | 2278 | } elseif ($globalDebug) echo "Done\n"; |
| 2279 | 2279 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 2280 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 2280 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 2281 | 2281 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 2282 | 2282 | if ($globalDebug) echo "Add to DB..."; |
| 2283 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 2283 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 2284 | 2284 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 2285 | 2285 | if ($error != '') { |
| 2286 | 2286 | return $error; |
| 2287 | 2287 | } elseif ($globalDebug) echo "Done\n"; |
| 2288 | 2288 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 2289 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 2289 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 2290 | 2290 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 2291 | 2291 | if ($globalDebug) echo "Add to DB..."; |
| 2292 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 2292 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 2293 | 2293 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 2294 | 2294 | if ($error != '') { |
| 2295 | 2295 | return $error; |
| 2296 | 2296 | } elseif ($globalDebug) echo "Done\n"; |
| 2297 | 2297 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 2298 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 2298 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 2299 | 2299 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 2300 | 2300 | if ($globalDebug) echo "Add to DB..."; |
| 2301 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 2301 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 2302 | 2302 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 2303 | 2303 | if ($error != '') { |
| 2304 | 2304 | return $error; |
| 2305 | 2305 | } elseif ($globalDebug) echo "Done\n"; |
| 2306 | 2306 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 2307 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 2307 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 2308 | 2308 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 2309 | 2309 | if ($globalDebug) echo "Add to DB..."; |
| 2310 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 2310 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 2311 | 2311 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 2312 | 2312 | if ($error != '') { |
| 2313 | 2313 | return $error; |
| 2314 | 2314 | } elseif ($globalDebug) echo "Done\n"; |
| 2315 | 2315 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 2316 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 2316 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 2317 | 2317 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 2318 | 2318 | if ($globalDebug) echo "Add to DB..."; |
| 2319 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 2319 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 2320 | 2320 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 2321 | 2321 | if ($error != '') { |
| 2322 | 2322 | return $error; |
| 2323 | 2323 | } elseif ($globalDebug) echo "Done\n"; |
| 2324 | 2324 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 2325 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 2325 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 2326 | 2326 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 2327 | 2327 | if ($globalDebug) echo "Add to DB..."; |
| 2328 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 2328 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 2329 | 2329 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 2330 | 2330 | if ($error != '') { |
| 2331 | 2331 | return $error; |
| 2332 | 2332 | } elseif ($globalDebug) echo "Done\n"; |
| 2333 | 2333 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 2334 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 2334 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 2335 | 2335 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 2336 | 2336 | if ($globalDebug) echo "Add to DB..."; |
| 2337 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 2337 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 2338 | 2338 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 2339 | 2339 | if ($error != '') { |
| 2340 | 2340 | return $error; |
| 2341 | 2341 | } elseif ($globalDebug) echo "Done\n"; |
| 2342 | 2342 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 2343 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 2343 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 2344 | 2344 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 2345 | 2345 | if ($globalDebug) echo "Add to DB..."; |
| 2346 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 2346 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 2347 | 2347 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 2348 | 2348 | if ($error != '') { |
| 2349 | 2349 | return $error; |
| 2350 | 2350 | } elseif ($globalDebug) echo "Done\n"; |
| 2351 | 2351 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 2352 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 2352 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 2353 | 2353 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 2354 | 2354 | if ($globalDebug) echo "Add to DB..."; |
| 2355 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 2355 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 2356 | 2356 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 2357 | 2357 | if ($error != '') { |
| 2358 | 2358 | return $error; |
| 2359 | 2359 | } elseif ($globalDebug) echo "Done\n"; |
| 2360 | 2360 | if ($globalMasterSource) { |
| 2361 | 2361 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 2362 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 2362 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 2363 | 2363 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 2364 | 2364 | if ($globalDebug) echo "Add to DB..."; |
| 2365 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 2365 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 2366 | 2366 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 2367 | 2367 | if ($error != '') { |
| 2368 | 2368 | return $error; |
| 2369 | 2369 | } elseif ($globalDebug) echo "Done\n"; |
| 2370 | 2370 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 2371 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 2371 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 2372 | 2372 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 2373 | 2373 | if ($globalDebug) echo "Add to DB..."; |
| 2374 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 2374 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 2375 | 2375 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 2376 | 2376 | if ($error != '') { |
| 2377 | 2377 | return $error; |
@@ -2384,7 +2384,7 @@ discard block |
||
| 2384 | 2384 | global $tmp_dir, $globalDebug; |
| 2385 | 2385 | $error = ''; |
| 2386 | 2386 | if ($globalDebug) echo "Translation : Download..."; |
| 2387 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 2387 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 2388 | 2388 | if (file_exists($tmp_dir.'translation.zip')) { |
| 2389 | 2389 | if ($globalDebug) echo "Unzip..."; |
| 2390 | 2390 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -2401,10 +2401,10 @@ discard block |
||
| 2401 | 2401 | global $tmp_dir, $globalDebug; |
| 2402 | 2402 | $error = ''; |
| 2403 | 2403 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 2404 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 2405 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
|
| 2404 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 2405 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5', $tmp_dir.'translation.tsv.gz.md5'); |
|
| 2406 | 2406 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
| 2407 | - $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2407 | + $translation_md5_file = explode(' ', file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2408 | 2408 | $translation_md5 = $translation_md5_file[0]; |
| 2409 | 2409 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
| 2410 | 2410 | if ($globalDebug) echo "Gunzip..."; |
@@ -2422,10 +2422,10 @@ discard block |
||
| 2422 | 2422 | global $tmp_dir, $globalDebug; |
| 2423 | 2423 | $error = ''; |
| 2424 | 2424 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 2425 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 2426 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
|
| 2425 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 2426 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5', $tmp_dir.'modes.tsv.gz.md5'); |
|
| 2427 | 2427 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
| 2428 | - $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2428 | + $modes_md5_file = explode(' ', file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2429 | 2429 | $modes_md5 = $modes_md5_file[0]; |
| 2430 | 2430 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
| 2431 | 2431 | if ($globalDebug) echo "Gunzip..."; |
@@ -2444,12 +2444,12 @@ discard block |
||
| 2444 | 2444 | global $tmp_dir, $globalDebug; |
| 2445 | 2445 | $error = ''; |
| 2446 | 2446 | if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
| 2447 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2447 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5', $tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2448 | 2448 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
| 2449 | - $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2449 | + $airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2450 | 2450 | $airlines_md5 = $airlines_md5_file[0]; |
| 2451 | 2451 | if (!update_db::check_airlines_version($airlines_md5)) { |
| 2452 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
|
| 2452 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz', $tmp_dir.'airlines.tsv.gz'); |
|
| 2453 | 2453 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
| 2454 | 2454 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
| 2455 | 2455 | if ($globalDebug) echo "Gunzip..."; |
@@ -2474,14 +2474,14 @@ discard block |
||
| 2474 | 2474 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 2475 | 2475 | $error = ''; |
| 2476 | 2476 | if ($globalOwner === TRUE) { |
| 2477 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2478 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2477 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2478 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2479 | 2479 | } else { |
| 2480 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2481 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2480 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2481 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2482 | 2482 | } |
| 2483 | 2483 | if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) { |
| 2484 | - $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2484 | + $owners_md5_file = explode(' ', file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2485 | 2485 | $owners_md5 = $owners_md5_file[0]; |
| 2486 | 2486 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
| 2487 | 2487 | if ($globalDebug) echo "Gunzip..."; |
@@ -2498,10 +2498,10 @@ discard block |
||
| 2498 | 2498 | public static function update_routes_fam() { |
| 2499 | 2499 | global $tmp_dir, $globalDebug; |
| 2500 | 2500 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2501 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2502 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
|
| 2501 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2502 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5', $tmp_dir.'routes.tsv.gz.md5'); |
|
| 2503 | 2503 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
| 2504 | - $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2504 | + $routes_md5_file = explode(' ', file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2505 | 2505 | $routes_md5 = $routes_md5_file[0]; |
| 2506 | 2506 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
| 2507 | 2507 | if ($globalDebug) echo "Gunzip..."; |
@@ -2517,13 +2517,13 @@ discard block |
||
| 2517 | 2517 | } |
| 2518 | 2518 | public static function update_marine_identity_fam() { |
| 2519 | 2519 | global $tmp_dir, $globalDebug; |
| 2520 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2520 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2521 | 2521 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2522 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2522 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2523 | 2523 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2524 | 2524 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2525 | 2525 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2526 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2526 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2527 | 2527 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2528 | 2528 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
| 2529 | 2529 | if ($globalDebug) echo "Gunzip..."; |
@@ -2545,13 +2545,13 @@ discard block |
||
| 2545 | 2545 | |
| 2546 | 2546 | public static function update_satellite_fam() { |
| 2547 | 2547 | global $tmp_dir, $globalDebug; |
| 2548 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2548 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2549 | 2549 | if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) { |
| 2550 | - $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2550 | + $satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2551 | 2551 | $satellite_md5 = $satellite_md5_file[0]; |
| 2552 | 2552 | if (!update_db::check_satellite_version($satellite_md5)) { |
| 2553 | 2553 | if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
| 2554 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
|
| 2554 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz'); |
|
| 2555 | 2555 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
| 2556 | 2556 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
| 2557 | 2557 | if ($globalDebug) echo "Gunzip..."; |
@@ -2573,7 +2573,7 @@ discard block |
||
| 2573 | 2573 | public static function update_banned_fam() { |
| 2574 | 2574 | global $tmp_dir, $globalDebug; |
| 2575 | 2575 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2576 | - update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2576 | + update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2577 | 2577 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2578 | 2578 | //if ($globalDebug) echo "Gunzip..."; |
| 2579 | 2579 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2592,18 +2592,18 @@ discard block |
||
| 2592 | 2592 | $error = ''; |
| 2593 | 2593 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2594 | 2594 | if ($globalDBdriver == 'mysql') { |
| 2595 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2595 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2596 | 2596 | } else { |
| 2597 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2597 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2598 | 2598 | } |
| 2599 | 2599 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2600 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2600 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2601 | 2601 | $airspace_md5 = $airspace_md5_file[0]; |
| 2602 | 2602 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2603 | 2603 | if ($globalDBdriver == 'mysql') { |
| 2604 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2604 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2605 | 2605 | } else { |
| 2606 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2606 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2607 | 2607 | } |
| 2608 | 2608 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2609 | 2609 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
@@ -2616,7 +2616,7 @@ discard block |
||
| 2616 | 2616 | try { |
| 2617 | 2617 | $sth = $Connection->db->prepare($query); |
| 2618 | 2618 | $sth->execute(); |
| 2619 | - } catch(PDOException $e) { |
|
| 2619 | + } catch (PDOException $e) { |
|
| 2620 | 2620 | return "error : ".$e->getMessage(); |
| 2621 | 2621 | } |
| 2622 | 2622 | } |
@@ -2636,16 +2636,16 @@ discard block |
||
| 2636 | 2636 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2637 | 2637 | $error = ''; |
| 2638 | 2638 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
| 2639 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2639 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2640 | 2640 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2641 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2641 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2642 | 2642 | $geoid_md5 = $geoid_md5_file[0]; |
| 2643 | 2643 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2644 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2644 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2645 | 2645 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2646 | 2646 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
| 2647 | 2647 | if ($globalDebug) echo "Gunzip..."; |
| 2648 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2648 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2649 | 2649 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2650 | 2650 | update_db::insert_geoid_version($geoid_md5); |
| 2651 | 2651 | } |
@@ -2662,15 +2662,15 @@ discard block |
||
| 2662 | 2662 | public static function update_tle() { |
| 2663 | 2663 | global $tmp_dir, $globalDebug; |
| 2664 | 2664 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2665 | - $alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt', |
|
| 2666 | - 'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt', |
|
| 2667 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt'); |
|
| 2665 | + $alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt', |
|
| 2666 | + 'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt', |
|
| 2667 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt', 'visual.txt', 'sarsat.txt', 'argos.txt', 'ses.txt', 'iridium-NEXT.txt', 'beidou.txt'); |
|
| 2668 | 2668 | foreach ($alltle as $filename) { |
| 2669 | 2669 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2670 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2670 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2671 | 2671 | if (file_exists($tmp_dir.$filename)) { |
| 2672 | 2672 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2673 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2673 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2674 | 2674 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2675 | 2675 | if ($error != '') { |
| 2676 | 2676 | echo $error."\n"; |
@@ -2682,7 +2682,7 @@ discard block |
||
| 2682 | 2682 | public static function update_ucsdb() { |
| 2683 | 2683 | global $tmp_dir, $globalDebug; |
| 2684 | 2684 | if ($globalDebug) echo "Download UCS DB : Download..."; |
| 2685 | - update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
|
| 2685 | + update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt', $tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
|
| 2686 | 2686 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
| 2687 | 2687 | if ($globalDebug) echo "Add to DB..."; |
| 2688 | 2688 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
@@ -2696,7 +2696,7 @@ discard block |
||
| 2696 | 2696 | public static function update_celestrak() { |
| 2697 | 2697 | global $tmp_dir, $globalDebug; |
| 2698 | 2698 | if ($globalDebug) echo "Download Celestrak DB : Download..."; |
| 2699 | - update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
|
| 2699 | + update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt'); |
|
| 2700 | 2700 | if (file_exists($tmp_dir.'satcat.txt')) { |
| 2701 | 2701 | if ($globalDebug) echo "Add to DB..."; |
| 2702 | 2702 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
@@ -2711,32 +2711,32 @@ discard block |
||
| 2711 | 2711 | global $tmp_dir, $globalDebug; |
| 2712 | 2712 | $error = ''; |
| 2713 | 2713 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2714 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2714 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2715 | 2715 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2716 | 2716 | if ($globalDebug) echo "Check files...\n"; |
| 2717 | 2717 | $newmodelsdb = array(); |
| 2718 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2719 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2718 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2719 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2720 | 2720 | $model = trim($row[2]); |
| 2721 | 2721 | $newmodelsdb[$model] = trim($row[0]); |
| 2722 | 2722 | } |
| 2723 | 2723 | } |
| 2724 | 2724 | $modelsdb = array(); |
| 2725 | 2725 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2726 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2727 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2726 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2727 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2728 | 2728 | $model = trim($row[2]); |
| 2729 | 2729 | $modelsdb[$model] = trim($row[0]); |
| 2730 | 2730 | } |
| 2731 | 2731 | } |
| 2732 | 2732 | } |
| 2733 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2733 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2734 | 2734 | foreach ($diff as $key => $value) { |
| 2735 | 2735 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2736 | - update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2736 | + update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2737 | 2737 | |
| 2738 | 2738 | } |
| 2739 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2739 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2740 | 2740 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2741 | 2741 | if ($error != '') { |
| 2742 | 2742 | return $error; |
@@ -2748,32 +2748,32 @@ discard block |
||
| 2748 | 2748 | global $tmp_dir, $globalDebug; |
| 2749 | 2749 | $error = ''; |
| 2750 | 2750 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2751 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2751 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2752 | 2752 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2753 | 2753 | if ($globalDebug) echo "Check files...\n"; |
| 2754 | 2754 | $newmodelsdb = array(); |
| 2755 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2756 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2755 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2756 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2757 | 2757 | $model = trim($row[2]); |
| 2758 | 2758 | $newmodelsdb[$model] = trim($row[0]); |
| 2759 | 2759 | } |
| 2760 | 2760 | } |
| 2761 | 2761 | $modelsdb = array(); |
| 2762 | 2762 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2763 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2764 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2763 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2764 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2765 | 2765 | $model = trim($row[2]); |
| 2766 | 2766 | $modelsdb[$model] = trim($row[0]); |
| 2767 | 2767 | } |
| 2768 | 2768 | } |
| 2769 | 2769 | } |
| 2770 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2770 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2771 | 2771 | foreach ($diff as $key => $value) { |
| 2772 | 2772 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2773 | - update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2773 | + update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2774 | 2774 | |
| 2775 | 2775 | } |
| 2776 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2776 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2777 | 2777 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2778 | 2778 | if ($error != '') { |
| 2779 | 2779 | return $error; |
@@ -2785,32 +2785,32 @@ discard block |
||
| 2785 | 2785 | global $tmp_dir, $globalDebug; |
| 2786 | 2786 | $error = ''; |
| 2787 | 2787 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2788 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2788 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2789 | 2789 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2790 | 2790 | if ($globalDebug) echo "Check files...\n"; |
| 2791 | 2791 | $newmodelsdb = array(); |
| 2792 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2793 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2792 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2793 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2794 | 2794 | $model = trim($row[2]); |
| 2795 | 2795 | $newmodelsdb[$model] = trim($row[0]); |
| 2796 | 2796 | } |
| 2797 | 2797 | } |
| 2798 | 2798 | $modelsdb = array(); |
| 2799 | 2799 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2800 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2801 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2800 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2801 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2802 | 2802 | $model = trim($row[2]); |
| 2803 | 2803 | $modelsdb[$model] = trim($row[0]); |
| 2804 | 2804 | } |
| 2805 | 2805 | } |
| 2806 | 2806 | } |
| 2807 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2807 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2808 | 2808 | foreach ($diff as $key => $value) { |
| 2809 | 2809 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2810 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2810 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2811 | 2811 | |
| 2812 | 2812 | } |
| 2813 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2813 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2814 | 2814 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2815 | 2815 | if ($error != '') { |
| 2816 | 2816 | return $error; |
@@ -2833,8 +2833,8 @@ discard block |
||
| 2833 | 2833 | */ |
| 2834 | 2834 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2835 | 2835 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2836 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | - $result = fread($fh,100000000); |
|
| 2836 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2837 | + $result = fread($fh, 100000000); |
|
| 2838 | 2838 | //echo $result; |
| 2839 | 2839 | //var_dump(str_get_html($result)); |
| 2840 | 2840 | //print_r(self::table2array($result)); |
@@ -2852,23 +2852,23 @@ discard block |
||
| 2852 | 2852 | $Connection = new Connection(); |
| 2853 | 2853 | $sth = $Connection->db->prepare($query); |
| 2854 | 2854 | $sth->execute(); |
| 2855 | - } catch(PDOException $e) { |
|
| 2855 | + } catch (PDOException $e) { |
|
| 2856 | 2856 | return "error : ".$e->getMessage(); |
| 2857 | 2857 | } |
| 2858 | 2858 | |
| 2859 | 2859 | $error = ''; |
| 2860 | 2860 | if ($globalDebug) echo "Notam : Download..."; |
| 2861 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2861 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2862 | 2862 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2863 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2863 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2864 | 2864 | foreach ($notams['channel']['item'] as $notam) { |
| 2865 | - $title = explode(':',$notam['title']); |
|
| 2865 | + $title = explode(':', $notam['title']); |
|
| 2866 | 2866 | $data['ref'] = trim($title[0]); |
| 2867 | 2867 | unset($title[0]); |
| 2868 | - $data['title'] = trim(implode(':',$title)); |
|
| 2869 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2870 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2871 | - $q = explode('/',$match[1]); |
|
| 2868 | + $data['title'] = trim(implode(':', $title)); |
|
| 2869 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2870 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2871 | + $q = explode('/', $match[1]); |
|
| 2872 | 2872 | $data['fir'] = $q[0]; |
| 2873 | 2873 | $data['code'] = $q[1]; |
| 2874 | 2874 | $ifrvfr = $q[2]; |
@@ -2884,30 +2884,30 @@ discard block |
||
| 2884 | 2884 | $data['lower_limit'] = $q[5]; |
| 2885 | 2885 | $data['upper_limit'] = $q[6]; |
| 2886 | 2886 | $latlonrad = $q[7]; |
| 2887 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2888 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2889 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2887 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2888 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2889 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2890 | 2890 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2891 | 2891 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2892 | 2892 | $data['center_latitude'] = $latitude; |
| 2893 | 2893 | $data['center_longitude'] = $longitude; |
| 2894 | 2894 | $data['radius'] = intval($radius); |
| 2895 | 2895 | |
| 2896 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2896 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2897 | 2897 | $data['text'] = $match[1]; |
| 2898 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2898 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2899 | 2899 | $fromto = $match[1]; |
| 2900 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2900 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2901 | 2901 | $fromall = trim($match[1]); |
| 2902 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2902 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2903 | 2903 | $from = trim($match[1]); |
| 2904 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2905 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2904 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2905 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2906 | 2906 | $toall = trim($match[1]); |
| 2907 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2908 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2907 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2908 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2909 | 2909 | $to = trim($match[1]); |
| 2910 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2910 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2911 | 2911 | $data['permanent'] = 0; |
| 2912 | 2912 | } else { |
| 2913 | 2913 | $data['date_end'] = NULL; |
@@ -2915,7 +2915,7 @@ discard block |
||
| 2915 | 2915 | } |
| 2916 | 2916 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2917 | 2917 | $NOTAM = new NOTAM(); |
| 2918 | - $NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 2918 | + $NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']); |
|
| 2919 | 2919 | unset($data); |
| 2920 | 2920 | } |
| 2921 | 2921 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2938,16 +2938,16 @@ discard block |
||
| 2938 | 2938 | $Connection = new Connection(); |
| 2939 | 2939 | $sth = $Connection->db->prepare($query); |
| 2940 | 2940 | $sth->execute(); |
| 2941 | - } catch(PDOException $e) { |
|
| 2941 | + } catch (PDOException $e) { |
|
| 2942 | 2942 | return "error : ".$e->getMessage(); |
| 2943 | 2943 | } |
| 2944 | 2944 | } |
| 2945 | 2945 | $Common = new Common(); |
| 2946 | 2946 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2947 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2947 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2948 | 2948 | foreach ($airspace_json['records'] as $airspace) { |
| 2949 | 2949 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2950 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2950 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2951 | 2951 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2952 | 2952 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2953 | 2953 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2969,7 +2969,7 @@ discard block |
||
| 2969 | 2969 | $Connection = new Connection(); |
| 2970 | 2970 | $sth = $Connection->db->prepare($query); |
| 2971 | 2971 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2972 | - } catch(PDOException $e) { |
|
| 2972 | + } catch (PDOException $e) { |
|
| 2973 | 2973 | return "error : ".$e->getMessage(); |
| 2974 | 2974 | } |
| 2975 | 2975 | } |
@@ -2986,7 +2986,7 @@ discard block |
||
| 2986 | 2986 | $Connection = new Connection(); |
| 2987 | 2987 | $sth = $Connection->db->prepare($query); |
| 2988 | 2988 | $sth->execute(); |
| 2989 | - } catch(PDOException $e) { |
|
| 2989 | + } catch (PDOException $e) { |
|
| 2990 | 2990 | return "error : ".$e->getMessage(); |
| 2991 | 2991 | } |
| 2992 | 2992 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3001,7 +3001,7 @@ discard block |
||
| 3001 | 3001 | $Connection = new Connection(); |
| 3002 | 3002 | $sth = $Connection->db->prepare($query); |
| 3003 | 3003 | $sth->execute(); |
| 3004 | - } catch(PDOException $e) { |
|
| 3004 | + } catch (PDOException $e) { |
|
| 3005 | 3005 | return "error : ".$e->getMessage(); |
| 3006 | 3006 | } |
| 3007 | 3007 | } |
@@ -3012,7 +3012,7 @@ discard block |
||
| 3012 | 3012 | $Connection = new Connection(); |
| 3013 | 3013 | $sth = $Connection->db->prepare($query); |
| 3014 | 3014 | $sth->execute(array(':version' => $version)); |
| 3015 | - } catch(PDOException $e) { |
|
| 3015 | + } catch (PDOException $e) { |
|
| 3016 | 3016 | return "error : ".$e->getMessage(); |
| 3017 | 3017 | } |
| 3018 | 3018 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3026,7 +3026,7 @@ discard block |
||
| 3026 | 3026 | $Connection = new Connection(); |
| 3027 | 3027 | $sth = $Connection->db->prepare($query); |
| 3028 | 3028 | $sth->execute(array(':version' => $version)); |
| 3029 | - } catch(PDOException $e) { |
|
| 3029 | + } catch (PDOException $e) { |
|
| 3030 | 3030 | return "error : ".$e->getMessage(); |
| 3031 | 3031 | } |
| 3032 | 3032 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3040,7 +3040,7 @@ discard block |
||
| 3040 | 3040 | $Connection = new Connection(); |
| 3041 | 3041 | $sth = $Connection->db->prepare($query); |
| 3042 | 3042 | $sth->execute(array(':version' => $version)); |
| 3043 | - } catch(PDOException $e) { |
|
| 3043 | + } catch (PDOException $e) { |
|
| 3044 | 3044 | return "error : ".$e->getMessage(); |
| 3045 | 3045 | } |
| 3046 | 3046 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3054,7 +3054,7 @@ discard block |
||
| 3054 | 3054 | $Connection = new Connection(); |
| 3055 | 3055 | $sth = $Connection->db->prepare($query); |
| 3056 | 3056 | $sth->execute(array(':version' => $version)); |
| 3057 | - } catch(PDOException $e) { |
|
| 3057 | + } catch (PDOException $e) { |
|
| 3058 | 3058 | return "error : ".$e->getMessage(); |
| 3059 | 3059 | } |
| 3060 | 3060 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3068,7 +3068,7 @@ discard block |
||
| 3068 | 3068 | $Connection = new Connection(); |
| 3069 | 3069 | $sth = $Connection->db->prepare($query); |
| 3070 | 3070 | $sth->execute(array(':version' => $version)); |
| 3071 | - } catch(PDOException $e) { |
|
| 3071 | + } catch (PDOException $e) { |
|
| 3072 | 3072 | return "error : ".$e->getMessage(); |
| 3073 | 3073 | } |
| 3074 | 3074 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3082,7 +3082,7 @@ discard block |
||
| 3082 | 3082 | $Connection = new Connection(); |
| 3083 | 3083 | $sth = $Connection->db->prepare($query); |
| 3084 | 3084 | $sth->execute(array(':version' => $version)); |
| 3085 | - } catch(PDOException $e) { |
|
| 3085 | + } catch (PDOException $e) { |
|
| 3086 | 3086 | return "error : ".$e->getMessage(); |
| 3087 | 3087 | } |
| 3088 | 3088 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3097,7 +3097,7 @@ discard block |
||
| 3097 | 3097 | $Connection = new Connection(); |
| 3098 | 3098 | $sth = $Connection->db->prepare($query); |
| 3099 | 3099 | $sth->execute(array(':version' => $version)); |
| 3100 | - } catch(PDOException $e) { |
|
| 3100 | + } catch (PDOException $e) { |
|
| 3101 | 3101 | return "error : ".$e->getMessage(); |
| 3102 | 3102 | } |
| 3103 | 3103 | } |
@@ -3109,7 +3109,7 @@ discard block |
||
| 3109 | 3109 | $Connection = new Connection(); |
| 3110 | 3110 | $sth = $Connection->db->prepare($query); |
| 3111 | 3111 | $sth->execute(array(':version' => $version)); |
| 3112 | - } catch(PDOException $e) { |
|
| 3112 | + } catch (PDOException $e) { |
|
| 3113 | 3113 | return "error : ".$e->getMessage(); |
| 3114 | 3114 | } |
| 3115 | 3115 | } |
@@ -3121,7 +3121,7 @@ discard block |
||
| 3121 | 3121 | $Connection = new Connection(); |
| 3122 | 3122 | $sth = $Connection->db->prepare($query); |
| 3123 | 3123 | $sth->execute(array(':version' => $version)); |
| 3124 | - } catch(PDOException $e) { |
|
| 3124 | + } catch (PDOException $e) { |
|
| 3125 | 3125 | return "error : ".$e->getMessage(); |
| 3126 | 3126 | } |
| 3127 | 3127 | } |
@@ -3133,7 +3133,7 @@ discard block |
||
| 3133 | 3133 | $Connection = new Connection(); |
| 3134 | 3134 | $sth = $Connection->db->prepare($query); |
| 3135 | 3135 | $sth->execute(array(':version' => $version)); |
| 3136 | - } catch(PDOException $e) { |
|
| 3136 | + } catch (PDOException $e) { |
|
| 3137 | 3137 | return "error : ".$e->getMessage(); |
| 3138 | 3138 | } |
| 3139 | 3139 | } |
@@ -3145,7 +3145,7 @@ discard block |
||
| 3145 | 3145 | $Connection = new Connection(); |
| 3146 | 3146 | $sth = $Connection->db->prepare($query); |
| 3147 | 3147 | $sth->execute(array(':version' => $version)); |
| 3148 | - } catch(PDOException $e) { |
|
| 3148 | + } catch (PDOException $e) { |
|
| 3149 | 3149 | return "error : ".$e->getMessage(); |
| 3150 | 3150 | } |
| 3151 | 3151 | } |
@@ -3157,7 +3157,7 @@ discard block |
||
| 3157 | 3157 | $Connection = new Connection(); |
| 3158 | 3158 | $sth = $Connection->db->prepare($query); |
| 3159 | 3159 | $sth->execute(array(':version' => $version)); |
| 3160 | - } catch(PDOException $e) { |
|
| 3160 | + } catch (PDOException $e) { |
|
| 3161 | 3161 | return "error : ".$e->getMessage(); |
| 3162 | 3162 | } |
| 3163 | 3163 | } |
@@ -3173,7 +3173,7 @@ discard block |
||
| 3173 | 3173 | $Connection = new Connection(); |
| 3174 | 3174 | $sth = $Connection->db->prepare($query); |
| 3175 | 3175 | $sth->execute(); |
| 3176 | - } catch(PDOException $e) { |
|
| 3176 | + } catch (PDOException $e) { |
|
| 3177 | 3177 | return "error : ".$e->getMessage(); |
| 3178 | 3178 | } |
| 3179 | 3179 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3188,7 +3188,7 @@ discard block |
||
| 3188 | 3188 | $Connection = new Connection(); |
| 3189 | 3189 | $sth = $Connection->db->prepare($query); |
| 3190 | 3190 | $sth->execute(); |
| 3191 | - } catch(PDOException $e) { |
|
| 3191 | + } catch (PDOException $e) { |
|
| 3192 | 3192 | return "error : ".$e->getMessage(); |
| 3193 | 3193 | } |
| 3194 | 3194 | } |
@@ -3204,7 +3204,7 @@ discard block |
||
| 3204 | 3204 | $Connection = new Connection(); |
| 3205 | 3205 | $sth = $Connection->db->prepare($query); |
| 3206 | 3206 | $sth->execute(); |
| 3207 | - } catch(PDOException $e) { |
|
| 3207 | + } catch (PDOException $e) { |
|
| 3208 | 3208 | return "error : ".$e->getMessage(); |
| 3209 | 3209 | } |
| 3210 | 3210 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3219,7 +3219,7 @@ discard block |
||
| 3219 | 3219 | $Connection = new Connection(); |
| 3220 | 3220 | $sth = $Connection->db->prepare($query); |
| 3221 | 3221 | $sth->execute(); |
| 3222 | - } catch(PDOException $e) { |
|
| 3222 | + } catch (PDOException $e) { |
|
| 3223 | 3223 | return "error : ".$e->getMessage(); |
| 3224 | 3224 | } |
| 3225 | 3225 | } |
@@ -3235,7 +3235,7 @@ discard block |
||
| 3235 | 3235 | $Connection = new Connection(); |
| 3236 | 3236 | $sth = $Connection->db->prepare($query); |
| 3237 | 3237 | $sth->execute(); |
| 3238 | - } catch(PDOException $e) { |
|
| 3238 | + } catch (PDOException $e) { |
|
| 3239 | 3239 | return "error : ".$e->getMessage(); |
| 3240 | 3240 | } |
| 3241 | 3241 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3250,7 +3250,7 @@ discard block |
||
| 3250 | 3250 | $Connection = new Connection(); |
| 3251 | 3251 | $sth = $Connection->db->prepare($query); |
| 3252 | 3252 | $sth->execute(); |
| 3253 | - } catch(PDOException $e) { |
|
| 3253 | + } catch (PDOException $e) { |
|
| 3254 | 3254 | return "error : ".$e->getMessage(); |
| 3255 | 3255 | } |
| 3256 | 3256 | } |
@@ -3266,7 +3266,7 @@ discard block |
||
| 3266 | 3266 | $Connection = new Connection(); |
| 3267 | 3267 | $sth = $Connection->db->prepare($query); |
| 3268 | 3268 | $sth->execute(); |
| 3269 | - } catch(PDOException $e) { |
|
| 3269 | + } catch (PDOException $e) { |
|
| 3270 | 3270 | return "error : ".$e->getMessage(); |
| 3271 | 3271 | } |
| 3272 | 3272 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3281,7 +3281,7 @@ discard block |
||
| 3281 | 3281 | $Connection = new Connection(); |
| 3282 | 3282 | $sth = $Connection->db->prepare($query); |
| 3283 | 3283 | $sth->execute(); |
| 3284 | - } catch(PDOException $e) { |
|
| 3284 | + } catch (PDOException $e) { |
|
| 3285 | 3285 | return "error : ".$e->getMessage(); |
| 3286 | 3286 | } |
| 3287 | 3287 | } |
@@ -3297,7 +3297,7 @@ discard block |
||
| 3297 | 3297 | $Connection = new Connection(); |
| 3298 | 3298 | $sth = $Connection->db->prepare($query); |
| 3299 | 3299 | $sth->execute(); |
| 3300 | - } catch(PDOException $e) { |
|
| 3300 | + } catch (PDOException $e) { |
|
| 3301 | 3301 | return "error : ".$e->getMessage(); |
| 3302 | 3302 | } |
| 3303 | 3303 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3312,7 +3312,7 @@ discard block |
||
| 3312 | 3312 | $Connection = new Connection(); |
| 3313 | 3313 | $sth = $Connection->db->prepare($query); |
| 3314 | 3314 | $sth->execute(); |
| 3315 | - } catch(PDOException $e) { |
|
| 3315 | + } catch (PDOException $e) { |
|
| 3316 | 3316 | return "error : ".$e->getMessage(); |
| 3317 | 3317 | } |
| 3318 | 3318 | } |
@@ -3328,7 +3328,7 @@ discard block |
||
| 3328 | 3328 | $Connection = new Connection(); |
| 3329 | 3329 | $sth = $Connection->db->prepare($query); |
| 3330 | 3330 | $sth->execute(); |
| 3331 | - } catch(PDOException $e) { |
|
| 3331 | + } catch (PDOException $e) { |
|
| 3332 | 3332 | return "error : ".$e->getMessage(); |
| 3333 | 3333 | } |
| 3334 | 3334 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3343,7 +3343,7 @@ discard block |
||
| 3343 | 3343 | $Connection = new Connection(); |
| 3344 | 3344 | $sth = $Connection->db->prepare($query); |
| 3345 | 3345 | $sth->execute(); |
| 3346 | - } catch(PDOException $e) { |
|
| 3346 | + } catch (PDOException $e) { |
|
| 3347 | 3347 | return "error : ".$e->getMessage(); |
| 3348 | 3348 | } |
| 3349 | 3349 | } |
@@ -3359,7 +3359,7 @@ discard block |
||
| 3359 | 3359 | $Connection = new Connection(); |
| 3360 | 3360 | $sth = $Connection->db->prepare($query); |
| 3361 | 3361 | $sth->execute(); |
| 3362 | - } catch(PDOException $e) { |
|
| 3362 | + } catch (PDOException $e) { |
|
| 3363 | 3363 | return "error : ".$e->getMessage(); |
| 3364 | 3364 | } |
| 3365 | 3365 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3374,7 +3374,7 @@ discard block |
||
| 3374 | 3374 | $Connection = new Connection(); |
| 3375 | 3375 | $sth = $Connection->db->prepare($query); |
| 3376 | 3376 | $sth->execute(); |
| 3377 | - } catch(PDOException $e) { |
|
| 3377 | + } catch (PDOException $e) { |
|
| 3378 | 3378 | return "error : ".$e->getMessage(); |
| 3379 | 3379 | } |
| 3380 | 3380 | } |
@@ -3390,7 +3390,7 @@ discard block |
||
| 3390 | 3390 | $Connection = new Connection(); |
| 3391 | 3391 | $sth = $Connection->db->prepare($query); |
| 3392 | 3392 | $sth->execute(); |
| 3393 | - } catch(PDOException $e) { |
|
| 3393 | + } catch (PDOException $e) { |
|
| 3394 | 3394 | return "error : ".$e->getMessage(); |
| 3395 | 3395 | } |
| 3396 | 3396 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3405,7 +3405,7 @@ discard block |
||
| 3405 | 3405 | $Connection = new Connection(); |
| 3406 | 3406 | $sth = $Connection->db->prepare($query); |
| 3407 | 3407 | $sth->execute(); |
| 3408 | - } catch(PDOException $e) { |
|
| 3408 | + } catch (PDOException $e) { |
|
| 3409 | 3409 | return "error : ".$e->getMessage(); |
| 3410 | 3410 | } |
| 3411 | 3411 | } |
@@ -3421,7 +3421,7 @@ discard block |
||
| 3421 | 3421 | $Connection = new Connection(); |
| 3422 | 3422 | $sth = $Connection->db->prepare($query); |
| 3423 | 3423 | $sth->execute(); |
| 3424 | - } catch(PDOException $e) { |
|
| 3424 | + } catch (PDOException $e) { |
|
| 3425 | 3425 | return "error : ".$e->getMessage(); |
| 3426 | 3426 | } |
| 3427 | 3427 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3436,7 +3436,7 @@ discard block |
||
| 3436 | 3436 | $Connection = new Connection(); |
| 3437 | 3437 | $sth = $Connection->db->prepare($query); |
| 3438 | 3438 | $sth->execute(); |
| 3439 | - } catch(PDOException $e) { |
|
| 3439 | + } catch (PDOException $e) { |
|
| 3440 | 3440 | return "error : ".$e->getMessage(); |
| 3441 | 3441 | } |
| 3442 | 3442 | } |
@@ -3452,7 +3452,7 @@ discard block |
||
| 3452 | 3452 | $Connection = new Connection(); |
| 3453 | 3453 | $sth = $Connection->db->prepare($query); |
| 3454 | 3454 | $sth->execute(); |
| 3455 | - } catch(PDOException $e) { |
|
| 3455 | + } catch (PDOException $e) { |
|
| 3456 | 3456 | return "error : ".$e->getMessage(); |
| 3457 | 3457 | } |
| 3458 | 3458 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3467,7 +3467,7 @@ discard block |
||
| 3467 | 3467 | $Connection = new Connection(); |
| 3468 | 3468 | $sth = $Connection->db->prepare($query); |
| 3469 | 3469 | $sth->execute(); |
| 3470 | - } catch(PDOException $e) { |
|
| 3470 | + } catch (PDOException $e) { |
|
| 3471 | 3471 | return "error : ".$e->getMessage(); |
| 3472 | 3472 | } |
| 3473 | 3473 | } |
@@ -3483,7 +3483,7 @@ discard block |
||
| 3483 | 3483 | $Connection = new Connection(); |
| 3484 | 3484 | $sth = $Connection->db->prepare($query); |
| 3485 | 3485 | $sth->execute(); |
| 3486 | - } catch(PDOException $e) { |
|
| 3486 | + } catch (PDOException $e) { |
|
| 3487 | 3487 | return "error : ".$e->getMessage(); |
| 3488 | 3488 | } |
| 3489 | 3489 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3502,7 +3502,7 @@ discard block |
||
| 3502 | 3502 | $Connection = new Connection(); |
| 3503 | 3503 | $sth = $Connection->db->prepare($query); |
| 3504 | 3504 | $sth->execute(); |
| 3505 | - } catch(PDOException $e) { |
|
| 3505 | + } catch (PDOException $e) { |
|
| 3506 | 3506 | return "error : ".$e->getMessage(); |
| 3507 | 3507 | } |
| 3508 | 3508 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3517,7 +3517,7 @@ discard block |
||
| 3517 | 3517 | $Connection = new Connection(); |
| 3518 | 3518 | $sth = $Connection->db->prepare($query); |
| 3519 | 3519 | $sth->execute(); |
| 3520 | - } catch(PDOException $e) { |
|
| 3520 | + } catch (PDOException $e) { |
|
| 3521 | 3521 | return "error : ".$e->getMessage(); |
| 3522 | 3522 | } |
| 3523 | 3523 | } |
@@ -3529,7 +3529,7 @@ discard block |
||
| 3529 | 3529 | $Connection = new Connection(); |
| 3530 | 3530 | $sth = $Connection->db->prepare($query); |
| 3531 | 3531 | $sth->execute(); |
| 3532 | - } catch(PDOException $e) { |
|
| 3532 | + } catch (PDOException $e) { |
|
| 3533 | 3533 | return "error : ".$e->getMessage(); |
| 3534 | 3534 | } |
| 3535 | 3535 | } |
@@ -3545,7 +3545,7 @@ discard block |
||
| 3545 | 3545 | $Connection = new Connection(); |
| 3546 | 3546 | $sth = $Connection->db->prepare($query); |
| 3547 | 3547 | $sth->execute(); |
| 3548 | - } catch(PDOException $e) { |
|
| 3548 | + } catch (PDOException $e) { |
|
| 3549 | 3549 | return "error : ".$e->getMessage(); |
| 3550 | 3550 | } |
| 3551 | 3551 | } |
@@ -3560,7 +3560,7 @@ discard block |
||
| 3560 | 3560 | $Connection = new Connection(); |
| 3561 | 3561 | $sth = $Connection->db->prepare($query); |
| 3562 | 3562 | $sth->execute(); |
| 3563 | - } catch(PDOException $e) { |
|
| 3563 | + } catch (PDOException $e) { |
|
| 3564 | 3564 | return "error : ".$e->getMessage(); |
| 3565 | 3565 | } |
| 3566 | 3566 | } |
@@ -26,7 +26,9 @@ discard block |
||
| 26 | 26 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 27 | 27 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 28 | 28 | curl_setopt($ch, CURLOPT_TIMEOUT, 20); |
| 29 | - if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 29 | + if ($referer != '') { |
|
| 30 | + curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 31 | + } |
|
| 30 | 32 | curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
| 31 | 33 | curl_setopt($ch, CURLOPT_FILE, $fp); |
| 32 | 34 | curl_exec($ch); |
@@ -37,12 +39,16 @@ discard block |
||
| 37 | 39 | public static function gunzip($in_file,$out_file_name = '') { |
| 38 | 40 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 39 | 41 | $buffer_size = 4096; // read 4kb at a time |
| 40 | - if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
|
| 42 | + if ($out_file_name == '') { |
|
| 43 | + $out_file_name = str_replace('.gz', '', $in_file); |
|
| 44 | + } |
|
| 41 | 45 | if ($in_file != '' && file_exists($in_file)) { |
| 42 | 46 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 43 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 44 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 45 | - else { |
|
| 47 | + if (function_exists('gzopen')) { |
|
| 48 | + $file = gzopen($in_file,'rb'); |
|
| 49 | + } elseif (function_exists('gzopen64')) { |
|
| 50 | + $file = gzopen64($in_file,'rb'); |
|
| 51 | + } else { |
|
| 46 | 52 | echo 'gzopen not available'; |
| 47 | 53 | die; |
| 48 | 54 | } |
@@ -63,8 +69,12 @@ discard block |
||
| 63 | 69 | if ($res === TRUE) { |
| 64 | 70 | $zip->extractTo($path); |
| 65 | 71 | $zip->close(); |
| 66 | - } else return false; |
|
| 67 | - } else return false; |
|
| 72 | + } else { |
|
| 73 | + return false; |
|
| 74 | + } |
|
| 75 | + } else { |
|
| 76 | + return false; |
|
| 77 | + } |
|
| 68 | 78 | } |
| 69 | 79 | |
| 70 | 80 | public static function connect_sqlite($database) { |
@@ -79,7 +89,9 @@ discard block |
||
| 79 | 89 | public static function retrieve_route_sqlite_to_dest($database_file) { |
| 80 | 90 | global $globalDebug, $globalTransaction; |
| 81 | 91 | //$query = 'TRUNCATE TABLE routes'; |
| 82 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 92 | + if ($globalDebug) { |
|
| 93 | + echo " - Delete previous routes from DB -"; |
|
| 94 | + } |
|
| 83 | 95 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 84 | 96 | $Connection = new Connection(); |
| 85 | 97 | try { |
@@ -90,7 +102,9 @@ discard block |
||
| 90 | 102 | return "error : ".$e->getMessage(); |
| 91 | 103 | } |
| 92 | 104 | |
| 93 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 105 | + if ($globalDebug) { |
|
| 106 | + echo " - Add routes to DB -"; |
|
| 107 | + } |
|
| 94 | 108 | update_db::connect_sqlite($database_file); |
| 95 | 109 | //$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID'; |
| 96 | 110 | $query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID"; |
@@ -105,15 +119,21 @@ discard block |
||
| 105 | 119 | $Connection = new Connection(); |
| 106 | 120 | $sth_dest = $Connection->db->prepare($query_dest); |
| 107 | 121 | try { |
| 108 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 122 | + if ($globalTransaction) { |
|
| 123 | + $Connection->db->beginTransaction(); |
|
| 124 | + } |
|
| 109 | 125 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 110 | 126 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 111 | 127 | $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 112 | 128 | $sth_dest->execute($query_dest_values); |
| 113 | 129 | } |
| 114 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 130 | + if ($globalTransaction) { |
|
| 131 | + $Connection->db->commit(); |
|
| 132 | + } |
|
| 115 | 133 | } catch(PDOException $e) { |
| 116 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 134 | + if ($globalTransaction) { |
|
| 135 | + $Connection->db->rollBack(); |
|
| 136 | + } |
|
| 117 | 137 | return "error : ".$e->getMessage(); |
| 118 | 138 | } |
| 119 | 139 | return ''; |
@@ -121,7 +141,9 @@ discard block |
||
| 121 | 141 | public static function retrieve_route_oneworld($database_file) { |
| 122 | 142 | global $globalDebug, $globalTransaction; |
| 123 | 143 | //$query = 'TRUNCATE TABLE routes'; |
| 124 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 144 | + if ($globalDebug) { |
|
| 145 | + echo " - Delete previous routes from DB -"; |
|
| 146 | + } |
|
| 125 | 147 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 126 | 148 | $Connection = new Connection(); |
| 127 | 149 | try { |
@@ -132,14 +154,18 @@ discard block |
||
| 132 | 154 | return "error : ".$e->getMessage(); |
| 133 | 155 | } |
| 134 | 156 | |
| 135 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 157 | + if ($globalDebug) { |
|
| 158 | + echo " - Add routes to DB -"; |
|
| 159 | + } |
|
| 136 | 160 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 161 | $Spotter = new Spotter(); |
| 138 | 162 | if ($fh = fopen($database_file,"r")) { |
| 139 | 163 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 140 | 164 | $Connection = new Connection(); |
| 141 | 165 | $sth_dest = $Connection->db->prepare($query_dest); |
| 142 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 166 | + if ($globalTransaction) { |
|
| 167 | + $Connection->db->beginTransaction(); |
|
| 168 | + } |
|
| 143 | 169 | while (!feof($fh)) { |
| 144 | 170 | $line = fgetcsv($fh,9999,','); |
| 145 | 171 | if ($line[0] != '') { |
@@ -148,13 +174,17 @@ discard block |
||
| 148 | 174 | $query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld'); |
| 149 | 175 | $sth_dest->execute($query_dest_values); |
| 150 | 176 | } catch(PDOException $e) { |
| 151 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 177 | + if ($globalTransaction) { |
|
| 178 | + $Connection->db->rollBack(); |
|
| 179 | + } |
|
| 152 | 180 | return "error : ".$e->getMessage(); |
| 153 | 181 | } |
| 154 | 182 | } |
| 155 | 183 | } |
| 156 | 184 | } |
| 157 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 185 | + if ($globalTransaction) { |
|
| 186 | + $Connection->db->commit(); |
|
| 187 | + } |
|
| 158 | 188 | } |
| 159 | 189 | return ''; |
| 160 | 190 | } |
@@ -162,7 +192,9 @@ discard block |
||
| 162 | 192 | public static function retrieve_route_skyteam($database_file) { |
| 163 | 193 | global $globalDebug, $globalTransaction; |
| 164 | 194 | //$query = 'TRUNCATE TABLE routes'; |
| 165 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 195 | + if ($globalDebug) { |
|
| 196 | + echo " - Delete previous routes from DB -"; |
|
| 197 | + } |
|
| 166 | 198 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 167 | 199 | $Connection = new Connection(); |
| 168 | 200 | try { |
@@ -173,7 +205,9 @@ discard block |
||
| 173 | 205 | return "error : ".$e->getMessage(); |
| 174 | 206 | } |
| 175 | 207 | |
| 176 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 208 | + if ($globalDebug) { |
|
| 209 | + echo " - Add routes to DB -"; |
|
| 210 | + } |
|
| 177 | 211 | |
| 178 | 212 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 213 | $Spotter = new Spotter(); |
@@ -182,7 +216,9 @@ discard block |
||
| 182 | 216 | $Connection = new Connection(); |
| 183 | 217 | $sth_dest = $Connection->db->prepare($query_dest); |
| 184 | 218 | try { |
| 185 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 219 | + if ($globalTransaction) { |
|
| 220 | + $Connection->db->beginTransaction(); |
|
| 221 | + } |
|
| 186 | 222 | while (!feof($fh)) { |
| 187 | 223 | $line = fgetcsv($fh,9999,','); |
| 188 | 224 | if ($line[0] != '') { |
@@ -193,9 +229,13 @@ discard block |
||
| 193 | 229 | } |
| 194 | 230 | } |
| 195 | 231 | } |
| 196 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 232 | + if ($globalTransaction) { |
|
| 233 | + $Connection->db->commit(); |
|
| 234 | + } |
|
| 197 | 235 | } catch(PDOException $e) { |
| 198 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 236 | + if ($globalTransaction) { |
|
| 237 | + $Connection->db->rollBack(); |
|
| 238 | + } |
|
| 199 | 239 | return "error : ".$e->getMessage(); |
| 200 | 240 | } |
| 201 | 241 | } |
@@ -238,11 +278,16 @@ discard block |
||
| 238 | 278 | $sth_dest = $Connection->db->prepare($query_dest); |
| 239 | 279 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
| 240 | 280 | try { |
| 241 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 281 | + if ($globalTransaction) { |
|
| 282 | + $Connection->db->beginTransaction(); |
|
| 283 | + } |
|
| 242 | 284 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 243 | 285 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 244 | - if ($values['UserString4'] == 'M') $type = 'military'; |
|
| 245 | - else $type = null; |
|
| 286 | + if ($values['UserString4'] == 'M') { |
|
| 287 | + $type = 'military'; |
|
| 288 | + } else { |
|
| 289 | + $type = null; |
|
| 290 | + } |
|
| 246 | 291 | $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
| 247 | 292 | $sth_dest->execute($query_dest_values); |
| 248 | 293 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
@@ -250,7 +295,9 @@ discard block |
||
| 250 | 295 | $sth_dest_owner->execute($query_dest_owner_values); |
| 251 | 296 | } |
| 252 | 297 | } |
| 253 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 298 | + if ($globalTransaction) { |
|
| 299 | + $Connection->db->commit(); |
|
| 300 | + } |
|
| 254 | 301 | } catch(PDOException $e) { |
| 255 | 302 | return "error : ".$e->getMessage(); |
| 256 | 303 | } |
@@ -287,7 +334,9 @@ discard block |
||
| 287 | 334 | $Connection = new Connection(); |
| 288 | 335 | $sth_dest = $Connection->db->prepare($query_dest); |
| 289 | 336 | try { |
| 290 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 337 | + if ($globalTransaction) { |
|
| 338 | + $Connection->db->beginTransaction(); |
|
| 339 | + } |
|
| 291 | 340 | while (!feof($fh)) { |
| 292 | 341 | $values = array(); |
| 293 | 342 | $line = $Common->hex2str(fgets($fh,9999)); |
@@ -298,7 +347,9 @@ discard block |
||
| 298 | 347 | // Check if we can find ICAO, else set it to GLID |
| 299 | 348 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 300 | 349 | $search_more = ''; |
| 301 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 350 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 351 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 352 | + } |
|
| 302 | 353 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 303 | 354 | $sth_search = $Connection->db->prepare($query_search); |
| 304 | 355 | try { |
@@ -311,7 +362,9 @@ discard block |
||
| 311 | 362 | } catch(PDOException $e) { |
| 312 | 363 | return "error : ".$e->getMessage(); |
| 313 | 364 | } |
| 314 | - if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
|
| 365 | + if (!isset($values['ICAOTypeCode'])) { |
|
| 366 | + $values['ICAOTypeCode'] = 'GLID'; |
|
| 367 | + } |
|
| 315 | 368 | // Add data to db |
| 316 | 369 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 317 | 370 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
@@ -320,7 +373,9 @@ discard block |
||
| 320 | 373 | $sth_dest->execute($query_dest_values); |
| 321 | 374 | } |
| 322 | 375 | } |
| 323 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 376 | + if ($globalTransaction) { |
|
| 377 | + $Connection->db->commit(); |
|
| 378 | + } |
|
| 324 | 379 | } catch(PDOException $e) { |
| 325 | 380 | return "error : ".$e->getMessage(); |
| 326 | 381 | } |
@@ -356,7 +411,9 @@ discard block |
||
| 356 | 411 | $Connection = new Connection(); |
| 357 | 412 | $sth_dest = $Connection->db->prepare($query_dest); |
| 358 | 413 | try { |
| 359 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 414 | + if ($globalTransaction) { |
|
| 415 | + $Connection->db->beginTransaction(); |
|
| 416 | + } |
|
| 360 | 417 | $tmp = fgetcsv($fh,9999,',',"'"); |
| 361 | 418 | while (!feof($fh)) { |
| 362 | 419 | $line = fgetcsv($fh,9999,',',"'"); |
@@ -370,13 +427,17 @@ discard block |
||
| 370 | 427 | // Check if we can find ICAO, else set it to GLID |
| 371 | 428 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 372 | 429 | $search_more = ''; |
| 373 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 430 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 431 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 432 | + } |
|
| 374 | 433 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 375 | 434 | $sth_search = $Connection->db->prepare($query_search); |
| 376 | 435 | try { |
| 377 | 436 | $sth_search->execute(); |
| 378 | 437 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 379 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 438 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
| 439 | + $values['ICAOTypeCode'] = $result['icao']; |
|
| 440 | + } |
|
| 380 | 441 | } catch(PDOException $e) { |
| 381 | 442 | return "error : ".$e->getMessage(); |
| 382 | 443 | } |
@@ -389,7 +450,9 @@ discard block |
||
| 389 | 450 | $sth_dest->execute($query_dest_values); |
| 390 | 451 | } |
| 391 | 452 | } |
| 392 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 453 | + if ($globalTransaction) { |
|
| 454 | + $Connection->db->commit(); |
|
| 455 | + } |
|
| 393 | 456 | } catch(PDOException $e) { |
| 394 | 457 | return "error : ".$e->getMessage(); |
| 395 | 458 | } |
@@ -428,7 +491,9 @@ discard block |
||
| 428 | 491 | $sth_dest = $Connection->db->prepare($query_dest); |
| 429 | 492 | $sth_modes = $Connection->db->prepare($query_modes); |
| 430 | 493 | try { |
| 431 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 494 | + if ($globalTransaction) { |
|
| 495 | + $Connection->db->beginTransaction(); |
|
| 496 | + } |
|
| 432 | 497 | $tmp = fgetcsv($fh,9999,',','"'); |
| 433 | 498 | while (!feof($fh)) { |
| 434 | 499 | $line = fgetcsv($fh,9999,',','"'); |
@@ -438,16 +503,22 @@ discard block |
||
| 438 | 503 | $values['registration'] = $line[0]; |
| 439 | 504 | $values['base'] = $line[4]; |
| 440 | 505 | $values['owner'] = $line[5]; |
| 441 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | + if ($line[6] == '') { |
|
| 507 | + $values['date_first_reg'] = null; |
|
| 508 | + } else { |
|
| 509 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 510 | + } |
|
| 443 | 511 | $values['cancel'] = $line[7]; |
| 444 | 512 | } elseif ($country == 'EI') { |
| 445 | 513 | // TODO : add modeS & reg to aircraft_modes |
| 446 | 514 | $values['registration'] = $line[0]; |
| 447 | 515 | $values['base'] = $line[3]; |
| 448 | 516 | $values['owner'] = $line[2]; |
| 449 | - if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 517 | + if ($line[1] == '') { |
|
| 518 | + $values['date_first_reg'] = null; |
|
| 519 | + } else { |
|
| 520 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 521 | + } |
|
| 451 | 522 | $values['cancel'] = ''; |
| 452 | 523 | $values['modes'] = $line[7]; |
| 453 | 524 | $values['icao'] = $line[8]; |
@@ -466,16 +537,22 @@ discard block |
||
| 466 | 537 | $values['registration'] = $line[3]; |
| 467 | 538 | $values['base'] = null; |
| 468 | 539 | $values['owner'] = $line[5]; |
| 469 | - if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 540 | + if ($line[18] == '') { |
|
| 541 | + $values['date_first_reg'] = null; |
|
| 542 | + } else { |
|
| 543 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 544 | + } |
|
| 471 | 545 | $values['cancel'] = ''; |
| 472 | 546 | } elseif ($country == 'VH') { |
| 473 | 547 | // TODO : add modeS & reg to aircraft_modes |
| 474 | 548 | $values['registration'] = $line[0]; |
| 475 | 549 | $values['base'] = null; |
| 476 | 550 | $values['owner'] = $line[12]; |
| 477 | - if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 551 | + if ($line[28] == '') { |
|
| 552 | + $values['date_first_reg'] = null; |
|
| 553 | + } else { |
|
| 554 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 555 | + } |
|
| 479 | 556 | |
| 480 | 557 | $values['cancel'] = $line[39]; |
| 481 | 558 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -494,29 +571,41 @@ discard block |
||
| 494 | 571 | $values['registration'] = $line[0]; |
| 495 | 572 | $values['base'] = null; |
| 496 | 573 | $values['owner'] = $line[8]; |
| 497 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 574 | + if ($line[7] == '') { |
|
| 575 | + $values['date_first_reg'] = null; |
|
| 576 | + } else { |
|
| 577 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 578 | + } |
|
| 499 | 579 | $values['cancel'] = ''; |
| 500 | 580 | } elseif ($country == 'PP') { |
| 501 | 581 | $values['registration'] = $line[0]; |
| 502 | 582 | $values['base'] = null; |
| 503 | 583 | $values['owner'] = $line[4]; |
| 504 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 584 | + if ($line[6] == '') { |
|
| 585 | + $values['date_first_reg'] = null; |
|
| 586 | + } else { |
|
| 587 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 588 | + } |
|
| 506 | 589 | $values['cancel'] = $line[7]; |
| 507 | 590 | } elseif ($country == 'E7') { |
| 508 | 591 | $values['registration'] = $line[0]; |
| 509 | 592 | $values['base'] = null; |
| 510 | 593 | $values['owner'] = $line[4]; |
| 511 | - if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 594 | + if ($line[5] == '') { |
|
| 595 | + $values['date_first_reg'] = null; |
|
| 596 | + } else { |
|
| 597 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 598 | + } |
|
| 513 | 599 | $values['cancel'] = ''; |
| 514 | 600 | } elseif ($country == '8Q') { |
| 515 | 601 | $values['registration'] = $line[0]; |
| 516 | 602 | $values['base'] = null; |
| 517 | 603 | $values['owner'] = $line[3]; |
| 518 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 604 | + if ($line[7] == '') { |
|
| 605 | + $values['date_first_reg'] = null; |
|
| 606 | + } else { |
|
| 607 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 608 | + } |
|
| 520 | 609 | $values['cancel'] = ''; |
| 521 | 610 | } elseif ($country == 'ZK') { |
| 522 | 611 | $values['registration'] = $line[0]; |
@@ -561,7 +650,9 @@ discard block |
||
| 561 | 650 | $sth_modes->execute($query_modes_values); |
| 562 | 651 | } |
| 563 | 652 | } |
| 564 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 653 | + if ($globalTransaction) { |
|
| 654 | + $Connection->db->commit(); |
|
| 655 | + } |
|
| 565 | 656 | } catch(PDOException $e) { |
| 566 | 657 | return "error : ".$e->getMessage(); |
| 567 | 658 | } |
@@ -697,25 +788,45 @@ discard block |
||
| 697 | 788 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)"; |
| 698 | 789 | $Connection = new Connection(); |
| 699 | 790 | $sth_dest = $Connection->db->prepare($query_dest); |
| 700 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 791 | + if ($globalTransaction) { |
|
| 792 | + $Connection->db->beginTransaction(); |
|
| 793 | + } |
|
| 701 | 794 | |
| 702 | 795 | $i = 0; |
| 703 | 796 | while($row = sparql_fetch_array($result)) |
| 704 | 797 | { |
| 705 | 798 | if ($i >= 1) { |
| 706 | 799 | //print_r($row); |
| 707 | - if (!isset($row['iata'])) $row['iata'] = ''; |
|
| 708 | - if (!isset($row['icao'])) $row['icao'] = ''; |
|
| 709 | - if (!isset($row['type'])) $row['type'] = ''; |
|
| 710 | - if (!isset($row['altitude'])) $row['altitude'] = ''; |
|
| 800 | + if (!isset($row['iata'])) { |
|
| 801 | + $row['iata'] = ''; |
|
| 802 | + } |
|
| 803 | + if (!isset($row['icao'])) { |
|
| 804 | + $row['icao'] = ''; |
|
| 805 | + } |
|
| 806 | + if (!isset($row['type'])) { |
|
| 807 | + $row['type'] = ''; |
|
| 808 | + } |
|
| 809 | + if (!isset($row['altitude'])) { |
|
| 810 | + $row['altitude'] = ''; |
|
| 811 | + } |
|
| 711 | 812 | if (isset($row['city_bis'])) { |
| 712 | 813 | $row['city'] = $row['city_bis']; |
| 713 | 814 | } |
| 714 | - if (!isset($row['city'])) $row['city'] = ''; |
|
| 715 | - if (!isset($row['country'])) $row['country'] = ''; |
|
| 716 | - if (!isset($row['homepage'])) $row['homepage'] = ''; |
|
| 717 | - if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = ''; |
|
| 718 | - if (!isset($row['name'])) continue; |
|
| 815 | + if (!isset($row['city'])) { |
|
| 816 | + $row['city'] = ''; |
|
| 817 | + } |
|
| 818 | + if (!isset($row['country'])) { |
|
| 819 | + $row['country'] = ''; |
|
| 820 | + } |
|
| 821 | + if (!isset($row['homepage'])) { |
|
| 822 | + $row['homepage'] = ''; |
|
| 823 | + } |
|
| 824 | + if (!isset($row['wikipedia_page'])) { |
|
| 825 | + $row['wikipedia_page'] = ''; |
|
| 826 | + } |
|
| 827 | + if (!isset($row['name'])) { |
|
| 828 | + continue; |
|
| 829 | + } |
|
| 719 | 830 | if (!isset($row['image'])) { |
| 720 | 831 | $row['image'] = ''; |
| 721 | 832 | $row['image_thumb'] = ''; |
@@ -771,7 +882,9 @@ discard block |
||
| 771 | 882 | |
| 772 | 883 | $i++; |
| 773 | 884 | } |
| 774 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 885 | + if ($globalTransaction) { |
|
| 886 | + $Connection->db->commit(); |
|
| 887 | + } |
|
| 775 | 888 | /* |
| 776 | 889 | echo "Delete duplicate rows...\n"; |
| 777 | 890 | $query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)'; |
@@ -814,7 +927,9 @@ discard block |
||
| 814 | 927 | $delimiter = ','; |
| 815 | 928 | $out_file = $tmp_dir.'airports.csv'; |
| 816 | 929 | update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
| 817 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 930 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 931 | + return FALSE; |
|
| 932 | + } |
|
| 818 | 933 | echo "Add data from ourairports.com...\n"; |
| 819 | 934 | |
| 820 | 935 | $header = NULL; |
@@ -824,8 +939,9 @@ discard block |
||
| 824 | 939 | //$Connection->db->beginTransaction(); |
| 825 | 940 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 826 | 941 | { |
| 827 | - if(!$header) $header = $row; |
|
| 828 | - else { |
|
| 942 | + if(!$header) { |
|
| 943 | + $header = $row; |
|
| 944 | + } else { |
|
| 829 | 945 | $data = array(); |
| 830 | 946 | $data = array_combine($header, $row); |
| 831 | 947 | try { |
@@ -866,7 +982,9 @@ discard block |
||
| 866 | 982 | echo "Download data from another free database...\n"; |
| 867 | 983 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 868 | 984 | update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
| 869 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 985 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 986 | + return FALSE; |
|
| 987 | + } |
|
| 870 | 988 | update_db::unzip($out_file); |
| 871 | 989 | $header = NULL; |
| 872 | 990 | echo "Add data from another free database...\n"; |
@@ -877,8 +995,9 @@ discard block |
||
| 877 | 995 | //$Connection->db->beginTransaction(); |
| 878 | 996 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 879 | 997 | { |
| 880 | - if(!$header) $header = $row; |
|
| 881 | - else { |
|
| 998 | + if(!$header) { |
|
| 999 | + $header = $row; |
|
| 1000 | + } else { |
|
| 882 | 1001 | $data = $row; |
| 883 | 1002 | |
| 884 | 1003 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
@@ -1047,7 +1166,9 @@ discard block |
||
| 1047 | 1166 | if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE) |
| 1048 | 1167 | { |
| 1049 | 1168 | $i = 0; |
| 1050 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1169 | + if ($globalTransaction) { |
|
| 1170 | + $Connection->db->beginTransaction(); |
|
| 1171 | + } |
|
| 1051 | 1172 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1052 | 1173 | { |
| 1053 | 1174 | if ($i > 0) { |
@@ -1060,7 +1181,9 @@ discard block |
||
| 1060 | 1181 | } |
| 1061 | 1182 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
| 1062 | 1183 | if (!empty($result_search)) { |
| 1063 | - if ($globalDebug) echo '.'; |
|
| 1184 | + if ($globalDebug) { |
|
| 1185 | + echo '.'; |
|
| 1186 | + } |
|
| 1064 | 1187 | //if ($globalDBdriver == 'mysql') { |
| 1065 | 1188 | // $queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao'; |
| 1066 | 1189 | //} else { |
@@ -1082,8 +1205,12 @@ discard block |
||
| 1082 | 1205 | } |
| 1083 | 1206 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
| 1084 | 1207 | if (!empty($result_search_mfr)) { |
| 1085 | - if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23]; |
|
| 1086 | - if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15]; |
|
| 1208 | + if (trim($data[16]) == '' && trim($data[23]) != '') { |
|
| 1209 | + $data[16] = $data[23]; |
|
| 1210 | + } |
|
| 1211 | + if (trim($data[16]) == '' && trim($data[15]) != '') { |
|
| 1212 | + $data[16] = $data[15]; |
|
| 1213 | + } |
|
| 1087 | 1214 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1088 | 1215 | try { |
| 1089 | 1216 | $sthf = $Connection->db->prepare($queryf); |
@@ -1094,7 +1221,9 @@ discard block |
||
| 1094 | 1221 | } |
| 1095 | 1222 | } |
| 1096 | 1223 | if (strtotime($data[29]) > time()) { |
| 1097 | - if ($globalDebug) echo 'i'; |
|
| 1224 | + if ($globalDebug) { |
|
| 1225 | + echo 'i'; |
|
| 1226 | + } |
|
| 1098 | 1227 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1099 | 1228 | try { |
| 1100 | 1229 | $sth = $Connection->db->prepare($query); |
@@ -1105,13 +1234,19 @@ discard block |
||
| 1105 | 1234 | } |
| 1106 | 1235 | } |
| 1107 | 1236 | if ($i % 90 == 0) { |
| 1108 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1109 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1237 | + if ($globalTransaction) { |
|
| 1238 | + $Connection->db->commit(); |
|
| 1239 | + } |
|
| 1240 | + if ($globalTransaction) { |
|
| 1241 | + $Connection->db->beginTransaction(); |
|
| 1242 | + } |
|
| 1110 | 1243 | } |
| 1111 | 1244 | $i++; |
| 1112 | 1245 | } |
| 1113 | 1246 | fclose($handle); |
| 1114 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1247 | + if ($globalTransaction) { |
|
| 1248 | + $Connection->db->commit(); |
|
| 1249 | + } |
|
| 1115 | 1250 | } |
| 1116 | 1251 | return ''; |
| 1117 | 1252 | } |
@@ -1131,11 +1266,15 @@ discard block |
||
| 1131 | 1266 | if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE) |
| 1132 | 1267 | { |
| 1133 | 1268 | $i = 0; |
| 1134 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1269 | + if ($globalTransaction) { |
|
| 1270 | + $Connection->db->beginTransaction(); |
|
| 1271 | + } |
|
| 1135 | 1272 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1136 | 1273 | { |
| 1137 | 1274 | if ($i > 0) { |
| 1138 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
| 1275 | + if ($data[1] == 'NULL') { |
|
| 1276 | + $data[1] = $data[0]; |
|
| 1277 | + } |
|
| 1139 | 1278 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1140 | 1279 | try { |
| 1141 | 1280 | $sth = $Connection->db->prepare($query); |
@@ -1147,7 +1286,9 @@ discard block |
||
| 1147 | 1286 | $i++; |
| 1148 | 1287 | } |
| 1149 | 1288 | fclose($handle); |
| 1150 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1289 | + if ($globalTransaction) { |
|
| 1290 | + $Connection->db->commit(); |
|
| 1291 | + } |
|
| 1151 | 1292 | } |
| 1152 | 1293 | return ''; |
| 1153 | 1294 | } |
@@ -1179,11 +1320,15 @@ discard block |
||
| 1179 | 1320 | if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE) |
| 1180 | 1321 | { |
| 1181 | 1322 | $i = 0; |
| 1182 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1323 | + if ($globalTransaction) { |
|
| 1324 | + $Connection->db->beginTransaction(); |
|
| 1325 | + } |
|
| 1183 | 1326 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1184 | 1327 | { |
| 1185 | 1328 | if ($i > 0) { |
| 1186 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
| 1329 | + if ($data[1] == 'NULL') { |
|
| 1330 | + $data[1] = $data[0]; |
|
| 1331 | + } |
|
| 1187 | 1332 | $query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)'; |
| 1188 | 1333 | try { |
| 1189 | 1334 | $sth = $Connection->db->prepare($query); |
@@ -1195,7 +1340,9 @@ discard block |
||
| 1195 | 1340 | $i++; |
| 1196 | 1341 | } |
| 1197 | 1342 | fclose($handle); |
| 1198 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1343 | + if ($globalTransaction) { |
|
| 1344 | + $Connection->db->commit(); |
|
| 1345 | + } |
|
| 1199 | 1346 | } |
| 1200 | 1347 | /* |
| 1201 | 1348 | $query = "UNLOCK TABLES"; |
@@ -1225,7 +1372,9 @@ discard block |
||
| 1225 | 1372 | if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE) |
| 1226 | 1373 | { |
| 1227 | 1374 | $i = 0; |
| 1228 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1375 | + if ($globalTransaction) { |
|
| 1376 | + $Connection->db->beginTransaction(); |
|
| 1377 | + } |
|
| 1229 | 1378 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1230 | 1379 | { |
| 1231 | 1380 | if ($i > 0) { |
@@ -1241,7 +1390,9 @@ discard block |
||
| 1241 | 1390 | $i++; |
| 1242 | 1391 | } |
| 1243 | 1392 | fclose($handle); |
| 1244 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1393 | + if ($globalTransaction) { |
|
| 1394 | + $Connection->db->commit(); |
|
| 1395 | + } |
|
| 1245 | 1396 | } |
| 1246 | 1397 | return ''; |
| 1247 | 1398 | } |
@@ -1261,7 +1412,9 @@ discard block |
||
| 1261 | 1412 | if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE) |
| 1262 | 1413 | { |
| 1263 | 1414 | $i = 0; |
| 1264 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1415 | + if ($globalTransaction) { |
|
| 1416 | + $Connection->db->beginTransaction(); |
|
| 1417 | + } |
|
| 1265 | 1418 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1266 | 1419 | { |
| 1267 | 1420 | if ($i > 0) { |
@@ -1270,13 +1423,17 @@ discard block |
||
| 1270 | 1423 | $sth = $Connection->db->prepare($query); |
| 1271 | 1424 | $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
| 1272 | 1425 | } catch(PDOException $e) { |
| 1273 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1426 | + if ($globalDebug) { |
|
| 1427 | + echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1428 | + } |
|
| 1274 | 1429 | } |
| 1275 | 1430 | } |
| 1276 | 1431 | $i++; |
| 1277 | 1432 | } |
| 1278 | 1433 | fclose($handle); |
| 1279 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1434 | + if ($globalTransaction) { |
|
| 1435 | + $Connection->db->commit(); |
|
| 1436 | + } |
|
| 1280 | 1437 | } |
| 1281 | 1438 | return ''; |
| 1282 | 1439 | } |
@@ -1301,7 +1458,9 @@ discard block |
||
| 1301 | 1458 | $i = 0; |
| 1302 | 1459 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1303 | 1460 | //$Connection->db->beginTransaction(); |
| 1304 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1461 | + if ($globalTransaction) { |
|
| 1462 | + $Connection->db->beginTransaction(); |
|
| 1463 | + } |
|
| 1305 | 1464 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1306 | 1465 | { |
| 1307 | 1466 | if ($i > 0) { |
@@ -1317,7 +1476,9 @@ discard block |
||
| 1317 | 1476 | $i++; |
| 1318 | 1477 | } |
| 1319 | 1478 | fclose($handle); |
| 1320 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1479 | + if ($globalTransaction) { |
|
| 1480 | + $Connection->db->commit(); |
|
| 1481 | + } |
|
| 1321 | 1482 | } |
| 1322 | 1483 | return ''; |
| 1323 | 1484 | } |
@@ -1337,7 +1498,9 @@ discard block |
||
| 1337 | 1498 | if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE) |
| 1338 | 1499 | { |
| 1339 | 1500 | $i = 0; |
| 1340 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1501 | + if ($globalTransaction) { |
|
| 1502 | + $Connection->db->beginTransaction(); |
|
| 1503 | + } |
|
| 1341 | 1504 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1342 | 1505 | { |
| 1343 | 1506 | if ($i > 0) { |
@@ -1354,7 +1517,9 @@ discard block |
||
| 1354 | 1517 | $i++; |
| 1355 | 1518 | } |
| 1356 | 1519 | fclose($handle); |
| 1357 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1520 | + if ($globalTransaction) { |
|
| 1521 | + $Connection->db->commit(); |
|
| 1522 | + } |
|
| 1358 | 1523 | } |
| 1359 | 1524 | return ''; |
| 1360 | 1525 | } |
@@ -1373,7 +1538,9 @@ discard block |
||
| 1373 | 1538 | $Connection = new Connection(); |
| 1374 | 1539 | if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE) |
| 1375 | 1540 | { |
| 1376 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1541 | + if ($globalTransaction) { |
|
| 1542 | + $Connection->db->beginTransaction(); |
|
| 1543 | + } |
|
| 1377 | 1544 | while (($data = fgetcsv($handle, 1000)) !== FALSE) |
| 1378 | 1545 | { |
| 1379 | 1546 | $query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL'; |
@@ -1388,7 +1555,9 @@ discard block |
||
| 1388 | 1555 | } |
| 1389 | 1556 | } |
| 1390 | 1557 | fclose($handle); |
| 1391 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1558 | + if ($globalTransaction) { |
|
| 1559 | + $Connection->db->commit(); |
|
| 1560 | + } |
|
| 1392 | 1561 | } |
| 1393 | 1562 | return ''; |
| 1394 | 1563 | } |
@@ -1464,9 +1633,14 @@ discard block |
||
| 1464 | 1633 | if ($i > 0 && $data[0] != '') { |
| 1465 | 1634 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
| 1466 | 1635 | $period = str_replace(',','',$data[14]); |
| 1467 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
| 1468 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1469 | - else $launch_date = NULL; |
|
| 1636 | + if (!empty($period) && strpos($period,'days')) { |
|
| 1637 | + $period = str_replace(' days','',$period)*24*60; |
|
| 1638 | + } |
|
| 1639 | + if ($data[18] != '') { |
|
| 1640 | + $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1641 | + } else { |
|
| 1642 | + $launch_date = NULL; |
|
| 1643 | + } |
|
| 1470 | 1644 | $data = array_map(function($value) { |
| 1471 | 1645 | return trim($value) === '' ? null : $value; |
| 1472 | 1646 | }, $data); |
@@ -1829,7 +2003,9 @@ discard block |
||
| 1829 | 2003 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1830 | 2004 | { |
| 1831 | 2005 | $i = 0; |
| 1832 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 2006 | + if ($globalTransaction) { |
|
| 2007 | + $Connection->db->beginTransaction(); |
|
| 2008 | + } |
|
| 1833 | 2009 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1834 | 2010 | { |
| 1835 | 2011 | $i++; |
@@ -1857,7 +2033,9 @@ discard block |
||
| 1857 | 2033 | } |
| 1858 | 2034 | } |
| 1859 | 2035 | fclose($handle); |
| 1860 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 2036 | + if ($globalTransaction) { |
|
| 2037 | + $Connection->db->commit(); |
|
| 2038 | + } |
|
| 1861 | 2039 | } |
| 1862 | 2040 | return ''; |
| 1863 | 2041 | } |
@@ -1900,7 +2078,9 @@ discard block |
||
| 1900 | 2078 | $Connection = new Connection(); |
| 1901 | 2079 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1902 | 2080 | { |
| 1903 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 2081 | + if ($globalTransaction) { |
|
| 2082 | + $Connection->db->beginTransaction(); |
|
| 2083 | + } |
|
| 1904 | 2084 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1905 | 2085 | { |
| 1906 | 2086 | if(count($row) > 1) { |
@@ -1914,7 +2094,9 @@ discard block |
||
| 1914 | 2094 | } |
| 1915 | 2095 | } |
| 1916 | 2096 | fclose($handle); |
| 1917 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 2097 | + if ($globalTransaction) { |
|
| 2098 | + $Connection->db->commit(); |
|
| 2099 | + } |
|
| 1918 | 2100 | } |
| 1919 | 2101 | return ''; |
| 1920 | 2102 | } |
@@ -1934,8 +2116,9 @@ discard block |
||
| 1934 | 2116 | } |
| 1935 | 2117 | |
| 1936 | 2118 | |
| 1937 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1938 | - else { |
|
| 2119 | + if ($globalDBdriver == 'mysql') { |
|
| 2120 | + update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 2121 | + } else { |
|
| 1939 | 2122 | update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
| 1940 | 2123 | $query = "CREATE EXTENSION postgis"; |
| 1941 | 2124 | $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
@@ -1954,7 +2137,9 @@ discard block |
||
| 1954 | 2137 | global $tmp_dir, $globalDebug; |
| 1955 | 2138 | include_once('class.create_db.php'); |
| 1956 | 2139 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1957 | - if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
|
| 2140 | + if ($globalDebug) { |
|
| 2141 | + echo "NOTAM from FlightAirMap website : Download..."; |
|
| 2142 | + } |
|
| 1958 | 2143 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
| 1959 | 2144 | $error = ''; |
| 1960 | 2145 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
@@ -1964,20 +2149,34 @@ discard block |
||
| 1964 | 2149 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
| 1965 | 2150 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1966 | 2151 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
| 1967 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2152 | + if ($globalDebug) { |
|
| 2153 | + echo "Gunzip..."; |
|
| 2154 | + } |
|
| 1968 | 2155 | update_db::gunzip($tmp_dir.'notam.txt.gz'); |
| 1969 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2156 | + if ($globalDebug) { |
|
| 2157 | + echo "Add to DB..."; |
|
| 2158 | + } |
|
| 1970 | 2159 | //$error = create_db::import_file($tmp_dir.'notam.sql'); |
| 1971 | 2160 | $NOTAM = new NOTAM(); |
| 1972 | 2161 | $NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt'); |
| 1973 | 2162 | update_db::insert_notam_version($notam_md5); |
| 1974 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
| 1975 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 1976 | - } elseif ($globalDebug) echo "No new version."; |
|
| 1977 | - } else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
| 2163 | + } else { |
|
| 2164 | + $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
| 2165 | + } |
|
| 2166 | + } else { |
|
| 2167 | + $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 2168 | + } |
|
| 2169 | + } elseif ($globalDebug) { |
|
| 2170 | + echo "No new version."; |
|
| 2171 | + } |
|
| 2172 | + } else { |
|
| 2173 | + $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
| 2174 | + } |
|
| 1978 | 2175 | if ($error != '') { |
| 1979 | 2176 | return $error; |
| 1980 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2177 | + } elseif ($globalDebug) { |
|
| 2178 | + echo "Done\n"; |
|
| 2179 | + } |
|
| 1981 | 2180 | return ''; |
| 1982 | 2181 | } |
| 1983 | 2182 | |
@@ -2032,68 +2231,114 @@ discard block |
||
| 2032 | 2231 | //update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip'); |
| 2033 | 2232 | if (extension_loaded('zip')) { |
| 2034 | 2233 | if (file_exists($tmp_dir.'ivae_feb2013.zip')) { |
| 2035 | - if ($globalDebug) echo "Unzip..."; |
|
| 2234 | + if ($globalDebug) { |
|
| 2235 | + echo "Unzip..."; |
|
| 2236 | + } |
|
| 2036 | 2237 | update_db::unzip($tmp_dir.'ivae_feb2013.zip'); |
| 2037 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2238 | + if ($globalDebug) { |
|
| 2239 | + echo "Add to DB..."; |
|
| 2240 | + } |
|
| 2038 | 2241 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 2039 | - if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
|
| 2242 | + if ($globalDebug) { |
|
| 2243 | + echo "Copy airlines logos to airlines images directory..."; |
|
| 2244 | + } |
|
| 2040 | 2245 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 2041 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2042 | - } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 2043 | - } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 2044 | - } else $error = "ZIP module not loaded but required for IVAO."; |
|
| 2246 | + if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) { |
|
| 2247 | + $error = "Failed to copy airlines logo."; |
|
| 2248 | + } |
|
| 2249 | + } else { |
|
| 2250 | + $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 2251 | + } |
|
| 2252 | + } else { |
|
| 2253 | + $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 2254 | + } |
|
| 2255 | + } else { |
|
| 2256 | + $error = "ZIP module not loaded but required for IVAO."; |
|
| 2257 | + } |
|
| 2045 | 2258 | if ($error != '') { |
| 2046 | 2259 | return $error; |
| 2047 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2260 | + } elseif ($globalDebug) { |
|
| 2261 | + echo "Done\n"; |
|
| 2262 | + } |
|
| 2048 | 2263 | return ''; |
| 2049 | 2264 | } |
| 2050 | 2265 | |
| 2051 | 2266 | public static function update_routes() { |
| 2052 | 2267 | global $tmp_dir, $globalDebug; |
| 2053 | 2268 | $error = ''; |
| 2054 | - if ($globalDebug) echo "Routes : Download..."; |
|
| 2269 | + if ($globalDebug) { |
|
| 2270 | + echo "Routes : Download..."; |
|
| 2271 | + } |
|
| 2055 | 2272 | update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
| 2056 | 2273 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 2057 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2274 | + if ($globalDebug) { |
|
| 2275 | + echo "Gunzip..."; |
|
| 2276 | + } |
|
| 2058 | 2277 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
| 2059 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2278 | + if ($globalDebug) { |
|
| 2279 | + echo "Add to DB..."; |
|
| 2280 | + } |
|
| 2060 | 2281 | $error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb'); |
| 2061 | - } else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 2282 | + } else { |
|
| 2283 | + $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 2284 | + } |
|
| 2062 | 2285 | if ($error != '') { |
| 2063 | 2286 | return $error; |
| 2064 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2287 | + } elseif ($globalDebug) { |
|
| 2288 | + echo "Done\n"; |
|
| 2289 | + } |
|
| 2065 | 2290 | return ''; |
| 2066 | 2291 | } |
| 2067 | 2292 | public static function update_oneworld() { |
| 2068 | 2293 | global $tmp_dir, $globalDebug; |
| 2069 | 2294 | $error = ''; |
| 2070 | - if ($globalDebug) echo "Schedules Oneworld : Download..."; |
|
| 2295 | + if ($globalDebug) { |
|
| 2296 | + echo "Schedules Oneworld : Download..."; |
|
| 2297 | + } |
|
| 2071 | 2298 | update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
| 2072 | 2299 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 2073 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2300 | + if ($globalDebug) { |
|
| 2301 | + echo "Gunzip..."; |
|
| 2302 | + } |
|
| 2074 | 2303 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
| 2075 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2304 | + if ($globalDebug) { |
|
| 2305 | + echo "Add to DB..."; |
|
| 2306 | + } |
|
| 2076 | 2307 | $error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv'); |
| 2077 | - } else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 2308 | + } else { |
|
| 2309 | + $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 2310 | + } |
|
| 2078 | 2311 | if ($error != '') { |
| 2079 | 2312 | return $error; |
| 2080 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2313 | + } elseif ($globalDebug) { |
|
| 2314 | + echo "Done\n"; |
|
| 2315 | + } |
|
| 2081 | 2316 | return ''; |
| 2082 | 2317 | } |
| 2083 | 2318 | public static function update_skyteam() { |
| 2084 | 2319 | global $tmp_dir, $globalDebug; |
| 2085 | 2320 | $error = ''; |
| 2086 | - if ($globalDebug) echo "Schedules Skyteam : Download..."; |
|
| 2321 | + if ($globalDebug) { |
|
| 2322 | + echo "Schedules Skyteam : Download..."; |
|
| 2323 | + } |
|
| 2087 | 2324 | update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
| 2088 | 2325 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 2089 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2326 | + if ($globalDebug) { |
|
| 2327 | + echo "Gunzip..."; |
|
| 2328 | + } |
|
| 2090 | 2329 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
| 2091 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2330 | + if ($globalDebug) { |
|
| 2331 | + echo "Add to DB..."; |
|
| 2332 | + } |
|
| 2092 | 2333 | $error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv'); |
| 2093 | - } else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 2334 | + } else { |
|
| 2335 | + $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 2336 | + } |
|
| 2094 | 2337 | if ($error != '') { |
| 2095 | 2338 | return $error; |
| 2096 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2339 | + } elseif ($globalDebug) { |
|
| 2340 | + echo "Done\n"; |
|
| 2341 | + } |
|
| 2097 | 2342 | return ''; |
| 2098 | 2343 | } |
| 2099 | 2344 | public static function update_ModeS() { |
@@ -2110,340 +2355,590 @@ discard block |
||
| 2110 | 2355 | exit; |
| 2111 | 2356 | } elseif ($globalDebug) echo "Done\n"; |
| 2112 | 2357 | */ |
| 2113 | - if ($globalDebug) echo "Modes : Download..."; |
|
| 2114 | -// update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 2358 | + if ($globalDebug) { |
|
| 2359 | + echo "Modes : Download..."; |
|
| 2360 | + } |
|
| 2361 | + // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 2115 | 2362 | update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
| 2116 | 2363 | |
| 2117 | 2364 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 2118 | 2365 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
| 2119 | - if ($globalDebug) echo "Unzip..."; |
|
| 2120 | -// update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 2366 | + if ($globalDebug) { |
|
| 2367 | + echo "Unzip..."; |
|
| 2368 | + } |
|
| 2369 | + // update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 2121 | 2370 | update_db::gunzip($tmp_dir.'BaseStation.sqb.gz'); |
| 2122 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2371 | + if ($globalDebug) { |
|
| 2372 | + echo "Add to DB..."; |
|
| 2373 | + } |
|
| 2123 | 2374 | $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb'); |
| 2124 | 2375 | // $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb'); |
| 2125 | - } else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 2376 | + } else { |
|
| 2377 | + $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 2378 | + } |
|
| 2126 | 2379 | if ($error != '') { |
| 2127 | 2380 | return $error; |
| 2128 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2381 | + } elseif ($globalDebug) { |
|
| 2382 | + echo "Done\n"; |
|
| 2383 | + } |
|
| 2129 | 2384 | return ''; |
| 2130 | 2385 | } |
| 2131 | 2386 | |
| 2132 | 2387 | public static function update_ModeS_faa() { |
| 2133 | 2388 | global $tmp_dir, $globalDebug; |
| 2134 | - if ($globalDebug) echo "Modes FAA: Download..."; |
|
| 2389 | + if ($globalDebug) { |
|
| 2390 | + echo "Modes FAA: Download..."; |
|
| 2391 | + } |
|
| 2135 | 2392 | update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
| 2136 | 2393 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 2137 | - if ($globalDebug) echo "Unzip..."; |
|
| 2394 | + if ($globalDebug) { |
|
| 2395 | + echo "Unzip..."; |
|
| 2396 | + } |
|
| 2138 | 2397 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
| 2139 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2398 | + if ($globalDebug) { |
|
| 2399 | + echo "Add to DB..."; |
|
| 2400 | + } |
|
| 2140 | 2401 | $error = update_db::modes_faa(); |
| 2141 | - } else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 2402 | + } else { |
|
| 2403 | + $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 2404 | + } |
|
| 2142 | 2405 | if ($error != '') { |
| 2143 | 2406 | return $error; |
| 2144 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2407 | + } elseif ($globalDebug) { |
|
| 2408 | + echo "Done\n"; |
|
| 2409 | + } |
|
| 2145 | 2410 | return ''; |
| 2146 | 2411 | } |
| 2147 | 2412 | |
| 2148 | 2413 | public static function update_ModeS_flarm() { |
| 2149 | 2414 | global $tmp_dir, $globalDebug; |
| 2150 | - if ($globalDebug) echo "Modes Flarmnet: Download..."; |
|
| 2415 | + if ($globalDebug) { |
|
| 2416 | + echo "Modes Flarmnet: Download..."; |
|
| 2417 | + } |
|
| 2151 | 2418 | update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
| 2152 | 2419 | if (file_exists($tmp_dir.'data.fln')) { |
| 2153 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2420 | + if ($globalDebug) { |
|
| 2421 | + echo "Add to DB..."; |
|
| 2422 | + } |
|
| 2154 | 2423 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
| 2155 | - } else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 2424 | + } else { |
|
| 2425 | + $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 2426 | + } |
|
| 2156 | 2427 | if ($error != '') { |
| 2157 | 2428 | return $error; |
| 2158 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2429 | + } elseif ($globalDebug) { |
|
| 2430 | + echo "Done\n"; |
|
| 2431 | + } |
|
| 2159 | 2432 | return ''; |
| 2160 | 2433 | } |
| 2161 | 2434 | |
| 2162 | 2435 | public static function update_ModeS_ogn() { |
| 2163 | 2436 | global $tmp_dir, $globalDebug; |
| 2164 | - if ($globalDebug) echo "Modes OGN: Download..."; |
|
| 2437 | + if ($globalDebug) { |
|
| 2438 | + echo "Modes OGN: Download..."; |
|
| 2439 | + } |
|
| 2165 | 2440 | update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
| 2166 | 2441 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 2167 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2442 | + if ($globalDebug) { |
|
| 2443 | + echo "Add to DB..."; |
|
| 2444 | + } |
|
| 2168 | 2445 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
| 2169 | - } else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2446 | + } else { |
|
| 2447 | + $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2448 | + } |
|
| 2170 | 2449 | if ($error != '') { |
| 2171 | 2450 | return $error; |
| 2172 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2451 | + } elseif ($globalDebug) { |
|
| 2452 | + echo "Done\n"; |
|
| 2453 | + } |
|
| 2173 | 2454 | return ''; |
| 2174 | 2455 | } |
| 2175 | 2456 | |
| 2176 | 2457 | public static function update_owner() { |
| 2177 | 2458 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 2178 | 2459 | |
| 2179 | - if ($globalDebug) echo "Owner France: Download..."; |
|
| 2460 | + if ($globalDebug) { |
|
| 2461 | + echo "Owner France: Download..."; |
|
| 2462 | + } |
|
| 2180 | 2463 | update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
| 2181 | 2464 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 2182 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2465 | + if ($globalDebug) { |
|
| 2466 | + echo "Add to DB..."; |
|
| 2467 | + } |
|
| 2183 | 2468 | $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
| 2184 | - } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2469 | + } else { |
|
| 2470 | + $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2471 | + } |
|
| 2185 | 2472 | if ($error != '') { |
| 2186 | 2473 | return $error; |
| 2187 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2474 | + } elseif ($globalDebug) { |
|
| 2475 | + echo "Done\n"; |
|
| 2476 | + } |
|
| 2188 | 2477 | |
| 2189 | - if ($globalDebug) echo "Owner Ireland: Download..."; |
|
| 2478 | + if ($globalDebug) { |
|
| 2479 | + echo "Owner Ireland: Download..."; |
|
| 2480 | + } |
|
| 2190 | 2481 | update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
| 2191 | 2482 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 2192 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2483 | + if ($globalDebug) { |
|
| 2484 | + echo "Add to DB..."; |
|
| 2485 | + } |
|
| 2193 | 2486 | $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
| 2194 | - } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2487 | + } else { |
|
| 2488 | + $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2489 | + } |
|
| 2195 | 2490 | if ($error != '') { |
| 2196 | 2491 | return $error; |
| 2197 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2198 | - if ($globalDebug) echo "Owner Switzerland: Download..."; |
|
| 2492 | + } elseif ($globalDebug) { |
|
| 2493 | + echo "Done\n"; |
|
| 2494 | + } |
|
| 2495 | + if ($globalDebug) { |
|
| 2496 | + echo "Owner Switzerland: Download..."; |
|
| 2497 | + } |
|
| 2199 | 2498 | update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
| 2200 | 2499 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 2201 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2500 | + if ($globalDebug) { |
|
| 2501 | + echo "Add to DB..."; |
|
| 2502 | + } |
|
| 2202 | 2503 | $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
| 2203 | - } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2504 | + } else { |
|
| 2505 | + $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2506 | + } |
|
| 2204 | 2507 | if ($error != '') { |
| 2205 | 2508 | return $error; |
| 2206 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2207 | - if ($globalDebug) echo "Owner Czech Republic: Download..."; |
|
| 2509 | + } elseif ($globalDebug) { |
|
| 2510 | + echo "Done\n"; |
|
| 2511 | + } |
|
| 2512 | + if ($globalDebug) { |
|
| 2513 | + echo "Owner Czech Republic: Download..."; |
|
| 2514 | + } |
|
| 2208 | 2515 | update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
| 2209 | 2516 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 2210 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2517 | + if ($globalDebug) { |
|
| 2518 | + echo "Add to DB..."; |
|
| 2519 | + } |
|
| 2211 | 2520 | $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
| 2212 | - } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2521 | + } else { |
|
| 2522 | + $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2523 | + } |
|
| 2213 | 2524 | if ($error != '') { |
| 2214 | 2525 | return $error; |
| 2215 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2216 | - if ($globalDebug) echo "Owner Australia: Download..."; |
|
| 2526 | + } elseif ($globalDebug) { |
|
| 2527 | + echo "Done\n"; |
|
| 2528 | + } |
|
| 2529 | + if ($globalDebug) { |
|
| 2530 | + echo "Owner Australia: Download..."; |
|
| 2531 | + } |
|
| 2217 | 2532 | update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
| 2218 | 2533 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 2219 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2534 | + if ($globalDebug) { |
|
| 2535 | + echo "Add to DB..."; |
|
| 2536 | + } |
|
| 2220 | 2537 | $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
| 2221 | - } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2538 | + } else { |
|
| 2539 | + $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2540 | + } |
|
| 2222 | 2541 | if ($error != '') { |
| 2223 | 2542 | return $error; |
| 2224 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2225 | - if ($globalDebug) echo "Owner Austria: Download..."; |
|
| 2543 | + } elseif ($globalDebug) { |
|
| 2544 | + echo "Done\n"; |
|
| 2545 | + } |
|
| 2546 | + if ($globalDebug) { |
|
| 2547 | + echo "Owner Austria: Download..."; |
|
| 2548 | + } |
|
| 2226 | 2549 | update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
| 2227 | 2550 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 2228 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2551 | + if ($globalDebug) { |
|
| 2552 | + echo "Add to DB..."; |
|
| 2553 | + } |
|
| 2229 | 2554 | $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
| 2230 | - } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2555 | + } else { |
|
| 2556 | + $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2557 | + } |
|
| 2231 | 2558 | if ($error != '') { |
| 2232 | 2559 | return $error; |
| 2233 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2234 | - if ($globalDebug) echo "Owner Chile: Download..."; |
|
| 2560 | + } elseif ($globalDebug) { |
|
| 2561 | + echo "Done\n"; |
|
| 2562 | + } |
|
| 2563 | + if ($globalDebug) { |
|
| 2564 | + echo "Owner Chile: Download..."; |
|
| 2565 | + } |
|
| 2235 | 2566 | update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
| 2236 | 2567 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 2237 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2568 | + if ($globalDebug) { |
|
| 2569 | + echo "Add to DB..."; |
|
| 2570 | + } |
|
| 2238 | 2571 | $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
| 2239 | - } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2572 | + } else { |
|
| 2573 | + $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2574 | + } |
|
| 2240 | 2575 | if ($error != '') { |
| 2241 | 2576 | return $error; |
| 2242 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2243 | - if ($globalDebug) echo "Owner Colombia: Download..."; |
|
| 2577 | + } elseif ($globalDebug) { |
|
| 2578 | + echo "Done\n"; |
|
| 2579 | + } |
|
| 2580 | + if ($globalDebug) { |
|
| 2581 | + echo "Owner Colombia: Download..."; |
|
| 2582 | + } |
|
| 2244 | 2583 | update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
| 2245 | 2584 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 2246 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2585 | + if ($globalDebug) { |
|
| 2586 | + echo "Add to DB..."; |
|
| 2587 | + } |
|
| 2247 | 2588 | $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
| 2248 | - } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2589 | + } else { |
|
| 2590 | + $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2591 | + } |
|
| 2249 | 2592 | if ($error != '') { |
| 2250 | 2593 | return $error; |
| 2251 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2252 | - if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2594 | + } elseif ($globalDebug) { |
|
| 2595 | + echo "Done\n"; |
|
| 2596 | + } |
|
| 2597 | + if ($globalDebug) { |
|
| 2598 | + echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2599 | + } |
|
| 2253 | 2600 | update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
| 2254 | 2601 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 2255 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2602 | + if ($globalDebug) { |
|
| 2603 | + echo "Add to DB..."; |
|
| 2604 | + } |
|
| 2256 | 2605 | $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
| 2257 | - } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2606 | + } else { |
|
| 2607 | + $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2608 | + } |
|
| 2258 | 2609 | if ($error != '') { |
| 2259 | 2610 | return $error; |
| 2260 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2261 | - if ($globalDebug) echo "Owner Brazil: Download..."; |
|
| 2611 | + } elseif ($globalDebug) { |
|
| 2612 | + echo "Done\n"; |
|
| 2613 | + } |
|
| 2614 | + if ($globalDebug) { |
|
| 2615 | + echo "Owner Brazil: Download..."; |
|
| 2616 | + } |
|
| 2262 | 2617 | update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
| 2263 | 2618 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 2264 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2619 | + if ($globalDebug) { |
|
| 2620 | + echo "Add to DB..."; |
|
| 2621 | + } |
|
| 2265 | 2622 | $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
| 2266 | - } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2623 | + } else { |
|
| 2624 | + $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2625 | + } |
|
| 2267 | 2626 | if ($error != '') { |
| 2268 | 2627 | return $error; |
| 2269 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2270 | - if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
|
| 2628 | + } elseif ($globalDebug) { |
|
| 2629 | + echo "Done\n"; |
|
| 2630 | + } |
|
| 2631 | + if ($globalDebug) { |
|
| 2632 | + echo "Owner Cayman Islands: Download..."; |
|
| 2633 | + } |
|
| 2271 | 2634 | update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
| 2272 | 2635 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 2273 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2636 | + if ($globalDebug) { |
|
| 2637 | + echo "Add to DB..."; |
|
| 2638 | + } |
|
| 2274 | 2639 | $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
| 2275 | - } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2640 | + } else { |
|
| 2641 | + $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2642 | + } |
|
| 2276 | 2643 | if ($error != '') { |
| 2277 | 2644 | return $error; |
| 2278 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2279 | - if ($globalDebug) echo "Owner Croatia: Download..."; |
|
| 2645 | + } elseif ($globalDebug) { |
|
| 2646 | + echo "Done\n"; |
|
| 2647 | + } |
|
| 2648 | + if ($globalDebug) { |
|
| 2649 | + echo "Owner Croatia: Download..."; |
|
| 2650 | + } |
|
| 2280 | 2651 | update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
| 2281 | 2652 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 2282 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2653 | + if ($globalDebug) { |
|
| 2654 | + echo "Add to DB..."; |
|
| 2655 | + } |
|
| 2283 | 2656 | $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
| 2284 | - } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2657 | + } else { |
|
| 2658 | + $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2659 | + } |
|
| 2285 | 2660 | if ($error != '') { |
| 2286 | 2661 | return $error; |
| 2287 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2288 | - if ($globalDebug) echo "Owner Luxembourg: Download..."; |
|
| 2662 | + } elseif ($globalDebug) { |
|
| 2663 | + echo "Done\n"; |
|
| 2664 | + } |
|
| 2665 | + if ($globalDebug) { |
|
| 2666 | + echo "Owner Luxembourg: Download..."; |
|
| 2667 | + } |
|
| 2289 | 2668 | update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
| 2290 | 2669 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 2291 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2670 | + if ($globalDebug) { |
|
| 2671 | + echo "Add to DB..."; |
|
| 2672 | + } |
|
| 2292 | 2673 | $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
| 2293 | - } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2674 | + } else { |
|
| 2675 | + $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2676 | + } |
|
| 2294 | 2677 | if ($error != '') { |
| 2295 | 2678 | return $error; |
| 2296 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2297 | - if ($globalDebug) echo "Owner Maldives: Download..."; |
|
| 2679 | + } elseif ($globalDebug) { |
|
| 2680 | + echo "Done\n"; |
|
| 2681 | + } |
|
| 2682 | + if ($globalDebug) { |
|
| 2683 | + echo "Owner Maldives: Download..."; |
|
| 2684 | + } |
|
| 2298 | 2685 | update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
| 2299 | 2686 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 2300 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2687 | + if ($globalDebug) { |
|
| 2688 | + echo "Add to DB..."; |
|
| 2689 | + } |
|
| 2301 | 2690 | $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
| 2302 | - } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2691 | + } else { |
|
| 2692 | + $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2693 | + } |
|
| 2303 | 2694 | if ($error != '') { |
| 2304 | 2695 | return $error; |
| 2305 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2306 | - if ($globalDebug) echo "Owner New Zealand: Download..."; |
|
| 2696 | + } elseif ($globalDebug) { |
|
| 2697 | + echo "Done\n"; |
|
| 2698 | + } |
|
| 2699 | + if ($globalDebug) { |
|
| 2700 | + echo "Owner New Zealand: Download..."; |
|
| 2701 | + } |
|
| 2307 | 2702 | update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
| 2308 | 2703 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 2309 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2704 | + if ($globalDebug) { |
|
| 2705 | + echo "Add to DB..."; |
|
| 2706 | + } |
|
| 2310 | 2707 | $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
| 2311 | - } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2708 | + } else { |
|
| 2709 | + $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2710 | + } |
|
| 2312 | 2711 | if ($error != '') { |
| 2313 | 2712 | return $error; |
| 2314 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2315 | - if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
|
| 2713 | + } elseif ($globalDebug) { |
|
| 2714 | + echo "Done\n"; |
|
| 2715 | + } |
|
| 2716 | + if ($globalDebug) { |
|
| 2717 | + echo "Owner Papua New Guinea: Download..."; |
|
| 2718 | + } |
|
| 2316 | 2719 | update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
| 2317 | 2720 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 2318 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2721 | + if ($globalDebug) { |
|
| 2722 | + echo "Add to DB..."; |
|
| 2723 | + } |
|
| 2319 | 2724 | $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
| 2320 | - } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2725 | + } else { |
|
| 2726 | + $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2727 | + } |
|
| 2321 | 2728 | if ($error != '') { |
| 2322 | 2729 | return $error; |
| 2323 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2324 | - if ($globalDebug) echo "Owner Slovakia: Download..."; |
|
| 2730 | + } elseif ($globalDebug) { |
|
| 2731 | + echo "Done\n"; |
|
| 2732 | + } |
|
| 2733 | + if ($globalDebug) { |
|
| 2734 | + echo "Owner Slovakia: Download..."; |
|
| 2735 | + } |
|
| 2325 | 2736 | update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
| 2326 | 2737 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 2327 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2738 | + if ($globalDebug) { |
|
| 2739 | + echo "Add to DB..."; |
|
| 2740 | + } |
|
| 2328 | 2741 | $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
| 2329 | - } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2742 | + } else { |
|
| 2743 | + $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2744 | + } |
|
| 2330 | 2745 | if ($error != '') { |
| 2331 | 2746 | return $error; |
| 2332 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2333 | - if ($globalDebug) echo "Owner Ecuador: Download..."; |
|
| 2747 | + } elseif ($globalDebug) { |
|
| 2748 | + echo "Done\n"; |
|
| 2749 | + } |
|
| 2750 | + if ($globalDebug) { |
|
| 2751 | + echo "Owner Ecuador: Download..."; |
|
| 2752 | + } |
|
| 2334 | 2753 | update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
| 2335 | 2754 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 2336 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2755 | + if ($globalDebug) { |
|
| 2756 | + echo "Add to DB..."; |
|
| 2757 | + } |
|
| 2337 | 2758 | $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
| 2338 | - } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2759 | + } else { |
|
| 2760 | + $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2761 | + } |
|
| 2339 | 2762 | if ($error != '') { |
| 2340 | 2763 | return $error; |
| 2341 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2342 | - if ($globalDebug) echo "Owner Iceland: Download..."; |
|
| 2764 | + } elseif ($globalDebug) { |
|
| 2765 | + echo "Done\n"; |
|
| 2766 | + } |
|
| 2767 | + if ($globalDebug) { |
|
| 2768 | + echo "Owner Iceland: Download..."; |
|
| 2769 | + } |
|
| 2343 | 2770 | update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
| 2344 | 2771 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 2345 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2772 | + if ($globalDebug) { |
|
| 2773 | + echo "Add to DB..."; |
|
| 2774 | + } |
|
| 2346 | 2775 | $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
| 2347 | - } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2776 | + } else { |
|
| 2777 | + $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2778 | + } |
|
| 2348 | 2779 | if ($error != '') { |
| 2349 | 2780 | return $error; |
| 2350 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2351 | - if ($globalDebug) echo "Owner Isle of Man: Download..."; |
|
| 2781 | + } elseif ($globalDebug) { |
|
| 2782 | + echo "Done\n"; |
|
| 2783 | + } |
|
| 2784 | + if ($globalDebug) { |
|
| 2785 | + echo "Owner Isle of Man: Download..."; |
|
| 2786 | + } |
|
| 2352 | 2787 | update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
| 2353 | 2788 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 2354 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2789 | + if ($globalDebug) { |
|
| 2790 | + echo "Add to DB..."; |
|
| 2791 | + } |
|
| 2355 | 2792 | $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
| 2356 | - } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2793 | + } else { |
|
| 2794 | + $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2795 | + } |
|
| 2357 | 2796 | if ($error != '') { |
| 2358 | 2797 | return $error; |
| 2359 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2798 | + } elseif ($globalDebug) { |
|
| 2799 | + echo "Done\n"; |
|
| 2800 | + } |
|
| 2360 | 2801 | if ($globalMasterSource) { |
| 2361 | - if ($globalDebug) echo "ModeS Netherlands: Download..."; |
|
| 2802 | + if ($globalDebug) { |
|
| 2803 | + echo "ModeS Netherlands: Download..."; |
|
| 2804 | + } |
|
| 2362 | 2805 | update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
| 2363 | 2806 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 2364 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2807 | + if ($globalDebug) { |
|
| 2808 | + echo "Add to DB..."; |
|
| 2809 | + } |
|
| 2365 | 2810 | $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
| 2366 | - } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2811 | + } else { |
|
| 2812 | + $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2813 | + } |
|
| 2367 | 2814 | if ($error != '') { |
| 2368 | 2815 | return $error; |
| 2369 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2370 | - if ($globalDebug) echo "ModeS Denmark: Download..."; |
|
| 2816 | + } elseif ($globalDebug) { |
|
| 2817 | + echo "Done\n"; |
|
| 2818 | + } |
|
| 2819 | + if ($globalDebug) { |
|
| 2820 | + echo "ModeS Denmark: Download..."; |
|
| 2821 | + } |
|
| 2371 | 2822 | update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
| 2372 | 2823 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 2373 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2824 | + if ($globalDebug) { |
|
| 2825 | + echo "Add to DB..."; |
|
| 2826 | + } |
|
| 2374 | 2827 | $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
| 2375 | - } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2828 | + } else { |
|
| 2829 | + $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2830 | + } |
|
| 2376 | 2831 | if ($error != '') { |
| 2377 | 2832 | return $error; |
| 2378 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2379 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2833 | + } elseif ($globalDebug) { |
|
| 2834 | + echo "Done\n"; |
|
| 2835 | + } |
|
| 2836 | + } elseif ($globalDebug) { |
|
| 2837 | + echo "Done\n"; |
|
| 2838 | + } |
|
| 2380 | 2839 | return ''; |
| 2381 | 2840 | } |
| 2382 | 2841 | |
| 2383 | 2842 | public static function update_translation() { |
| 2384 | 2843 | global $tmp_dir, $globalDebug; |
| 2385 | 2844 | $error = ''; |
| 2386 | - if ($globalDebug) echo "Translation : Download..."; |
|
| 2845 | + if ($globalDebug) { |
|
| 2846 | + echo "Translation : Download..."; |
|
| 2847 | + } |
|
| 2387 | 2848 | update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
| 2388 | 2849 | if (file_exists($tmp_dir.'translation.zip')) { |
| 2389 | - if ($globalDebug) echo "Unzip..."; |
|
| 2850 | + if ($globalDebug) { |
|
| 2851 | + echo "Unzip..."; |
|
| 2852 | + } |
|
| 2390 | 2853 | update_db::unzip($tmp_dir.'translation.zip'); |
| 2391 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2854 | + if ($globalDebug) { |
|
| 2855 | + echo "Add to DB..."; |
|
| 2856 | + } |
|
| 2392 | 2857 | $error = update_db::translation(); |
| 2393 | - } else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2858 | + } else { |
|
| 2859 | + $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2860 | + } |
|
| 2394 | 2861 | if ($error != '') { |
| 2395 | 2862 | return $error; |
| 2396 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2863 | + } elseif ($globalDebug) { |
|
| 2864 | + echo "Done\n"; |
|
| 2865 | + } |
|
| 2397 | 2866 | return ''; |
| 2398 | 2867 | } |
| 2399 | 2868 | |
| 2400 | 2869 | public static function update_translation_fam() { |
| 2401 | 2870 | global $tmp_dir, $globalDebug; |
| 2402 | 2871 | $error = ''; |
| 2403 | - if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
|
| 2872 | + if ($globalDebug) { |
|
| 2873 | + echo "Translation from FlightAirMap website : Download..."; |
|
| 2874 | + } |
|
| 2404 | 2875 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
| 2405 | 2876 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
| 2406 | 2877 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
| 2407 | 2878 | $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
| 2408 | 2879 | $translation_md5 = $translation_md5_file[0]; |
| 2409 | 2880 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
| 2410 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2881 | + if ($globalDebug) { |
|
| 2882 | + echo "Gunzip..."; |
|
| 2883 | + } |
|
| 2411 | 2884 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
| 2412 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2885 | + if ($globalDebug) { |
|
| 2886 | + echo "Add to DB..."; |
|
| 2887 | + } |
|
| 2413 | 2888 | $error = update_db::translation_fam(); |
| 2414 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
| 2415 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2889 | + } else { |
|
| 2890 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
| 2891 | + } |
|
| 2892 | + } else { |
|
| 2893 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2894 | + } |
|
| 2416 | 2895 | if ($error != '') { |
| 2417 | 2896 | return $error; |
| 2418 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2897 | + } elseif ($globalDebug) { |
|
| 2898 | + echo "Done\n"; |
|
| 2899 | + } |
|
| 2419 | 2900 | return ''; |
| 2420 | 2901 | } |
| 2421 | 2902 | public static function update_ModeS_fam() { |
| 2422 | 2903 | global $tmp_dir, $globalDebug; |
| 2423 | 2904 | $error = ''; |
| 2424 | - if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
|
| 2905 | + if ($globalDebug) { |
|
| 2906 | + echo "ModeS from FlightAirMap website : Download..."; |
|
| 2907 | + } |
|
| 2425 | 2908 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
| 2426 | 2909 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
| 2427 | 2910 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
| 2428 | 2911 | $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
| 2429 | 2912 | $modes_md5 = $modes_md5_file[0]; |
| 2430 | 2913 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
| 2431 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2914 | + if ($globalDebug) { |
|
| 2915 | + echo "Gunzip..."; |
|
| 2916 | + } |
|
| 2432 | 2917 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
| 2433 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2918 | + if ($globalDebug) { |
|
| 2919 | + echo "Add to DB..."; |
|
| 2920 | + } |
|
| 2434 | 2921 | $error = update_db::modes_fam(); |
| 2435 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
| 2436 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2922 | + } else { |
|
| 2923 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
| 2924 | + } |
|
| 2925 | + } else { |
|
| 2926 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2927 | + } |
|
| 2437 | 2928 | if ($error != '') { |
| 2438 | 2929 | return $error; |
| 2439 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2930 | + } elseif ($globalDebug) { |
|
| 2931 | + echo "Done\n"; |
|
| 2932 | + } |
|
| 2440 | 2933 | return ''; |
| 2441 | 2934 | } |
| 2442 | 2935 | |
| 2443 | 2936 | public static function update_airlines_fam() { |
| 2444 | 2937 | global $tmp_dir, $globalDebug; |
| 2445 | 2938 | $error = ''; |
| 2446 | - if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
|
| 2939 | + if ($globalDebug) { |
|
| 2940 | + echo "Airlines from FlightAirMap website : Download..."; |
|
| 2941 | + } |
|
| 2447 | 2942 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
| 2448 | 2943 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
| 2449 | 2944 | $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
@@ -2452,26 +2947,42 @@ discard block |
||
| 2452 | 2947 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
| 2453 | 2948 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
| 2454 | 2949 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
| 2455 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2950 | + if ($globalDebug) { |
|
| 2951 | + echo "Gunzip..."; |
|
| 2952 | + } |
|
| 2456 | 2953 | update_db::gunzip($tmp_dir.'airlines.tsv.gz'); |
| 2457 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2954 | + if ($globalDebug) { |
|
| 2955 | + echo "Add to DB..."; |
|
| 2956 | + } |
|
| 2458 | 2957 | $error = update_db::airlines_fam(); |
| 2459 | 2958 | update_db::insert_airlines_version($airlines_md5); |
| 2460 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
| 2461 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2462 | - } elseif ($globalDebug) echo "No update."; |
|
| 2463 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
| 2959 | + } else { |
|
| 2960 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
| 2961 | + } |
|
| 2962 | + } else { |
|
| 2963 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2964 | + } |
|
| 2965 | + } elseif ($globalDebug) { |
|
| 2966 | + echo "No update."; |
|
| 2967 | + } |
|
| 2968 | + } else { |
|
| 2969 | + $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
| 2970 | + } |
|
| 2464 | 2971 | if ($error != '') { |
| 2465 | 2972 | return $error; |
| 2466 | 2973 | } else { |
| 2467 | - if ($globalDebug) echo "Done\n"; |
|
| 2974 | + if ($globalDebug) { |
|
| 2975 | + echo "Done\n"; |
|
| 2976 | + } |
|
| 2468 | 2977 | } |
| 2469 | 2978 | return ''; |
| 2470 | 2979 | } |
| 2471 | 2980 | |
| 2472 | 2981 | public static function update_owner_fam() { |
| 2473 | 2982 | global $tmp_dir, $globalDebug, $globalOwner; |
| 2474 | - if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
|
| 2983 | + if ($globalDebug) { |
|
| 2984 | + echo "owner from FlightAirMap website : Download..."; |
|
| 2985 | + } |
|
| 2475 | 2986 | $error = ''; |
| 2476 | 2987 | if ($globalOwner === TRUE) { |
| 2477 | 2988 | update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
@@ -2484,35 +2995,57 @@ discard block |
||
| 2484 | 2995 | $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
| 2485 | 2996 | $owners_md5 = $owners_md5_file[0]; |
| 2486 | 2997 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
| 2487 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2998 | + if ($globalDebug) { |
|
| 2999 | + echo "Gunzip..."; |
|
| 3000 | + } |
|
| 2488 | 3001 | update_db::gunzip($tmp_dir.'owners.tsv.gz'); |
| 2489 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3002 | + if ($globalDebug) { |
|
| 3003 | + echo "Add to DB..."; |
|
| 3004 | + } |
|
| 2490 | 3005 | $error = update_db::owner_fam(); |
| 2491 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
| 2492 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 3006 | + } else { |
|
| 3007 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
| 3008 | + } |
|
| 3009 | + } else { |
|
| 3010 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 3011 | + } |
|
| 2493 | 3012 | if ($error != '') { |
| 2494 | 3013 | return $error; |
| 2495 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3014 | + } elseif ($globalDebug) { |
|
| 3015 | + echo "Done\n"; |
|
| 3016 | + } |
|
| 2496 | 3017 | return ''; |
| 2497 | 3018 | } |
| 2498 | 3019 | public static function update_routes_fam() { |
| 2499 | 3020 | global $tmp_dir, $globalDebug; |
| 2500 | - if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
|
| 3021 | + if ($globalDebug) { |
|
| 3022 | + echo "Routes from FlightAirMap website : Download..."; |
|
| 3023 | + } |
|
| 2501 | 3024 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
| 2502 | 3025 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
| 2503 | 3026 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
| 2504 | 3027 | $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
| 2505 | 3028 | $routes_md5 = $routes_md5_file[0]; |
| 2506 | 3029 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
| 2507 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3030 | + if ($globalDebug) { |
|
| 3031 | + echo "Gunzip..."; |
|
| 3032 | + } |
|
| 2508 | 3033 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
| 2509 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3034 | + if ($globalDebug) { |
|
| 3035 | + echo "Add to DB..."; |
|
| 3036 | + } |
|
| 2510 | 3037 | $error = update_db::routes_fam(); |
| 2511 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
| 2512 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 3038 | + } else { |
|
| 3039 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
| 3040 | + } |
|
| 3041 | + } else { |
|
| 3042 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 3043 | + } |
|
| 2513 | 3044 | if ($error != '') { |
| 2514 | 3045 | return $error; |
| 2515 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3046 | + } elseif ($globalDebug) { |
|
| 3047 | + echo "Done\n"; |
|
| 3048 | + } |
|
| 2516 | 3049 | return ''; |
| 2517 | 3050 | } |
| 2518 | 3051 | public static function update_marine_identity_fam() { |
@@ -2522,21 +3055,33 @@ discard block |
||
| 2522 | 3055 | $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
| 2523 | 3056 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2524 | 3057 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2525 | - if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
|
| 3058 | + if ($globalDebug) { |
|
| 3059 | + echo "Marine identity from FlightAirMap website : Download..."; |
|
| 3060 | + } |
|
| 2526 | 3061 | update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
| 2527 | 3062 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2528 | 3063 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
| 2529 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3064 | + if ($globalDebug) { |
|
| 3065 | + echo "Gunzip..."; |
|
| 3066 | + } |
|
| 2530 | 3067 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
| 2531 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3068 | + if ($globalDebug) { |
|
| 3069 | + echo "Add to DB..."; |
|
| 3070 | + } |
|
| 2532 | 3071 | $error = update_db::marine_identity_fam(); |
| 2533 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
| 2534 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 3072 | + } else { |
|
| 3073 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
| 3074 | + } |
|
| 3075 | + } else { |
|
| 3076 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 3077 | + } |
|
| 2535 | 3078 | if ($error != '') { |
| 2536 | 3079 | return $error; |
| 2537 | 3080 | } else { |
| 2538 | 3081 | update_db::insert_marine_identity_version($marine_identity_md5); |
| 2539 | - if ($globalDebug) echo "Done\n"; |
|
| 3082 | + if ($globalDebug) { |
|
| 3083 | + echo "Done\n"; |
|
| 3084 | + } |
|
| 2540 | 3085 | } |
| 2541 | 3086 | } |
| 2542 | 3087 | } |
@@ -2550,21 +3095,33 @@ discard block |
||
| 2550 | 3095 | $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
| 2551 | 3096 | $satellite_md5 = $satellite_md5_file[0]; |
| 2552 | 3097 | if (!update_db::check_satellite_version($satellite_md5)) { |
| 2553 | - if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
|
| 3098 | + if ($globalDebug) { |
|
| 3099 | + echo "Satellite from FlightAirMap website : Download..."; |
|
| 3100 | + } |
|
| 2554 | 3101 | update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
| 2555 | 3102 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
| 2556 | 3103 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
| 2557 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3104 | + if ($globalDebug) { |
|
| 3105 | + echo "Gunzip..."; |
|
| 3106 | + } |
|
| 2558 | 3107 | update_db::gunzip($tmp_dir.'satellite.tsv.gz'); |
| 2559 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3108 | + if ($globalDebug) { |
|
| 3109 | + echo "Add to DB..."; |
|
| 3110 | + } |
|
| 2560 | 3111 | $error = update_db::satellite_fam(); |
| 2561 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
| 2562 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
| 3112 | + } else { |
|
| 3113 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
| 3114 | + } |
|
| 3115 | + } else { |
|
| 3116 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
| 3117 | + } |
|
| 2563 | 3118 | if ($error != '') { |
| 2564 | 3119 | return $error; |
| 2565 | 3120 | } else { |
| 2566 | 3121 | update_db::insert_satellite_version($satellite_md5); |
| 2567 | - if ($globalDebug) echo "Done\n"; |
|
| 3122 | + if ($globalDebug) { |
|
| 3123 | + echo "Done\n"; |
|
| 3124 | + } |
|
| 2568 | 3125 | } |
| 2569 | 3126 | } |
| 2570 | 3127 | } |
@@ -2572,17 +3129,25 @@ discard block |
||
| 2572 | 3129 | } |
| 2573 | 3130 | public static function update_banned_fam() { |
| 2574 | 3131 | global $tmp_dir, $globalDebug; |
| 2575 | - if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 3132 | + if ($globalDebug) { |
|
| 3133 | + echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 3134 | + } |
|
| 2576 | 3135 | update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
| 2577 | 3136 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2578 | 3137 | //if ($globalDebug) echo "Gunzip..."; |
| 2579 | 3138 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
| 2580 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3139 | + if ($globalDebug) { |
|
| 3140 | + echo "Add to DB..."; |
|
| 3141 | + } |
|
| 2581 | 3142 | $error = update_db::banned_fam(); |
| 2582 | - } else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 3143 | + } else { |
|
| 3144 | + $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 3145 | + } |
|
| 2583 | 3146 | if ($error != '') { |
| 2584 | 3147 | return $error; |
| 2585 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3148 | + } elseif ($globalDebug) { |
|
| 3149 | + echo "Done\n"; |
|
| 3150 | + } |
|
| 2586 | 3151 | return ''; |
| 2587 | 3152 | } |
| 2588 | 3153 | |
@@ -2590,7 +3155,9 @@ discard block |
||
| 2590 | 3155 | global $tmp_dir, $globalDebug, $globalDBdriver; |
| 2591 | 3156 | include_once('class.create_db.php'); |
| 2592 | 3157 | $error = ''; |
| 2593 | - if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
|
| 3158 | + if ($globalDebug) { |
|
| 3159 | + echo "Airspace from FlightAirMap website : Download..."; |
|
| 3160 | + } |
|
| 2594 | 3161 | if ($globalDBdriver == 'mysql') { |
| 2595 | 3162 | update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
| 2596 | 3163 | } else { |
@@ -2607,9 +3174,13 @@ discard block |
||
| 2607 | 3174 | } |
| 2608 | 3175 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2609 | 3176 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
| 2610 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3177 | + if ($globalDebug) { |
|
| 3178 | + echo "Gunzip..."; |
|
| 3179 | + } |
|
| 2611 | 3180 | update_db::gunzip($tmp_dir.'airspace.sql.gz'); |
| 2612 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3181 | + if ($globalDebug) { |
|
| 3182 | + echo "Add to DB..."; |
|
| 3183 | + } |
|
| 2613 | 3184 | $Connection = new Connection(); |
| 2614 | 3185 | if ($Connection->tableExists('airspace')) { |
| 2615 | 3186 | $query = 'DROP TABLE airspace'; |
@@ -2622,20 +3193,30 @@ discard block |
||
| 2622 | 3193 | } |
| 2623 | 3194 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
| 2624 | 3195 | update_db::insert_airspace_version($airspace_md5); |
| 2625 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
| 2626 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
| 3196 | + } else { |
|
| 3197 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
| 3198 | + } |
|
| 3199 | + } else { |
|
| 3200 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
| 3201 | + } |
|
| 2627 | 3202 | } |
| 2628 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 3203 | + } else { |
|
| 3204 | + $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 3205 | + } |
|
| 2629 | 3206 | if ($error != '') { |
| 2630 | 3207 | return $error; |
| 2631 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3208 | + } elseif ($globalDebug) { |
|
| 3209 | + echo "Done\n"; |
|
| 3210 | + } |
|
| 2632 | 3211 | return ''; |
| 2633 | 3212 | } |
| 2634 | 3213 | |
| 2635 | 3214 | public static function update_geoid_fam() { |
| 2636 | 3215 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2637 | 3216 | $error = ''; |
| 2638 | - if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
|
| 3217 | + if ($globalDebug) { |
|
| 3218 | + echo "Geoid from FlightAirMap website : Download..."; |
|
| 3219 | + } |
|
| 2639 | 3220 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
| 2640 | 3221 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2641 | 3222 | $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
@@ -2644,76 +3225,116 @@ discard block |
||
| 2644 | 3225 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
| 2645 | 3226 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2646 | 3227 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
| 2647 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3228 | + if ($globalDebug) { |
|
| 3229 | + echo "Gunzip..."; |
|
| 3230 | + } |
|
| 2648 | 3231 | update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
| 2649 | 3232 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2650 | 3233 | update_db::insert_geoid_version($geoid_md5); |
| 2651 | 3234 | } |
| 2652 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
| 2653 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 3235 | + } else { |
|
| 3236 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
| 3237 | + } |
|
| 3238 | + } else { |
|
| 3239 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 3240 | + } |
|
| 2654 | 3241 | } |
| 2655 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 3242 | + } else { |
|
| 3243 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 3244 | + } |
|
| 2656 | 3245 | if ($error != '') { |
| 2657 | 3246 | return $error; |
| 2658 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3247 | + } elseif ($globalDebug) { |
|
| 3248 | + echo "Done\n"; |
|
| 3249 | + } |
|
| 2659 | 3250 | return ''; |
| 2660 | 3251 | } |
| 2661 | 3252 | |
| 2662 | 3253 | public static function update_tle() { |
| 2663 | 3254 | global $tmp_dir, $globalDebug; |
| 2664 | - if ($globalDebug) echo "Download TLE : Download..."; |
|
| 3255 | + if ($globalDebug) { |
|
| 3256 | + echo "Download TLE : Download..."; |
|
| 3257 | + } |
|
| 2665 | 3258 | $alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt', |
| 2666 | 3259 | 'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt', |
| 2667 | 3260 | 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt'); |
| 2668 | 3261 | foreach ($alltle as $filename) { |
| 2669 | - if ($globalDebug) echo "downloading ".$filename.'...'; |
|
| 3262 | + if ($globalDebug) { |
|
| 3263 | + echo "downloading ".$filename.'...'; |
|
| 3264 | + } |
|
| 2670 | 3265 | update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
| 2671 | 3266 | if (file_exists($tmp_dir.$filename)) { |
| 2672 | - if ($globalDebug) echo "Add to DB ".$filename."..."; |
|
| 3267 | + if ($globalDebug) { |
|
| 3268 | + echo "Add to DB ".$filename."..."; |
|
| 3269 | + } |
|
| 2673 | 3270 | $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
| 2674 | - } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 3271 | + } else { |
|
| 3272 | + $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 3273 | + } |
|
| 2675 | 3274 | if ($error != '') { |
| 2676 | 3275 | echo $error."\n"; |
| 2677 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3276 | + } elseif ($globalDebug) { |
|
| 3277 | + echo "Done\n"; |
|
| 3278 | + } |
|
| 2678 | 3279 | } |
| 2679 | 3280 | return ''; |
| 2680 | 3281 | } |
| 2681 | 3282 | |
| 2682 | 3283 | public static function update_ucsdb() { |
| 2683 | 3284 | global $tmp_dir, $globalDebug; |
| 2684 | - if ($globalDebug) echo "Download UCS DB : Download..."; |
|
| 3285 | + if ($globalDebug) { |
|
| 3286 | + echo "Download UCS DB : Download..."; |
|
| 3287 | + } |
|
| 2685 | 3288 | update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
| 2686 | 3289 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
| 2687 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3290 | + if ($globalDebug) { |
|
| 3291 | + echo "Add to DB..."; |
|
| 3292 | + } |
|
| 2688 | 3293 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
| 2689 | - } else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
| 3294 | + } else { |
|
| 3295 | + $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
| 3296 | + } |
|
| 2690 | 3297 | if ($error != '') { |
| 2691 | 3298 | echo $error."\n"; |
| 2692 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3299 | + } elseif ($globalDebug) { |
|
| 3300 | + echo "Done\n"; |
|
| 3301 | + } |
|
| 2693 | 3302 | return ''; |
| 2694 | 3303 | } |
| 2695 | 3304 | |
| 2696 | 3305 | public static function update_celestrak() { |
| 2697 | 3306 | global $tmp_dir, $globalDebug; |
| 2698 | - if ($globalDebug) echo "Download Celestrak DB : Download..."; |
|
| 3307 | + if ($globalDebug) { |
|
| 3308 | + echo "Download Celestrak DB : Download..."; |
|
| 3309 | + } |
|
| 2699 | 3310 | update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
| 2700 | 3311 | if (file_exists($tmp_dir.'satcat.txt')) { |
| 2701 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3312 | + if ($globalDebug) { |
|
| 3313 | + echo "Add to DB..."; |
|
| 3314 | + } |
|
| 2702 | 3315 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
| 2703 | - } else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
| 3316 | + } else { |
|
| 3317 | + $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
| 3318 | + } |
|
| 2704 | 3319 | if ($error != '') { |
| 2705 | 3320 | echo $error."\n"; |
| 2706 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3321 | + } elseif ($globalDebug) { |
|
| 3322 | + echo "Done\n"; |
|
| 3323 | + } |
|
| 2707 | 3324 | return ''; |
| 2708 | 3325 | } |
| 2709 | 3326 | |
| 2710 | 3327 | public static function update_models() { |
| 2711 | 3328 | global $tmp_dir, $globalDebug; |
| 2712 | 3329 | $error = ''; |
| 2713 | - if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
|
| 3330 | + if ($globalDebug) { |
|
| 3331 | + echo "Models from FlightAirMap website : Download..."; |
|
| 3332 | + } |
|
| 2714 | 3333 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
| 2715 | 3334 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2716 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3335 | + if ($globalDebug) { |
|
| 3336 | + echo "Check files...\n"; |
|
| 3337 | + } |
|
| 2717 | 3338 | $newmodelsdb = array(); |
| 2718 | 3339 | if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
| 2719 | 3340 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2732,25 +3353,35 @@ discard block |
||
| 2732 | 3353 | } |
| 2733 | 3354 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2734 | 3355 | foreach ($diff as $key => $value) { |
| 2735 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3356 | + if ($globalDebug) { |
|
| 3357 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3358 | + } |
|
| 2736 | 3359 | update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
| 2737 | 3360 | |
| 2738 | 3361 | } |
| 2739 | 3362 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
| 2740 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3363 | + } else { |
|
| 3364 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3365 | + } |
|
| 2741 | 3366 | if ($error != '') { |
| 2742 | 3367 | return $error; |
| 2743 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3368 | + } elseif ($globalDebug) { |
|
| 3369 | + echo "Done\n"; |
|
| 3370 | + } |
|
| 2744 | 3371 | return ''; |
| 2745 | 3372 | } |
| 2746 | 3373 | |
| 2747 | 3374 | public static function update_space_models() { |
| 2748 | 3375 | global $tmp_dir, $globalDebug; |
| 2749 | 3376 | $error = ''; |
| 2750 | - if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
|
| 3377 | + if ($globalDebug) { |
|
| 3378 | + echo "Space models from FlightAirMap website : Download..."; |
|
| 3379 | + } |
|
| 2751 | 3380 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
| 2752 | 3381 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2753 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3382 | + if ($globalDebug) { |
|
| 3383 | + echo "Check files...\n"; |
|
| 3384 | + } |
|
| 2754 | 3385 | $newmodelsdb = array(); |
| 2755 | 3386 | if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
| 2756 | 3387 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2769,25 +3400,35 @@ discard block |
||
| 2769 | 3400 | } |
| 2770 | 3401 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2771 | 3402 | foreach ($diff as $key => $value) { |
| 2772 | - if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 3403 | + if ($globalDebug) { |
|
| 3404 | + echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 3405 | + } |
|
| 2773 | 3406 | update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
| 2774 | 3407 | |
| 2775 | 3408 | } |
| 2776 | 3409 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
| 2777 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3410 | + } else { |
|
| 3411 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3412 | + } |
|
| 2778 | 3413 | if ($error != '') { |
| 2779 | 3414 | return $error; |
| 2780 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3415 | + } elseif ($globalDebug) { |
|
| 3416 | + echo "Done\n"; |
|
| 3417 | + } |
|
| 2781 | 3418 | return ''; |
| 2782 | 3419 | } |
| 2783 | 3420 | |
| 2784 | 3421 | public static function update_vehicules_models() { |
| 2785 | 3422 | global $tmp_dir, $globalDebug; |
| 2786 | 3423 | $error = ''; |
| 2787 | - if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 3424 | + if ($globalDebug) { |
|
| 3425 | + echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 3426 | + } |
|
| 2788 | 3427 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
| 2789 | 3428 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2790 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3429 | + if ($globalDebug) { |
|
| 3430 | + echo "Check files...\n"; |
|
| 3431 | + } |
|
| 2791 | 3432 | $newmodelsdb = array(); |
| 2792 | 3433 | if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
| 2793 | 3434 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2806,15 +3447,21 @@ discard block |
||
| 2806 | 3447 | } |
| 2807 | 3448 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2808 | 3449 | foreach ($diff as $key => $value) { |
| 2809 | - if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 3450 | + if ($globalDebug) { |
|
| 3451 | + echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 3452 | + } |
|
| 2810 | 3453 | update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
| 2811 | 3454 | |
| 2812 | 3455 | } |
| 2813 | 3456 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
| 2814 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3457 | + } else { |
|
| 3458 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3459 | + } |
|
| 2815 | 3460 | if ($error != '') { |
| 2816 | 3461 | return $error; |
| 2817 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3462 | + } elseif ($globalDebug) { |
|
| 3463 | + echo "Done\n"; |
|
| 3464 | + } |
|
| 2818 | 3465 | return ''; |
| 2819 | 3466 | } |
| 2820 | 3467 | |
@@ -2857,7 +3504,9 @@ discard block |
||
| 2857 | 3504 | } |
| 2858 | 3505 | |
| 2859 | 3506 | $error = ''; |
| 2860 | - if ($globalDebug) echo "Notam : Download..."; |
|
| 3507 | + if ($globalDebug) { |
|
| 3508 | + echo "Notam : Download..."; |
|
| 3509 | + } |
|
| 2861 | 3510 | update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
| 2862 | 3511 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2863 | 3512 | $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
@@ -2872,14 +3521,30 @@ discard block |
||
| 2872 | 3521 | $data['fir'] = $q[0]; |
| 2873 | 3522 | $data['code'] = $q[1]; |
| 2874 | 3523 | $ifrvfr = $q[2]; |
| 2875 | - if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR'; |
|
| 2876 | - if ($ifrvfr == 'I') $data['rules'] = 'IFR'; |
|
| 2877 | - if ($ifrvfr == 'V') $data['rules'] = 'VFR'; |
|
| 2878 | - if ($q[4] == 'A') $data['scope'] = 'Airport warning'; |
|
| 2879 | - if ($q[4] == 'E') $data['scope'] = 'Enroute warning'; |
|
| 2880 | - if ($q[4] == 'W') $data['scope'] = 'Navigation warning'; |
|
| 2881 | - if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning'; |
|
| 2882 | - if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning'; |
|
| 3524 | + if ($ifrvfr == 'IV') { |
|
| 3525 | + $data['rules'] = 'IFR/VFR'; |
|
| 3526 | + } |
|
| 3527 | + if ($ifrvfr == 'I') { |
|
| 3528 | + $data['rules'] = 'IFR'; |
|
| 3529 | + } |
|
| 3530 | + if ($ifrvfr == 'V') { |
|
| 3531 | + $data['rules'] = 'VFR'; |
|
| 3532 | + } |
|
| 3533 | + if ($q[4] == 'A') { |
|
| 3534 | + $data['scope'] = 'Airport warning'; |
|
| 3535 | + } |
|
| 3536 | + if ($q[4] == 'E') { |
|
| 3537 | + $data['scope'] = 'Enroute warning'; |
|
| 3538 | + } |
|
| 3539 | + if ($q[4] == 'W') { |
|
| 3540 | + $data['scope'] = 'Navigation warning'; |
|
| 3541 | + } |
|
| 3542 | + if ($q[4] == 'AE') { |
|
| 3543 | + $data['scope'] = 'Airport/Enroute warning'; |
|
| 3544 | + } |
|
| 3545 | + if ($q[4] == 'AW') { |
|
| 3546 | + $data['scope'] = 'Airport/Navigation warning'; |
|
| 3547 | + } |
|
| 2883 | 3548 | //$data['scope'] = $q[4]; |
| 2884 | 3549 | $data['lower_limit'] = $q[5]; |
| 2885 | 3550 | $data['upper_limit'] = $q[6]; |
@@ -2887,8 +3552,12 @@ discard block |
||
| 2887 | 3552 | sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
| 2888 | 3553 | $latitude = $Common->convertDec($las,'latitude'); |
| 2889 | 3554 | $longitude = $Common->convertDec($lns,'longitude'); |
| 2890 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 2891 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 3555 | + if ($lac == 'S') { |
|
| 3556 | + $latitude = '-'.$latitude; |
|
| 3557 | + } |
|
| 3558 | + if ($lnc == 'W') { |
|
| 3559 | + $longitude = '-'.$longitude; |
|
| 3560 | + } |
|
| 2892 | 3561 | $data['center_latitude'] = $latitude; |
| 2893 | 3562 | $data['center_longitude'] = $longitude; |
| 2894 | 3563 | $data['radius'] = intval($radius); |
@@ -2918,10 +3587,14 @@ discard block |
||
| 2918 | 3587 | $NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
| 2919 | 3588 | unset($data); |
| 2920 | 3589 | } |
| 2921 | - } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 3590 | + } else { |
|
| 3591 | + $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 3592 | + } |
|
| 2922 | 3593 | if ($error != '') { |
| 2923 | 3594 | return $error; |
| 2924 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3595 | + } elseif ($globalDebug) { |
|
| 3596 | + echo "Done\n"; |
|
| 3597 | + } |
|
| 2925 | 3598 | return ''; |
| 2926 | 3599 | } |
| 2927 | 3600 | |
@@ -2946,7 +3619,9 @@ discard block |
||
| 2946 | 3619 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2947 | 3620 | $airspace_json = json_decode($airspace_lst,true); |
| 2948 | 3621 | foreach ($airspace_json['records'] as $airspace) { |
| 2949 | - if ($globalDebug) echo $airspace['name']."...\n"; |
|
| 3622 | + if ($globalDebug) { |
|
| 3623 | + echo $airspace['name']."...\n"; |
|
| 3624 | + } |
|
| 2950 | 3625 | update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
| 2951 | 3626 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2952 | 3627 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
@@ -2990,8 +3665,11 @@ discard block |
||
| 2990 | 3665 | return "error : ".$e->getMessage(); |
| 2991 | 3666 | } |
| 2992 | 3667 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2993 | - if ($row['nb'] > 0) return false; |
|
| 2994 | - else return true; |
|
| 3668 | + if ($row['nb'] > 0) { |
|
| 3669 | + return false; |
|
| 3670 | + } else { |
|
| 3671 | + return true; |
|
| 3672 | + } |
|
| 2995 | 3673 | } |
| 2996 | 3674 | |
| 2997 | 3675 | public static function insert_last_update() { |
@@ -3016,8 +3694,11 @@ discard block |
||
| 3016 | 3694 | return "error : ".$e->getMessage(); |
| 3017 | 3695 | } |
| 3018 | 3696 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3019 | - if ($row['nb'] > 0) return true; |
|
| 3020 | - else return false; |
|
| 3697 | + if ($row['nb'] > 0) { |
|
| 3698 | + return true; |
|
| 3699 | + } else { |
|
| 3700 | + return false; |
|
| 3701 | + } |
|
| 3021 | 3702 | } |
| 3022 | 3703 | |
| 3023 | 3704 | public static function check_geoid_version($version) { |
@@ -3030,8 +3711,11 @@ discard block |
||
| 3030 | 3711 | return "error : ".$e->getMessage(); |
| 3031 | 3712 | } |
| 3032 | 3713 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3033 | - if ($row['nb'] > 0) return true; |
|
| 3034 | - else return false; |
|
| 3714 | + if ($row['nb'] > 0) { |
|
| 3715 | + return true; |
|
| 3716 | + } else { |
|
| 3717 | + return false; |
|
| 3718 | + } |
|
| 3035 | 3719 | } |
| 3036 | 3720 | |
| 3037 | 3721 | public static function check_marine_identity_version($version) { |
@@ -3044,8 +3728,11 @@ discard block |
||
| 3044 | 3728 | return "error : ".$e->getMessage(); |
| 3045 | 3729 | } |
| 3046 | 3730 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3047 | - if ($row['nb'] > 0) return true; |
|
| 3048 | - else return false; |
|
| 3731 | + if ($row['nb'] > 0) { |
|
| 3732 | + return true; |
|
| 3733 | + } else { |
|
| 3734 | + return false; |
|
| 3735 | + } |
|
| 3049 | 3736 | } |
| 3050 | 3737 | |
| 3051 | 3738 | public static function check_satellite_version($version) { |
@@ -3058,8 +3745,11 @@ discard block |
||
| 3058 | 3745 | return "error : ".$e->getMessage(); |
| 3059 | 3746 | } |
| 3060 | 3747 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3061 | - if ($row['nb'] > 0) return true; |
|
| 3062 | - else return false; |
|
| 3748 | + if ($row['nb'] > 0) { |
|
| 3749 | + return true; |
|
| 3750 | + } else { |
|
| 3751 | + return false; |
|
| 3752 | + } |
|
| 3063 | 3753 | } |
| 3064 | 3754 | |
| 3065 | 3755 | public static function check_airlines_version($version) { |
@@ -3072,8 +3762,11 @@ discard block |
||
| 3072 | 3762 | return "error : ".$e->getMessage(); |
| 3073 | 3763 | } |
| 3074 | 3764 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3075 | - if ($row['nb'] > 0) return true; |
|
| 3076 | - else return false; |
|
| 3765 | + if ($row['nb'] > 0) { |
|
| 3766 | + return true; |
|
| 3767 | + } else { |
|
| 3768 | + return false; |
|
| 3769 | + } |
|
| 3077 | 3770 | } |
| 3078 | 3771 | |
| 3079 | 3772 | public static function check_notam_version($version) { |
@@ -3086,8 +3779,11 @@ discard block |
||
| 3086 | 3779 | return "error : ".$e->getMessage(); |
| 3087 | 3780 | } |
| 3088 | 3781 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3089 | - if ($row['nb'] > 0) return true; |
|
| 3090 | - else return false; |
|
| 3782 | + if ($row['nb'] > 0) { |
|
| 3783 | + return true; |
|
| 3784 | + } else { |
|
| 3785 | + return false; |
|
| 3786 | + } |
|
| 3091 | 3787 | } |
| 3092 | 3788 | |
| 3093 | 3789 | public static function insert_airlines_version($version) { |
@@ -3177,8 +3873,11 @@ discard block |
||
| 3177 | 3873 | return "error : ".$e->getMessage(); |
| 3178 | 3874 | } |
| 3179 | 3875 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3180 | - if ($row['nb'] > 0) return false; |
|
| 3181 | - else return true; |
|
| 3876 | + if ($row['nb'] > 0) { |
|
| 3877 | + return false; |
|
| 3878 | + } else { |
|
| 3879 | + return true; |
|
| 3880 | + } |
|
| 3182 | 3881 | } |
| 3183 | 3882 | |
| 3184 | 3883 | public static function insert_last_notam_update() { |
@@ -3208,8 +3907,11 @@ discard block |
||
| 3208 | 3907 | return "error : ".$e->getMessage(); |
| 3209 | 3908 | } |
| 3210 | 3909 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3211 | - if ($row['nb'] > 0) return false; |
|
| 3212 | - else return true; |
|
| 3910 | + if ($row['nb'] > 0) { |
|
| 3911 | + return false; |
|
| 3912 | + } else { |
|
| 3913 | + return true; |
|
| 3914 | + } |
|
| 3213 | 3915 | } |
| 3214 | 3916 | |
| 3215 | 3917 | public static function insert_last_airspace_update() { |
@@ -3239,8 +3941,11 @@ discard block |
||
| 3239 | 3941 | return "error : ".$e->getMessage(); |
| 3240 | 3942 | } |
| 3241 | 3943 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3242 | - if ($row['nb'] > 0) return false; |
|
| 3243 | - else return true; |
|
| 3944 | + if ($row['nb'] > 0) { |
|
| 3945 | + return false; |
|
| 3946 | + } else { |
|
| 3947 | + return true; |
|
| 3948 | + } |
|
| 3244 | 3949 | } |
| 3245 | 3950 | |
| 3246 | 3951 | public static function insert_last_geoid_update() { |
@@ -3270,8 +3975,11 @@ discard block |
||
| 3270 | 3975 | return "error : ".$e->getMessage(); |
| 3271 | 3976 | } |
| 3272 | 3977 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3273 | - if ($row['nb'] > 0) return false; |
|
| 3274 | - else return true; |
|
| 3978 | + if ($row['nb'] > 0) { |
|
| 3979 | + return false; |
|
| 3980 | + } else { |
|
| 3981 | + return true; |
|
| 3982 | + } |
|
| 3275 | 3983 | } |
| 3276 | 3984 | |
| 3277 | 3985 | public static function insert_last_owner_update() { |
@@ -3301,8 +4009,11 @@ discard block |
||
| 3301 | 4009 | return "error : ".$e->getMessage(); |
| 3302 | 4010 | } |
| 3303 | 4011 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3304 | - if ($row['nb'] > 0) return false; |
|
| 3305 | - else return true; |
|
| 4012 | + if ($row['nb'] > 0) { |
|
| 4013 | + return false; |
|
| 4014 | + } else { |
|
| 4015 | + return true; |
|
| 4016 | + } |
|
| 3306 | 4017 | } |
| 3307 | 4018 | |
| 3308 | 4019 | public static function insert_last_fires_update() { |
@@ -3332,8 +4043,11 @@ discard block |
||
| 3332 | 4043 | return "error : ".$e->getMessage(); |
| 3333 | 4044 | } |
| 3334 | 4045 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3335 | - if ($row['nb'] > 0) return false; |
|
| 3336 | - else return true; |
|
| 4046 | + if ($row['nb'] > 0) { |
|
| 4047 | + return false; |
|
| 4048 | + } else { |
|
| 4049 | + return true; |
|
| 4050 | + } |
|
| 3337 | 4051 | } |
| 3338 | 4052 | |
| 3339 | 4053 | public static function insert_last_airlines_update() { |
@@ -3363,8 +4077,11 @@ discard block |
||
| 3363 | 4077 | return "error : ".$e->getMessage(); |
| 3364 | 4078 | } |
| 3365 | 4079 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3366 | - if ($row['nb'] > 0) return false; |
|
| 3367 | - else return true; |
|
| 4080 | + if ($row['nb'] > 0) { |
|
| 4081 | + return false; |
|
| 4082 | + } else { |
|
| 4083 | + return true; |
|
| 4084 | + } |
|
| 3368 | 4085 | } |
| 3369 | 4086 | |
| 3370 | 4087 | public static function insert_last_schedules_update() { |
@@ -3394,8 +4111,11 @@ discard block |
||
| 3394 | 4111 | return "error : ".$e->getMessage(); |
| 3395 | 4112 | } |
| 3396 | 4113 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3397 | - if ($row['nb'] > 0) return false; |
|
| 3398 | - else return true; |
|
| 4114 | + if ($row['nb'] > 0) { |
|
| 4115 | + return false; |
|
| 4116 | + } else { |
|
| 4117 | + return true; |
|
| 4118 | + } |
|
| 3399 | 4119 | } |
| 3400 | 4120 | |
| 3401 | 4121 | public static function insert_last_tle_update() { |
@@ -3425,8 +4145,11 @@ discard block |
||
| 3425 | 4145 | return "error : ".$e->getMessage(); |
| 3426 | 4146 | } |
| 3427 | 4147 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3428 | - if ($row['nb'] > 0) return false; |
|
| 3429 | - else return true; |
|
| 4148 | + if ($row['nb'] > 0) { |
|
| 4149 | + return false; |
|
| 4150 | + } else { |
|
| 4151 | + return true; |
|
| 4152 | + } |
|
| 3430 | 4153 | } |
| 3431 | 4154 | |
| 3432 | 4155 | public static function insert_last_ucsdb_update() { |
@@ -3456,8 +4179,11 @@ discard block |
||
| 3456 | 4179 | return "error : ".$e->getMessage(); |
| 3457 | 4180 | } |
| 3458 | 4181 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3459 | - if ($row['nb'] > 0) return false; |
|
| 3460 | - else return true; |
|
| 4182 | + if ($row['nb'] > 0) { |
|
| 4183 | + return false; |
|
| 4184 | + } else { |
|
| 4185 | + return true; |
|
| 4186 | + } |
|
| 3461 | 4187 | } |
| 3462 | 4188 | |
| 3463 | 4189 | public static function insert_last_celestrak_update() { |
@@ -3487,8 +4213,11 @@ discard block |
||
| 3487 | 4213 | return "error : ".$e->getMessage(); |
| 3488 | 4214 | } |
| 3489 | 4215 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3490 | - if ($row['nb'] > 0) return false; |
|
| 3491 | - else return true; |
|
| 4216 | + if ($row['nb'] > 0) { |
|
| 4217 | + return false; |
|
| 4218 | + } else { |
|
| 4219 | + return true; |
|
| 4220 | + } |
|
| 3492 | 4221 | } |
| 3493 | 4222 | |
| 3494 | 4223 | public static function check_last_satellite_update() { |
@@ -3506,8 +4235,11 @@ discard block |
||
| 3506 | 4235 | return "error : ".$e->getMessage(); |
| 3507 | 4236 | } |
| 3508 | 4237 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3509 | - if ($row['nb'] > 0) return false; |
|
| 3510 | - else return true; |
|
| 4238 | + if ($row['nb'] > 0) { |
|
| 4239 | + return false; |
|
| 4240 | + } else { |
|
| 4241 | + return true; |
|
| 4242 | + } |
|
| 3511 | 4243 | } |
| 3512 | 4244 | |
| 3513 | 4245 | public static function insert_last_marine_identity_update() { |
