Ysurac /
FlightAirMap
@@ -17,14 +17,14 @@ discard block |
||
| 17 | 17 | $this->db = $Connection->db(); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 20 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 21 | 21 | $query = "DELETE FROM config WHERE name = :type; |
| 22 | 22 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 23 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 23 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 24 | 24 | try { |
| 25 | 25 | $sth = $this->db->prepare($query); |
| 26 | 26 | $sth->execute($query_values); |
| 27 | - } catch(PDOException $e) { |
|
| 27 | + } catch (PDOException $e) { |
|
| 28 | 28 | return "error : ".$e->getMessage(); |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | try { |
| 35 | 35 | $sth = $this->db->prepare($query); |
| 36 | 36 | $sth->execute(array(':type' => $type)); |
| 37 | - } catch(PDOException $e) { |
|
| 37 | + } catch (PDOException $e) { |
|
| 38 | 38 | echo "error : ".$e->getMessage(); |
| 39 | 39 | } |
| 40 | 40 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | try { |
| 55 | 55 | $sth = $this->db->prepare($query); |
| 56 | 56 | $sth->execute(array(':filter_name' => $filter_name)); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | try { |
| 65 | 65 | $sth = $this->db->prepare($query); |
| 66 | 66 | $sth->execute(); |
| 67 | - } catch(PDOException $e) { |
|
| 67 | + } catch (PDOException $e) { |
|
| 68 | 68 | return "error : ".$e->getMessage(); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $sth = $this->db->prepare($query); |
| 74 | 74 | $sth->execute(array(':filter_name' => $filter_name)); |
| 75 | - } catch(PDOException $e) { |
|
| 75 | + } catch (PDOException $e) { |
|
| 76 | 76 | return "error : ".$e->getMessage(); |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -82,69 +82,69 @@ discard block |
||
| 82 | 82 | try { |
| 83 | 83 | $sth = $this->db->prepare($query); |
| 84 | 84 | $sth->execute(array(':filter_name' => $filter_name)); |
| 85 | - } catch(PDOException $e) { |
|
| 85 | + } catch (PDOException $e) { |
|
| 86 | 86 | echo "error : ".$e->getMessage(); |
| 87 | 87 | } |
| 88 | 88 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 89 | 89 | return $all; |
| 90 | 90 | } |
| 91 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 91 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 92 | 92 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 93 | 93 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 94 | 94 | try { |
| 95 | 95 | $sth = $this->db->prepare($query); |
| 96 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 97 | - } catch(PDOException $e) { |
|
| 96 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 97 | + } catch (PDOException $e) { |
|
| 98 | 98 | echo "error : ".$e->getMessage(); |
| 99 | 99 | } |
| 100 | 100 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 101 | 101 | return $all; |
| 102 | 102 | } |
| 103 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 103 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 104 | 104 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 105 | 105 | $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"; |
| 106 | 106 | try { |
| 107 | 107 | $sth = $this->db->prepare($query); |
| 108 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 109 | - } catch(PDOException $e) { |
|
| 108 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 109 | + } catch (PDOException $e) { |
|
| 110 | 110 | echo "error : ".$e->getMessage(); |
| 111 | 111 | } |
| 112 | 112 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 113 | 113 | return $all; |
| 114 | 114 | } |
| 115 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 115 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 116 | 116 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 117 | 117 | $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"; |
| 118 | 118 | try { |
| 119 | 119 | $sth = $this->db->prepare($query); |
| 120 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 121 | - } catch(PDOException $e) { |
|
| 120 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 121 | + } catch (PDOException $e) { |
|
| 122 | 122 | echo "error : ".$e->getMessage(); |
| 123 | 123 | } |
| 124 | 124 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 125 | 125 | return $all; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 128 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 129 | 129 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 130 | 130 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 131 | 131 | try { |
| 132 | 132 | $sth = $this->db->prepare($query); |
| 133 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 134 | - } catch(PDOException $e) { |
|
| 133 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 134 | + } catch (PDOException $e) { |
|
| 135 | 135 | echo "error : ".$e->getMessage(); |
| 136 | 136 | } |
| 137 | 137 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 138 | 138 | return $all; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 141 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 142 | 142 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 143 | 143 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 147 | - } catch(PDOException $e) { |
|
| 146 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 147 | + } catch (PDOException $e) { |
|
| 148 | 148 | echo "error : ".$e->getMessage(); |
| 149 | 149 | } |
| 150 | 150 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
| 155 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 155 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 156 | 156 | global $globalStatsFilters; |
| 157 | 157 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 158 | 158 | if ($year == '' && $month == '') { |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | 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"; |
| 161 | 161 | try { |
| 162 | 162 | $sth = $this->db->prepare($query); |
| 163 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 164 | - } catch(PDOException $e) { |
|
| 163 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 164 | + } catch (PDOException $e) { |
|
| 165 | 165 | echo "error : ".$e->getMessage(); |
| 166 | 166 | } |
| 167 | 167 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -169,14 +169,14 @@ discard block |
||
| 169 | 169 | if (empty($all)) { |
| 170 | 170 | $filters = array('airlines' => array($stats_airline)); |
| 171 | 171 | if ($filter_name != '') { |
| 172 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 172 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 173 | 173 | } |
| 174 | 174 | $Spotter = new Spotter($this->db); |
| 175 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 175 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters, $year, $month); |
|
| 176 | 176 | } |
| 177 | 177 | return $all; |
| 178 | 178 | } |
| 179 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 179 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 180 | 180 | global $globalStatsFilters; |
| 181 | 181 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 182 | 182 | if ($year == '' && $month == '') { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | try { |
| 186 | 186 | $sth = $this->db->prepare($query); |
| 187 | 187 | $sth->execute(array(':filter_name' => $filter_name)); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | echo "error : ".$e->getMessage(); |
| 190 | 190 | } |
| 191 | 191 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -194,13 +194,13 @@ discard block |
||
| 194 | 194 | $Spotter = new Spotter($this->db); |
| 195 | 195 | $filters = array(); |
| 196 | 196 | if ($filter_name != '') { |
| 197 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 197 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 198 | 198 | } |
| 199 | - $all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 199 | + $all = $Spotter->countAllAirlineCountries($limit, $filters, $year, $month); |
|
| 200 | 200 | } |
| 201 | 201 | return $all; |
| 202 | 202 | } |
| 203 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 203 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 204 | 204 | global $globalStatsFilters; |
| 205 | 205 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 206 | 206 | if ($year == '' && $month == '') { |
@@ -208,8 +208,8 @@ discard block |
||
| 208 | 208 | 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"; |
| 209 | 209 | try { |
| 210 | 210 | $sth = $this->db->prepare($query); |
| 211 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 212 | - } catch(PDOException $e) { |
|
| 211 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 212 | + } catch (PDOException $e) { |
|
| 213 | 213 | echo "error : ".$e->getMessage(); |
| 214 | 214 | } |
| 215 | 215 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -217,15 +217,15 @@ discard block |
||
| 217 | 217 | if (empty($all)) { |
| 218 | 218 | $filters = array('airlines' => array($stats_airline)); |
| 219 | 219 | if ($filter_name != '') { |
| 220 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 220 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 221 | 221 | } |
| 222 | 222 | $Spotter = new Spotter($this->db); |
| 223 | - $all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
|
| 223 | + $all = $Spotter->countAllAircraftManufacturers($filters, $year, $month); |
|
| 224 | 224 | } |
| 225 | 225 | return $all; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 228 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 229 | 229 | global $globalStatsFilters; |
| 230 | 230 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 231 | 231 | if ($year == '' && $month == '') { |
@@ -233,8 +233,8 @@ discard block |
||
| 233 | 233 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
| 234 | 234 | try { |
| 235 | 235 | $sth = $this->db->prepare($query); |
| 236 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 237 | - } catch(PDOException $e) { |
|
| 236 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 237 | + } catch (PDOException $e) { |
|
| 238 | 238 | echo "error : ".$e->getMessage(); |
| 239 | 239 | } |
| 240 | 240 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | if (empty($all)) { |
| 243 | 243 | $filters = array('airlines' => array($stats_airline)); |
| 244 | 244 | if ($filter_name != '') { |
| 245 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 245 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 246 | 246 | } |
| 247 | 247 | $Spotter = new Spotter($this->db); |
| 248 | - $all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
|
| 248 | + $all = $Spotter->countAllArrivalCountries($limit, $filters, $year, $month); |
|
| 249 | 249 | } |
| 250 | 250 | return $all; |
| 251 | 251 | } |
@@ -256,23 +256,23 @@ discard block |
||
| 256 | 256 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
| 257 | 257 | try { |
| 258 | 258 | $sth = $this->db->prepare($query); |
| 259 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 260 | - } catch(PDOException $e) { |
|
| 259 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 260 | + } catch (PDOException $e) { |
|
| 261 | 261 | echo "error : ".$e->getMessage(); |
| 262 | 262 | } |
| 263 | 263 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 264 | 264 | if (empty($all)) { |
| 265 | 265 | $filters = array('airlines' => array($stats_airline)); |
| 266 | 266 | if ($filter_name != '') { |
| 267 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 267 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 268 | 268 | } |
| 269 | 269 | $Spotter = new Spotter($this->db); |
| 270 | - $all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
|
| 270 | + $all = $Spotter->countAllDepartureCountries($filters, $year, $month); |
|
| 271 | 271 | } |
| 272 | 272 | return $all; |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 275 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 276 | 276 | global $globalStatsFilters; |
| 277 | 277 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 278 | 278 | if ($year == '' && $month == '') { |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | try { |
| 282 | 282 | $sth = $this->db->prepare($query); |
| 283 | 283 | $sth->execute(array(':filter_name' => $filter_name)); |
| 284 | - } catch(PDOException $e) { |
|
| 284 | + } catch (PDOException $e) { |
|
| 285 | 285 | echo "error : ".$e->getMessage(); |
| 286 | 286 | } |
| 287 | 287 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -290,14 +290,14 @@ discard block |
||
| 290 | 290 | $Spotter = new Spotter($this->db); |
| 291 | 291 | $filters = array(); |
| 292 | 292 | if ($filter_name != '') { |
| 293 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 293 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
|
| 296 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters, $year, $month); |
|
| 297 | 297 | } |
| 298 | 298 | return $all; |
| 299 | 299 | } |
| 300 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 300 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 301 | 301 | global $globalStatsFilters; |
| 302 | 302 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 303 | 303 | if ($year == '' && $month == '') { |
@@ -305,8 +305,8 @@ discard block |
||
| 305 | 305 | 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"; |
| 306 | 306 | try { |
| 307 | 307 | $sth = $this->db->prepare($query); |
| 308 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 309 | - } catch(PDOException $e) { |
|
| 308 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 309 | + } catch (PDOException $e) { |
|
| 310 | 310 | echo "error : ".$e->getMessage(); |
| 311 | 311 | } |
| 312 | 312 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -314,14 +314,14 @@ discard block |
||
| 314 | 314 | if (empty($all)) { |
| 315 | 315 | $filters = array('airlines' => array($stats_airline)); |
| 316 | 316 | if ($filter_name != '') { |
| 317 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 317 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 318 | 318 | } |
| 319 | 319 | $Spotter = new Spotter($this->db); |
| 320 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 320 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters, $year, $month); |
|
| 321 | 321 | } |
| 322 | 322 | return $all; |
| 323 | 323 | } |
| 324 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 324 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 325 | 325 | global $globalStatsFilters; |
| 326 | 326 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 327 | 327 | if ($year == '' && $month == '') { |
@@ -329,8 +329,8 @@ discard block |
||
| 329 | 329 | 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"; |
| 330 | 330 | try { |
| 331 | 331 | $sth = $this->db->prepare($query); |
| 332 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 333 | - } catch(PDOException $e) { |
|
| 332 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 333 | + } catch (PDOException $e) { |
|
| 334 | 334 | echo "error : ".$e->getMessage(); |
| 335 | 335 | } |
| 336 | 336 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -338,14 +338,14 @@ discard block |
||
| 338 | 338 | if (empty($all)) { |
| 339 | 339 | $filters = array('airlines' => array($stats_airline)); |
| 340 | 340 | if ($filter_name != '') { |
| 341 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 341 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 342 | 342 | } |
| 343 | 343 | $Spotter = new Spotter($this->db); |
| 344 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
|
| 344 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters, $year, $month); |
|
| 345 | 345 | } |
| 346 | 346 | return $all; |
| 347 | 347 | } |
| 348 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 348 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 349 | 349 | $Connection = new Connection(); |
| 350 | 350 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 351 | 351 | if ($Connection->tableExists('countries')) { |
@@ -354,8 +354,8 @@ discard block |
||
| 354 | 354 | 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"; |
| 355 | 355 | try { |
| 356 | 356 | $sth = $this->db->prepare($query); |
| 357 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 358 | - } catch(PDOException $e) { |
|
| 357 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 358 | + } catch (PDOException $e) { |
|
| 359 | 359 | echo "error : ".$e->getMessage(); |
| 360 | 360 | } |
| 361 | 361 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | return array(); |
| 372 | 372 | } |
| 373 | 373 | } |
| 374 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 374 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 375 | 375 | global $globalStatsFilters; |
| 376 | 376 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 377 | 377 | if ($year == '' && $month == '') { |
@@ -379,8 +379,8 @@ discard block |
||
| 379 | 379 | 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"; |
| 380 | 380 | try { |
| 381 | 381 | $sth = $this->db->prepare($query); |
| 382 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 383 | - } catch(PDOException $e) { |
|
| 382 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 383 | + } catch (PDOException $e) { |
|
| 384 | 384 | echo "error : ".$e->getMessage(); |
| 385 | 385 | } |
| 386 | 386 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -388,15 +388,15 @@ discard block |
||
| 388 | 388 | if (empty($all)) { |
| 389 | 389 | $filters = array('airlines' => array($stats_airline)); |
| 390 | 390 | if ($filter_name != '') { |
| 391 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 391 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 392 | 392 | } |
| 393 | 393 | $Spotter = new Spotter($this->db); |
| 394 | - $all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
|
| 394 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters, $year, $month); |
|
| 395 | 395 | } |
| 396 | 396 | return $all; |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 399 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 400 | 400 | global $globalStatsFilters; |
| 401 | 401 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 402 | 402 | if ($year == '' && $month == '') { |
@@ -404,8 +404,8 @@ discard block |
||
| 404 | 404 | 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"; |
| 405 | 405 | try { |
| 406 | 406 | $sth = $this->db->prepare($query); |
| 407 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 408 | - } catch(PDOException $e) { |
|
| 407 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 408 | + } catch (PDOException $e) { |
|
| 409 | 409 | echo "error : ".$e->getMessage(); |
| 410 | 410 | } |
| 411 | 411 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -413,14 +413,14 @@ discard block |
||
| 413 | 413 | if (empty($all)) { |
| 414 | 414 | $filters = array('airlines' => array($stats_airline)); |
| 415 | 415 | if ($filter_name != '') { |
| 416 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 416 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 417 | 417 | } |
| 418 | 418 | $Spotter = new Spotter($this->db); |
| 419 | - $all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 419 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters, $year, $month); |
|
| 420 | 420 | } |
| 421 | 421 | return $all; |
| 422 | 422 | } |
| 423 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 423 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 424 | 424 | global $globalStatsFilters; |
| 425 | 425 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 426 | 426 | if ($year == '' && $month == '') { |
@@ -428,8 +428,8 @@ discard block |
||
| 428 | 428 | 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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 429 | 429 | try { |
| 430 | 430 | $sth = $this->db->prepare($query); |
| 431 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 432 | - } catch(PDOException $e) { |
|
| 431 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | echo "error : ".$e->getMessage(); |
| 434 | 434 | } |
| 435 | 435 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | if (empty($all)) { |
| 438 | 438 | $filters = array('airlines' => array($stats_airline)); |
| 439 | 439 | if ($filter_name != '') { |
| 440 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 440 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 441 | 441 | } |
| 442 | 442 | $Spotter = new Spotter($this->db); |
| 443 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
|
| 444 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
|
| 443 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters, $year, $month); |
|
| 444 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters, $year, $month); |
|
| 445 | 445 | $all = array(); |
| 446 | 446 | foreach ($pall as $value) { |
| 447 | 447 | $icao = $value['airport_departure_icao']; |
@@ -458,11 +458,11 @@ discard block |
||
| 458 | 458 | foreach ($all as $key => $row) { |
| 459 | 459 | $count[$key] = $row['airport_departure_icao_count']; |
| 460 | 460 | } |
| 461 | - array_multisort($count,SORT_DESC,$all); |
|
| 461 | + array_multisort($count, SORT_DESC, $all); |
|
| 462 | 462 | } |
| 463 | 463 | return $all; |
| 464 | 464 | } |
| 465 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 465 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 466 | 466 | global $globalStatsFilters; |
| 467 | 467 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 468 | 468 | if ($year == '' && $month == '') { |
@@ -470,8 +470,8 @@ discard block |
||
| 470 | 470 | 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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 471 | 471 | try { |
| 472 | 472 | $sth = $this->db->prepare($query); |
| 473 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 474 | - } catch(PDOException $e) { |
|
| 473 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 474 | + } catch (PDOException $e) { |
|
| 475 | 475 | echo "error : ".$e->getMessage(); |
| 476 | 476 | } |
| 477 | 477 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -479,11 +479,11 @@ discard block |
||
| 479 | 479 | if (empty($all)) { |
| 480 | 480 | $filters = array('airlines' => array($stats_airline)); |
| 481 | 481 | if ($filter_name != '') { |
| 482 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 482 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 483 | 483 | } |
| 484 | 484 | $Spotter = new Spotter($this->db); |
| 485 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
|
| 486 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
|
| 485 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters, $year, $month); |
|
| 486 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters, $year, $month); |
|
| 487 | 487 | $all = array(); |
| 488 | 488 | foreach ($pall as $value) { |
| 489 | 489 | $icao = $value['airport_arrival_icao']; |
@@ -500,12 +500,12 @@ discard block |
||
| 500 | 500 | foreach ($all as $key => $row) { |
| 501 | 501 | $count[$key] = $row['airport_arrival_icao_count']; |
| 502 | 502 | } |
| 503 | - array_multisort($count,SORT_DESC,$all); |
|
| 503 | + array_multisort($count, SORT_DESC, $all); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | return $all; |
| 507 | 507 | } |
| 508 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 508 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 509 | 509 | global $globalDBdriver, $globalStatsFilters; |
| 510 | 510 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 511 | 511 | if ($globalDBdriver == 'mysql') { |
@@ -515,18 +515,18 @@ discard block |
||
| 515 | 515 | 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"; |
| 516 | 516 | 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"; |
| 517 | 517 | } |
| 518 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 518 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 519 | 519 | try { |
| 520 | 520 | $sth = $this->db->prepare($query); |
| 521 | 521 | $sth->execute($query_data); |
| 522 | - } catch(PDOException $e) { |
|
| 522 | + } catch (PDOException $e) { |
|
| 523 | 523 | echo "error : ".$e->getMessage(); |
| 524 | 524 | } |
| 525 | 525 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 526 | 526 | if (empty($all)) { |
| 527 | 527 | $filters = array('airlines' => array($stats_airline)); |
| 528 | 528 | if ($filter_name != '') { |
| 529 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 529 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 530 | 530 | } |
| 531 | 531 | $Spotter = new Spotter($this->db); |
| 532 | 532 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -535,29 +535,29 @@ discard block |
||
| 535 | 535 | return $all; |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 538 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 539 | 539 | global $globalStatsFilters; |
| 540 | 540 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 541 | 541 | $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"; |
| 542 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 542 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 543 | 543 | try { |
| 544 | 544 | $sth = $this->db->prepare($query); |
| 545 | 545 | $sth->execute($query_data); |
| 546 | - } catch(PDOException $e) { |
|
| 546 | + } catch (PDOException $e) { |
|
| 547 | 547 | echo "error : ".$e->getMessage(); |
| 548 | 548 | } |
| 549 | 549 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 550 | 550 | if (empty($all)) { |
| 551 | 551 | $filters = array('airlines' => array($stats_airline)); |
| 552 | 552 | if ($filter_name != '') { |
| 553 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 553 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 554 | 554 | } |
| 555 | 555 | $Spotter = new Spotter($this->db); |
| 556 | 556 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 557 | 557 | } |
| 558 | 558 | return $all; |
| 559 | 559 | } |
| 560 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 560 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 561 | 561 | global $globalDBdriver, $globalStatsFilters; |
| 562 | 562 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 563 | 563 | if ($globalDBdriver == 'mysql') { |
@@ -565,40 +565,40 @@ discard block |
||
| 565 | 565 | } else { |
| 566 | 566 | $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"; |
| 567 | 567 | } |
| 568 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 568 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 569 | 569 | try { |
| 570 | 570 | $sth = $this->db->prepare($query); |
| 571 | 571 | $sth->execute($query_data); |
| 572 | - } catch(PDOException $e) { |
|
| 572 | + } catch (PDOException $e) { |
|
| 573 | 573 | echo "error : ".$e->getMessage(); |
| 574 | 574 | } |
| 575 | 575 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 576 | 576 | if (empty($all)) { |
| 577 | 577 | $filters = array('airlines' => array($stats_airline)); |
| 578 | 578 | if ($filter_name != '') { |
| 579 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 579 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 580 | 580 | } |
| 581 | 581 | $Spotter = new Spotter($this->db); |
| 582 | 582 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 583 | 583 | } |
| 584 | 584 | return $all; |
| 585 | 585 | } |
| 586 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 586 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 587 | 587 | global $globalStatsFilters; |
| 588 | 588 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 589 | 589 | $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"; |
| 590 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 590 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 591 | 591 | try { |
| 592 | 592 | $sth = $this->db->prepare($query); |
| 593 | 593 | $sth->execute($query_data); |
| 594 | - } catch(PDOException $e) { |
|
| 594 | + } catch (PDOException $e) { |
|
| 595 | 595 | echo "error : ".$e->getMessage(); |
| 596 | 596 | } |
| 597 | 597 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 598 | 598 | if (empty($all)) { |
| 599 | 599 | $filters = array('airlines' => array($stats_airline)); |
| 600 | 600 | if ($filter_name != '') { |
| 601 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 601 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 602 | 602 | } |
| 603 | 603 | $Spotter = new Spotter($this->db); |
| 604 | 604 | $all = $Spotter->countAllDates($filters); |
@@ -613,28 +613,28 @@ discard block |
||
| 613 | 613 | try { |
| 614 | 614 | $sth = $this->db->prepare($query); |
| 615 | 615 | $sth->execute($query_data); |
| 616 | - } catch(PDOException $e) { |
|
| 616 | + } catch (PDOException $e) { |
|
| 617 | 617 | echo "error : ".$e->getMessage(); |
| 618 | 618 | } |
| 619 | 619 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 620 | 620 | if (empty($all)) { |
| 621 | 621 | $filters = array(); |
| 622 | 622 | if ($filter_name != '') { |
| 623 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 623 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 624 | 624 | } |
| 625 | 625 | $Spotter = new Spotter($this->db); |
| 626 | 626 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 627 | 627 | } |
| 628 | 628 | return $all; |
| 629 | 629 | } |
| 630 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 630 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 631 | 631 | global $globalStatsFilters; |
| 632 | 632 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 633 | 633 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 634 | 634 | try { |
| 635 | 635 | $sth = $this->db->prepare($query); |
| 636 | 636 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 637 | - } catch(PDOException $e) { |
|
| 637 | + } catch (PDOException $e) { |
|
| 638 | 638 | echo "error : ".$e->getMessage(); |
| 639 | 639 | } |
| 640 | 640 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | if (empty($all)) { |
| 643 | 643 | $filters = array('airlines' => array($stats_airline)); |
| 644 | 644 | if ($filter_name != '') { |
| 645 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 645 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 646 | 646 | } |
| 647 | 647 | $Spotter = new Spotter($this->db); |
| 648 | 648 | $all = $Spotter->countAllMonths($filters); |
@@ -657,21 +657,21 @@ discard block |
||
| 657 | 657 | try { |
| 658 | 658 | $sth = $this->db->prepare($query); |
| 659 | 659 | $sth->execute(array(':filter_name' => $filter_name)); |
| 660 | - } catch(PDOException $e) { |
|
| 660 | + } catch (PDOException $e) { |
|
| 661 | 661 | echo "error : ".$e->getMessage(); |
| 662 | 662 | } |
| 663 | 663 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 664 | 664 | if (empty($all)) { |
| 665 | 665 | $filters = array(); |
| 666 | 666 | if ($filter_name != '') { |
| 667 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 667 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 668 | 668 | } |
| 669 | 669 | $Spotter = new Spotter($this->db); |
| 670 | 670 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 671 | 671 | } |
| 672 | 672 | return $all; |
| 673 | 673 | } |
| 674 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 674 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 675 | 675 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 676 | 676 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 677 | 677 | 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"; |
@@ -688,91 +688,91 @@ discard block |
||
| 688 | 688 | try { |
| 689 | 689 | $sth = $this->db->prepare($query); |
| 690 | 690 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 691 | - } catch(PDOException $e) { |
|
| 691 | + } catch (PDOException $e) { |
|
| 692 | 692 | echo "error : ".$e->getMessage(); |
| 693 | 693 | } |
| 694 | 694 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 695 | 695 | if (empty($all)) { |
| 696 | 696 | $filters = array('airlines' => array($stats_airline)); |
| 697 | 697 | if ($filter_name != '') { |
| 698 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 698 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 699 | 699 | } |
| 700 | 700 | $Spotter = new Spotter($this->db); |
| 701 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 701 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 702 | 702 | } |
| 703 | 703 | return $all; |
| 704 | 704 | } |
| 705 | 705 | |
| 706 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 706 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 707 | 707 | global $globalStatsFilters; |
| 708 | 708 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 709 | 709 | if ($year == '') $year = date('Y'); |
| 710 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 710 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 711 | 711 | if (empty($all)) { |
| 712 | 712 | $filters = array('airlines' => array($stats_airline)); |
| 713 | 713 | if ($filter_name != '') { |
| 714 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 714 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 715 | 715 | } |
| 716 | 716 | $Spotter = new Spotter($this->db); |
| 717 | - $all = $Spotter->countOverallFlights($filters,$year,$month); |
|
| 717 | + $all = $Spotter->countOverallFlights($filters, $year, $month); |
|
| 718 | 718 | } |
| 719 | 719 | return $all; |
| 720 | 720 | } |
| 721 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 721 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 722 | 722 | global $globalStatsFilters; |
| 723 | 723 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 724 | 724 | if ($year == '') $year = date('Y'); |
| 725 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 725 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 726 | 726 | if (empty($all)) { |
| 727 | 727 | $filters = array(); |
| 728 | 728 | if ($filter_name != '') { |
| 729 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 729 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 730 | 730 | } |
| 731 | 731 | $Spotter = new Spotter($this->db); |
| 732 | - $all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
|
| 732 | + $all = $Spotter->countOverallMilitaryFlights($filters, $year, $month); |
|
| 733 | 733 | } |
| 734 | 734 | return $all; |
| 735 | 735 | } |
| 736 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 736 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 737 | 737 | global $globalStatsFilters; |
| 738 | 738 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 739 | 739 | if ($year == '') $year = date('Y'); |
| 740 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 740 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 741 | 741 | if (empty($all)) { |
| 742 | 742 | $filters = array('airlines' => array($stats_airline)); |
| 743 | 743 | if ($filter_name != '') { |
| 744 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 744 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 745 | 745 | } |
| 746 | 746 | $Spotter = new Spotter($this->db); |
| 747 | - $all = $Spotter->countOverallArrival($filters,$year,$month); |
|
| 747 | + $all = $Spotter->countOverallArrival($filters, $year, $month); |
|
| 748 | 748 | } |
| 749 | 749 | return $all; |
| 750 | 750 | } |
| 751 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 751 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 752 | 752 | global $globalStatsFilters; |
| 753 | 753 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 754 | 754 | if ($year == '' && $month == '') { |
| 755 | 755 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $this->db->prepare($query); |
| 758 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 759 | - } catch(PDOException $e) { |
|
| 758 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | echo "error : ".$e->getMessage(); |
| 761 | 761 | } |
| 762 | 762 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 763 | 763 | $all = $result[0]['nb']; |
| 764 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 764 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 765 | 765 | if (empty($all)) { |
| 766 | 766 | $filters = array('airlines' => array($stats_airline)); |
| 767 | 767 | if ($filter_name != '') { |
| 768 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 768 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 769 | 769 | } |
| 770 | 770 | $Spotter = new Spotter($this->db); |
| 771 | - $all = $Spotter->countOverallAircrafts($filters,$year,$month); |
|
| 771 | + $all = $Spotter->countOverallAircrafts($filters, $year, $month); |
|
| 772 | 772 | } |
| 773 | 773 | return $all; |
| 774 | 774 | } |
| 775 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 775 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 776 | 776 | global $globalStatsFilters; |
| 777 | 777 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 778 | 778 | if ($year == '' && $month == '') { |
@@ -780,23 +780,23 @@ discard block |
||
| 780 | 780 | try { |
| 781 | 781 | $sth = $this->db->prepare($query); |
| 782 | 782 | $sth->execute(array(':filter_name' => $filter_name)); |
| 783 | - } catch(PDOException $e) { |
|
| 783 | + } catch (PDOException $e) { |
|
| 784 | 784 | echo "error : ".$e->getMessage(); |
| 785 | 785 | } |
| 786 | 786 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 787 | 787 | $all = $result[0]['nb_airline']; |
| 788 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 788 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 789 | 789 | if (empty($all)) { |
| 790 | 790 | $filters = array(); |
| 791 | 791 | if ($filter_name != '') { |
| 792 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 792 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 793 | 793 | } |
| 794 | 794 | $Spotter = new Spotter($this->db); |
| 795 | - $all = $Spotter->countOverallAirlines($filters,$year,$month); |
|
| 795 | + $all = $Spotter->countOverallAirlines($filters, $year, $month); |
|
| 796 | 796 | } |
| 797 | 797 | return $all; |
| 798 | 798 | } |
| 799 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 799 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 800 | 800 | global $globalStatsFilters; |
| 801 | 801 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 802 | 802 | if ($year == '' && $month == '') { |
@@ -805,25 +805,25 @@ discard block |
||
| 805 | 805 | try { |
| 806 | 806 | $sth = $this->db->prepare($query); |
| 807 | 807 | $sth->execute($query_values); |
| 808 | - } catch(PDOException $e) { |
|
| 808 | + } catch (PDOException $e) { |
|
| 809 | 809 | echo "error : ".$e->getMessage(); |
| 810 | 810 | } |
| 811 | 811 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 812 | 812 | $all = $result[0]['nb']; |
| 813 | 813 | } else { |
| 814 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 814 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 815 | 815 | } |
| 816 | 816 | if (empty($all)) { |
| 817 | 817 | $filters = array('airlines' => array($stats_airline)); |
| 818 | 818 | if ($filter_name != '') { |
| 819 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 819 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 820 | 820 | } |
| 821 | 821 | $Spotter = new Spotter($this->db); |
| 822 | - $all = $Spotter->countOverallOwners($filters,$year,$month); |
|
| 822 | + $all = $Spotter->countOverallOwners($filters, $year, $month); |
|
| 823 | 823 | } |
| 824 | 824 | return $all; |
| 825 | 825 | } |
| 826 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 826 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 827 | 827 | global $globalStatsFilters; |
| 828 | 828 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 829 | 829 | //if ($year == '') $year = date('Y'); |
@@ -833,75 +833,75 @@ discard block |
||
| 833 | 833 | try { |
| 834 | 834 | $sth = $this->db->prepare($query); |
| 835 | 835 | $sth->execute($query_values); |
| 836 | - } catch(PDOException $e) { |
|
| 836 | + } catch (PDOException $e) { |
|
| 837 | 837 | echo "error : ".$e->getMessage(); |
| 838 | 838 | } |
| 839 | 839 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 840 | 840 | $all = $result[0]['nb']; |
| 841 | 841 | } else { |
| 842 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 842 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 843 | 843 | } |
| 844 | 844 | if (empty($all)) { |
| 845 | 845 | $filters = array('airlines' => array($stats_airline)); |
| 846 | 846 | if ($filter_name != '') { |
| 847 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 847 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 848 | 848 | } |
| 849 | 849 | $Spotter = new Spotter($this->db); |
| 850 | - $all = $Spotter->countOverallPilots($filters,$year,$month); |
|
| 850 | + $all = $Spotter->countOverallPilots($filters, $year, $month); |
|
| 851 | 851 | } |
| 852 | 852 | return $all; |
| 853 | 853 | } |
| 854 | 854 | |
| 855 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 855 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 856 | 856 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 857 | 857 | $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"; |
| 858 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 858 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 859 | 859 | try { |
| 860 | 860 | $sth = $this->db->prepare($query); |
| 861 | 861 | $sth->execute($query_values); |
| 862 | - } catch(PDOException $e) { |
|
| 862 | + } catch (PDOException $e) { |
|
| 863 | 863 | echo "error : ".$e->getMessage(); |
| 864 | 864 | } |
| 865 | 865 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 866 | 866 | return $all; |
| 867 | 867 | } |
| 868 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 868 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 869 | 869 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 870 | 870 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 871 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 871 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 872 | 872 | try { |
| 873 | 873 | $sth = $this->db->prepare($query); |
| 874 | 874 | $sth->execute($query_values); |
| 875 | - } catch(PDOException $e) { |
|
| 875 | + } catch (PDOException $e) { |
|
| 876 | 876 | echo "error : ".$e->getMessage(); |
| 877 | 877 | } |
| 878 | 878 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 879 | 879 | return $all; |
| 880 | 880 | } |
| 881 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 881 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 882 | 882 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 883 | 883 | global $globalArchiveMonths, $globalDBdriver; |
| 884 | 884 | if ($globalDBdriver == 'mysql') { |
| 885 | 885 | if ($month == '') { |
| 886 | 886 | $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"; |
| 887 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 887 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 888 | 888 | } else { |
| 889 | 889 | $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"; |
| 890 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 890 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 891 | 891 | } |
| 892 | 892 | } else { |
| 893 | 893 | if ($month == '') { |
| 894 | 894 | $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"; |
| 895 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 895 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 896 | 896 | } else { |
| 897 | 897 | $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"; |
| 898 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 898 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 899 | 899 | } |
| 900 | 900 | } |
| 901 | 901 | try { |
| 902 | 902 | $sth = $this->db->prepare($query); |
| 903 | 903 | $sth->execute($query_values); |
| 904 | - } catch(PDOException $e) { |
|
| 904 | + } catch (PDOException $e) { |
|
| 905 | 905 | echo "error : ".$e->getMessage(); |
| 906 | 906 | } |
| 907 | 907 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | try { |
| 920 | 920 | $sth = $this->db->prepare($query); |
| 921 | 921 | $sth->execute($query_values); |
| 922 | - } catch(PDOException $e) { |
|
| 922 | + } catch (PDOException $e) { |
|
| 923 | 923 | echo "error : ".$e->getMessage(); |
| 924 | 924 | } |
| 925 | 925 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -936,7 +936,7 @@ discard block |
||
| 936 | 936 | try { |
| 937 | 937 | $sth = $this->db->prepare($query); |
| 938 | 938 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 939 | - } catch(PDOException $e) { |
|
| 939 | + } catch (PDOException $e) { |
|
| 940 | 940 | echo "error : ".$e->getMessage(); |
| 941 | 941 | } |
| 942 | 942 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | try { |
| 954 | 954 | $sth = $this->db->prepare($query); |
| 955 | 955 | $sth->execute(array(':filter_name' => $filter_name)); |
| 956 | - } catch(PDOException $e) { |
|
| 956 | + } catch (PDOException $e) { |
|
| 957 | 957 | echo "error : ".$e->getMessage(); |
| 958 | 958 | } |
| 959 | 959 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -970,20 +970,20 @@ discard block |
||
| 970 | 970 | try { |
| 971 | 971 | $sth = $this->db->prepare($query); |
| 972 | 972 | $sth->execute(array(':filter_name' => $filter_name)); |
| 973 | - } catch(PDOException $e) { |
|
| 973 | + } catch (PDOException $e) { |
|
| 974 | 974 | echo "error : ".$e->getMessage(); |
| 975 | 975 | } |
| 976 | 976 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 977 | 977 | return $all[0]['total']; |
| 978 | 978 | } |
| 979 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 979 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 980 | 980 | global $globalArchiveMonths, $globalDBdriver; |
| 981 | 981 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 982 | 982 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 983 | 983 | try { |
| 984 | 984 | $sth = $this->db->prepare($query); |
| 985 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 986 | - } catch(PDOException $e) { |
|
| 985 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 986 | + } catch (PDOException $e) { |
|
| 987 | 987 | echo "error : ".$e->getMessage(); |
| 988 | 988 | } |
| 989 | 989 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1001,20 +1001,20 @@ discard block |
||
| 1001 | 1001 | try { |
| 1002 | 1002 | $sth = $this->db->prepare($query); |
| 1003 | 1003 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1004 | - } catch(PDOException $e) { |
|
| 1004 | + } catch (PDOException $e) { |
|
| 1005 | 1005 | echo "error : ".$e->getMessage(); |
| 1006 | 1006 | } |
| 1007 | 1007 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1008 | 1008 | return $all[0]['total']; |
| 1009 | 1009 | } |
| 1010 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1010 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1011 | 1011 | global $globalArchiveMonths, $globalDBdriver; |
| 1012 | 1012 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1013 | 1013 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1014 | 1014 | try { |
| 1015 | 1015 | $sth = $this->db->prepare($query); |
| 1016 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1017 | - } catch(PDOException $e) { |
|
| 1016 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1017 | + } catch (PDOException $e) { |
|
| 1018 | 1018 | echo "error : ".$e->getMessage(); |
| 1019 | 1019 | } |
| 1020 | 1020 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | else return 0; |
| 1023 | 1023 | } |
| 1024 | 1024 | |
| 1025 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1025 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1026 | 1026 | global $globalDBdriver; |
| 1027 | 1027 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1028 | 1028 | if ($globalDBdriver == 'mysql') { |
@@ -1030,15 +1030,15 @@ discard block |
||
| 1030 | 1030 | } else { |
| 1031 | 1031 | $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);"; |
| 1032 | 1032 | } |
| 1033 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1033 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1034 | 1034 | try { |
| 1035 | 1035 | $sth = $this->db->prepare($query); |
| 1036 | 1036 | $sth->execute($query_values); |
| 1037 | - } catch(PDOException $e) { |
|
| 1037 | + } catch (PDOException $e) { |
|
| 1038 | 1038 | return "error : ".$e->getMessage(); |
| 1039 | 1039 | } |
| 1040 | 1040 | } |
| 1041 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1041 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1042 | 1042 | global $globalDBdriver; |
| 1043 | 1043 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1044 | 1044 | if ($globalDBdriver == 'mysql') { |
@@ -1047,11 +1047,11 @@ discard block |
||
| 1047 | 1047 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1048 | 1048 | $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);"; |
| 1049 | 1049 | } |
| 1050 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1050 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1051 | 1051 | try { |
| 1052 | 1052 | $sth = $this->db->prepare($query); |
| 1053 | 1053 | $sth->execute($query_values); |
| 1054 | - } catch(PDOException $e) { |
|
| 1054 | + } catch (PDOException $e) { |
|
| 1055 | 1055 | return "error : ".$e->getMessage(); |
| 1056 | 1056 | } |
| 1057 | 1057 | } |
@@ -1075,75 +1075,75 @@ discard block |
||
| 1075 | 1075 | } |
| 1076 | 1076 | */ |
| 1077 | 1077 | |
| 1078 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1078 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1079 | 1079 | global $globalDBdriver; |
| 1080 | 1080 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1081 | 1081 | $query_values = array(); |
| 1082 | 1082 | if ($globalDBdriver == 'mysql') { |
| 1083 | 1083 | if ($year != '') { |
| 1084 | 1084 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1085 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1085 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1086 | 1086 | } |
| 1087 | 1087 | if ($month != '') { |
| 1088 | 1088 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1089 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1089 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1090 | 1090 | } |
| 1091 | 1091 | if ($day != '') { |
| 1092 | 1092 | $query .= ' AND DAY(stats_date) = :day'; |
| 1093 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1093 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1094 | 1094 | } |
| 1095 | 1095 | } else { |
| 1096 | 1096 | if ($year != '') { |
| 1097 | 1097 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1098 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1098 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1099 | 1099 | } |
| 1100 | 1100 | if ($month != '') { |
| 1101 | 1101 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1102 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1102 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1103 | 1103 | } |
| 1104 | 1104 | if ($day != '') { |
| 1105 | 1105 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1106 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1106 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | $query .= " ORDER BY source_name"; |
| 1110 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1110 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1111 | 1111 | try { |
| 1112 | 1112 | $sth = $this->db->prepare($query); |
| 1113 | 1113 | $sth->execute($query_values); |
| 1114 | - } catch(PDOException $e) { |
|
| 1114 | + } catch (PDOException $e) { |
|
| 1115 | 1115 | echo "error : ".$e->getMessage(); |
| 1116 | 1116 | } |
| 1117 | 1117 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1118 | 1118 | return $all; |
| 1119 | 1119 | } |
| 1120 | 1120 | |
| 1121 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1121 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1122 | 1122 | global $globalDBdriver; |
| 1123 | 1123 | if ($globalDBdriver == 'mysql') { |
| 1124 | 1124 | $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"; |
| 1125 | 1125 | } else { |
| 1126 | 1126 | $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);"; |
| 1127 | 1127 | } |
| 1128 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1128 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1129 | 1129 | try { |
| 1130 | 1130 | $sth = $this->db->prepare($query); |
| 1131 | 1131 | $sth->execute($query_values); |
| 1132 | - } catch(PDOException $e) { |
|
| 1132 | + } catch (PDOException $e) { |
|
| 1133 | 1133 | return "error : ".$e->getMessage(); |
| 1134 | 1134 | } |
| 1135 | 1135 | } |
| 1136 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1136 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1137 | 1137 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1138 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1138 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1139 | 1139 | try { |
| 1140 | 1140 | $sth = $this->db->prepare($query); |
| 1141 | 1141 | $sth->execute($query_values); |
| 1142 | - } catch(PDOException $e) { |
|
| 1142 | + } catch (PDOException $e) { |
|
| 1143 | 1143 | return "error : ".$e->getMessage(); |
| 1144 | 1144 | } |
| 1145 | 1145 | } |
| 1146 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1146 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1147 | 1147 | global $globalDBdriver; |
| 1148 | 1148 | if ($globalDBdriver == 'mysql') { |
| 1149 | 1149 | if ($reset) { |
@@ -1158,15 +1158,15 @@ discard block |
||
| 1158 | 1158 | $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);"; |
| 1159 | 1159 | } |
| 1160 | 1160 | } |
| 1161 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1161 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1162 | 1162 | try { |
| 1163 | 1163 | $sth = $this->db->prepare($query); |
| 1164 | 1164 | $sth->execute($query_values); |
| 1165 | - } catch(PDOException $e) { |
|
| 1165 | + } catch (PDOException $e) { |
|
| 1166 | 1166 | return "error : ".$e->getMessage(); |
| 1167 | 1167 | } |
| 1168 | 1168 | } |
| 1169 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1169 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1170 | 1170 | global $globalDBdriver; |
| 1171 | 1171 | if ($globalDBdriver == 'mysql') { |
| 1172 | 1172 | if ($reset) { |
@@ -1181,15 +1181,15 @@ discard block |
||
| 1181 | 1181 | $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);"; |
| 1182 | 1182 | } |
| 1183 | 1183 | } |
| 1184 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1184 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1185 | 1185 | try { |
| 1186 | 1186 | $sth = $this->db->prepare($query); |
| 1187 | 1187 | $sth->execute($query_values); |
| 1188 | - } catch(PDOException $e) { |
|
| 1188 | + } catch (PDOException $e) { |
|
| 1189 | 1189 | return "error : ".$e->getMessage(); |
| 1190 | 1190 | } |
| 1191 | 1191 | } |
| 1192 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1192 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1193 | 1193 | global $globalDBdriver; |
| 1194 | 1194 | if ($globalDBdriver == 'mysql') { |
| 1195 | 1195 | if ($reset) { |
@@ -1204,15 +1204,15 @@ discard block |
||
| 1204 | 1204 | $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);"; |
| 1205 | 1205 | } |
| 1206 | 1206 | } |
| 1207 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1207 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1208 | 1208 | try { |
| 1209 | 1209 | $sth = $this->db->prepare($query); |
| 1210 | 1210 | $sth->execute($query_values); |
| 1211 | - } catch(PDOException $e) { |
|
| 1211 | + } catch (PDOException $e) { |
|
| 1212 | 1212 | return "error : ".$e->getMessage(); |
| 1213 | 1213 | } |
| 1214 | 1214 | } |
| 1215 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1215 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1216 | 1216 | global $globalDBdriver; |
| 1217 | 1217 | if ($globalDBdriver == 'mysql') { |
| 1218 | 1218 | if ($reset) { |
@@ -1227,15 +1227,15 @@ discard block |
||
| 1227 | 1227 | $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);"; |
| 1228 | 1228 | } |
| 1229 | 1229 | } |
| 1230 | - $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); |
|
| 1230 | + $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); |
|
| 1231 | 1231 | try { |
| 1232 | 1232 | $sth = $this->db->prepare($query); |
| 1233 | 1233 | $sth->execute($query_values); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error : ".$e->getMessage(); |
| 1236 | 1236 | } |
| 1237 | 1237 | } |
| 1238 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1238 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1239 | 1239 | global $globalDBdriver; |
| 1240 | 1240 | if ($globalDBdriver == 'mysql') { |
| 1241 | 1241 | if ($reset) { |
@@ -1250,15 +1250,15 @@ discard block |
||
| 1250 | 1250 | $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);"; |
| 1251 | 1251 | } |
| 1252 | 1252 | } |
| 1253 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1253 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1254 | 1254 | try { |
| 1255 | 1255 | $sth = $this->db->prepare($query); |
| 1256 | 1256 | $sth->execute($query_values); |
| 1257 | - } catch(PDOException $e) { |
|
| 1257 | + } catch (PDOException $e) { |
|
| 1258 | 1258 | return "error : ".$e->getMessage(); |
| 1259 | 1259 | } |
| 1260 | 1260 | } |
| 1261 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1261 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1262 | 1262 | global $globalDBdriver; |
| 1263 | 1263 | if ($globalDBdriver == 'mysql') { |
| 1264 | 1264 | if ($reset) { |
@@ -1273,15 +1273,15 @@ discard block |
||
| 1273 | 1273 | $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);"; |
| 1274 | 1274 | } |
| 1275 | 1275 | } |
| 1276 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1276 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1277 | 1277 | try { |
| 1278 | 1278 | $sth = $this->db->prepare($query); |
| 1279 | 1279 | $sth->execute($query_values); |
| 1280 | - } catch(PDOException $e) { |
|
| 1280 | + } catch (PDOException $e) { |
|
| 1281 | 1281 | return "error : ".$e->getMessage(); |
| 1282 | 1282 | } |
| 1283 | 1283 | } |
| 1284 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1284 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1285 | 1285 | global $globalDBdriver; |
| 1286 | 1286 | if ($globalDBdriver == 'mysql') { |
| 1287 | 1287 | if ($reset) { |
@@ -1296,15 +1296,15 @@ discard block |
||
| 1296 | 1296 | $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);"; |
| 1297 | 1297 | } |
| 1298 | 1298 | } |
| 1299 | - $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); |
|
| 1299 | + $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); |
|
| 1300 | 1300 | try { |
| 1301 | 1301 | $sth = $this->db->prepare($query); |
| 1302 | 1302 | $sth->execute($query_values); |
| 1303 | - } catch(PDOException $e) { |
|
| 1303 | + } catch (PDOException $e) { |
|
| 1304 | 1304 | return "error : ".$e->getMessage(); |
| 1305 | 1305 | } |
| 1306 | 1306 | } |
| 1307 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1307 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1308 | 1308 | global $globalDBdriver; |
| 1309 | 1309 | if ($airport_icao != '') { |
| 1310 | 1310 | if ($globalDBdriver == 'mysql') { |
@@ -1320,16 +1320,16 @@ discard block |
||
| 1320 | 1320 | $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);"; |
| 1321 | 1321 | } |
| 1322 | 1322 | } |
| 1323 | - $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); |
|
| 1323 | + $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); |
|
| 1324 | 1324 | try { |
| 1325 | 1325 | $sth = $this->db->prepare($query); |
| 1326 | 1326 | $sth->execute($query_values); |
| 1327 | - } catch(PDOException $e) { |
|
| 1327 | + } catch (PDOException $e) { |
|
| 1328 | 1328 | return "error : ".$e->getMessage(); |
| 1329 | 1329 | } |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
| 1332 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 1332 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 1333 | 1333 | global $globalDBdriver; |
| 1334 | 1334 | if ($airport_icao != '') { |
| 1335 | 1335 | if ($globalDBdriver == 'mysql') { |
@@ -1337,16 +1337,16 @@ discard block |
||
| 1337 | 1337 | } else { |
| 1338 | 1338 | $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);"; |
| 1339 | 1339 | } |
| 1340 | - $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); |
|
| 1340 | + $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); |
|
| 1341 | 1341 | try { |
| 1342 | 1342 | $sth = $this->db->prepare($query); |
| 1343 | 1343 | $sth->execute($query_values); |
| 1344 | - } catch(PDOException $e) { |
|
| 1344 | + } catch (PDOException $e) { |
|
| 1345 | 1345 | return "error : ".$e->getMessage(); |
| 1346 | 1346 | } |
| 1347 | 1347 | } |
| 1348 | 1348 | } |
| 1349 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1349 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1350 | 1350 | global $globalDBdriver; |
| 1351 | 1351 | if ($airport_icao != '') { |
| 1352 | 1352 | if ($globalDBdriver == 'mysql') { |
@@ -1362,16 +1362,16 @@ discard block |
||
| 1362 | 1362 | $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);"; |
| 1363 | 1363 | } |
| 1364 | 1364 | } |
| 1365 | - $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); |
|
| 1365 | + $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); |
|
| 1366 | 1366 | try { |
| 1367 | 1367 | $sth = $this->db->prepare($query); |
| 1368 | 1368 | $sth->execute($query_values); |
| 1369 | - } catch(PDOException $e) { |
|
| 1369 | + } catch (PDOException $e) { |
|
| 1370 | 1370 | return "error : ".$e->getMessage(); |
| 1371 | 1371 | } |
| 1372 | 1372 | } |
| 1373 | 1373 | } |
| 1374 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 1374 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 1375 | 1375 | global $globalDBdriver; |
| 1376 | 1376 | if ($airport_icao != '') { |
| 1377 | 1377 | if ($globalDBdriver == 'mysql') { |
@@ -1379,11 +1379,11 @@ discard block |
||
| 1379 | 1379 | } else { |
| 1380 | 1380 | $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);"; |
| 1381 | 1381 | } |
| 1382 | - $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); |
|
| 1382 | + $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); |
|
| 1383 | 1383 | try { |
| 1384 | 1384 | $sth = $this->db->prepare($query); |
| 1385 | 1385 | $sth->execute($query_values); |
| 1386 | - } catch(PDOException $e) { |
|
| 1386 | + } catch (PDOException $e) { |
|
| 1387 | 1387 | return "error : ".$e->getMessage(); |
| 1388 | 1388 | } |
| 1389 | 1389 | } |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | try { |
| 1396 | 1396 | $sth = $this->db->prepare($query); |
| 1397 | 1397 | $sth->execute($query_values); |
| 1398 | - } catch(PDOException $e) { |
|
| 1398 | + } catch (PDOException $e) { |
|
| 1399 | 1399 | return "error : ".$e->getMessage(); |
| 1400 | 1400 | } |
| 1401 | 1401 | } |
@@ -1405,7 +1405,7 @@ discard block |
||
| 1405 | 1405 | try { |
| 1406 | 1406 | $sth = $this->db->prepare($query); |
| 1407 | 1407 | $sth->execute($query_values); |
| 1408 | - } catch(PDOException $e) { |
|
| 1408 | + } catch (PDOException $e) { |
|
| 1409 | 1409 | return "error : ".$e->getMessage(); |
| 1410 | 1410 | } |
| 1411 | 1411 | } |
@@ -1415,13 +1415,13 @@ discard block |
||
| 1415 | 1415 | try { |
| 1416 | 1416 | $sth = $this->db->prepare($query); |
| 1417 | 1417 | $sth->execute($query_values); |
| 1418 | - } catch(PDOException $e) { |
|
| 1418 | + } catch (PDOException $e) { |
|
| 1419 | 1419 | return "error : ".$e->getMessage(); |
| 1420 | 1420 | } |
| 1421 | 1421 | } |
| 1422 | 1422 | |
| 1423 | 1423 | public function addOldStats() { |
| 1424 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1424 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear; |
|
| 1425 | 1425 | $Common = new Common(); |
| 1426 | 1426 | $Connection = new Connection(); |
| 1427 | 1427 | date_default_timezone_set('UTC'); |
@@ -1438,40 +1438,40 @@ discard block |
||
| 1438 | 1438 | $Spotter = new Spotter($this->db); |
| 1439 | 1439 | |
| 1440 | 1440 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 1441 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 1441 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 1442 | 1442 | foreach ($alldata as $number) { |
| 1443 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 1443 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 1444 | 1444 | } |
| 1445 | 1445 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 1446 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 1446 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 1447 | 1447 | foreach ($alldata as $number) { |
| 1448 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 1448 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 1449 | 1449 | } |
| 1450 | 1450 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 1451 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 1451 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 1452 | 1452 | foreach ($alldata as $number) { |
| 1453 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 1453 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 1454 | 1454 | } |
| 1455 | 1455 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 1456 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 1456 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 1457 | 1457 | foreach ($alldata as $number) { |
| 1458 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1458 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1459 | 1459 | } |
| 1460 | 1460 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 1461 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 1461 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 1462 | 1462 | foreach ($alldata as $number) { |
| 1463 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 1463 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 1464 | 1464 | } |
| 1465 | 1465 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 1466 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 1466 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 1467 | 1467 | foreach ($alldata as $number) { |
| 1468 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 1468 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | 1471 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1472 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 1472 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 1473 | 1473 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1474 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1474 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 1475 | 1475 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1476 | 1476 | $alldata = array(); |
| 1477 | 1477 | |
@@ -1489,14 +1489,14 @@ discard block |
||
| 1489 | 1489 | foreach ($alldata as $key => $row) { |
| 1490 | 1490 | $count[$key] = $row['airport_departure_icao_count']; |
| 1491 | 1491 | } |
| 1492 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1492 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1493 | 1493 | foreach ($alldata as $number) { |
| 1494 | - 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); |
|
| 1494 | + 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); |
|
| 1495 | 1495 | } |
| 1496 | 1496 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1497 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 1497 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 1498 | 1498 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1499 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1499 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 1500 | 1500 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1501 | 1501 | $alldata = array(); |
| 1502 | 1502 | foreach ($pall as $value) { |
@@ -1513,16 +1513,16 @@ discard block |
||
| 1513 | 1513 | foreach ($alldata as $key => $row) { |
| 1514 | 1514 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1515 | 1515 | } |
| 1516 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1516 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1517 | 1517 | foreach ($alldata as $number) { |
| 1518 | - 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); |
|
| 1518 | + 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); |
|
| 1519 | 1519 | } |
| 1520 | 1520 | if ($Connection->tableExists('countries')) { |
| 1521 | 1521 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 1522 | 1522 | $SpotterArchive = new SpotterArchive(); |
| 1523 | - $alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 1523 | + $alldata = $SpotterArchive->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 1524 | 1524 | foreach ($alldata as $number) { |
| 1525 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 1525 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 1526 | 1526 | } |
| 1527 | 1527 | } |
| 1528 | 1528 | |
@@ -1536,37 +1536,37 @@ discard block |
||
| 1536 | 1536 | $lastyear = false; |
| 1537 | 1537 | foreach ($alldata as $number) { |
| 1538 | 1538 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1539 | - $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']))); |
|
| 1539 | + $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']))); |
|
| 1540 | 1540 | } |
| 1541 | 1541 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 1542 | 1542 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1543 | 1543 | foreach ($alldata as $number) { |
| 1544 | - $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']))); |
|
| 1544 | + $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']))); |
|
| 1545 | 1545 | } |
| 1546 | 1546 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 1547 | 1547 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1548 | 1548 | foreach ($alldata as $number) { |
| 1549 | - $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']))); |
|
| 1549 | + $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']))); |
|
| 1550 | 1550 | } |
| 1551 | 1551 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 1552 | 1552 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1553 | 1553 | foreach ($alldata as $number) { |
| 1554 | - $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']))); |
|
| 1554 | + $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']))); |
|
| 1555 | 1555 | } |
| 1556 | 1556 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 1557 | 1557 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1558 | 1558 | foreach ($alldata as $number) { |
| 1559 | - $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']))); |
|
| 1559 | + $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']))); |
|
| 1560 | 1560 | } |
| 1561 | 1561 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 1562 | 1562 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1563 | 1563 | foreach ($alldata as $number) { |
| 1564 | - $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']))); |
|
| 1564 | + $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']))); |
|
| 1565 | 1565 | } |
| 1566 | 1566 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 1567 | 1567 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1568 | 1568 | foreach ($alldata as $number) { |
| 1569 | - $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']))); |
|
| 1569 | + $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']))); |
|
| 1570 | 1570 | } |
| 1571 | 1571 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 1572 | 1572 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -1611,7 +1611,7 @@ discard block |
||
| 1611 | 1611 | } |
| 1612 | 1612 | $alldata = $pall; |
| 1613 | 1613 | foreach ($alldata as $number) { |
| 1614 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 1614 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 1615 | 1615 | } |
| 1616 | 1616 | echo '...Arrival'."\n"; |
| 1617 | 1617 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -1653,7 +1653,7 @@ discard block |
||
| 1653 | 1653 | } |
| 1654 | 1654 | $alldata = $pall; |
| 1655 | 1655 | foreach ($alldata as $number) { |
| 1656 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 1656 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 1657 | 1657 | } |
| 1658 | 1658 | |
| 1659 | 1659 | echo 'Flights data...'."\n"; |
@@ -1661,28 +1661,28 @@ discard block |
||
| 1661 | 1661 | echo '-> countAllDatesLastMonth...'."\n"; |
| 1662 | 1662 | $alldata = $Spotter->countAllDatesLastMonth(); |
| 1663 | 1663 | foreach ($alldata as $number) { |
| 1664 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 1664 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 1665 | 1665 | } |
| 1666 | 1666 | echo '-> countAllDates...'."\n"; |
| 1667 | 1667 | $previousdata = $this->countAllDates(); |
| 1668 | 1668 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 1669 | 1669 | $this->deleteStatFlight('date'); |
| 1670 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates()); |
|
| 1670 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates()); |
|
| 1671 | 1671 | $values = array(); |
| 1672 | 1672 | foreach ($alldata as $cnt) { |
| 1673 | 1673 | $values[] = $cnt['date_count']; |
| 1674 | 1674 | } |
| 1675 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1676 | - array_splice($alldata,11); |
|
| 1675 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1676 | + array_splice($alldata, 11); |
|
| 1677 | 1677 | foreach ($alldata as $number) { |
| 1678 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 1678 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 1679 | 1679 | } |
| 1680 | 1680 | |
| 1681 | 1681 | $this->deleteStatFlight('hour'); |
| 1682 | 1682 | echo '-> countAllHours...'."\n"; |
| 1683 | 1683 | $alldata = $Spotter->countAllHours('hour'); |
| 1684 | 1684 | foreach ($alldata as $number) { |
| 1685 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 1685 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 1686 | 1686 | } |
| 1687 | 1687 | |
| 1688 | 1688 | |
@@ -1692,41 +1692,41 @@ discard block |
||
| 1692 | 1692 | if ($Connection->tableExists('countries')) { |
| 1693 | 1693 | if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
| 1694 | 1694 | $SpotterArchive = new SpotterArchive(); |
| 1695 | - $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 1695 | + $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 1696 | 1696 | foreach ($alldata as $number) { |
| 1697 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 1697 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 1698 | 1698 | } |
| 1699 | 1699 | } |
| 1700 | 1700 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 1701 | 1701 | $Spotter = new Spotter($this->db); |
| 1702 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 1702 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 1703 | 1703 | foreach ($alldata as $number) { |
| 1704 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 1704 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 1705 | 1705 | } |
| 1706 | 1706 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 1707 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 1707 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 1708 | 1708 | foreach ($alldata as $number) { |
| 1709 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 1709 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 1710 | 1710 | } |
| 1711 | 1711 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 1712 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 1712 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 1713 | 1713 | foreach ($alldata as $number) { |
| 1714 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1714 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1715 | 1715 | } |
| 1716 | 1716 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 1717 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 1717 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 1718 | 1718 | foreach ($alldata as $number) { |
| 1719 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 1719 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 1720 | 1720 | } |
| 1721 | 1721 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 1722 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 1722 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 1723 | 1723 | foreach ($alldata as $number) { |
| 1724 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 1724 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 1725 | 1725 | } |
| 1726 | 1726 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1727 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1727 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1728 | 1728 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1729 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1729 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1730 | 1730 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1731 | 1731 | //$alldata = array(); |
| 1732 | 1732 | foreach ($dall as $value) { |
@@ -1746,12 +1746,12 @@ discard block |
||
| 1746 | 1746 | } |
| 1747 | 1747 | $alldata = $pall; |
| 1748 | 1748 | foreach ($alldata as $number) { |
| 1749 | - 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); |
|
| 1749 | + 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); |
|
| 1750 | 1750 | } |
| 1751 | 1751 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1752 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1752 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1753 | 1753 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1754 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1754 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1755 | 1755 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1756 | 1756 | //$alldata = array(); |
| 1757 | 1757 | foreach ($dall as $value) { |
@@ -1771,7 +1771,7 @@ discard block |
||
| 1771 | 1771 | } |
| 1772 | 1772 | $alldata = $pall; |
| 1773 | 1773 | foreach ($alldata as $number) { |
| 1774 | - 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); |
|
| 1774 | + 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); |
|
| 1775 | 1775 | } |
| 1776 | 1776 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 1777 | 1777 | $Spotter = new Spotter($this->db); |
@@ -1779,27 +1779,27 @@ discard block |
||
| 1779 | 1779 | $lastyear = false; |
| 1780 | 1780 | foreach ($alldata as $number) { |
| 1781 | 1781 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1782 | - $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']); |
|
| 1782 | + $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']); |
|
| 1783 | 1783 | } |
| 1784 | 1784 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 1785 | 1785 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1786 | 1786 | foreach ($alldata as $number) { |
| 1787 | - $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']); |
|
| 1787 | + $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']); |
|
| 1788 | 1788 | } |
| 1789 | 1789 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 1790 | 1790 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1791 | 1791 | foreach ($alldata as $number) { |
| 1792 | - $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']); |
|
| 1792 | + $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']); |
|
| 1793 | 1793 | } |
| 1794 | 1794 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 1795 | 1795 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1796 | 1796 | foreach ($alldata as $number) { |
| 1797 | - $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']); |
|
| 1797 | + $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']); |
|
| 1798 | 1798 | } |
| 1799 | 1799 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 1800 | 1800 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1801 | 1801 | foreach ($alldata as $number) { |
| 1802 | - $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']); |
|
| 1802 | + $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']); |
|
| 1803 | 1803 | } |
| 1804 | 1804 | if ($globalDebug) echo '...Departure'."\n"; |
| 1805 | 1805 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -1822,7 +1822,7 @@ discard block |
||
| 1822 | 1822 | } |
| 1823 | 1823 | $alldata = $pall; |
| 1824 | 1824 | foreach ($alldata as $number) { |
| 1825 | - $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']); |
|
| 1825 | + $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']); |
|
| 1826 | 1826 | } |
| 1827 | 1827 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1828 | 1828 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -1845,32 +1845,32 @@ discard block |
||
| 1845 | 1845 | } |
| 1846 | 1846 | $alldata = $pall; |
| 1847 | 1847 | foreach ($alldata as $number) { |
| 1848 | - $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']); |
|
| 1848 | + $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']); |
|
| 1849 | 1849 | } |
| 1850 | 1850 | |
| 1851 | 1851 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 1852 | 1852 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 1853 | 1853 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1854 | 1854 | foreach ($alldata as $number) { |
| 1855 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 1855 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1856 | 1856 | } |
| 1857 | 1857 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 1858 | 1858 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1859 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
|
| 1859 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines()); |
|
| 1860 | 1860 | $values = array(); |
| 1861 | 1861 | foreach ($alldata as $cnt) { |
| 1862 | 1862 | $values[] = $cnt['date_count']; |
| 1863 | 1863 | } |
| 1864 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1865 | - array_splice($alldata,11); |
|
| 1864 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1865 | + array_splice($alldata, 11); |
|
| 1866 | 1866 | foreach ($alldata as $number) { |
| 1867 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 1867 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1868 | 1868 | } |
| 1869 | 1869 | |
| 1870 | 1870 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 1871 | 1871 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1872 | 1872 | foreach ($alldata as $number) { |
| 1873 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 1873 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 1874 | 1874 | } |
| 1875 | 1875 | |
| 1876 | 1876 | |
@@ -1889,32 +1889,32 @@ discard block |
||
| 1889 | 1889 | // Count by filter |
| 1890 | 1890 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 1891 | 1891 | $Spotter = new Spotter($this->db); |
| 1892 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 1892 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 1893 | 1893 | foreach ($alldata as $number) { |
| 1894 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 1894 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 1895 | 1895 | } |
| 1896 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 1896 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 1897 | 1897 | foreach ($alldata as $number) { |
| 1898 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 1898 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 1899 | 1899 | } |
| 1900 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 1900 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 1901 | 1901 | foreach ($alldata as $number) { |
| 1902 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 1902 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 1903 | 1903 | } |
| 1904 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 1904 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 1905 | 1905 | foreach ($alldata as $number) { |
| 1906 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 1906 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 1907 | 1907 | } |
| 1908 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 1908 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 1909 | 1909 | foreach ($alldata as $number) { |
| 1910 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 1910 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 1911 | 1911 | } |
| 1912 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 1912 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 1913 | 1913 | foreach ($alldata as $number) { |
| 1914 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 1914 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 1915 | 1915 | } |
| 1916 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1917 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1916 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 1917 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 1918 | 1918 | $alldata = array(); |
| 1919 | 1919 | foreach ($pall as $value) { |
| 1920 | 1920 | $icao = $value['airport_departure_icao']; |
@@ -1930,12 +1930,12 @@ discard block |
||
| 1930 | 1930 | foreach ($alldata as $key => $row) { |
| 1931 | 1931 | $count[$key] = $row['airport_departure_icao_count']; |
| 1932 | 1932 | } |
| 1933 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1933 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1934 | 1934 | foreach ($alldata as $number) { |
| 1935 | - 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); |
|
| 1935 | + 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); |
|
| 1936 | 1936 | } |
| 1937 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1938 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1937 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 1938 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 1939 | 1939 | $alldata = array(); |
| 1940 | 1940 | foreach ($pall as $value) { |
| 1941 | 1941 | $icao = $value['airport_arrival_icao']; |
@@ -1951,40 +1951,40 @@ discard block |
||
| 1951 | 1951 | foreach ($alldata as $key => $row) { |
| 1952 | 1952 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1953 | 1953 | } |
| 1954 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1954 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1955 | 1955 | foreach ($alldata as $number) { |
| 1956 | - 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); |
|
| 1956 | + 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); |
|
| 1957 | 1957 | } |
| 1958 | 1958 | $Spotter = new Spotter($this->db); |
| 1959 | 1959 | $alldata = $Spotter->countAllMonths($filter); |
| 1960 | 1960 | $lastyear = false; |
| 1961 | 1961 | foreach ($alldata as $number) { |
| 1962 | 1962 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1963 | - $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); |
|
| 1963 | + $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); |
|
| 1964 | 1964 | } |
| 1965 | 1965 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 1966 | 1966 | foreach ($alldata as $number) { |
| 1967 | - $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); |
|
| 1967 | + $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); |
|
| 1968 | 1968 | } |
| 1969 | 1969 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 1970 | 1970 | foreach ($alldata as $number) { |
| 1971 | - $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); |
|
| 1971 | + $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); |
|
| 1972 | 1972 | } |
| 1973 | 1973 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 1974 | 1974 | foreach ($alldata as $number) { |
| 1975 | - $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); |
|
| 1975 | + $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); |
|
| 1976 | 1976 | } |
| 1977 | 1977 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 1978 | 1978 | foreach ($alldata as $number) { |
| 1979 | - $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); |
|
| 1979 | + $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); |
|
| 1980 | 1980 | } |
| 1981 | 1981 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 1982 | 1982 | foreach ($alldata as $number) { |
| 1983 | - $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); |
|
| 1983 | + $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); |
|
| 1984 | 1984 | } |
| 1985 | 1985 | echo '...Departure'."\n"; |
| 1986 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 1987 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 1986 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 1987 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 1988 | 1988 | foreach ($dall as $value) { |
| 1989 | 1989 | $icao = $value['departure_airport_icao']; |
| 1990 | 1990 | $ddate = $value['date']; |
@@ -2002,11 +2002,11 @@ discard block |
||
| 2002 | 2002 | } |
| 2003 | 2003 | $alldata = $pall; |
| 2004 | 2004 | foreach ($alldata as $number) { |
| 2005 | - $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); |
|
| 2005 | + $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); |
|
| 2006 | 2006 | } |
| 2007 | 2007 | echo '...Arrival'."\n"; |
| 2008 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2009 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2008 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2009 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2010 | 2010 | foreach ($dall as $value) { |
| 2011 | 2011 | $icao = $value['arrival_airport_icao']; |
| 2012 | 2012 | $ddate = $value['date']; |
@@ -2024,40 +2024,40 @@ discard block |
||
| 2024 | 2024 | } |
| 2025 | 2025 | $alldata = $pall; |
| 2026 | 2026 | foreach ($alldata as $number) { |
| 2027 | - $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); |
|
| 2027 | + $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); |
|
| 2028 | 2028 | } |
| 2029 | 2029 | |
| 2030 | 2030 | echo 'Flights data...'."\n"; |
| 2031 | 2031 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2032 | 2032 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2033 | 2033 | foreach ($alldata as $number) { |
| 2034 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2034 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2035 | 2035 | } |
| 2036 | 2036 | echo '-> countAllDates...'."\n"; |
| 2037 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2038 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2037 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2038 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2039 | 2039 | $values = array(); |
| 2040 | 2040 | foreach ($alldata as $cnt) { |
| 2041 | 2041 | $values[] = $cnt['date_count']; |
| 2042 | 2042 | } |
| 2043 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2044 | - array_splice($alldata,11); |
|
| 2043 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2044 | + array_splice($alldata, 11); |
|
| 2045 | 2045 | foreach ($alldata as $number) { |
| 2046 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2046 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2047 | 2047 | } |
| 2048 | 2048 | |
| 2049 | 2049 | echo '-> countAllHours...'."\n"; |
| 2050 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2050 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2051 | 2051 | foreach ($alldata as $number) { |
| 2052 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2052 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2053 | 2053 | } |
| 2054 | 2054 | echo 'Insert last stats update date...'."\n"; |
| 2055 | 2055 | date_default_timezone_set('UTC'); |
| 2056 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2056 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2057 | 2057 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2058 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2058 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2059 | 2059 | $this->deleteOldStats($filter_name); |
| 2060 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2060 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2061 | 2061 | } |
| 2062 | 2062 | } |
| 2063 | 2063 | |
@@ -2070,16 +2070,16 @@ discard block |
||
| 2070 | 2070 | // SUM all previous month to put as year |
| 2071 | 2071 | $previous_year = date('Y'); |
| 2072 | 2072 | $previous_year--; |
| 2073 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2074 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2075 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2076 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2073 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2074 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2075 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2076 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2077 | 2077 | $allairlines = $this->getAllAirlineNames(); |
| 2078 | 2078 | foreach ($allairlines as $data) { |
| 2079 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2080 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2081 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2082 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2079 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2080 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2081 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2082 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2083 | 2083 | } |
| 2084 | 2084 | |
| 2085 | 2085 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2088,7 +2088,7 @@ discard block |
||
| 2088 | 2088 | try { |
| 2089 | 2089 | $sth = $this->db->prepare($query); |
| 2090 | 2090 | $sth->execute(); |
| 2091 | - } catch(PDOException $e) { |
|
| 2091 | + } catch (PDOException $e) { |
|
| 2092 | 2092 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2093 | 2093 | } |
| 2094 | 2094 | } |
@@ -2097,15 +2097,15 @@ discard block |
||
| 2097 | 2097 | try { |
| 2098 | 2098 | $sth = $this->db->prepare($query); |
| 2099 | 2099 | $sth->execute(); |
| 2100 | - } catch(PDOException $e) { |
|
| 2100 | + } catch (PDOException $e) { |
|
| 2101 | 2101 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2102 | 2102 | } |
| 2103 | 2103 | } |
| 2104 | 2104 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2105 | 2105 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2106 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2106 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2107 | 2107 | $this->deleteOldStats(); |
| 2108 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2108 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2109 | 2109 | $lastyearupdate = true; |
| 2110 | 2110 | } |
| 2111 | 2111 | } |
@@ -2127,7 +2127,7 @@ discard block |
||
| 2127 | 2127 | try { |
| 2128 | 2128 | $sth = $this->db->prepare($query); |
| 2129 | 2129 | $sth->execute(); |
| 2130 | - } catch(PDOException $e) { |
|
| 2130 | + } catch (PDOException $e) { |
|
| 2131 | 2131 | return "error : ".$e->getMessage(); |
| 2132 | 2132 | } |
| 2133 | 2133 | } |
@@ -2141,14 +2141,14 @@ discard block |
||
| 2141 | 2141 | try { |
| 2142 | 2142 | $sth = $this->db->prepare($query); |
| 2143 | 2143 | $sth->execute(); |
| 2144 | - } catch(PDOException $e) { |
|
| 2144 | + } catch (PDOException $e) { |
|
| 2145 | 2145 | return "error : ".$e->getMessage(); |
| 2146 | 2146 | } |
| 2147 | 2147 | } |
| 2148 | 2148 | if (!isset($lastyearupdate)) { |
| 2149 | 2149 | echo 'Insert last stats update date...'."\n"; |
| 2150 | 2150 | date_default_timezone_set('UTC'); |
| 2151 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 2151 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 2152 | 2152 | } |
| 2153 | 2153 | if ($globalStatsResetYear) { |
| 2154 | 2154 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -12,7 +12,9 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function __construct($dbc = null) { |
| 14 | 14 | global $globalFilterName; |
| 15 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 15 | + if (isset($globalFilterName)) { |
|
| 16 | + $this->filter_name = $globalFilterName; |
|
| 17 | + } |
|
| 16 | 18 | $Connection = new Connection($dbc); |
| 17 | 19 | $this->db = $Connection->db(); |
| 18 | 20 | } |
@@ -77,7 +79,9 @@ discard block |
||
| 77 | 79 | } |
| 78 | 80 | } |
| 79 | 81 | public function getAllAirlineNames($filter_name = '') { |
| 80 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 82 | + if ($filter_name == '') { |
|
| 83 | + $filter_name = $this->filter_name; |
|
| 84 | + } |
|
| 81 | 85 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 82 | 86 | try { |
| 83 | 87 | $sth = $this->db->prepare($query); |
@@ -89,7 +93,9 @@ discard block |
||
| 89 | 93 | return $all; |
| 90 | 94 | } |
| 91 | 95 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 92 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 96 | + if ($filter_name == '') { |
|
| 97 | + $filter_name = $this->filter_name; |
|
| 98 | + } |
|
| 93 | 99 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 94 | 100 | try { |
| 95 | 101 | $sth = $this->db->prepare($query); |
@@ -101,7 +107,9 @@ discard block |
||
| 101 | 107 | return $all; |
| 102 | 108 | } |
| 103 | 109 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 104 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 110 | + if ($filter_name == '') { |
|
| 111 | + $filter_name = $this->filter_name; |
|
| 112 | + } |
|
| 105 | 113 | $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"; |
| 106 | 114 | try { |
| 107 | 115 | $sth = $this->db->prepare($query); |
@@ -113,7 +121,9 @@ discard block |
||
| 113 | 121 | return $all; |
| 114 | 122 | } |
| 115 | 123 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 116 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 124 | + if ($filter_name == '') { |
|
| 125 | + $filter_name = $this->filter_name; |
|
| 126 | + } |
|
| 117 | 127 | $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"; |
| 118 | 128 | try { |
| 119 | 129 | $sth = $this->db->prepare($query); |
@@ -126,7 +136,9 @@ discard block |
||
| 126 | 136 | } |
| 127 | 137 | |
| 128 | 138 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 129 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 139 | + if ($filter_name == '') { |
|
| 140 | + $filter_name = $this->filter_name; |
|
| 141 | + } |
|
| 130 | 142 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 131 | 143 | try { |
| 132 | 144 | $sth = $this->db->prepare($query); |
@@ -139,7 +151,9 @@ discard block |
||
| 139 | 151 | } |
| 140 | 152 | |
| 141 | 153 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 142 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 154 | + if ($filter_name == '') { |
|
| 155 | + $filter_name = $this->filter_name; |
|
| 156 | + } |
|
| 143 | 157 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 144 | 158 | try { |
| 145 | 159 | $sth = $this->db->prepare($query); |
@@ -154,10 +168,15 @@ discard block |
||
| 154 | 168 | |
| 155 | 169 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 156 | 170 | global $globalStatsFilters; |
| 157 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 171 | + if ($filter_name == '') { |
|
| 172 | + $filter_name = $this->filter_name; |
|
| 173 | + } |
|
| 158 | 174 | if ($year == '' && $month == '') { |
| 159 | - 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"; |
|
| 160 | - 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"; |
|
| 175 | + if ($limit) { |
|
| 176 | + $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"; |
|
| 177 | + } else { |
|
| 178 | + $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"; |
|
| 179 | + } |
|
| 161 | 180 | try { |
| 162 | 181 | $sth = $this->db->prepare($query); |
| 163 | 182 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -165,7 +184,9 @@ discard block |
||
| 165 | 184 | echo "error : ".$e->getMessage(); |
| 166 | 185 | } |
| 167 | 186 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 168 | - } else $all = array(); |
|
| 187 | + } else { |
|
| 188 | + $all = array(); |
|
| 189 | + } |
|
| 169 | 190 | if (empty($all)) { |
| 170 | 191 | $filters = array('airlines' => array($stats_airline)); |
| 171 | 192 | if ($filter_name != '') { |
@@ -178,10 +199,15 @@ discard block |
||
| 178 | 199 | } |
| 179 | 200 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 180 | 201 | global $globalStatsFilters; |
| 181 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 202 | + if ($filter_name == '') { |
|
| 203 | + $filter_name = $this->filter_name; |
|
| 204 | + } |
|
| 182 | 205 | if ($year == '' && $month == '') { |
| 183 | - if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | - else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC"; |
|
| 206 | + if ($limit) { |
|
| 207 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 208 | + } else { |
|
| 209 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC"; |
|
| 210 | + } |
|
| 185 | 211 | try { |
| 186 | 212 | $sth = $this->db->prepare($query); |
| 187 | 213 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -189,7 +215,9 @@ discard block |
||
| 189 | 215 | echo "error : ".$e->getMessage(); |
| 190 | 216 | } |
| 191 | 217 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 192 | - } else $all = array(); |
|
| 218 | + } else { |
|
| 219 | + $all = array(); |
|
| 220 | + } |
|
| 193 | 221 | if (empty($all)) { |
| 194 | 222 | $Spotter = new Spotter($this->db); |
| 195 | 223 | $filters = array(); |
@@ -202,10 +230,15 @@ discard block |
||
| 202 | 230 | } |
| 203 | 231 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 204 | 232 | global $globalStatsFilters; |
| 205 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 233 | + if ($filter_name == '') { |
|
| 234 | + $filter_name = $this->filter_name; |
|
| 235 | + } |
|
| 206 | 236 | if ($year == '' && $month == '') { |
| 207 | - 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"; |
|
| 208 | - 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"; |
|
| 237 | + if ($limit) { |
|
| 238 | + $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"; |
|
| 239 | + } else { |
|
| 240 | + $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"; |
|
| 241 | + } |
|
| 209 | 242 | try { |
| 210 | 243 | $sth = $this->db->prepare($query); |
| 211 | 244 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -213,7 +246,9 @@ discard block |
||
| 213 | 246 | echo "error : ".$e->getMessage(); |
| 214 | 247 | } |
| 215 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 216 | - } else $all = array(); |
|
| 249 | + } else { |
|
| 250 | + $all = array(); |
|
| 251 | + } |
|
| 217 | 252 | if (empty($all)) { |
| 218 | 253 | $filters = array('airlines' => array($stats_airline)); |
| 219 | 254 | if ($filter_name != '') { |
@@ -227,10 +262,15 @@ discard block |
||
| 227 | 262 | |
| 228 | 263 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 229 | 264 | global $globalStatsFilters; |
| 230 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 265 | + if ($filter_name == '') { |
|
| 266 | + $filter_name = $this->filter_name; |
|
| 267 | + } |
|
| 231 | 268 | if ($year == '' && $month == '') { |
| 232 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 233 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
|
| 269 | + if ($limit) { |
|
| 270 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 271 | + } else { |
|
| 272 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
|
| 273 | + } |
|
| 234 | 274 | try { |
| 235 | 275 | $sth = $this->db->prepare($query); |
| 236 | 276 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -238,7 +278,9 @@ discard block |
||
| 238 | 278 | echo "error : ".$e->getMessage(); |
| 239 | 279 | } |
| 240 | 280 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 241 | - } else $all = array(); |
|
| 281 | + } else { |
|
| 282 | + $all = array(); |
|
| 283 | + } |
|
| 242 | 284 | if (empty($all)) { |
| 243 | 285 | $filters = array('airlines' => array($stats_airline)); |
| 244 | 286 | if ($filter_name != '') { |
@@ -251,9 +293,14 @@ discard block |
||
| 251 | 293 | } |
| 252 | 294 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 253 | 295 | global $globalStatsFilters; |
| 254 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 255 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 256 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
|
| 296 | + if ($filter_name == '') { |
|
| 297 | + $filter_name = $this->filter_name; |
|
| 298 | + } |
|
| 299 | + if ($limit) { |
|
| 300 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 301 | + } else { |
|
| 302 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
|
| 303 | + } |
|
| 257 | 304 | try { |
| 258 | 305 | $sth = $this->db->prepare($query); |
| 259 | 306 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -274,10 +321,15 @@ discard block |
||
| 274 | 321 | |
| 275 | 322 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
| 276 | 323 | global $globalStatsFilters; |
| 277 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 324 | + if ($filter_name == '') { |
|
| 325 | + $filter_name = $this->filter_name; |
|
| 326 | + } |
|
| 278 | 327 | if ($year == '' && $month == '') { |
| 279 | - 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 ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 280 | - 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 ORDER BY airline_count DESC"; |
|
| 328 | + if ($limit) { |
|
| 329 | + $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 ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 330 | + } else { |
|
| 331 | + $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 ORDER BY airline_count DESC"; |
|
| 332 | + } |
|
| 281 | 333 | try { |
| 282 | 334 | $sth = $this->db->prepare($query); |
| 283 | 335 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -285,7 +337,9 @@ discard block |
||
| 285 | 337 | echo "error : ".$e->getMessage(); |
| 286 | 338 | } |
| 287 | 339 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 288 | - } else $all = array(); |
|
| 340 | + } else { |
|
| 341 | + $all = array(); |
|
| 342 | + } |
|
| 289 | 343 | if (empty($all)) { |
| 290 | 344 | $Spotter = new Spotter($this->db); |
| 291 | 345 | $filters = array(); |
@@ -299,10 +353,15 @@ discard block |
||
| 299 | 353 | } |
| 300 | 354 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 301 | 355 | global $globalStatsFilters; |
| 302 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 356 | + if ($filter_name == '') { |
|
| 357 | + $filter_name = $this->filter_name; |
|
| 358 | + } |
|
| 303 | 359 | if ($year == '' && $month == '') { |
| 304 | - 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"; |
|
| 305 | - 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"; |
|
| 360 | + if ($limit) { |
|
| 361 | + $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"; |
|
| 362 | + } else { |
|
| 363 | + $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"; |
|
| 364 | + } |
|
| 306 | 365 | try { |
| 307 | 366 | $sth = $this->db->prepare($query); |
| 308 | 367 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -310,7 +369,9 @@ discard block |
||
| 310 | 369 | echo "error : ".$e->getMessage(); |
| 311 | 370 | } |
| 312 | 371 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 313 | - } else $all = array(); |
|
| 372 | + } else { |
|
| 373 | + $all = array(); |
|
| 374 | + } |
|
| 314 | 375 | if (empty($all)) { |
| 315 | 376 | $filters = array('airlines' => array($stats_airline)); |
| 316 | 377 | if ($filter_name != '') { |
@@ -323,10 +384,15 @@ discard block |
||
| 323 | 384 | } |
| 324 | 385 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 325 | 386 | global $globalStatsFilters; |
| 326 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 387 | + if ($filter_name == '') { |
|
| 388 | + $filter_name = $this->filter_name; |
|
| 389 | + } |
|
| 327 | 390 | if ($year == '' && $month == '') { |
| 328 | - 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"; |
|
| 329 | - 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"; |
|
| 391 | + if ($limit) { |
|
| 392 | + $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"; |
|
| 393 | + } else { |
|
| 394 | + $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"; |
|
| 395 | + } |
|
| 330 | 396 | try { |
| 331 | 397 | $sth = $this->db->prepare($query); |
| 332 | 398 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -334,7 +400,9 @@ discard block |
||
| 334 | 400 | echo "error : ".$e->getMessage(); |
| 335 | 401 | } |
| 336 | 402 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 337 | - } else $all = array(); |
|
| 403 | + } else { |
|
| 404 | + $all = array(); |
|
| 405 | + } |
|
| 338 | 406 | if (empty($all)) { |
| 339 | 407 | $filters = array('airlines' => array($stats_airline)); |
| 340 | 408 | if ($filter_name != '') { |
@@ -347,11 +415,16 @@ discard block |
||
| 347 | 415 | } |
| 348 | 416 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 349 | 417 | $Connection = new Connection(); |
| 350 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 418 | + if ($filter_name == '') { |
|
| 419 | + $filter_name = $this->filter_name; |
|
| 420 | + } |
|
| 351 | 421 | if ($Connection->tableExists('countries')) { |
| 352 | 422 | if ($year == '' && $month == '') { |
| 353 | - 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"; |
|
| 354 | - 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"; |
|
| 423 | + if ($limit) { |
|
| 424 | + $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"; |
|
| 425 | + } else { |
|
| 426 | + $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"; |
|
| 427 | + } |
|
| 355 | 428 | try { |
| 356 | 429 | $sth = $this->db->prepare($query); |
| 357 | 430 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -366,17 +439,24 @@ discard block |
||
| 366 | 439 | } |
| 367 | 440 | */ |
| 368 | 441 | return $all; |
| 369 | - } else return array(); |
|
| 442 | + } else { |
|
| 443 | + return array(); |
|
| 444 | + } |
|
| 370 | 445 | } else { |
| 371 | 446 | return array(); |
| 372 | 447 | } |
| 373 | 448 | } |
| 374 | 449 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
| 375 | 450 | global $globalStatsFilters; |
| 376 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 451 | + if ($filter_name == '') { |
|
| 452 | + $filter_name = $this->filter_name; |
|
| 453 | + } |
|
| 377 | 454 | if ($year == '' && $month == '') { |
| 378 | - 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"; |
|
| 379 | - 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"; |
|
| 455 | + if ($limit) { |
|
| 456 | + $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"; |
|
| 457 | + } else { |
|
| 458 | + $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"; |
|
| 459 | + } |
|
| 380 | 460 | try { |
| 381 | 461 | $sth = $this->db->prepare($query); |
| 382 | 462 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -384,7 +464,9 @@ discard block |
||
| 384 | 464 | echo "error : ".$e->getMessage(); |
| 385 | 465 | } |
| 386 | 466 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 387 | - } else $all = array(); |
|
| 467 | + } else { |
|
| 468 | + $all = array(); |
|
| 469 | + } |
|
| 388 | 470 | if (empty($all)) { |
| 389 | 471 | $filters = array('airlines' => array($stats_airline)); |
| 390 | 472 | if ($filter_name != '') { |
@@ -398,10 +480,15 @@ discard block |
||
| 398 | 480 | |
| 399 | 481 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 400 | 482 | global $globalStatsFilters; |
| 401 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 483 | + if ($filter_name == '') { |
|
| 484 | + $filter_name = $this->filter_name; |
|
| 485 | + } |
|
| 402 | 486 | if ($year == '' && $month == '') { |
| 403 | - 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"; |
|
| 404 | - 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"; |
|
| 487 | + if ($limit) { |
|
| 488 | + $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"; |
|
| 489 | + } else { |
|
| 490 | + $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"; |
|
| 491 | + } |
|
| 405 | 492 | try { |
| 406 | 493 | $sth = $this->db->prepare($query); |
| 407 | 494 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -409,7 +496,9 @@ discard block |
||
| 409 | 496 | echo "error : ".$e->getMessage(); |
| 410 | 497 | } |
| 411 | 498 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 412 | - } else $all = array(); |
|
| 499 | + } else { |
|
| 500 | + $all = array(); |
|
| 501 | + } |
|
| 413 | 502 | if (empty($all)) { |
| 414 | 503 | $filters = array('airlines' => array($stats_airline)); |
| 415 | 504 | if ($filter_name != '') { |
@@ -422,10 +511,15 @@ discard block |
||
| 422 | 511 | } |
| 423 | 512 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 424 | 513 | global $globalStatsFilters; |
| 425 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 514 | + if ($filter_name == '') { |
|
| 515 | + $filter_name = $this->filter_name; |
|
| 516 | + } |
|
| 426 | 517 | if ($year == '' && $month == '') { |
| 427 | - 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 FROM stats_airport WHERE 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"; |
|
| 428 | - 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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 518 | + if ($limit) { |
|
| 519 | + $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 FROM stats_airport WHERE 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"; |
|
| 520 | + } else { |
|
| 521 | + $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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 522 | + } |
|
| 429 | 523 | try { |
| 430 | 524 | $sth = $this->db->prepare($query); |
| 431 | 525 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -433,7 +527,9 @@ discard block |
||
| 433 | 527 | echo "error : ".$e->getMessage(); |
| 434 | 528 | } |
| 435 | 529 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 436 | - } else $all = array(); |
|
| 530 | + } else { |
|
| 531 | + $all = array(); |
|
| 532 | + } |
|
| 437 | 533 | if (empty($all)) { |
| 438 | 534 | $filters = array('airlines' => array($stats_airline)); |
| 439 | 535 | if ($filter_name != '') { |
@@ -452,7 +548,9 @@ discard block |
||
| 452 | 548 | $icao = $value['airport_departure_icao']; |
| 453 | 549 | if (isset($all[$icao])) { |
| 454 | 550 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 455 | - } else $all[$icao] = $value; |
|
| 551 | + } else { |
|
| 552 | + $all[$icao] = $value; |
|
| 553 | + } |
|
| 456 | 554 | } |
| 457 | 555 | $count = array(); |
| 458 | 556 | foreach ($all as $key => $row) { |
@@ -464,10 +562,15 @@ discard block |
||
| 464 | 562 | } |
| 465 | 563 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 466 | 564 | global $globalStatsFilters; |
| 467 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 565 | + if ($filter_name == '') { |
|
| 566 | + $filter_name = $this->filter_name; |
|
| 567 | + } |
|
| 468 | 568 | if ($year == '' && $month == '') { |
| 469 | - 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 FROM stats_airport WHERE 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"; |
|
| 470 | - 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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 569 | + if ($limit) { |
|
| 570 | + $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 FROM stats_airport WHERE 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"; |
|
| 571 | + } else { |
|
| 572 | + $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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 573 | + } |
|
| 471 | 574 | try { |
| 472 | 575 | $sth = $this->db->prepare($query); |
| 473 | 576 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -475,7 +578,9 @@ discard block |
||
| 475 | 578 | echo "error : ".$e->getMessage(); |
| 476 | 579 | } |
| 477 | 580 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 478 | - } else $all = array(); |
|
| 581 | + } else { |
|
| 582 | + $all = array(); |
|
| 583 | + } |
|
| 479 | 584 | if (empty($all)) { |
| 480 | 585 | $filters = array('airlines' => array($stats_airline)); |
| 481 | 586 | if ($filter_name != '') { |
@@ -494,7 +599,9 @@ discard block |
||
| 494 | 599 | $icao = $value['airport_arrival_icao']; |
| 495 | 600 | if (isset($all[$icao])) { |
| 496 | 601 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 497 | - } else $all[$icao] = $value; |
|
| 602 | + } else { |
|
| 603 | + $all[$icao] = $value; |
|
| 604 | + } |
|
| 498 | 605 | } |
| 499 | 606 | $count = array(); |
| 500 | 607 | foreach ($all as $key => $row) { |
@@ -507,13 +614,21 @@ discard block |
||
| 507 | 614 | } |
| 508 | 615 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 509 | 616 | global $globalDBdriver, $globalStatsFilters; |
| 510 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 617 | + if ($filter_name == '') { |
|
| 618 | + $filter_name = $this->filter_name; |
|
| 619 | + } |
|
| 511 | 620 | if ($globalDBdriver == 'mysql') { |
| 512 | - 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"; |
|
| 513 | - 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"; |
|
| 621 | + if ($limit) { |
|
| 622 | + $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"; |
|
| 623 | + } else { |
|
| 624 | + $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"; |
|
| 625 | + } |
|
| 514 | 626 | } else { |
| 515 | - 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"; |
|
| 516 | - 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"; |
|
| 627 | + if ($limit) { |
|
| 628 | + $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"; |
|
| 629 | + } else { |
|
| 630 | + $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"; |
|
| 631 | + } |
|
| 517 | 632 | } |
| 518 | 633 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 519 | 634 | try { |
@@ -537,7 +652,9 @@ discard block |
||
| 537 | 652 | |
| 538 | 653 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 539 | 654 | global $globalStatsFilters; |
| 540 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 655 | + if ($filter_name == '') { |
|
| 656 | + $filter_name = $this->filter_name; |
|
| 657 | + } |
|
| 541 | 658 | $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"; |
| 542 | 659 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 543 | 660 | try { |
@@ -559,7 +676,9 @@ discard block |
||
| 559 | 676 | } |
| 560 | 677 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 561 | 678 | global $globalDBdriver, $globalStatsFilters; |
| 562 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 679 | + if ($filter_name == '') { |
|
| 680 | + $filter_name = $this->filter_name; |
|
| 681 | + } |
|
| 563 | 682 | if ($globalDBdriver == 'mysql') { |
| 564 | 683 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 565 | 684 | } else { |
@@ -585,7 +704,9 @@ discard block |
||
| 585 | 704 | } |
| 586 | 705 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 587 | 706 | global $globalStatsFilters; |
| 588 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 707 | + if ($filter_name == '') { |
|
| 708 | + $filter_name = $this->filter_name; |
|
| 709 | + } |
|
| 589 | 710 | $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"; |
| 590 | 711 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 591 | 712 | try { |
@@ -607,7 +728,9 @@ discard block |
||
| 607 | 728 | } |
| 608 | 729 | public function countAllDatesByAirlines($filter_name = '') { |
| 609 | 730 | global $globalStatsFilters; |
| 610 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 731 | + if ($filter_name == '') { |
|
| 732 | + $filter_name = $this->filter_name; |
|
| 733 | + } |
|
| 611 | 734 | $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"; |
| 612 | 735 | $query_data = array('filter_name' => $filter_name); |
| 613 | 736 | try { |
@@ -629,7 +752,9 @@ discard block |
||
| 629 | 752 | } |
| 630 | 753 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 631 | 754 | global $globalStatsFilters; |
| 632 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 755 | + if ($filter_name == '') { |
|
| 756 | + $filter_name = $this->filter_name; |
|
| 757 | + } |
|
| 633 | 758 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 634 | 759 | try { |
| 635 | 760 | $sth = $this->db->prepare($query); |
@@ -652,7 +777,9 @@ discard block |
||
| 652 | 777 | } |
| 653 | 778 | public function countAllMilitaryMonths($filter_name = '') { |
| 654 | 779 | global $globalStatsFilters; |
| 655 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 780 | + if ($filter_name == '') { |
|
| 781 | + $filter_name = $this->filter_name; |
|
| 782 | + } |
|
| 656 | 783 | $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"; |
| 657 | 784 | try { |
| 658 | 785 | $sth = $this->db->prepare($query); |
@@ -673,9 +800,14 @@ discard block |
||
| 673 | 800 | } |
| 674 | 801 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 675 | 802 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 676 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 677 | - 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"; |
|
| 678 | - 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"; |
|
| 803 | + if ($filter_name == '') { |
|
| 804 | + $filter_name = $this->filter_name; |
|
| 805 | + } |
|
| 806 | + if ($limit) { |
|
| 807 | + $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"; |
|
| 808 | + } else { |
|
| 809 | + $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"; |
|
| 810 | + } |
|
| 679 | 811 | if ($orderby == 'hour') { |
| 680 | 812 | /* |
| 681 | 813 | if ($globalDBdriver == 'mysql') { |
@@ -684,7 +816,9 @@ discard block |
||
| 684 | 816 | */ |
| 685 | 817 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 686 | 818 | } |
| 687 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 819 | + if ($orderby == 'count') { |
|
| 820 | + $query .= " ORDER BY hour_count DESC"; |
|
| 821 | + } |
|
| 688 | 822 | try { |
| 689 | 823 | $sth = $this->db->prepare($query); |
| 690 | 824 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
@@ -705,8 +839,12 @@ discard block |
||
| 705 | 839 | |
| 706 | 840 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 707 | 841 | global $globalStatsFilters; |
| 708 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 709 | - if ($year == '') $year = date('Y'); |
|
| 842 | + if ($filter_name == '') { |
|
| 843 | + $filter_name = $this->filter_name; |
|
| 844 | + } |
|
| 845 | + if ($year == '') { |
|
| 846 | + $year = date('Y'); |
|
| 847 | + } |
|
| 710 | 848 | $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
| 711 | 849 | if (empty($all)) { |
| 712 | 850 | $filters = array('airlines' => array($stats_airline)); |
@@ -720,8 +858,12 @@ discard block |
||
| 720 | 858 | } |
| 721 | 859 | public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
| 722 | 860 | global $globalStatsFilters; |
| 723 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 724 | - if ($year == '') $year = date('Y'); |
|
| 861 | + if ($filter_name == '') { |
|
| 862 | + $filter_name = $this->filter_name; |
|
| 863 | + } |
|
| 864 | + if ($year == '') { |
|
| 865 | + $year = date('Y'); |
|
| 866 | + } |
|
| 725 | 867 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 726 | 868 | if (empty($all)) { |
| 727 | 869 | $filters = array(); |
@@ -735,8 +877,12 @@ discard block |
||
| 735 | 877 | } |
| 736 | 878 | public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
| 737 | 879 | global $globalStatsFilters; |
| 738 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 739 | - if ($year == '') $year = date('Y'); |
|
| 880 | + if ($filter_name == '') { |
|
| 881 | + $filter_name = $this->filter_name; |
|
| 882 | + } |
|
| 883 | + if ($year == '') { |
|
| 884 | + $year = date('Y'); |
|
| 885 | + } |
|
| 740 | 886 | $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
| 741 | 887 | if (empty($all)) { |
| 742 | 888 | $filters = array('airlines' => array($stats_airline)); |
@@ -750,7 +896,9 @@ discard block |
||
| 750 | 896 | } |
| 751 | 897 | public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 752 | 898 | global $globalStatsFilters; |
| 753 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 899 | + if ($filter_name == '') { |
|
| 900 | + $filter_name = $this->filter_name; |
|
| 901 | + } |
|
| 754 | 902 | if ($year == '' && $month == '') { |
| 755 | 903 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 756 | 904 | try { |
@@ -761,7 +909,9 @@ discard block |
||
| 761 | 909 | } |
| 762 | 910 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 763 | 911 | $all = $result[0]['nb']; |
| 764 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 912 | + } else { |
|
| 913 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 914 | + } |
|
| 765 | 915 | if (empty($all)) { |
| 766 | 916 | $filters = array('airlines' => array($stats_airline)); |
| 767 | 917 | if ($filter_name != '') { |
@@ -774,7 +924,9 @@ discard block |
||
| 774 | 924 | } |
| 775 | 925 | public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
| 776 | 926 | global $globalStatsFilters; |
| 777 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 927 | + if ($filter_name == '') { |
|
| 928 | + $filter_name = $this->filter_name; |
|
| 929 | + } |
|
| 778 | 930 | if ($year == '' && $month == '') { |
| 779 | 931 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 780 | 932 | try { |
@@ -785,7 +937,9 @@ discard block |
||
| 785 | 937 | } |
| 786 | 938 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 787 | 939 | $all = $result[0]['nb_airline']; |
| 788 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 940 | + } else { |
|
| 941 | + $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 942 | + } |
|
| 789 | 943 | if (empty($all)) { |
| 790 | 944 | $filters = array(); |
| 791 | 945 | if ($filter_name != '') { |
@@ -798,7 +952,9 @@ discard block |
||
| 798 | 952 | } |
| 799 | 953 | public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 800 | 954 | global $globalStatsFilters; |
| 801 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 955 | + if ($filter_name == '') { |
|
| 956 | + $filter_name = $this->filter_name; |
|
| 957 | + } |
|
| 802 | 958 | if ($year == '' && $month == '') { |
| 803 | 959 | $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 804 | 960 | $query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
@@ -825,7 +981,9 @@ discard block |
||
| 825 | 981 | } |
| 826 | 982 | public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 827 | 983 | global $globalStatsFilters; |
| 828 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 984 | + if ($filter_name == '') { |
|
| 985 | + $filter_name = $this->filter_name; |
|
| 986 | + } |
|
| 829 | 987 | //if ($year == '') $year = date('Y'); |
| 830 | 988 | if ($year == '' && $month == '') { |
| 831 | 989 | $query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -853,7 +1011,9 @@ discard block |
||
| 853 | 1011 | } |
| 854 | 1012 | |
| 855 | 1013 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 856 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1014 | + if ($filter_name == '') { |
|
| 1015 | + $filter_name = $this->filter_name; |
|
| 1016 | + } |
|
| 857 | 1017 | $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"; |
| 858 | 1018 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 859 | 1019 | try { |
@@ -866,7 +1026,9 @@ discard block |
||
| 866 | 1026 | return $all; |
| 867 | 1027 | } |
| 868 | 1028 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 869 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1029 | + if ($filter_name == '') { |
|
| 1030 | + $filter_name = $this->filter_name; |
|
| 1031 | + } |
|
| 870 | 1032 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 871 | 1033 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 872 | 1034 | try { |
@@ -879,7 +1041,9 @@ discard block |
||
| 879 | 1041 | return $all; |
| 880 | 1042 | } |
| 881 | 1043 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 882 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1044 | + if ($filter_name == '') { |
|
| 1045 | + $filter_name = $this->filter_name; |
|
| 1046 | + } |
|
| 883 | 1047 | global $globalArchiveMonths, $globalDBdriver; |
| 884 | 1048 | if ($globalDBdriver == 'mysql') { |
| 885 | 1049 | if ($month == '') { |
@@ -909,7 +1073,9 @@ discard block |
||
| 909 | 1073 | } |
| 910 | 1074 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 911 | 1075 | global $globalArchiveMonths, $globalDBdriver; |
| 912 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1076 | + if ($filter_name == '') { |
|
| 1077 | + $filter_name = $this->filter_name; |
|
| 1078 | + } |
|
| 913 | 1079 | if ($globalDBdriver == 'mysql') { |
| 914 | 1080 | $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 = :stats_airline AND filter_name = :filter_name"; |
| 915 | 1081 | } else { |
@@ -927,7 +1093,9 @@ discard block |
||
| 927 | 1093 | } |
| 928 | 1094 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 929 | 1095 | global $globalArchiveMonths, $globalDBdriver; |
| 930 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1096 | + if ($filter_name == '') { |
|
| 1097 | + $filter_name = $this->filter_name; |
|
| 1098 | + } |
|
| 931 | 1099 | if ($globalDBdriver == 'mysql') { |
| 932 | 1100 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 933 | 1101 | } else { |
@@ -944,7 +1112,9 @@ discard block |
||
| 944 | 1112 | } |
| 945 | 1113 | public function getStatsAirlineTotal($filter_name = '') { |
| 946 | 1114 | global $globalArchiveMonths, $globalDBdriver; |
| 947 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1115 | + if ($filter_name == '') { |
|
| 1116 | + $filter_name = $this->filter_name; |
|
| 1117 | + } |
|
| 948 | 1118 | if ($globalDBdriver == 'mysql') { |
| 949 | 1119 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 950 | 1120 | } else { |
@@ -961,7 +1131,9 @@ discard block |
||
| 961 | 1131 | } |
| 962 | 1132 | public function getStatsOwnerTotal($filter_name = '') { |
| 963 | 1133 | global $globalArchiveMonths, $globalDBdriver; |
| 964 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1134 | + if ($filter_name == '') { |
|
| 1135 | + $filter_name = $this->filter_name; |
|
| 1136 | + } |
|
| 965 | 1137 | if ($globalDBdriver == 'mysql') { |
| 966 | 1138 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 967 | 1139 | } else { |
@@ -978,7 +1150,9 @@ discard block |
||
| 978 | 1150 | } |
| 979 | 1151 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 980 | 1152 | global $globalArchiveMonths, $globalDBdriver; |
| 981 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1153 | + if ($filter_name == '') { |
|
| 1154 | + $filter_name = $this->filter_name; |
|
| 1155 | + } |
|
| 982 | 1156 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 983 | 1157 | try { |
| 984 | 1158 | $sth = $this->db->prepare($query); |
@@ -987,12 +1161,17 @@ discard block |
||
| 987 | 1161 | echo "error : ".$e->getMessage(); |
| 988 | 1162 | } |
| 989 | 1163 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 990 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 991 | - else return 0; |
|
| 1164 | + if (isset($all[0]['cnt'])) { |
|
| 1165 | + return $all[0]['cnt']; |
|
| 1166 | + } else { |
|
| 1167 | + return 0; |
|
| 1168 | + } |
|
| 992 | 1169 | } |
| 993 | 1170 | public function getStatsPilotTotal($filter_name = '') { |
| 994 | 1171 | global $globalArchiveMonths, $globalDBdriver; |
| 995 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1172 | + if ($filter_name == '') { |
|
| 1173 | + $filter_name = $this->filter_name; |
|
| 1174 | + } |
|
| 996 | 1175 | if ($globalDBdriver == 'mysql') { |
| 997 | 1176 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 998 | 1177 | } else { |
@@ -1009,7 +1188,9 @@ discard block |
||
| 1009 | 1188 | } |
| 1010 | 1189 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1011 | 1190 | global $globalArchiveMonths, $globalDBdriver; |
| 1012 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1191 | + if ($filter_name == '') { |
|
| 1192 | + $filter_name = $this->filter_name; |
|
| 1193 | + } |
|
| 1013 | 1194 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1014 | 1195 | try { |
| 1015 | 1196 | $sth = $this->db->prepare($query); |
@@ -1018,13 +1199,18 @@ discard block |
||
| 1018 | 1199 | echo "error : ".$e->getMessage(); |
| 1019 | 1200 | } |
| 1020 | 1201 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1021 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1022 | - else return 0; |
|
| 1202 | + if (isset($all[0]['cnt'])) { |
|
| 1203 | + return $all[0]['cnt']; |
|
| 1204 | + } else { |
|
| 1205 | + return 0; |
|
| 1206 | + } |
|
| 1023 | 1207 | } |
| 1024 | 1208 | |
| 1025 | 1209 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1026 | 1210 | global $globalDBdriver; |
| 1027 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1211 | + if ($filter_name == '') { |
|
| 1212 | + $filter_name = $this->filter_name; |
|
| 1213 | + } |
|
| 1028 | 1214 | if ($globalDBdriver == 'mysql') { |
| 1029 | 1215 | $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"; |
| 1030 | 1216 | } else { |
@@ -1040,7 +1226,9 @@ discard block |
||
| 1040 | 1226 | } |
| 1041 | 1227 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1042 | 1228 | global $globalDBdriver; |
| 1043 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1229 | + if ($filter_name == '') { |
|
| 1230 | + $filter_name = $this->filter_name; |
|
| 1231 | + } |
|
| 1044 | 1232 | if ($globalDBdriver == 'mysql') { |
| 1045 | 1233 | $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"; |
| 1046 | 1234 | } else { |
@@ -1426,10 +1614,14 @@ discard block |
||
| 1426 | 1614 | $Connection = new Connection(); |
| 1427 | 1615 | date_default_timezone_set('UTC'); |
| 1428 | 1616 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 1429 | - if ($globalDebug) echo 'Update stats !'."\n"; |
|
| 1617 | + if ($globalDebug) { |
|
| 1618 | + echo 'Update stats !'."\n"; |
|
| 1619 | + } |
|
| 1430 | 1620 | if (isset($last_update[0]['value'])) { |
| 1431 | 1621 | $last_update_day = $last_update[0]['value']; |
| 1432 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 1622 | + } else { |
|
| 1623 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 1624 | + } |
|
| 1433 | 1625 | $reset = false; |
| 1434 | 1626 | if ($globalStatsResetYear) { |
| 1435 | 1627 | $reset = true; |
@@ -1437,42 +1629,60 @@ discard block |
||
| 1437 | 1629 | } |
| 1438 | 1630 | $Spotter = new Spotter($this->db); |
| 1439 | 1631 | |
| 1440 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 1632 | + if ($globalDebug) { |
|
| 1633 | + echo 'Count all aircraft types...'."\n"; |
|
| 1634 | + } |
|
| 1441 | 1635 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 1442 | 1636 | foreach ($alldata as $number) { |
| 1443 | 1637 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 1444 | 1638 | } |
| 1445 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 1639 | + if ($globalDebug) { |
|
| 1640 | + echo 'Count all airlines...'."\n"; |
|
| 1641 | + } |
|
| 1446 | 1642 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 1447 | 1643 | foreach ($alldata as $number) { |
| 1448 | 1644 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 1449 | 1645 | } |
| 1450 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 1646 | + if ($globalDebug) { |
|
| 1647 | + echo 'Count all registrations...'."\n"; |
|
| 1648 | + } |
|
| 1451 | 1649 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 1452 | 1650 | foreach ($alldata as $number) { |
| 1453 | 1651 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 1454 | 1652 | } |
| 1455 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 1653 | + if ($globalDebug) { |
|
| 1654 | + echo 'Count all callsigns...'."\n"; |
|
| 1655 | + } |
|
| 1456 | 1656 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 1457 | 1657 | foreach ($alldata as $number) { |
| 1458 | 1658 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1459 | 1659 | } |
| 1460 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 1660 | + if ($globalDebug) { |
|
| 1661 | + echo 'Count all owners...'."\n"; |
|
| 1662 | + } |
|
| 1461 | 1663 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 1462 | 1664 | foreach ($alldata as $number) { |
| 1463 | 1665 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 1464 | 1666 | } |
| 1465 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 1667 | + if ($globalDebug) { |
|
| 1668 | + echo 'Count all pilots...'."\n"; |
|
| 1669 | + } |
|
| 1466 | 1670 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 1467 | 1671 | foreach ($alldata as $number) { |
| 1468 | 1672 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 1469 | 1673 | } |
| 1470 | 1674 | |
| 1471 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 1675 | + if ($globalDebug) { |
|
| 1676 | + echo 'Count all departure airports...'."\n"; |
|
| 1677 | + } |
|
| 1472 | 1678 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1473 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 1679 | + if ($globalDebug) { |
|
| 1680 | + echo 'Count all detected departure airports...'."\n"; |
|
| 1681 | + } |
|
| 1474 | 1682 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 1475 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 1683 | + if ($globalDebug) { |
|
| 1684 | + echo 'Order departure airports...'."\n"; |
|
| 1685 | + } |
|
| 1476 | 1686 | $alldata = array(); |
| 1477 | 1687 | |
| 1478 | 1688 | foreach ($pall as $value) { |
@@ -1483,7 +1693,9 @@ discard block |
||
| 1483 | 1693 | $icao = $value['airport_departure_icao']; |
| 1484 | 1694 | if (isset($alldata[$icao])) { |
| 1485 | 1695 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 1486 | - } else $alldata[$icao] = $value; |
|
| 1696 | + } else { |
|
| 1697 | + $alldata[$icao] = $value; |
|
| 1698 | + } |
|
| 1487 | 1699 | } |
| 1488 | 1700 | $count = array(); |
| 1489 | 1701 | foreach ($alldata as $key => $row) { |
@@ -1493,11 +1705,17 @@ discard block |
||
| 1493 | 1705 | foreach ($alldata as $number) { |
| 1494 | 1706 | 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); |
| 1495 | 1707 | } |
| 1496 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 1708 | + if ($globalDebug) { |
|
| 1709 | + echo 'Count all arrival airports...'."\n"; |
|
| 1710 | + } |
|
| 1497 | 1711 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1498 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 1712 | + if ($globalDebug) { |
|
| 1713 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 1714 | + } |
|
| 1499 | 1715 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 1500 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 1716 | + if ($globalDebug) { |
|
| 1717 | + echo 'Order arrival airports...'."\n"; |
|
| 1718 | + } |
|
| 1501 | 1719 | $alldata = array(); |
| 1502 | 1720 | foreach ($pall as $value) { |
| 1503 | 1721 | $icao = $value['airport_arrival_icao']; |
@@ -1507,7 +1725,9 @@ discard block |
||
| 1507 | 1725 | $icao = $value['airport_arrival_icao']; |
| 1508 | 1726 | if (isset($alldata[$icao])) { |
| 1509 | 1727 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 1510 | - } else $alldata[$icao] = $value; |
|
| 1728 | + } else { |
|
| 1729 | + $alldata[$icao] = $value; |
|
| 1730 | + } |
|
| 1511 | 1731 | } |
| 1512 | 1732 | $count = array(); |
| 1513 | 1733 | foreach ($alldata as $key => $row) { |
@@ -1518,7 +1738,9 @@ discard block |
||
| 1518 | 1738 | 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); |
| 1519 | 1739 | } |
| 1520 | 1740 | if ($Connection->tableExists('countries')) { |
| 1521 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 1741 | + if ($globalDebug) { |
|
| 1742 | + echo 'Count all flights by countries...'."\n"; |
|
| 1743 | + } |
|
| 1522 | 1744 | $SpotterArchive = new SpotterArchive(); |
| 1523 | 1745 | $alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 1524 | 1746 | foreach ($alldata as $number) { |
@@ -1530,46 +1752,66 @@ discard block |
||
| 1530 | 1752 | // Add by month using getstat if month finish... |
| 1531 | 1753 | |
| 1532 | 1754 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 1533 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 1755 | + if ($globalDebug) { |
|
| 1756 | + echo 'Count all flights by months...'."\n"; |
|
| 1757 | + } |
|
| 1534 | 1758 | $Spotter = new Spotter($this->db); |
| 1535 | 1759 | $alldata = $Spotter->countAllMonths(); |
| 1536 | 1760 | $lastyear = false; |
| 1537 | 1761 | foreach ($alldata as $number) { |
| 1538 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 1762 | + if ($number['year_name'] != date('Y')) { |
|
| 1763 | + $lastyear = true; |
|
| 1764 | + } |
|
| 1539 | 1765 | $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']))); |
| 1540 | 1766 | } |
| 1541 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 1767 | + if ($globalDebug) { |
|
| 1768 | + echo 'Count all military flights by months...'."\n"; |
|
| 1769 | + } |
|
| 1542 | 1770 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1543 | 1771 | foreach ($alldata as $number) { |
| 1544 | 1772 | $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']))); |
| 1545 | 1773 | } |
| 1546 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 1774 | + if ($globalDebug) { |
|
| 1775 | + echo 'Count all owners by months...'."\n"; |
|
| 1776 | + } |
|
| 1547 | 1777 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1548 | 1778 | foreach ($alldata as $number) { |
| 1549 | 1779 | $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']))); |
| 1550 | 1780 | } |
| 1551 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 1781 | + if ($globalDebug) { |
|
| 1782 | + echo 'Count all pilots by months...'."\n"; |
|
| 1783 | + } |
|
| 1552 | 1784 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1553 | 1785 | foreach ($alldata as $number) { |
| 1554 | 1786 | $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']))); |
| 1555 | 1787 | } |
| 1556 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 1788 | + if ($globalDebug) { |
|
| 1789 | + echo 'Count all airlines by months...'."\n"; |
|
| 1790 | + } |
|
| 1557 | 1791 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1558 | 1792 | foreach ($alldata as $number) { |
| 1559 | 1793 | $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']))); |
| 1560 | 1794 | } |
| 1561 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 1795 | + if ($globalDebug) { |
|
| 1796 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 1797 | + } |
|
| 1562 | 1798 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1563 | 1799 | foreach ($alldata as $number) { |
| 1564 | 1800 | $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']))); |
| 1565 | 1801 | } |
| 1566 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 1802 | + if ($globalDebug) { |
|
| 1803 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 1804 | + } |
|
| 1567 | 1805 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1568 | 1806 | foreach ($alldata as $number) { |
| 1569 | 1807 | $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']))); |
| 1570 | 1808 | } |
| 1571 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 1572 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 1809 | + if ($globalDebug) { |
|
| 1810 | + echo 'Airports data...'."\n"; |
|
| 1811 | + } |
|
| 1812 | + if ($globalDebug) { |
|
| 1813 | + echo '...Departure'."\n"; |
|
| 1814 | + } |
|
| 1573 | 1815 | $this->deleteStatAirport('daily'); |
| 1574 | 1816 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1575 | 1817 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -1690,44 +1932,62 @@ discard block |
||
| 1690 | 1932 | // Count by airlines |
| 1691 | 1933 | echo '--- Stats by airlines ---'."\n"; |
| 1692 | 1934 | if ($Connection->tableExists('countries')) { |
| 1693 | - if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
|
| 1935 | + if ($globalDebug) { |
|
| 1936 | + echo 'Count all flights by countries by airlines...'."\n"; |
|
| 1937 | + } |
|
| 1694 | 1938 | $SpotterArchive = new SpotterArchive(); |
| 1695 | 1939 | $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 1696 | 1940 | foreach ($alldata as $number) { |
| 1697 | 1941 | $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
| 1698 | 1942 | } |
| 1699 | 1943 | } |
| 1700 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 1944 | + if ($globalDebug) { |
|
| 1945 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 1946 | + } |
|
| 1701 | 1947 | $Spotter = new Spotter($this->db); |
| 1702 | 1948 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 1703 | 1949 | foreach ($alldata as $number) { |
| 1704 | 1950 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 1705 | 1951 | } |
| 1706 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 1952 | + if ($globalDebug) { |
|
| 1953 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 1954 | + } |
|
| 1707 | 1955 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 1708 | 1956 | foreach ($alldata as $number) { |
| 1709 | 1957 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 1710 | 1958 | } |
| 1711 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 1959 | + if ($globalDebug) { |
|
| 1960 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 1961 | + } |
|
| 1712 | 1962 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 1713 | 1963 | foreach ($alldata as $number) { |
| 1714 | 1964 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1715 | 1965 | } |
| 1716 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 1966 | + if ($globalDebug) { |
|
| 1967 | + echo 'Count all owners by airlines...'."\n"; |
|
| 1968 | + } |
|
| 1717 | 1969 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 1718 | 1970 | foreach ($alldata as $number) { |
| 1719 | 1971 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 1720 | 1972 | } |
| 1721 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 1973 | + if ($globalDebug) { |
|
| 1974 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 1975 | + } |
|
| 1722 | 1976 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 1723 | 1977 | foreach ($alldata as $number) { |
| 1724 | 1978 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 1725 | 1979 | } |
| 1726 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 1980 | + if ($globalDebug) { |
|
| 1981 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 1982 | + } |
|
| 1727 | 1983 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1728 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 1984 | + if ($globalDebug) { |
|
| 1985 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 1986 | + } |
|
| 1729 | 1987 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1730 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 1988 | + if ($globalDebug) { |
|
| 1989 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 1990 | + } |
|
| 1731 | 1991 | //$alldata = array(); |
| 1732 | 1992 | foreach ($dall as $value) { |
| 1733 | 1993 | $icao = $value['airport_departure_icao']; |
@@ -1748,11 +2008,17 @@ discard block |
||
| 1748 | 2008 | foreach ($alldata as $number) { |
| 1749 | 2009 | 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); |
| 1750 | 2010 | } |
| 1751 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2011 | + if ($globalDebug) { |
|
| 2012 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2013 | + } |
|
| 1752 | 2014 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1753 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2015 | + if ($globalDebug) { |
|
| 2016 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2017 | + } |
|
| 1754 | 2018 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1755 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 2019 | + if ($globalDebug) { |
|
| 2020 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 2021 | + } |
|
| 1756 | 2022 | //$alldata = array(); |
| 1757 | 2023 | foreach ($dall as $value) { |
| 1758 | 2024 | $icao = $value['airport_arrival_icao']; |
@@ -1771,37 +2037,53 @@ discard block |
||
| 1771 | 2037 | } |
| 1772 | 2038 | $alldata = $pall; |
| 1773 | 2039 | foreach ($alldata as $number) { |
| 1774 | - 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); |
|
| 2040 | + if ($number['airline_icao'] != '') { |
|
| 2041 | + 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); |
|
| 2042 | + } |
|
| 2043 | + } |
|
| 2044 | + if ($globalDebug) { |
|
| 2045 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 1775 | 2046 | } |
| 1776 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 1777 | 2047 | $Spotter = new Spotter($this->db); |
| 1778 | 2048 | $alldata = $Spotter->countAllMonthsByAirlines(); |
| 1779 | 2049 | $lastyear = false; |
| 1780 | 2050 | foreach ($alldata as $number) { |
| 1781 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2051 | + if ($number['year_name'] != date('Y')) { |
|
| 2052 | + $lastyear = true; |
|
| 2053 | + } |
|
| 1782 | 2054 | $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']); |
| 1783 | 2055 | } |
| 1784 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 2056 | + if ($globalDebug) { |
|
| 2057 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 2058 | + } |
|
| 1785 | 2059 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1786 | 2060 | foreach ($alldata as $number) { |
| 1787 | 2061 | $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']); |
| 1788 | 2062 | } |
| 1789 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2063 | + if ($globalDebug) { |
|
| 2064 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2065 | + } |
|
| 1790 | 2066 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1791 | 2067 | foreach ($alldata as $number) { |
| 1792 | 2068 | $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']); |
| 1793 | 2069 | } |
| 1794 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2070 | + if ($globalDebug) { |
|
| 2071 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2072 | + } |
|
| 1795 | 2073 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1796 | 2074 | foreach ($alldata as $number) { |
| 1797 | 2075 | $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']); |
| 1798 | 2076 | } |
| 1799 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2077 | + if ($globalDebug) { |
|
| 2078 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2079 | + } |
|
| 1800 | 2080 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1801 | 2081 | foreach ($alldata as $number) { |
| 1802 | 2082 | $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']); |
| 1803 | 2083 | } |
| 1804 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2084 | + if ($globalDebug) { |
|
| 2085 | + echo '...Departure'."\n"; |
|
| 2086 | + } |
|
| 1805 | 2087 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1806 | 2088 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 1807 | 2089 | foreach ($dall as $value) { |
@@ -1824,7 +2106,9 @@ discard block |
||
| 1824 | 2106 | foreach ($alldata as $number) { |
| 1825 | 2107 | $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']); |
| 1826 | 2108 | } |
| 1827 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 2109 | + if ($globalDebug) { |
|
| 2110 | + echo '...Arrival'."\n"; |
|
| 2111 | + } |
|
| 1828 | 2112 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1829 | 2113 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 1830 | 2114 | foreach ($dall as $value) { |
@@ -1848,13 +2132,19 @@ discard block |
||
| 1848 | 2132 | $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']); |
| 1849 | 2133 | } |
| 1850 | 2134 | |
| 1851 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 1852 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2135 | + if ($globalDebug) { |
|
| 2136 | + echo 'Flights data...'."\n"; |
|
| 2137 | + } |
|
| 2138 | + if ($globalDebug) { |
|
| 2139 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2140 | + } |
|
| 1853 | 2141 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1854 | 2142 | foreach ($alldata as $number) { |
| 1855 | 2143 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 1856 | 2144 | } |
| 1857 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 2145 | + if ($globalDebug) { |
|
| 2146 | + echo '-> countAllDates...'."\n"; |
|
| 2147 | + } |
|
| 1858 | 2148 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1859 | 2149 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
| 1860 | 2150 | $values = array(); |
@@ -1867,7 +2157,9 @@ discard block |
||
| 1867 | 2157 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 1868 | 2158 | } |
| 1869 | 2159 | |
| 1870 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 2160 | + if ($globalDebug) { |
|
| 2161 | + echo '-> countAllHours...'."\n"; |
|
| 2162 | + } |
|
| 1871 | 2163 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1872 | 2164 | foreach ($alldata as $number) { |
| 1873 | 2165 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
@@ -1875,7 +2167,9 @@ discard block |
||
| 1875 | 2167 | |
| 1876 | 2168 | |
| 1877 | 2169 | // Stats by filters |
| 1878 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 2170 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 2171 | + $globalStatsFilters = array(); |
|
| 2172 | + } |
|
| 1879 | 2173 | foreach ($globalStatsFilters as $name => $filter) { |
| 1880 | 2174 | //$filter_name = $filter['name']; |
| 1881 | 2175 | $filter_name = $name; |
@@ -1883,11 +2177,15 @@ discard block |
||
| 1883 | 2177 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 1884 | 2178 | if (isset($last_update[0]['value'])) { |
| 1885 | 2179 | $last_update_day = $last_update[0]['value']; |
| 1886 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2180 | + } else { |
|
| 2181 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2182 | + } |
|
| 1887 | 2183 | $reset = false; |
| 1888 | 2184 | |
| 1889 | 2185 | // Count by filter |
| 1890 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2186 | + if ($globalDebug) { |
|
| 2187 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2188 | + } |
|
| 1891 | 2189 | $Spotter = new Spotter($this->db); |
| 1892 | 2190 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 1893 | 2191 | foreach ($alldata as $number) { |
@@ -1924,7 +2222,9 @@ discard block |
||
| 1924 | 2222 | $icao = $value['airport_departure_icao']; |
| 1925 | 2223 | if (isset($alldata[$icao])) { |
| 1926 | 2224 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 1927 | - } else $alldata[$icao] = $value; |
|
| 2225 | + } else { |
|
| 2226 | + $alldata[$icao] = $value; |
|
| 2227 | + } |
|
| 1928 | 2228 | } |
| 1929 | 2229 | $count = array(); |
| 1930 | 2230 | foreach ($alldata as $key => $row) { |
@@ -1945,7 +2245,9 @@ discard block |
||
| 1945 | 2245 | $icao = $value['airport_arrival_icao']; |
| 1946 | 2246 | if (isset($alldata[$icao])) { |
| 1947 | 2247 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 1948 | - } else $alldata[$icao] = $value; |
|
| 2248 | + } else { |
|
| 2249 | + $alldata[$icao] = $value; |
|
| 2250 | + } |
|
| 1949 | 2251 | } |
| 1950 | 2252 | $count = array(); |
| 1951 | 2253 | foreach ($alldata as $key => $row) { |
@@ -1959,7 +2261,9 @@ discard block |
||
| 1959 | 2261 | $alldata = $Spotter->countAllMonths($filter); |
| 1960 | 2262 | $lastyear = false; |
| 1961 | 2263 | foreach ($alldata as $number) { |
| 1962 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2264 | + if ($number['year_name'] != date('Y')) { |
|
| 2265 | + $lastyear = true; |
|
| 2266 | + } |
|
| 1963 | 2267 | $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); |
| 1964 | 2268 | } |
| 1965 | 2269 | $alldata = $Spotter->countAllMonthsOwners($filter); |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT spotter_output.* FROM spotter_output"; |
| 6 | 6 | |
| 7 | -class Spotter{ |
|
| 7 | +class Spotter { |
|
| 8 | 8 | public $aircraft_correct_icaotype = array('CL64' => 'CL60', |
| 9 | 9 | 'F9LX' => 'F900', |
| 10 | 10 | 'K35T' => 'K35R', |
@@ -59,45 +59,45 @@ discard block |
||
| 59 | 59 | * @param Array $filter the filter |
| 60 | 60 | * @return Array the SQL part |
| 61 | 61 | */ |
| 62 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 62 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 63 | 63 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 64 | 64 | $filters = array(); |
| 65 | 65 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 66 | 66 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 67 | 67 | $filters = $globalStatsFilters[$globalFilterName]; |
| 68 | 68 | } else { |
| 69 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 69 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 72 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 73 | 73 | $filter_query_join = ''; |
| 74 | 74 | $filter_query_where = ''; |
| 75 | - foreach($filters as $flt) { |
|
| 75 | + foreach ($filters as $flt) { |
|
| 76 | 76 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 77 | 77 | if ($flt['airlines'][0] != '') { |
| 78 | 78 | if (isset($flt['source'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 80 | 80 | } else { |
| 81 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 81 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 86 | 86 | if (isset($flt['source'])) { |
| 87 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 87 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 88 | 88 | } else { |
| 89 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 89 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) { |
| 93 | 93 | if (isset($flt['source'])) { |
| 94 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 94 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 99 | 99 | if ($filter['airlines'][0] != '') { |
| 100 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 100 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
@@ -107,19 +107,19 @@ discard block |
||
| 107 | 107 | $filter_query_join .= " INNER JOIN (SELECT icao FROM airlines WHERE alliance = '".$filter['alliance']."') sal ON sal.icao = spotter_output.airline_icao "; |
| 108 | 108 | } |
| 109 | 109 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 110 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 110 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id"; |
|
| 111 | 111 | } |
| 112 | 112 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 113 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 113 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 114 | 114 | } |
| 115 | 115 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 116 | 116 | $filter_query_where = " WHERE ident = '".$filter['ident']."'"; |
| 117 | 117 | } |
| 118 | 118 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | 119 | if ($filter_query_where == '') { |
| 120 | - $filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 120 | + $filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 121 | 121 | } else { |
| 122 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 122 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | * @return Array the spotter information |
| 138 | 138 | * |
| 139 | 139 | */ |
| 140 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 140 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 141 | 141 | { |
| 142 | 142 | global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM; |
| 143 | 143 | $Image = new Image($this->db); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $sth = $this->db->prepare($query.$limitQuery); |
| 168 | 168 | $sth->execute($params); |
| 169 | 169 | } catch (PDOException $e) { |
| 170 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 170 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 171 | 171 | exit(); |
| 172 | 172 | } |
| 173 | 173 | |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | $spotter_array = array(); |
| 178 | 178 | |
| 179 | 179 | |
| 180 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 180 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 181 | 181 | { |
| 182 | 182 | $num_rows++; |
| 183 | 183 | $temp_array = array(); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
| 222 | 222 | if (isset($row['route_stop']) && $row['route_stop'] != '') { |
| 223 | 223 | $temp_array['route_stop'] = $row['route_stop']; |
| 224 | - $allroute = explode(' ',$row['route_stop']); |
|
| 224 | + $allroute = explode(' ', $row['route_stop']); |
|
| 225 | 225 | foreach ($allroute as $route) { |
| 226 | 226 | $route_airport_array = $this->getAllAirportInfo($route); |
| 227 | 227 | if (isset($route_airport_array[0]['name'])) { |
@@ -274,16 +274,16 @@ discard block |
||
| 274 | 274 | { |
| 275 | 275 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 276 | 276 | } else { |
| 277 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 277 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 278 | 278 | } |
| 279 | 279 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 280 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 281 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 280 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 281 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 282 | 282 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 283 | 283 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 284 | 284 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 285 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 286 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 285 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 286 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 287 | 287 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 288 | 288 | } |
| 289 | 289 | } |
@@ -318,9 +318,9 @@ discard block |
||
| 318 | 318 | if (!isset($row['airline_name']) || $row['airline_name'] == '') { |
| 319 | 319 | if (!is_numeric(substr($row['ident'], 0, 3))) { |
| 320 | 320 | if (is_numeric(substr($row['ident'], 2, 1))) { |
| 321 | - $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource); |
|
| 321 | + $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource); |
|
| 322 | 322 | } elseif (is_numeric(substr($row['ident'], 3, 1))) { |
| 323 | - $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource); |
|
| 323 | + $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource); |
|
| 324 | 324 | } else { |
| 325 | 325 | $airline_array = $this->getAllAirlineInfo('NA'); |
| 326 | 326 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') { |
| 360 | - $acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3)); |
|
| 360 | + $acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3)); |
|
| 361 | 361 | //$acars_array = ACARS->getLiveAcarsData('BA40YL'); |
| 362 | 362 | if (count($acars_array) > 0) { |
| 363 | 363 | $temp_array['acars'] = $acars_array; |
@@ -374,11 +374,11 @@ discard block |
||
| 374 | 374 | $temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg']; |
| 375 | 375 | } |
| 376 | 376 | |
| 377 | - if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != '')) |
|
| 377 | + if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != '')) |
|
| 378 | 378 | { |
| 379 | 379 | if ($globalIVAO) { |
| 380 | - if (isset($temp_array['airline_icao'])) $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']); |
|
| 381 | - else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']); |
|
| 380 | + if (isset($temp_array['airline_icao'])) $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']); |
|
| 381 | + else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']); |
|
| 382 | 382 | } else $image_array = $Image->getSpotterImage($temp_array['registration']); |
| 383 | 383 | if (count($image_array) > 0) { |
| 384 | 384 | $temp_array['image'] = $image_array[0]['image']; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | $temp_array['arrival_airport_time'] = $row['arrival_airport_time']; |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | - if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) { |
|
| 405 | + if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) { |
|
| 406 | 406 | if ($schedules === true) { |
| 407 | 407 | $schedule_array = $Schedule->getSchedule($temp_array['ident']); |
| 408 | 408 | //print_r($schedule_array); |
@@ -484,12 +484,12 @@ discard block |
||
| 484 | 484 | if (isset($row['squawk'])) { |
| 485 | 485 | $temp_array['squawk'] = $row['squawk']; |
| 486 | 486 | if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) { |
| 487 | - $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']); |
|
| 488 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 487 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']); |
|
| 488 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 489 | 489 | } elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) { |
| 490 | - $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']); |
|
| 491 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 492 | - } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 490 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']); |
|
| 491 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 492 | + } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | $temp_array['query_number_rows'] = $num_rows; |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | * @return Array the spotter information |
| 509 | 509 | * |
| 510 | 510 | */ |
| 511 | - 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()) |
|
| 511 | + 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()) |
|
| 512 | 512 | { |
| 513 | 513 | global $globalTimezone, $globalDBdriver; |
| 514 | 514 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | |
| 519 | 519 | $query_values = array(); |
| 520 | 520 | $additional_query = ''; |
| 521 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 521 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 522 | 522 | if ($q != "") |
| 523 | 523 | { |
| 524 | 524 | if (!is_string($q)) |
@@ -526,8 +526,8 @@ discard block |
||
| 526 | 526 | return false; |
| 527 | 527 | } else { |
| 528 | 528 | $q_array = explode(" ", $q); |
| 529 | - foreach ($q_array as $q_item){ |
|
| 530 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 529 | + foreach ($q_array as $q_item) { |
|
| 530 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 531 | 531 | $additional_query .= " AND ("; |
| 532 | 532 | if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR "; |
| 533 | 533 | $additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -559,37 +559,37 @@ discard block |
||
| 559 | 559 | |
| 560 | 560 | if ($registration != "") |
| 561 | 561 | { |
| 562 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 562 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 563 | 563 | if (!is_string($registration)) |
| 564 | 564 | { |
| 565 | 565 | return false; |
| 566 | 566 | } else { |
| 567 | 567 | $additional_query .= " AND spotter_output.registration = :registration"; |
| 568 | - $query_values = array_merge($query_values,array(':registration' => $registration)); |
|
| 568 | + $query_values = array_merge($query_values, array(':registration' => $registration)); |
|
| 569 | 569 | } |
| 570 | 570 | } |
| 571 | 571 | |
| 572 | 572 | if ($aircraft_icao != "") |
| 573 | 573 | { |
| 574 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 574 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 575 | 575 | if (!is_string($aircraft_icao)) |
| 576 | 576 | { |
| 577 | 577 | return false; |
| 578 | 578 | } else { |
| 579 | 579 | $additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao"; |
| 580 | - $query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao)); |
|
| 580 | + $query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao)); |
|
| 581 | 581 | } |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | 584 | if ($aircraft_manufacturer != "") |
| 585 | 585 | { |
| 586 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 586 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 587 | 587 | if (!is_string($aircraft_manufacturer)) |
| 588 | 588 | { |
| 589 | 589 | return false; |
| 590 | 590 | } else { |
| 591 | 591 | $additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer"; |
| 592 | - $query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
|
| 592 | + $query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
|
| 593 | 593 | } |
| 594 | 594 | } |
| 595 | 595 | |
@@ -605,25 +605,25 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | if ($airline_icao != "") |
| 607 | 607 | { |
| 608 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 608 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 609 | 609 | if (!is_string($airline_icao)) |
| 610 | 610 | { |
| 611 | 611 | return false; |
| 612 | 612 | } else { |
| 613 | 613 | $additional_query .= " AND spotter_output.airline_icao = :airline_icao"; |
| 614 | - $query_values = array_merge($query_values,array(':airline_icao' => $airline_icao)); |
|
| 614 | + $query_values = array_merge($query_values, array(':airline_icao' => $airline_icao)); |
|
| 615 | 615 | } |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | if ($airline_country != "") |
| 619 | 619 | { |
| 620 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 620 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 621 | 621 | if (!is_string($airline_country)) |
| 622 | 622 | { |
| 623 | 623 | return false; |
| 624 | 624 | } else { |
| 625 | 625 | $additional_query .= " AND spotter_output.airline_country = :airline_country"; |
| 626 | - $query_values = array_merge($query_values,array(':airline_country' => $airline_country)); |
|
| 626 | + $query_values = array_merge($query_values, array(':airline_country' => $airline_country)); |
|
| 627 | 627 | } |
| 628 | 628 | } |
| 629 | 629 | |
@@ -650,31 +650,31 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | if ($airport != "") |
| 652 | 652 | { |
| 653 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 653 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 654 | 654 | if (!is_string($airport)) |
| 655 | 655 | { |
| 656 | 656 | return false; |
| 657 | 657 | } else { |
| 658 | 658 | $additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)"; |
| 659 | - $query_values = array_merge($query_values,array(':airport' => $airport)); |
|
| 659 | + $query_values = array_merge($query_values, array(':airport' => $airport)); |
|
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | 663 | if ($airport_country != "") |
| 664 | 664 | { |
| 665 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 665 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 666 | 666 | if (!is_string($airport_country)) |
| 667 | 667 | { |
| 668 | 668 | return false; |
| 669 | 669 | } else { |
| 670 | 670 | $additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)"; |
| 671 | - $query_values = array_merge($query_values,array(':airport_country' => $airport_country)); |
|
| 671 | + $query_values = array_merge($query_values, array(':airport_country' => $airport_country)); |
|
| 672 | 672 | } |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | if ($callsign != "") |
| 676 | 676 | { |
| 677 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 677 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 678 | 678 | if (!is_string($callsign)) |
| 679 | 679 | { |
| 680 | 680 | return false; |
@@ -682,79 +682,79 @@ discard block |
||
| 682 | 682 | $translate = $Translation->ident2icao($callsign); |
| 683 | 683 | if ($translate != $callsign) { |
| 684 | 684 | $additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)"; |
| 685 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 685 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 686 | 686 | } else { |
| 687 | 687 | $additional_query .= " AND spotter_output.ident = :callsign"; |
| 688 | - $query_values = array_merge($query_values,array(':callsign' => $callsign)); |
|
| 688 | + $query_values = array_merge($query_values, array(':callsign' => $callsign)); |
|
| 689 | 689 | } |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | if ($owner != "") |
| 694 | 694 | { |
| 695 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 695 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 696 | 696 | if (!is_string($owner)) |
| 697 | 697 | { |
| 698 | 698 | return false; |
| 699 | 699 | } else { |
| 700 | 700 | $additional_query .= " AND spotter_output.owner_name = :owner"; |
| 701 | - $query_values = array_merge($query_values,array(':owner' => $owner)); |
|
| 701 | + $query_values = array_merge($query_values, array(':owner' => $owner)); |
|
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | if ($pilot_name != "") |
| 706 | 706 | { |
| 707 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 707 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 708 | 708 | if (!is_string($pilot_name)) |
| 709 | 709 | { |
| 710 | 710 | return false; |
| 711 | 711 | } else { |
| 712 | 712 | $additional_query .= " AND spotter_output.pilot_name = :pilot_name"; |
| 713 | - $query_values = array_merge($query_values,array(':pilot_name' => $pilot_name)); |
|
| 713 | + $query_values = array_merge($query_values, array(':pilot_name' => $pilot_name)); |
|
| 714 | 714 | } |
| 715 | 715 | } |
| 716 | 716 | |
| 717 | 717 | if ($pilot_id != "") |
| 718 | 718 | { |
| 719 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 719 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 720 | 720 | if (!is_string($pilot_id)) |
| 721 | 721 | { |
| 722 | 722 | return false; |
| 723 | 723 | } else { |
| 724 | 724 | $additional_query .= " AND spotter_output.pilot_id = :pilot_id"; |
| 725 | - $query_values = array_merge($query_values,array(':pilot_id' => $pilot_id)); |
|
| 725 | + $query_values = array_merge($query_values, array(':pilot_id' => $pilot_id)); |
|
| 726 | 726 | } |
| 727 | 727 | } |
| 728 | 728 | |
| 729 | 729 | if ($departure_airport_route != "") |
| 730 | 730 | { |
| 731 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 731 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 732 | 732 | if (!is_string($departure_airport_route)) |
| 733 | 733 | { |
| 734 | 734 | return false; |
| 735 | 735 | } else { |
| 736 | 736 | $additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route"; |
| 737 | - $query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route)); |
|
| 737 | + $query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route)); |
|
| 738 | 738 | } |
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | if ($arrival_airport_route != "") |
| 742 | 742 | { |
| 743 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 743 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 744 | 744 | if (!is_string($arrival_airport_route)) |
| 745 | 745 | { |
| 746 | 746 | return false; |
| 747 | 747 | } else { |
| 748 | 748 | $additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route"; |
| 749 | - $query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route)); |
|
| 749 | + $query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route)); |
|
| 750 | 750 | } |
| 751 | 751 | } |
| 752 | 752 | |
| 753 | 753 | if ($altitude != "") |
| 754 | 754 | { |
| 755 | 755 | $altitude_array = explode(",", $altitude); |
| 756 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 757 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 756 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 757 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 758 | 758 | |
| 759 | 759 | if ($altitude_array[1] != "") |
| 760 | 760 | { |
@@ -770,8 +770,8 @@ discard block |
||
| 770 | 770 | if ($date_posted != "") |
| 771 | 771 | { |
| 772 | 772 | $date_array = explode(",", $date_posted); |
| 773 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 774 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 773 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 774 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 775 | 775 | |
| 776 | 776 | if ($globalTimezone != '') { |
| 777 | 777 | date_default_timezone_set($globalTimezone); |
@@ -802,8 +802,8 @@ discard block |
||
| 802 | 802 | { |
| 803 | 803 | $limit_array = explode(",", $limit); |
| 804 | 804 | |
| 805 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 806 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 805 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 806 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 807 | 807 | |
| 808 | 808 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 809 | 809 | { |
@@ -832,23 +832,23 @@ discard block |
||
| 832 | 832 | |
| 833 | 833 | |
| 834 | 834 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 835 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 835 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 836 | 836 | |
| 837 | 837 | if ($globalDBdriver == 'mysql') { |
| 838 | - $query="SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance |
|
| 838 | + $query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance |
|
| 839 | 839 | FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 840 | 840 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query; |
| 841 | 841 | } else { |
| 842 | - $query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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 |
|
| 842 | + $query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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 |
|
| 843 | 843 | FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 844 | 844 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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.$orderby_query; |
| 845 | 845 | } |
| 846 | 846 | } else { |
| 847 | - $query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' |
|
| 847 | + $query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' |
|
| 848 | 848 | ".$additional_query." |
| 849 | 849 | ".$orderby_query; |
| 850 | 850 | } |
| 851 | - $spotter_array = $this->getDataFromDB($query, $query_values,$limit_query); |
|
| 851 | + $spotter_array = $this->getDataFromDB($query, $query_values, $limit_query); |
|
| 852 | 852 | return $spotter_array; |
| 853 | 853 | } |
| 854 | 854 | |
@@ -871,8 +871,8 @@ discard block |
||
| 871 | 871 | { |
| 872 | 872 | $limit_array = explode(",", $limit); |
| 873 | 873 | |
| 874 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 875 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 874 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 875 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 876 | 876 | |
| 877 | 877 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 878 | 878 | { |
@@ -889,9 +889,9 @@ discard block |
||
| 889 | 889 | $orderby_query = " ORDER BY spotter_output.date DESC"; |
| 890 | 890 | } |
| 891 | 891 | |
| 892 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 892 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 893 | 893 | |
| 894 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 894 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 895 | 895 | |
| 896 | 896 | return $spotter_array; |
| 897 | 897 | } |
@@ -937,34 +937,34 @@ discard block |
||
| 937 | 937 | { |
| 938 | 938 | return false; |
| 939 | 939 | } else { |
| 940 | - if ($interval == "30m"){ |
|
| 940 | + if ($interval == "30m") { |
|
| 941 | 941 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date '; |
| 942 | - } else if ($interval == "1h"){ |
|
| 942 | + } else if ($interval == "1h") { |
|
| 943 | 943 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date '; |
| 944 | - } else if ($interval == "3h"){ |
|
| 944 | + } else if ($interval == "3h") { |
|
| 945 | 945 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date '; |
| 946 | - } else if ($interval == "6h"){ |
|
| 946 | + } else if ($interval == "6h") { |
|
| 947 | 947 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date '; |
| 948 | - } else if ($interval == "12h"){ |
|
| 948 | + } else if ($interval == "12h") { |
|
| 949 | 949 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date '; |
| 950 | - } else if ($interval == "24h"){ |
|
| 950 | + } else if ($interval == "24h") { |
|
| 951 | 951 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date '; |
| 952 | - } else if ($interval == "7d"){ |
|
| 952 | + } else if ($interval == "7d") { |
|
| 953 | 953 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date '; |
| 954 | - } else if ($interval == "30d"){ |
|
| 954 | + } else if ($interval == "30d") { |
|
| 955 | 955 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date '; |
| 956 | 956 | } |
| 957 | 957 | } |
| 958 | 958 | } |
| 959 | 959 | |
| 960 | - $query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output |
|
| 960 | + $query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output |
|
| 961 | 961 | WHERE spotter_output.latitude <> '' |
| 962 | 962 | AND spotter_output.longitude <> '' |
| 963 | 963 | ".$additional_query." |
| 964 | 964 | HAVING distance < :radius |
| 965 | 965 | ORDER BY distance"; |
| 966 | 966 | |
| 967 | - $spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query); |
|
| 967 | + $spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query); |
|
| 968 | 968 | |
| 969 | 969 | return $spotter_array; |
| 970 | 970 | } |
@@ -976,21 +976,21 @@ discard block |
||
| 976 | 976 | * @return Array the spotter information |
| 977 | 977 | * |
| 978 | 978 | */ |
| 979 | - public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array()) |
|
| 979 | + public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array()) |
|
| 980 | 980 | { |
| 981 | 981 | global $global_query; |
| 982 | 982 | |
| 983 | 983 | date_default_timezone_set('UTC'); |
| 984 | 984 | |
| 985 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 985 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 986 | 986 | |
| 987 | 987 | $limit_query = ''; |
| 988 | 988 | if ($limit != "") |
| 989 | 989 | { |
| 990 | 990 | $limit_array = explode(",", $limit); |
| 991 | 991 | |
| 992 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 993 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 992 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 993 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 994 | 994 | |
| 995 | 995 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 996 | 996 | { |
@@ -1007,7 +1007,7 @@ discard block |
||
| 1007 | 1007 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | - $query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1010 | + $query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1011 | 1011 | |
| 1012 | 1012 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1013 | 1013 | |
@@ -1026,15 +1026,15 @@ discard block |
||
| 1026 | 1026 | global $global_query; |
| 1027 | 1027 | |
| 1028 | 1028 | date_default_timezone_set('UTC'); |
| 1029 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1029 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1030 | 1030 | |
| 1031 | 1031 | $limit_query = ''; |
| 1032 | 1032 | if ($limit != "") |
| 1033 | 1033 | { |
| 1034 | 1034 | $limit_array = explode(",", $limit); |
| 1035 | 1035 | |
| 1036 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1037 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1036 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1037 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1038 | 1038 | |
| 1039 | 1039 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1040 | 1040 | { |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1052 | 1052 | } |
| 1053 | 1053 | |
| 1054 | - $query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1054 | + $query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1055 | 1055 | |
| 1056 | 1056 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1057 | 1057 | |
@@ -1065,20 +1065,20 @@ discard block |
||
| 1065 | 1065 | * @return Array the spotter information |
| 1066 | 1066 | * |
| 1067 | 1067 | */ |
| 1068 | - public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array()) |
|
| 1068 | + public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array()) |
|
| 1069 | 1069 | { |
| 1070 | 1070 | global $global_query; |
| 1071 | 1071 | |
| 1072 | 1072 | date_default_timezone_set('UTC'); |
| 1073 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1073 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1074 | 1074 | |
| 1075 | 1075 | $limit_query = ''; |
| 1076 | 1076 | if ($limit != "") |
| 1077 | 1077 | { |
| 1078 | 1078 | $limit_array = explode(",", $limit); |
| 1079 | 1079 | |
| 1080 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1081 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1080 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1081 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | 1082 | |
| 1083 | 1083 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1084 | 1084 | { |
@@ -1095,7 +1095,7 @@ discard block |
||
| 1095 | 1095 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1096 | 1096 | } |
| 1097 | 1097 | |
| 1098 | - $query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1098 | + $query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1099 | 1099 | |
| 1100 | 1100 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1101 | 1101 | |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | |
| 1116 | 1116 | date_default_timezone_set('UTC'); |
| 1117 | 1117 | |
| 1118 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1118 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1119 | 1119 | |
| 1120 | 1120 | $limit_query = ''; |
| 1121 | 1121 | |
@@ -1123,8 +1123,8 @@ discard block |
||
| 1123 | 1123 | { |
| 1124 | 1124 | $limit_array = explode(",", $limit); |
| 1125 | 1125 | |
| 1126 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1127 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1126 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1127 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1128 | 1128 | |
| 1129 | 1129 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1130 | 1130 | { |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | - $query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1144 | + $query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1145 | 1145 | |
| 1146 | 1146 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1147 | 1147 | |
@@ -1160,14 +1160,14 @@ discard block |
||
| 1160 | 1160 | global $global_query; |
| 1161 | 1161 | |
| 1162 | 1162 | date_default_timezone_set('UTC'); |
| 1163 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1163 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1164 | 1164 | $limit_query = ''; |
| 1165 | 1165 | if ($limit != "") |
| 1166 | 1166 | { |
| 1167 | 1167 | $limit_array = explode(",", $limit); |
| 1168 | 1168 | |
| 1169 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1170 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1169 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1170 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1171 | 1171 | |
| 1172 | 1172 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1173 | 1173 | { |
@@ -1184,7 +1184,7 @@ discard block |
||
| 1184 | 1184 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1185 | 1185 | } |
| 1186 | 1186 | |
| 1187 | - $query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1187 | + $query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1188 | 1188 | |
| 1189 | 1189 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1190 | 1190 | |
@@ -1208,9 +1208,9 @@ discard block |
||
| 1208 | 1208 | $query_values = array(':id' => $id); |
| 1209 | 1209 | |
| 1210 | 1210 | //$query = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." "; |
| 1211 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 1211 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 1212 | 1212 | |
| 1213 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 1213 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 1214 | 1214 | |
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
@@ -1248,8 +1248,8 @@ discard block |
||
| 1248 | 1248 | { |
| 1249 | 1249 | $limit_array = explode(",", $limit); |
| 1250 | 1250 | |
| 1251 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1252 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1251 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1252 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1253 | 1253 | |
| 1254 | 1254 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1255 | 1255 | { |
@@ -1303,8 +1303,8 @@ discard block |
||
| 1303 | 1303 | { |
| 1304 | 1304 | $limit_array = explode(",", $limit); |
| 1305 | 1305 | |
| 1306 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1307 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1306 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1307 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1308 | 1308 | |
| 1309 | 1309 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1310 | 1310 | { |
@@ -1353,8 +1353,8 @@ discard block |
||
| 1353 | 1353 | { |
| 1354 | 1354 | $limit_array = explode(",", $limit); |
| 1355 | 1355 | |
| 1356 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1357 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1356 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1357 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1358 | 1358 | |
| 1359 | 1359 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1360 | 1360 | { |
@@ -1395,7 +1395,7 @@ discard block |
||
| 1395 | 1395 | $query_values = array(); |
| 1396 | 1396 | $limit_query = ''; |
| 1397 | 1397 | $additional_query = ''; |
| 1398 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1398 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1399 | 1399 | |
| 1400 | 1400 | if ($aircraft_type != "") |
| 1401 | 1401 | { |
@@ -1412,8 +1412,8 @@ discard block |
||
| 1412 | 1412 | { |
| 1413 | 1413 | $limit_array = explode(",", $limit); |
| 1414 | 1414 | |
| 1415 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1416 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1415 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1416 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1417 | 1417 | |
| 1418 | 1418 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1419 | 1419 | { |
@@ -1469,8 +1469,8 @@ discard block |
||
| 1469 | 1469 | { |
| 1470 | 1470 | $limit_array = explode(",", $limit); |
| 1471 | 1471 | |
| 1472 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1473 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1472 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1473 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1474 | 1474 | |
| 1475 | 1475 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1476 | 1476 | { |
@@ -1486,7 +1486,7 @@ discard block |
||
| 1486 | 1486 | } else { |
| 1487 | 1487 | $orderby_query = " ORDER BY spotter_output.date DESC"; |
| 1488 | 1488 | } |
| 1489 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1489 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1490 | 1490 | |
| 1491 | 1491 | //$query = $global_query.$filter_query." spotter_output.ident <> '' ".$additional_query." ".$orderby_query; |
| 1492 | 1492 | $query = $global_query.$filter_query." ".$additional_query." ".$orderby_query; |
@@ -1505,7 +1505,7 @@ discard block |
||
| 1505 | 1505 | * @return Array the spotter information |
| 1506 | 1506 | * |
| 1507 | 1507 | */ |
| 1508 | - public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array()) |
|
| 1508 | + public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array()) |
|
| 1509 | 1509 | { |
| 1510 | 1510 | global $global_query; |
| 1511 | 1511 | |
@@ -1514,7 +1514,7 @@ discard block |
||
| 1514 | 1514 | $query_values = array(); |
| 1515 | 1515 | $limit_query = ''; |
| 1516 | 1516 | $additional_query = ''; |
| 1517 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1517 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1518 | 1518 | |
| 1519 | 1519 | if ($airline != "") |
| 1520 | 1520 | { |
@@ -1531,8 +1531,8 @@ discard block |
||
| 1531 | 1531 | { |
| 1532 | 1532 | $limit_array = explode(",", $limit); |
| 1533 | 1533 | |
| 1534 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1535 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1534 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1535 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1536 | 1536 | |
| 1537 | 1537 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1538 | 1538 | { |
@@ -1562,7 +1562,7 @@ discard block |
||
| 1562 | 1562 | * @return Array the spotter information |
| 1563 | 1563 | * |
| 1564 | 1564 | */ |
| 1565 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1565 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1566 | 1566 | { |
| 1567 | 1567 | global $global_query; |
| 1568 | 1568 | |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | $query_values = array(); |
| 1571 | 1571 | $limit_query = ''; |
| 1572 | 1572 | $additional_query = ''; |
| 1573 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1573 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1574 | 1574 | |
| 1575 | 1575 | if ($airport != "") |
| 1576 | 1576 | { |
@@ -1587,8 +1587,8 @@ discard block |
||
| 1587 | 1587 | { |
| 1588 | 1588 | $limit_array = explode(",", $limit); |
| 1589 | 1589 | |
| 1590 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1591 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1590 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1591 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1592 | 1592 | |
| 1593 | 1593 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1594 | 1594 | { |
@@ -1620,7 +1620,7 @@ discard block |
||
| 1620 | 1620 | * @return Array the spotter information |
| 1621 | 1621 | * |
| 1622 | 1622 | */ |
| 1623 | - public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 1623 | + public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 1624 | 1624 | { |
| 1625 | 1625 | global $global_query, $globalTimezone, $globalDBdriver; |
| 1626 | 1626 | |
@@ -1628,7 +1628,7 @@ discard block |
||
| 1628 | 1628 | $limit_query = ''; |
| 1629 | 1629 | $additional_query = ''; |
| 1630 | 1630 | |
| 1631 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1631 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1632 | 1632 | |
| 1633 | 1633 | if ($date != "") |
| 1634 | 1634 | { |
@@ -1657,8 +1657,8 @@ discard block |
||
| 1657 | 1657 | { |
| 1658 | 1658 | $limit_array = explode(",", $limit); |
| 1659 | 1659 | |
| 1660 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1661 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1660 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1661 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1662 | 1662 | |
| 1663 | 1663 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1664 | 1664 | { |
@@ -1688,7 +1688,7 @@ discard block |
||
| 1688 | 1688 | * @return Array the spotter information |
| 1689 | 1689 | * |
| 1690 | 1690 | */ |
| 1691 | - public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array()) |
|
| 1691 | + public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array()) |
|
| 1692 | 1692 | { |
| 1693 | 1693 | global $global_query; |
| 1694 | 1694 | |
@@ -1697,7 +1697,7 @@ discard block |
||
| 1697 | 1697 | $query_values = array(); |
| 1698 | 1698 | $limit_query = ''; |
| 1699 | 1699 | $additional_query = ''; |
| 1700 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1700 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1701 | 1701 | if ($country != "") |
| 1702 | 1702 | { |
| 1703 | 1703 | if (!is_string($country)) |
@@ -1714,8 +1714,8 @@ discard block |
||
| 1714 | 1714 | { |
| 1715 | 1715 | $limit_array = explode(",", $limit); |
| 1716 | 1716 | |
| 1717 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1718 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1717 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1718 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1719 | 1719 | |
| 1720 | 1720 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1721 | 1721 | { |
@@ -1755,7 +1755,7 @@ discard block |
||
| 1755 | 1755 | $query_values = array(); |
| 1756 | 1756 | $additional_query = ''; |
| 1757 | 1757 | $limit_query = ''; |
| 1758 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1758 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1759 | 1759 | |
| 1760 | 1760 | if ($aircraft_manufacturer != "") |
| 1761 | 1761 | { |
@@ -1772,8 +1772,8 @@ discard block |
||
| 1772 | 1772 | { |
| 1773 | 1773 | $limit_array = explode(",", $limit); |
| 1774 | 1774 | |
| 1775 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1776 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1775 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1776 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1777 | 1777 | |
| 1778 | 1778 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1779 | 1779 | { |
@@ -1815,14 +1815,14 @@ discard block |
||
| 1815 | 1815 | $query_values = array(); |
| 1816 | 1816 | $additional_query = ''; |
| 1817 | 1817 | $limit_query = ''; |
| 1818 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1818 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1819 | 1819 | if ($departure_airport_icao != "") |
| 1820 | 1820 | { |
| 1821 | 1821 | if (!is_string($departure_airport_icao)) |
| 1822 | 1822 | { |
| 1823 | 1823 | return false; |
| 1824 | 1824 | } else { |
| 1825 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1825 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1826 | 1826 | $additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)"; |
| 1827 | 1827 | //$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao AND spotter_output.real_departure_airport_icao IS NULL) OR spotter_output.real_departure_airport_icao = :departure_airport_icao"; |
| 1828 | 1828 | $query_values = array(':departure_airport_icao' => $departure_airport_icao); |
@@ -1835,10 +1835,10 @@ discard block |
||
| 1835 | 1835 | { |
| 1836 | 1836 | return false; |
| 1837 | 1837 | } else { |
| 1838 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1838 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1839 | 1839 | $additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)"; |
| 1840 | 1840 | //$additional_query .= " AND ((spotter_output.arrival_airport_icao = :arrival_airport_icao AND spotter_output.real_arrival_airport_icao IS NULL) OR spotter_output.real_arrival_airport_icao = :arrival_airport_icao)"; |
| 1841 | - $query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 1841 | + $query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 1842 | 1842 | } |
| 1843 | 1843 | } |
| 1844 | 1844 | |
@@ -1846,8 +1846,8 @@ discard block |
||
| 1846 | 1846 | { |
| 1847 | 1847 | $limit_array = explode(",", $limit); |
| 1848 | 1848 | |
| 1849 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1850 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1849 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1850 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1851 | 1851 | |
| 1852 | 1852 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1853 | 1853 | { |
@@ -1886,15 +1886,15 @@ discard block |
||
| 1886 | 1886 | global $global_query; |
| 1887 | 1887 | |
| 1888 | 1888 | date_default_timezone_set('UTC'); |
| 1889 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1889 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1890 | 1890 | $limit_query = ''; |
| 1891 | 1891 | |
| 1892 | 1892 | if ($limit != "") |
| 1893 | 1893 | { |
| 1894 | 1894 | $limit_array = explode(",", $limit); |
| 1895 | 1895 | |
| 1896 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1897 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1896 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1897 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1898 | 1898 | |
| 1899 | 1899 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1900 | 1900 | { |
@@ -1911,7 +1911,7 @@ discard block |
||
| 1911 | 1911 | $orderby_query = " ORDER BY spotter_output.date DESC"; |
| 1912 | 1912 | } |
| 1913 | 1913 | |
| 1914 | - $query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query; |
|
| 1914 | + $query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query; |
|
| 1915 | 1915 | |
| 1916 | 1916 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1917 | 1917 | |
@@ -1924,19 +1924,19 @@ discard block |
||
| 1924 | 1924 | * @return String the highlight text |
| 1925 | 1925 | * |
| 1926 | 1926 | */ |
| 1927 | - public function getHighlightByRegistration($registration,$filter = array()) |
|
| 1927 | + public function getHighlightByRegistration($registration, $filter = array()) |
|
| 1928 | 1928 | { |
| 1929 | 1929 | global $global_query; |
| 1930 | 1930 | |
| 1931 | 1931 | date_default_timezone_set('UTC'); |
| 1932 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1933 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 1932 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1933 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 1934 | 1934 | |
| 1935 | - $query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration"; |
|
| 1935 | + $query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration"; |
|
| 1936 | 1936 | $sth = $this->db->prepare($query); |
| 1937 | 1937 | $sth->execute(array(':registration' => $registration)); |
| 1938 | 1938 | |
| 1939 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1939 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1940 | 1940 | { |
| 1941 | 1941 | $highlight = $row['highlight']; |
| 1942 | 1942 | } |
@@ -1952,14 +1952,14 @@ discard block |
||
| 1952 | 1952 | * @return String usage |
| 1953 | 1953 | * |
| 1954 | 1954 | */ |
| 1955 | - public function getSquawkUsage($squawk = '',$country = 'FR') |
|
| 1955 | + public function getSquawkUsage($squawk = '', $country = 'FR') |
|
| 1956 | 1956 | { |
| 1957 | 1957 | |
| 1958 | - $squawk = filter_var($squawk,FILTER_SANITIZE_STRING); |
|
| 1959 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 1958 | + $squawk = filter_var($squawk, FILTER_SANITIZE_STRING); |
|
| 1959 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 1960 | 1960 | |
| 1961 | 1961 | $query = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1"; |
| 1962 | - $query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country); |
|
| 1962 | + $query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country); |
|
| 1963 | 1963 | |
| 1964 | 1964 | $sth = $this->db->prepare($query); |
| 1965 | 1965 | $sth->execute($query_values); |
@@ -1981,9 +1981,9 @@ discard block |
||
| 1981 | 1981 | public function getAirportIcao($airport_iata = '') |
| 1982 | 1982 | { |
| 1983 | 1983 | |
| 1984 | - $airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING); |
|
| 1984 | + $airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING); |
|
| 1985 | 1985 | |
| 1986 | - $query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1"; |
|
| 1986 | + $query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1"; |
|
| 1987 | 1987 | $query_values = array(':airport' => $airport_iata); |
| 1988 | 1988 | |
| 1989 | 1989 | $sth = $this->db->prepare($query); |
@@ -2005,12 +2005,12 @@ discard block |
||
| 2005 | 2005 | * @return Float distance to the airport |
| 2006 | 2006 | * |
| 2007 | 2007 | */ |
| 2008 | - public function getAirportDistance($airport_icao,$latitude,$longitude) |
|
| 2008 | + public function getAirportDistance($airport_icao, $latitude, $longitude) |
|
| 2009 | 2009 | { |
| 2010 | 2010 | |
| 2011 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 2011 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 2012 | 2012 | |
| 2013 | - $query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1"; |
|
| 2013 | + $query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1"; |
|
| 2014 | 2014 | $query_values = array(':airport' => $airport_icao); |
| 2015 | 2015 | $sth = $this->db->prepare($query); |
| 2016 | 2016 | $sth->execute($query_values); |
@@ -2020,7 +2020,7 @@ discard block |
||
| 2020 | 2020 | $airport_latitude = $row['latitude']; |
| 2021 | 2021 | $airport_longitude = $row['longitude']; |
| 2022 | 2022 | $Common = new Common(); |
| 2023 | - return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude); |
|
| 2023 | + return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude); |
|
| 2024 | 2024 | } else return ''; |
| 2025 | 2025 | } |
| 2026 | 2026 | |
@@ -2034,11 +2034,11 @@ discard block |
||
| 2034 | 2034 | public function getAllAirportInfo($airport = '') |
| 2035 | 2035 | { |
| 2036 | 2036 | |
| 2037 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 2037 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 2038 | 2038 | |
| 2039 | 2039 | $query_values = array(); |
| 2040 | 2040 | if ($airport == 'NA') { |
| 2041 | - return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => '')); |
|
| 2041 | + return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => '')); |
|
| 2042 | 2042 | } elseif ($airport == '') { |
| 2043 | 2043 | $query = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport"; |
| 2044 | 2044 | } else { |
@@ -2086,14 +2086,14 @@ discard block |
||
| 2086 | 2086 | { |
| 2087 | 2087 | $lst_countries = ''; |
| 2088 | 2088 | foreach ($countries as $country) { |
| 2089 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 2089 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 2090 | 2090 | if ($lst_countries == '') { |
| 2091 | 2091 | $lst_countries = "'".$country."'"; |
| 2092 | 2092 | } else { |
| 2093 | 2093 | $lst_countries .= ",'".$country."'"; |
| 2094 | 2094 | } |
| 2095 | 2095 | } |
| 2096 | - $query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")"; |
|
| 2096 | + $query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")"; |
|
| 2097 | 2097 | |
| 2098 | 2098 | $sth = $this->db->prepare($query); |
| 2099 | 2099 | $sth->execute(); |
@@ -2101,7 +2101,7 @@ discard block |
||
| 2101 | 2101 | $airport_array = array(); |
| 2102 | 2102 | $temp_array = array(); |
| 2103 | 2103 | |
| 2104 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2104 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2105 | 2105 | { |
| 2106 | 2106 | $temp_array['name'] = $row['name']; |
| 2107 | 2107 | $temp_array['city'] = $row['city']; |
@@ -2129,10 +2129,10 @@ discard block |
||
| 2129 | 2129 | { |
| 2130 | 2130 | global $globalDBdriver; |
| 2131 | 2131 | if (is_array($coord)) { |
| 2132 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2133 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2134 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2135 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2132 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2133 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2134 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2135 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2136 | 2136 | } else return array(); |
| 2137 | 2137 | if ($globalDBdriver == 'mysql') { |
| 2138 | 2138 | $query = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'"; |
@@ -2144,7 +2144,7 @@ discard block |
||
| 2144 | 2144 | |
| 2145 | 2145 | $airport_array = array(); |
| 2146 | 2146 | |
| 2147 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2147 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2148 | 2148 | { |
| 2149 | 2149 | $temp_array = $row; |
| 2150 | 2150 | |
@@ -2164,13 +2164,13 @@ discard block |
||
| 2164 | 2164 | public function getAllWaypointsInfobyCoord($coord) |
| 2165 | 2165 | { |
| 2166 | 2166 | if (is_array($coord)) { |
| 2167 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2168 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2169 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2170 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2167 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2168 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2169 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2170 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2171 | 2171 | } else return array(); |
| 2172 | 2172 | //$query = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong; |
| 2173 | - $query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 2173 | + $query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 2174 | 2174 | //$query = "SELECT waypoints.* FROM waypoints"; |
| 2175 | 2175 | //$query = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end"; |
| 2176 | 2176 | //$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong; |
@@ -2182,7 +2182,7 @@ discard block |
||
| 2182 | 2182 | |
| 2183 | 2183 | $waypoints_array = array(); |
| 2184 | 2184 | |
| 2185 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2185 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2186 | 2186 | { |
| 2187 | 2187 | $temp_array = $row; |
| 2188 | 2188 | |
@@ -2204,10 +2204,10 @@ discard block |
||
| 2204 | 2204 | { |
| 2205 | 2205 | global $globalUseRealAirlines; |
| 2206 | 2206 | if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL; |
| 2207 | - $airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING)); |
|
| 2207 | + $airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING)); |
|
| 2208 | 2208 | if ($airline_icao == 'NA') { |
| 2209 | 2209 | $airline_array = array(); |
| 2210 | - $airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>''); |
|
| 2210 | + $airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>''); |
|
| 2211 | 2211 | return $airline_array; |
| 2212 | 2212 | } else { |
| 2213 | 2213 | if (strlen($airline_icao) == 2) { |
@@ -2228,7 +2228,7 @@ discard block |
||
| 2228 | 2228 | if ($fromsource === NULL) { |
| 2229 | 2229 | $sth->execute(array(':airline_icao' => $airline_icao)); |
| 2230 | 2230 | } else { |
| 2231 | - $sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource)); |
|
| 2231 | + $sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource)); |
|
| 2232 | 2232 | } |
| 2233 | 2233 | /* |
| 2234 | 2234 | $airline_array = array(); |
@@ -2273,13 +2273,13 @@ discard block |
||
| 2273 | 2273 | { |
| 2274 | 2274 | global $globalUseRealAirlines; |
| 2275 | 2275 | if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL; |
| 2276 | - $airline_name = strtolower(filter_var($airline_name,FILTER_SANITIZE_STRING)); |
|
| 2277 | - $query = "SELECT airlines.name, airlines.iata, airlines.icao, airlines.callsign, airlines.country, airlines.type FROM airlines WHERE lower(airlines.name) = :airline_name AND airlines.active = 'Y' AND airlines.forsource IS NULL LIMIT 1"; |
|
| 2276 | + $airline_name = strtolower(filter_var($airline_name, FILTER_SANITIZE_STRING)); |
|
| 2277 | + $query = "SELECT airlines.name, airlines.iata, airlines.icao, airlines.callsign, airlines.country, airlines.type FROM airlines WHERE lower(airlines.name) = :airline_name AND airlines.active = 'Y' AND airlines.forsource IS NULL LIMIT 1"; |
|
| 2278 | 2278 | $sth = $this->db->prepare($query); |
| 2279 | 2279 | if ($fromsource === NULL) { |
| 2280 | 2280 | $sth->execute(array(':airline_name' => $airline_name)); |
| 2281 | 2281 | } else { |
| 2282 | - $sth->execute(array(':airline_name' => $airline_name,':fromsource' => $fromsource)); |
|
| 2282 | + $sth->execute(array(':airline_name' => $airline_name, ':fromsource' => $fromsource)); |
|
| 2283 | 2283 | } |
| 2284 | 2284 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 2285 | 2285 | if (empty($result) && $fromsource !== NULL) { |
@@ -2304,12 +2304,12 @@ discard block |
||
| 2304 | 2304 | */ |
| 2305 | 2305 | public function getAllAircraftInfo($aircraft_type) |
| 2306 | 2306 | { |
| 2307 | - $aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING); |
|
| 2307 | + $aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING); |
|
| 2308 | 2308 | |
| 2309 | 2309 | if ($aircraft_type == 'NA') { |
| 2310 | - return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL)); |
|
| 2310 | + return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL)); |
|
| 2311 | 2311 | } |
| 2312 | - $query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type"; |
|
| 2312 | + $query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type"; |
|
| 2313 | 2313 | |
| 2314 | 2314 | $sth = $this->db->prepare($query); |
| 2315 | 2315 | $sth->execute(array(':aircraft_type' => $aircraft_type)); |
@@ -2341,7 +2341,7 @@ discard block |
||
| 2341 | 2341 | */ |
| 2342 | 2342 | public function getAircraftIcao($aircraft_type) |
| 2343 | 2343 | { |
| 2344 | - $aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING); |
|
| 2344 | + $aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING); |
|
| 2345 | 2345 | $all_aircraft = array('737-300' => 'B733', |
| 2346 | 2346 | '777-200' => 'B772', |
| 2347 | 2347 | '777-200ER' => 'B772', |
@@ -2353,10 +2353,10 @@ discard block |
||
| 2353 | 2353 | 'A380' => 'A388'); |
| 2354 | 2354 | if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type]; |
| 2355 | 2355 | |
| 2356 | - $query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1"; |
|
| 2356 | + $query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1"; |
|
| 2357 | 2357 | $aircraft_type = strtoupper($aircraft_type); |
| 2358 | 2358 | $sth = $this->db->prepare($query); |
| 2359 | - $sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,)); |
|
| 2359 | + $sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,)); |
|
| 2360 | 2360 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 2361 | 2361 | if (isset($result[0]['icao'])) return $result[0]['icao']; |
| 2362 | 2362 | else return ''; |
@@ -2371,9 +2371,9 @@ discard block |
||
| 2371 | 2371 | */ |
| 2372 | 2372 | public function getAllAircraftType($aircraft_modes) |
| 2373 | 2373 | { |
| 2374 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 2374 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 2375 | 2375 | |
| 2376 | - $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 2376 | + $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 2377 | 2377 | |
| 2378 | 2378 | $sth = $this->db->prepare($query); |
| 2379 | 2379 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -2396,9 +2396,9 @@ discard block |
||
| 2396 | 2396 | */ |
| 2397 | 2397 | public function getAllAircraftTypeByRegistration($registration) |
| 2398 | 2398 | { |
| 2399 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2399 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2400 | 2400 | |
| 2401 | - $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 2401 | + $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 2402 | 2402 | |
| 2403 | 2403 | $sth = $this->db->prepare($query); |
| 2404 | 2404 | $sth->execute(array(':registration' => $registration)); |
@@ -2419,9 +2419,9 @@ discard block |
||
| 2419 | 2419 | */ |
| 2420 | 2420 | public function getAllIDByRegistration($registration) |
| 2421 | 2421 | { |
| 2422 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2422 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2423 | 2423 | |
| 2424 | - $query = "SELECT spotter_id,flightaware_id, date FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2424 | + $query = "SELECT spotter_id,flightaware_id, date FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2425 | 2425 | |
| 2426 | 2426 | $sth = $this->db->prepare($query); |
| 2427 | 2427 | $sth->execute(array(':registration' => $registration)); |
@@ -2429,7 +2429,7 @@ discard block |
||
| 2429 | 2429 | $idarray = array(); |
| 2430 | 2430 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 2431 | 2431 | $date = $row['date']; |
| 2432 | - $idarray[$date] = array('flightaware_id' => $row['flightaware_id'],'spotter_id' => $row['spotter_id']); |
|
| 2432 | + $idarray[$date] = array('flightaware_id' => $row['flightaware_id'], 'spotter_id' => $row['spotter_id']); |
|
| 2433 | 2433 | } |
| 2434 | 2434 | return $idarray; |
| 2435 | 2435 | } |
@@ -2443,8 +2443,8 @@ discard block |
||
| 2443 | 2443 | */ |
| 2444 | 2444 | public function getOperator($operator) |
| 2445 | 2445 | { |
| 2446 | - $operator = filter_var($operator,FILTER_SANITIZE_STRING); |
|
| 2447 | - $query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1"; |
|
| 2446 | + $operator = filter_var($operator, FILTER_SANITIZE_STRING); |
|
| 2447 | + $query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1"; |
|
| 2448 | 2448 | |
| 2449 | 2449 | $sth = $this->db->prepare($query); |
| 2450 | 2450 | $sth->execute(array(':operator' => $operator)); |
@@ -2465,9 +2465,9 @@ discard block |
||
| 2465 | 2465 | */ |
| 2466 | 2466 | public function getRouteInfo($callsign) |
| 2467 | 2467 | { |
| 2468 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 2468 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 2469 | 2469 | if ($callsign == '') return array(); |
| 2470 | - $query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1"; |
|
| 2470 | + $query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1"; |
|
| 2471 | 2471 | |
| 2472 | 2472 | $sth = $this->db->prepare($query); |
| 2473 | 2473 | $sth->execute(array(':callsign' => $callsign)); |
@@ -2488,9 +2488,9 @@ discard block |
||
| 2488 | 2488 | */ |
| 2489 | 2489 | public function getAircraftInfoByRegistration($registration) |
| 2490 | 2490 | { |
| 2491 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2491 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2492 | 2492 | |
| 2493 | - $query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2493 | + $query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2494 | 2494 | |
| 2495 | 2495 | $sth = $this->db->prepare($query); |
| 2496 | 2496 | $sth->execute(array(':registration' => $registration)); |
@@ -2498,7 +2498,7 @@ discard block |
||
| 2498 | 2498 | $aircraft_array = array(); |
| 2499 | 2499 | $temp_array = array(); |
| 2500 | 2500 | |
| 2501 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2501 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2502 | 2502 | { |
| 2503 | 2503 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 2504 | 2504 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
@@ -2520,7 +2520,7 @@ discard block |
||
| 2520 | 2520 | */ |
| 2521 | 2521 | public function getAircraftOwnerByRegistration($registration) |
| 2522 | 2522 | { |
| 2523 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2523 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2524 | 2524 | $Connection = new Connection($this->db); |
| 2525 | 2525 | if ($Connection->tableExists('aircraft_owner')) { |
| 2526 | 2526 | $query = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1"; |
@@ -2542,7 +2542,7 @@ discard block |
||
| 2542 | 2542 | public function getAllFlightsforSitemap() |
| 2543 | 2543 | { |
| 2544 | 2544 | //$query = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT "; |
| 2545 | - $query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0"; |
|
| 2545 | + $query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0"; |
|
| 2546 | 2546 | |
| 2547 | 2547 | $sth = $this->db->prepare($query); |
| 2548 | 2548 | $sth->execute(); |
@@ -2589,7 +2589,7 @@ discard block |
||
| 2589 | 2589 | $manufacturer_array = array(); |
| 2590 | 2590 | $temp_array = array(); |
| 2591 | 2591 | |
| 2592 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2592 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2593 | 2593 | { |
| 2594 | 2594 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 2595 | 2595 | |
@@ -2626,7 +2626,7 @@ discard block |
||
| 2626 | 2626 | $aircraft_array = array(); |
| 2627 | 2627 | $temp_array = array(); |
| 2628 | 2628 | |
| 2629 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2629 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2630 | 2630 | { |
| 2631 | 2631 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 2632 | 2632 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
@@ -2647,8 +2647,8 @@ discard block |
||
| 2647 | 2647 | */ |
| 2648 | 2648 | public function getAllAircraftRegistrations($filters = array()) |
| 2649 | 2649 | { |
| 2650 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2651 | - $query = "SELECT DISTINCT spotter_output.registration |
|
| 2650 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2651 | + $query = "SELECT DISTINCT spotter_output.registration |
|
| 2652 | 2652 | FROM spotter_output".$filter_query." spotter_output.registration <> '' |
| 2653 | 2653 | ORDER BY spotter_output.registration ASC"; |
| 2654 | 2654 | |
@@ -2658,7 +2658,7 @@ discard block |
||
| 2658 | 2658 | $aircraft_array = array(); |
| 2659 | 2659 | $temp_array = array(); |
| 2660 | 2660 | |
| 2661 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2661 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2662 | 2662 | { |
| 2663 | 2663 | $temp_array['registration'] = $row['registration']; |
| 2664 | 2664 | |
@@ -2675,11 +2675,11 @@ discard block |
||
| 2675 | 2675 | * @return Array list of source name |
| 2676 | 2676 | * |
| 2677 | 2677 | */ |
| 2678 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 2678 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 2679 | 2679 | { |
| 2680 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2680 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2681 | 2681 | $query_values = array(); |
| 2682 | - $query = "SELECT DISTINCT spotter_output.source_name |
|
| 2682 | + $query = "SELECT DISTINCT spotter_output.source_name |
|
| 2683 | 2683 | FROM spotter_output".$filter_query." spotter_output.source_name <> ''"; |
| 2684 | 2684 | if ($type != '') { |
| 2685 | 2685 | $query_values = array(':type' => $type); |
@@ -2694,7 +2694,7 @@ discard block |
||
| 2694 | 2694 | $source_array = array(); |
| 2695 | 2695 | $temp_array = array(); |
| 2696 | 2696 | |
| 2697 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2697 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2698 | 2698 | { |
| 2699 | 2699 | $temp_array['source_name'] = $row['source_name']; |
| 2700 | 2700 | $source_array[] = $temp_array; |
@@ -2710,11 +2710,11 @@ discard block |
||
| 2710 | 2710 | * @return Array list of airline names |
| 2711 | 2711 | * |
| 2712 | 2712 | */ |
| 2713 | - public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array()) |
|
| 2713 | + public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array()) |
|
| 2714 | 2714 | { |
| 2715 | - global $globalAirlinesSource,$globalVATSIM, $globalIVAO; |
|
| 2716 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2717 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 2715 | + global $globalAirlinesSource, $globalVATSIM, $globalIVAO; |
|
| 2716 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2717 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 2718 | 2718 | if ($airline_type == '' || $airline_type == 'all') { |
| 2719 | 2719 | /* |
| 2720 | 2720 | $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
@@ -2733,7 +2733,7 @@ discard block |
||
| 2733 | 2733 | $query_data = array(':forsource' => $forsource); |
| 2734 | 2734 | } |
| 2735 | 2735 | } else { |
| 2736 | - $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
|
| 2736 | + $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
|
| 2737 | 2737 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' |
| 2738 | 2738 | AND spotter_output.airline_type = :airline_type |
| 2739 | 2739 | ORDER BY spotter_output.airline_icao ASC"; |
@@ -2746,7 +2746,7 @@ discard block |
||
| 2746 | 2746 | $airline_array = array(); |
| 2747 | 2747 | $temp_array = array(); |
| 2748 | 2748 | |
| 2749 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2749 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2750 | 2750 | { |
| 2751 | 2751 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 2752 | 2752 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -2763,10 +2763,10 @@ discard block |
||
| 2763 | 2763 | * @return Array list of alliance names |
| 2764 | 2764 | * |
| 2765 | 2765 | */ |
| 2766 | - public function getAllAllianceNames($forsource = NULL,$filters = array()) |
|
| 2766 | + public function getAllAllianceNames($forsource = NULL, $filters = array()) |
|
| 2767 | 2767 | { |
| 2768 | - global $globalAirlinesSource,$globalVATSIM, $globalIVAO; |
|
| 2769 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2768 | + global $globalAirlinesSource, $globalVATSIM, $globalIVAO; |
|
| 2769 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2770 | 2770 | if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource; |
| 2771 | 2771 | elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim'; |
| 2772 | 2772 | elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao'; |
@@ -2794,8 +2794,8 @@ discard block |
||
| 2794 | 2794 | */ |
| 2795 | 2795 | public function getAllAirlineCountries($filters = array()) |
| 2796 | 2796 | { |
| 2797 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2798 | - $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2797 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2798 | + $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2799 | 2799 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' |
| 2800 | 2800 | ORDER BY spotter_output.airline_country ASC"; |
| 2801 | 2801 | |
@@ -2806,7 +2806,7 @@ discard block |
||
| 2806 | 2806 | $airline_array = array(); |
| 2807 | 2807 | $temp_array = array(); |
| 2808 | 2808 | |
| 2809 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2809 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2810 | 2810 | { |
| 2811 | 2811 | $temp_array['airline_country'] = $row['airline_country']; |
| 2812 | 2812 | |
@@ -2826,9 +2826,9 @@ discard block |
||
| 2826 | 2826 | */ |
| 2827 | 2827 | public function getAllAirportNames($filters = array()) |
| 2828 | 2828 | { |
| 2829 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2829 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2830 | 2830 | $airport_array = array(); |
| 2831 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country |
|
| 2831 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country |
|
| 2832 | 2832 | FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA' |
| 2833 | 2833 | ORDER BY spotter_output.departure_airport_city ASC"; |
| 2834 | 2834 | |
@@ -2837,7 +2837,7 @@ discard block |
||
| 2837 | 2837 | $sth->execute(); |
| 2838 | 2838 | |
| 2839 | 2839 | $temp_array = array(); |
| 2840 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2840 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2841 | 2841 | { |
| 2842 | 2842 | $temp_array['airport_icao'] = $row['airport_icao']; |
| 2843 | 2843 | $temp_array['airport_name'] = $row['airport_name']; |
@@ -2847,14 +2847,14 @@ discard block |
||
| 2847 | 2847 | $airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array; |
| 2848 | 2848 | } |
| 2849 | 2849 | |
| 2850 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country |
|
| 2850 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country |
|
| 2851 | 2851 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' |
| 2852 | 2852 | ORDER BY spotter_output.arrival_airport_city ASC"; |
| 2853 | 2853 | |
| 2854 | 2854 | $sth = $this->db->prepare($query); |
| 2855 | 2855 | $sth->execute(); |
| 2856 | 2856 | |
| 2857 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2857 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2858 | 2858 | { |
| 2859 | 2859 | // if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao']) |
| 2860 | 2860 | // { |
@@ -2878,8 +2878,8 @@ discard block |
||
| 2878 | 2878 | */ |
| 2879 | 2879 | public function getAllOwnerNames($filters = array()) |
| 2880 | 2880 | { |
| 2881 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2882 | - $query = "SELECT DISTINCT spotter_output.owner_name |
|
| 2881 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2882 | + $query = "SELECT DISTINCT spotter_output.owner_name |
|
| 2883 | 2883 | FROM spotter_output".$filter_query." spotter_output.owner_name <> '' |
| 2884 | 2884 | ORDER BY spotter_output.owner_name ASC"; |
| 2885 | 2885 | |
@@ -2896,8 +2896,8 @@ discard block |
||
| 2896 | 2896 | */ |
| 2897 | 2897 | public function getAllPilotNames($filters = array()) |
| 2898 | 2898 | { |
| 2899 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2900 | - $query = "SELECT DISTINCT spotter_output.pilot_name, spotter_output.pilot_id |
|
| 2899 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2900 | + $query = "SELECT DISTINCT spotter_output.pilot_name, spotter_output.pilot_id |
|
| 2901 | 2901 | FROM spotter_output".$filter_query." spotter_output.pilot_name <> '' |
| 2902 | 2902 | ORDER BY spotter_output.pilot_name ASC"; |
| 2903 | 2903 | |
@@ -2930,21 +2930,21 @@ discard block |
||
| 2930 | 2930 | |
| 2931 | 2931 | $temp_array = array(); |
| 2932 | 2932 | |
| 2933 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2933 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2934 | 2934 | { |
| 2935 | 2935 | $temp_array['airport_country'] = $row['airport_country']; |
| 2936 | 2936 | |
| 2937 | 2937 | $airport_array[$row['airport_country']] = $temp_array; |
| 2938 | 2938 | } |
| 2939 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2940 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2939 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2940 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2941 | 2941 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' |
| 2942 | 2942 | ORDER BY spotter_output.arrival_airport_country ASC"; |
| 2943 | 2943 | |
| 2944 | 2944 | $sth = $this->db->prepare($query); |
| 2945 | 2945 | $sth->execute(); |
| 2946 | 2946 | |
| 2947 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2947 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2948 | 2948 | { |
| 2949 | 2949 | if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country']) |
| 2950 | 2950 | { |
@@ -2967,9 +2967,9 @@ discard block |
||
| 2967 | 2967 | */ |
| 2968 | 2968 | public function getAllCountries($filters = array()) |
| 2969 | 2969 | { |
| 2970 | - $Connection= new Connection($this->db); |
|
| 2970 | + $Connection = new Connection($this->db); |
|
| 2971 | 2971 | if ($Connection->tableExists('countries')) { |
| 2972 | - $query = "SELECT countries.name AS airport_country |
|
| 2972 | + $query = "SELECT countries.name AS airport_country |
|
| 2973 | 2973 | FROM countries |
| 2974 | 2974 | ORDER BY countries.name ASC"; |
| 2975 | 2975 | $sth = $this->db->prepare($query); |
@@ -2978,14 +2978,14 @@ discard block |
||
| 2978 | 2978 | $temp_array = array(); |
| 2979 | 2979 | $country_array = array(); |
| 2980 | 2980 | |
| 2981 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2981 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2982 | 2982 | { |
| 2983 | 2983 | $temp_array['country'] = $row['airport_country']; |
| 2984 | 2984 | $country_array[$row['airport_country']] = $temp_array; |
| 2985 | 2985 | } |
| 2986 | 2986 | } else { |
| 2987 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2988 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country |
|
| 2987 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2988 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country |
|
| 2989 | 2989 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' |
| 2990 | 2990 | ORDER BY spotter_output.departure_airport_country ASC"; |
| 2991 | 2991 | |
@@ -2994,20 +2994,20 @@ discard block |
||
| 2994 | 2994 | |
| 2995 | 2995 | $temp_array = array(); |
| 2996 | 2996 | $country_array = array(); |
| 2997 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2997 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2998 | 2998 | { |
| 2999 | 2999 | $temp_array['country'] = $row['airport_country']; |
| 3000 | 3000 | $country_array[$row['airport_country']] = $temp_array; |
| 3001 | 3001 | } |
| 3002 | 3002 | |
| 3003 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 3003 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 3004 | 3004 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' |
| 3005 | 3005 | ORDER BY spotter_output.arrival_airport_country ASC"; |
| 3006 | 3006 | |
| 3007 | 3007 | $sth = $this->db->prepare($query); |
| 3008 | 3008 | $sth->execute(); |
| 3009 | 3009 | |
| 3010 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3010 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3011 | 3011 | { |
| 3012 | 3012 | if ($country_array[$row['airport_country']]['country'] != $row['airport_country']) |
| 3013 | 3013 | { |
@@ -3017,14 +3017,14 @@ discard block |
||
| 3017 | 3017 | } |
| 3018 | 3018 | } |
| 3019 | 3019 | |
| 3020 | - $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 3020 | + $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 3021 | 3021 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' |
| 3022 | 3022 | ORDER BY spotter_output.airline_country ASC"; |
| 3023 | 3023 | |
| 3024 | 3024 | $sth = $this->db->prepare($query); |
| 3025 | 3025 | $sth->execute(); |
| 3026 | 3026 | |
| 3027 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3027 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3028 | 3028 | { |
| 3029 | 3029 | if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country']) |
| 3030 | 3030 | { |
@@ -3048,8 +3048,8 @@ discard block |
||
| 3048 | 3048 | */ |
| 3049 | 3049 | public function getAllIdents($filters = array()) |
| 3050 | 3050 | { |
| 3051 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3052 | - $query = "SELECT DISTINCT spotter_output.ident |
|
| 3051 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3052 | + $query = "SELECT DISTINCT spotter_output.ident |
|
| 3053 | 3053 | FROM spotter_output".$filter_query." spotter_output.ident <> '' |
| 3054 | 3054 | ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0"; |
| 3055 | 3055 | |
@@ -3059,7 +3059,7 @@ discard block |
||
| 3059 | 3059 | $ident_array = array(); |
| 3060 | 3060 | $temp_array = array(); |
| 3061 | 3061 | |
| 3062 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3062 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3063 | 3063 | { |
| 3064 | 3064 | $temp_array['ident'] = $row['ident']; |
| 3065 | 3065 | $ident_array[] = $temp_array; |
@@ -3073,9 +3073,9 @@ discard block |
||
| 3073 | 3073 | * @return Array number, icao, name and city of airports |
| 3074 | 3074 | */ |
| 3075 | 3075 | |
| 3076 | - public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) { |
|
| 3076 | + public function getLast7DaysAirportsDeparture($airport_icao = '', $filters = array()) { |
|
| 3077 | 3077 | global $globalTimezone, $globalDBdriver; |
| 3078 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3078 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3079 | 3079 | if ($globalTimezone != '') { |
| 3080 | 3080 | date_default_timezone_set($globalTimezone); |
| 3081 | 3081 | $datetime = new DateTime(); |
@@ -3140,7 +3140,7 @@ discard block |
||
| 3140 | 3140 | |
| 3141 | 3141 | public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) { |
| 3142 | 3142 | global $globalTimezone, $globalDBdriver; |
| 3143 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3143 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3144 | 3144 | if ($globalTimezone != '') { |
| 3145 | 3145 | date_default_timezone_set($globalTimezone); |
| 3146 | 3146 | $datetime = new DateTime(); |
@@ -3224,7 +3224,7 @@ discard block |
||
| 3224 | 3224 | |
| 3225 | 3225 | public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) { |
| 3226 | 3226 | global $globalTimezone, $globalDBdriver; |
| 3227 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3227 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3228 | 3228 | if ($globalTimezone != '') { |
| 3229 | 3229 | date_default_timezone_set($globalTimezone); |
| 3230 | 3230 | $datetime = new DateTime(); |
@@ -3257,9 +3257,9 @@ discard block |
||
| 3257 | 3257 | * @return Array number, icao, name and city of airports |
| 3258 | 3258 | */ |
| 3259 | 3259 | |
| 3260 | - public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) { |
|
| 3260 | + public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $filters = array()) { |
|
| 3261 | 3261 | global $globalTimezone, $globalDBdriver; |
| 3262 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3262 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3263 | 3263 | if ($globalTimezone != '') { |
| 3264 | 3264 | date_default_timezone_set($globalTimezone); |
| 3265 | 3265 | $datetime = new DateTime(); |
@@ -3391,12 +3391,12 @@ discard block |
||
| 3391 | 3391 | } else $offset = '+00:00'; |
| 3392 | 3392 | |
| 3393 | 3393 | if ($globalDBdriver == 'mysql') { |
| 3394 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date |
|
| 3394 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date |
|
| 3395 | 3395 | FROM spotter_output |
| 3396 | 3396 | WHERE spotter_output.date <> '' |
| 3397 | 3397 | ORDER BY spotter_output.date ASC LIMIT 0,200"; |
| 3398 | 3398 | } else { |
| 3399 | - $query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 3399 | + $query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 3400 | 3400 | FROM spotter_output |
| 3401 | 3401 | WHERE spotter_output.date <> '' |
| 3402 | 3402 | ORDER BY spotter_output.date ASC LIMIT 0,200"; |
@@ -3408,7 +3408,7 @@ discard block |
||
| 3408 | 3408 | $date_array = array(); |
| 3409 | 3409 | $temp_array = array(); |
| 3410 | 3410 | |
| 3411 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3411 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3412 | 3412 | { |
| 3413 | 3413 | $temp_array['date'] = $row['date']; |
| 3414 | 3414 | |
@@ -3428,7 +3428,7 @@ discard block |
||
| 3428 | 3428 | */ |
| 3429 | 3429 | public function getAllRoutes() |
| 3430 | 3430 | { |
| 3431 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao |
|
| 3431 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao |
|
| 3432 | 3432 | FROM spotter_output |
| 3433 | 3433 | WHERE spotter_output.ident <> '' |
| 3434 | 3434 | GROUP BY route |
@@ -3439,7 +3439,7 @@ discard block |
||
| 3439 | 3439 | |
| 3440 | 3440 | $routes_array = array(); |
| 3441 | 3441 | $temp_array = array(); |
| 3442 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3442 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3443 | 3443 | { |
| 3444 | 3444 | $temp_array['route'] = $row['route']; |
| 3445 | 3445 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -3458,21 +3458,21 @@ discard block |
||
| 3458 | 3458 | * @return String success or false |
| 3459 | 3459 | * |
| 3460 | 3460 | */ |
| 3461 | - public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL) |
|
| 3461 | + public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL) |
|
| 3462 | 3462 | { |
| 3463 | 3463 | if (!is_numeric(substr($ident, 0, 3))) |
| 3464 | 3464 | { |
| 3465 | 3465 | if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) { |
| 3466 | - $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource); |
|
| 3466 | + $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource); |
|
| 3467 | 3467 | } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
| 3468 | - $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource); |
|
| 3468 | + $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource); |
|
| 3469 | 3469 | } else { |
| 3470 | 3470 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3471 | 3471 | } |
| 3472 | 3472 | if (count($airline_array) == 0) { |
| 3473 | 3473 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3474 | 3474 | } |
| 3475 | - if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){ |
|
| 3475 | + if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") { |
|
| 3476 | 3476 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3477 | 3477 | } |
| 3478 | 3478 | } else { |
@@ -3485,7 +3485,7 @@ discard block |
||
| 3485 | 3485 | |
| 3486 | 3486 | |
| 3487 | 3487 | $query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id'; |
| 3488 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type); |
|
| 3488 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type); |
|
| 3489 | 3489 | |
| 3490 | 3490 | try { |
| 3491 | 3491 | $sth = $this->db->prepare($query); |
@@ -3506,11 +3506,11 @@ discard block |
||
| 3506 | 3506 | * @return String success or false |
| 3507 | 3507 | * |
| 3508 | 3508 | */ |
| 3509 | - public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '') |
|
| 3509 | + public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '') |
|
| 3510 | 3510 | { |
| 3511 | 3511 | if ($groundspeed == '') $groundspeed = NULL; |
| 3512 | 3512 | $query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id'; |
| 3513 | - $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident); |
|
| 3513 | + $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident); |
|
| 3514 | 3514 | |
| 3515 | 3515 | try { |
| 3516 | 3516 | $sth = $this->db->prepare($query); |
@@ -3550,7 +3550,7 @@ discard block |
||
| 3550 | 3550 | * @param String $verticalrate vertival rate of flight |
| 3551 | 3551 | * @return String success or false |
| 3552 | 3552 | */ |
| 3553 | - public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '') |
|
| 3553 | + public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '') |
|
| 3554 | 3554 | { |
| 3555 | 3555 | global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM; |
| 3556 | 3556 | |
@@ -3574,13 +3574,13 @@ discard block |
||
| 3574 | 3574 | if ($ModeS != '') { |
| 3575 | 3575 | $timeelapsed = microtime(true); |
| 3576 | 3576 | $registration = $this->getAircraftRegistrationBymodeS($ModeS); |
| 3577 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3577 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3578 | 3578 | } else { |
| 3579 | - $myhex = explode('-',$flightaware_id); |
|
| 3579 | + $myhex = explode('-', $flightaware_id); |
|
| 3580 | 3580 | if (count($myhex) > 0) { |
| 3581 | 3581 | $timeelapsed = microtime(true); |
| 3582 | 3582 | $registration = $this->getAircraftRegistrationBymodeS($myhex[0]); |
| 3583 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3583 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3584 | 3584 | } |
| 3585 | 3585 | } |
| 3586 | 3586 | } |
@@ -3602,24 +3602,24 @@ discard block |
||
| 3602 | 3602 | { |
| 3603 | 3603 | $timeelapsed = microtime(true); |
| 3604 | 3604 | if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) { |
| 3605 | - $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource); |
|
| 3605 | + $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource); |
|
| 3606 | 3606 | } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
| 3607 | - $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource); |
|
| 3607 | + $airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource); |
|
| 3608 | 3608 | } else { |
| 3609 | 3609 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3610 | 3610 | } |
| 3611 | 3611 | if (count($airline_array) == 0) { |
| 3612 | 3612 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3613 | 3613 | } |
| 3614 | - if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){ |
|
| 3614 | + if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") { |
|
| 3615 | 3615 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3616 | 3616 | } |
| 3617 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3617 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3618 | 3618 | |
| 3619 | 3619 | } else { |
| 3620 | 3620 | $timeelapsed = microtime(true); |
| 3621 | 3621 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3622 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3622 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3623 | 3623 | } |
| 3624 | 3624 | } |
| 3625 | 3625 | } else $airline_array = array(); |
@@ -3636,27 +3636,27 @@ discard block |
||
| 3636 | 3636 | { |
| 3637 | 3637 | $timeelapsed = microtime(true); |
| 3638 | 3638 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 3639 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3639 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3640 | 3640 | } else { |
| 3641 | 3641 | $timeelapsed = microtime(true); |
| 3642 | 3642 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 3643 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3643 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3644 | 3644 | } |
| 3645 | 3645 | } |
| 3646 | 3646 | } else { |
| 3647 | 3647 | if ($ModeS != '') { |
| 3648 | 3648 | $timeelapsed = microtime(true); |
| 3649 | 3649 | $aircraft_icao = $this->getAllAircraftType($ModeS); |
| 3650 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3650 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3651 | 3651 | if ($aircraft_icao == "" || $aircraft_icao == "XXXX") |
| 3652 | 3652 | { |
| 3653 | 3653 | $timeelapsed = microtime(true); |
| 3654 | 3654 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 3655 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3655 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3656 | 3656 | } else { |
| 3657 | 3657 | $timeelapsed = microtime(true); |
| 3658 | 3658 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 3659 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3659 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3660 | 3660 | } |
| 3661 | 3661 | } |
| 3662 | 3662 | } |
@@ -3672,7 +3672,7 @@ discard block |
||
| 3672 | 3672 | } else { |
| 3673 | 3673 | $timeelapsed = microtime(true); |
| 3674 | 3674 | $departure_airport_array = $this->getAllAirportInfo($departure_airport_icao); |
| 3675 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3675 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3676 | 3676 | } |
| 3677 | 3677 | } |
| 3678 | 3678 | |
@@ -3687,7 +3687,7 @@ discard block |
||
| 3687 | 3687 | } else { |
| 3688 | 3688 | $timeelapsed = microtime(true); |
| 3689 | 3689 | $arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao); |
| 3690 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3690 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3691 | 3691 | } |
| 3692 | 3692 | } |
| 3693 | 3693 | |
@@ -3750,7 +3750,7 @@ discard block |
||
| 3750 | 3750 | { |
| 3751 | 3751 | $timeelapsed = microtime(true); |
| 3752 | 3752 | $image_array = $Image->getSpotterImage($registration); |
| 3753 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3753 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3754 | 3754 | if (!isset($image_array[0]['registration'])) |
| 3755 | 3755 | { |
| 3756 | 3756 | //echo "Add image !!!! \n"; |
@@ -3758,7 +3758,7 @@ discard block |
||
| 3758 | 3758 | } |
| 3759 | 3759 | $timeelapsed = microtime(true); |
| 3760 | 3760 | $owner_info = $this->getAircraftOwnerByRegistration($registration); |
| 3761 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3761 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3762 | 3762 | if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner'])); |
| 3763 | 3763 | } |
| 3764 | 3764 | |
@@ -3766,33 +3766,33 @@ discard block |
||
| 3766 | 3766 | { |
| 3767 | 3767 | if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao']; |
| 3768 | 3768 | else $airline_icao = ''; |
| 3769 | - $image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 3769 | + $image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 3770 | 3770 | if (!isset($image_array[0]['registration'])) |
| 3771 | 3771 | { |
| 3772 | 3772 | //echo "Add image !!!! \n"; |
| 3773 | - $Image->addSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 3773 | + $Image->addSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 3774 | 3774 | } |
| 3775 | 3775 | } |
| 3776 | 3776 | |
| 3777 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 3778 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 3779 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 3780 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 3781 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3782 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3783 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3784 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3785 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 3786 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3787 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 3788 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3789 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 3790 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 3791 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 3792 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 3793 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 3794 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 3795 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 3777 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 3778 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 3779 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 3780 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 3781 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3782 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3783 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3784 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3785 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 3786 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3787 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 3788 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3789 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 3790 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 3791 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 3792 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 3793 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 3794 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 3795 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 3796 | 3796 | |
| 3797 | 3797 | if (count($airline_array) == 0) |
| 3798 | 3798 | { |
@@ -3820,7 +3820,7 @@ discard block |
||
| 3820 | 3820 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 3821 | 3821 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 3822 | 3822 | if (!isset($aircraft_owner)) $aircraft_owner = NULL; |
| 3823 | - $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) |
|
| 3823 | + $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) |
|
| 3824 | 3824 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)"; |
| 3825 | 3825 | |
| 3826 | 3826 | $airline_name = $airline_array[0]['name']; |
@@ -3830,7 +3830,7 @@ discard block |
||
| 3830 | 3830 | if ($airline_type == '') { |
| 3831 | 3831 | $timeelapsed = microtime(true); |
| 3832 | 3832 | $airline_type = $this->getAircraftTypeBymodeS($ModeS); |
| 3833 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3833 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3834 | 3834 | } |
| 3835 | 3835 | if ($airline_type == null) $airline_type = ''; |
| 3836 | 3836 | $aircraft_type = $aircraft_array[0]['type']; |
@@ -3842,7 +3842,7 @@ discard block |
||
| 3842 | 3842 | $arrival_airport_name = $arrival_airport_array[0]['name']; |
| 3843 | 3843 | $arrival_airport_city = $arrival_airport_array[0]['city']; |
| 3844 | 3844 | $arrival_airport_country = $arrival_airport_array[0]['country']; |
| 3845 | - $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_type' => $aircraft_type,':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,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name); |
|
| 3845 | + $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_type' => $aircraft_type, ':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, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name); |
|
| 3846 | 3846 | |
| 3847 | 3847 | try { |
| 3848 | 3848 | |
@@ -3868,13 +3868,13 @@ discard block |
||
| 3868 | 3868 | { |
| 3869 | 3869 | global $globalDBdriver, $globalTimezone; |
| 3870 | 3870 | if ($globalDBdriver == 'mysql') { |
| 3871 | - $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3871 | + $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3872 | 3872 | WHERE spotter_output.ident = :ident |
| 3873 | 3873 | AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 3874 | 3874 | AND spotter_output.date < UTC_TIMESTAMP()"; |
| 3875 | 3875 | $query_data = array(':ident' => $ident); |
| 3876 | 3876 | } else { |
| 3877 | - $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3877 | + $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3878 | 3878 | WHERE spotter_output.ident = :ident |
| 3879 | 3879 | AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 3880 | 3880 | AND spotter_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -3883,8 +3883,8 @@ discard block |
||
| 3883 | 3883 | |
| 3884 | 3884 | $sth = $this->db->prepare($query); |
| 3885 | 3885 | $sth->execute($query_data); |
| 3886 | - $ident_result=''; |
|
| 3887 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3886 | + $ident_result = ''; |
|
| 3887 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3888 | 3888 | { |
| 3889 | 3889 | $ident_result = $row['ident']; |
| 3890 | 3890 | } |
@@ -3910,8 +3910,8 @@ discard block |
||
| 3910 | 3910 | return false; |
| 3911 | 3911 | } else { |
| 3912 | 3912 | $q_array = explode(" ", $q); |
| 3913 | - foreach ($q_array as $q_item){ |
|
| 3914 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 3913 | + foreach ($q_array as $q_item) { |
|
| 3914 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 3915 | 3915 | $additional_query .= " AND ("; |
| 3916 | 3916 | $additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR "; |
| 3917 | 3917 | $additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR "; |
@@ -3926,11 +3926,11 @@ discard block |
||
| 3926 | 3926 | } |
| 3927 | 3927 | } |
| 3928 | 3928 | if ($globalDBdriver == 'mysql') { |
| 3929 | - $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3929 | + $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3930 | 3930 | WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 3931 | 3931 | AND spotter_output.date < UTC_TIMESTAMP()"; |
| 3932 | 3932 | } else { |
| 3933 | - $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3933 | + $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3934 | 3934 | WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 3935 | 3935 | AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 3936 | 3936 | } |
@@ -3947,11 +3947,11 @@ discard block |
||
| 3947 | 3947 | * @return Array the airline list |
| 3948 | 3948 | * |
| 3949 | 3949 | */ |
| 3950 | - public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(), $year = '', $month = '', $day = '') |
|
| 3950 | + public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 3951 | 3951 | { |
| 3952 | 3952 | global $globalDBdriver; |
| 3953 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 3954 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3953 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 3954 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3955 | 3955 | FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA'"; |
| 3956 | 3956 | if ($olderthanmonths > 0) { |
| 3957 | 3957 | if ($globalDBdriver == 'mysql') { |
@@ -3971,28 +3971,28 @@ discard block |
||
| 3971 | 3971 | if ($year != '') { |
| 3972 | 3972 | if ($globalDBdriver == 'mysql') { |
| 3973 | 3973 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 3974 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 3974 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 3975 | 3975 | } else { |
| 3976 | 3976 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 3977 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 3977 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 3978 | 3978 | } |
| 3979 | 3979 | } |
| 3980 | 3980 | if ($month != '') { |
| 3981 | 3981 | if ($globalDBdriver == 'mysql') { |
| 3982 | 3982 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 3983 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 3983 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 3984 | 3984 | } else { |
| 3985 | 3985 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 3986 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 3986 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 3987 | 3987 | } |
| 3988 | 3988 | } |
| 3989 | 3989 | if ($day != '') { |
| 3990 | 3990 | if ($globalDBdriver == 'mysql') { |
| 3991 | 3991 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 3992 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 3992 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 3993 | 3993 | } else { |
| 3994 | 3994 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 3995 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 3995 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 3996 | 3996 | } |
| 3997 | 3997 | } |
| 3998 | 3998 | $query .= " GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC"; |
@@ -4002,7 +4002,7 @@ discard block |
||
| 4002 | 4002 | $sth->execute($query_values); |
| 4003 | 4003 | $airline_array = array(); |
| 4004 | 4004 | $temp_array = array(); |
| 4005 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4005 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4006 | 4006 | { |
| 4007 | 4007 | $temp_array['airline_name'] = $row['airline_name']; |
| 4008 | 4008 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4019,11 +4019,11 @@ discard block |
||
| 4019 | 4019 | * @return Array the pilots list |
| 4020 | 4020 | * |
| 4021 | 4021 | */ |
| 4022 | - public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '',$day = '') |
|
| 4022 | + public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 4023 | 4023 | { |
| 4024 | 4024 | global $globalDBdriver; |
| 4025 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4026 | - $query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source |
|
| 4025 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4026 | + $query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source |
|
| 4027 | 4027 | FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''"; |
| 4028 | 4028 | if ($olderthanmonths > 0) { |
| 4029 | 4029 | if ($globalDBdriver == 'mysql') { |
@@ -4043,28 +4043,28 @@ discard block |
||
| 4043 | 4043 | if ($year != '') { |
| 4044 | 4044 | if ($globalDBdriver == 'mysql') { |
| 4045 | 4045 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 4046 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4046 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4047 | 4047 | } else { |
| 4048 | 4048 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 4049 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4049 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4050 | 4050 | } |
| 4051 | 4051 | } |
| 4052 | 4052 | if ($month != '') { |
| 4053 | 4053 | if ($globalDBdriver == 'mysql') { |
| 4054 | 4054 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 4055 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4055 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4056 | 4056 | } else { |
| 4057 | 4057 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 4058 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4058 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4059 | 4059 | } |
| 4060 | 4060 | } |
| 4061 | 4061 | if ($day != '') { |
| 4062 | 4062 | if ($globalDBdriver == 'mysql') { |
| 4063 | 4063 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 4064 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4064 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4065 | 4065 | } else { |
| 4066 | 4066 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 4067 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4067 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4068 | 4068 | } |
| 4069 | 4069 | } |
| 4070 | 4070 | |
@@ -4076,7 +4076,7 @@ discard block |
||
| 4076 | 4076 | $sth->execute($query_values); |
| 4077 | 4077 | $airline_array = array(); |
| 4078 | 4078 | $temp_array = array(); |
| 4079 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4079 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4080 | 4080 | { |
| 4081 | 4081 | $temp_array['pilot_name'] = $row['pilot_name']; |
| 4082 | 4082 | $temp_array['pilot_id'] = $row['pilot_id']; |
@@ -4096,7 +4096,7 @@ discard block |
||
| 4096 | 4096 | public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 4097 | 4097 | { |
| 4098 | 4098 | global $globalDBdriver; |
| 4099 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source |
|
| 4099 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source |
|
| 4100 | 4100 | FROM spotter_output WHERE spotter_output.pilot_id <> '' "; |
| 4101 | 4101 | if ($olderthanmonths > 0) { |
| 4102 | 4102 | if ($globalDBdriver == 'mysql') { |
@@ -4122,7 +4122,7 @@ discard block |
||
| 4122 | 4122 | $airline_array = array(); |
| 4123 | 4123 | $temp_array = array(); |
| 4124 | 4124 | |
| 4125 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4125 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4126 | 4126 | { |
| 4127 | 4127 | $temp_array['pilot_name'] = $row['pilot_name']; |
| 4128 | 4128 | $temp_array['pilot_id'] = $row['pilot_id']; |
@@ -4140,11 +4140,11 @@ discard block |
||
| 4140 | 4140 | * @return Array the pilots list |
| 4141 | 4141 | * |
| 4142 | 4142 | */ |
| 4143 | - public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 4143 | + public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 4144 | 4144 | { |
| 4145 | 4145 | global $globalDBdriver; |
| 4146 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4147 | - $query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count |
|
| 4146 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4147 | + $query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count |
|
| 4148 | 4148 | FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL"; |
| 4149 | 4149 | if ($olderthanmonths > 0) { |
| 4150 | 4150 | if ($globalDBdriver == 'mysql') { |
@@ -4164,28 +4164,28 @@ discard block |
||
| 4164 | 4164 | if ($year != '') { |
| 4165 | 4165 | if ($globalDBdriver == 'mysql') { |
| 4166 | 4166 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 4167 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4167 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4168 | 4168 | } else { |
| 4169 | 4169 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 4170 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4170 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4171 | 4171 | } |
| 4172 | 4172 | } |
| 4173 | 4173 | if ($month != '') { |
| 4174 | 4174 | if ($globalDBdriver == 'mysql') { |
| 4175 | 4175 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 4176 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4176 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4177 | 4177 | } else { |
| 4178 | 4178 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 4179 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4179 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4180 | 4180 | } |
| 4181 | 4181 | } |
| 4182 | 4182 | if ($day != '') { |
| 4183 | 4183 | if ($globalDBdriver == 'mysql') { |
| 4184 | 4184 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 4185 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4185 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4186 | 4186 | } else { |
| 4187 | 4187 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 4188 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4188 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4189 | 4189 | } |
| 4190 | 4190 | } |
| 4191 | 4191 | $query .= " GROUP BY spotter_output.owner_name ORDER BY owner_count DESC"; |
@@ -4195,7 +4195,7 @@ discard block |
||
| 4195 | 4195 | $sth->execute($query_values); |
| 4196 | 4196 | $airline_array = array(); |
| 4197 | 4197 | $temp_array = array(); |
| 4198 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4198 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4199 | 4199 | { |
| 4200 | 4200 | $temp_array['owner_name'] = $row['owner_name']; |
| 4201 | 4201 | $temp_array['owner_count'] = $row['owner_count']; |
@@ -4210,11 +4210,11 @@ discard block |
||
| 4210 | 4210 | * @return Array the pilots list |
| 4211 | 4211 | * |
| 4212 | 4212 | */ |
| 4213 | - public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array()) |
|
| 4213 | + public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 4214 | 4214 | { |
| 4215 | 4215 | global $globalDBdriver; |
| 4216 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4217 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count |
|
| 4216 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4217 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count |
|
| 4218 | 4218 | FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL "; |
| 4219 | 4219 | if ($olderthanmonths > 0) { |
| 4220 | 4220 | if ($globalDBdriver == 'mysql') { |
@@ -4240,7 +4240,7 @@ discard block |
||
| 4240 | 4240 | $airline_array = array(); |
| 4241 | 4241 | $temp_array = array(); |
| 4242 | 4242 | |
| 4243 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4243 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4244 | 4244 | { |
| 4245 | 4245 | $temp_array['owner_name'] = $row['owner_name']; |
| 4246 | 4246 | $temp_array['owner_count'] = $row['owner_count']; |
@@ -4256,11 +4256,11 @@ discard block |
||
| 4256 | 4256 | * @return Array the airline list |
| 4257 | 4257 | * |
| 4258 | 4258 | */ |
| 4259 | - public function countAllAirlinesByAircraft($aircraft_icao,$filters = array()) |
|
| 4259 | + public function countAllAirlinesByAircraft($aircraft_icao, $filters = array()) |
|
| 4260 | 4260 | { |
| 4261 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 4262 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4263 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4261 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 4262 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4263 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4264 | 4264 | FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 4265 | 4265 | GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country |
| 4266 | 4266 | ORDER BY airline_count DESC"; |
@@ -4272,7 +4272,7 @@ discard block |
||
| 4272 | 4272 | $airline_array = array(); |
| 4273 | 4273 | $temp_array = array(); |
| 4274 | 4274 | |
| 4275 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4275 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4276 | 4276 | { |
| 4277 | 4277 | $temp_array['airline_name'] = $row['airline_name']; |
| 4278 | 4278 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4292,11 +4292,11 @@ discard block |
||
| 4292 | 4292 | * @return Array the airline country list |
| 4293 | 4293 | * |
| 4294 | 4294 | */ |
| 4295 | - public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array()) |
|
| 4295 | + public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array()) |
|
| 4296 | 4296 | { |
| 4297 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 4298 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4299 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4297 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 4298 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4299 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4300 | 4300 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 4301 | 4301 | GROUP BY spotter_output.airline_country |
| 4302 | 4302 | ORDER BY airline_country_count DESC |
@@ -4309,7 +4309,7 @@ discard block |
||
| 4309 | 4309 | $airline_country_array = array(); |
| 4310 | 4310 | $temp_array = array(); |
| 4311 | 4311 | |
| 4312 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4312 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4313 | 4313 | { |
| 4314 | 4314 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4315 | 4315 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4328,11 +4328,11 @@ discard block |
||
| 4328 | 4328 | * @return Array the airline list |
| 4329 | 4329 | * |
| 4330 | 4330 | */ |
| 4331 | - public function countAllAirlinesByAirport($airport_icao,$filters = array()) |
|
| 4331 | + public function countAllAirlinesByAirport($airport_icao, $filters = array()) |
|
| 4332 | 4332 | { |
| 4333 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 4334 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4335 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4333 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 4334 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4335 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4336 | 4336 | FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) |
| 4337 | 4337 | GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country |
| 4338 | 4338 | ORDER BY airline_count DESC"; |
@@ -4344,7 +4344,7 @@ discard block |
||
| 4344 | 4344 | $airline_array = array(); |
| 4345 | 4345 | $temp_array = array(); |
| 4346 | 4346 | |
| 4347 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4347 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4348 | 4348 | { |
| 4349 | 4349 | $temp_array['airline_name'] = $row['airline_name']; |
| 4350 | 4350 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4363,11 +4363,11 @@ discard block |
||
| 4363 | 4363 | * @return Array the airline country list |
| 4364 | 4364 | * |
| 4365 | 4365 | */ |
| 4366 | - public function countAllAirlineCountriesByAirport($airport_icao,$filters = array()) |
|
| 4366 | + public function countAllAirlineCountriesByAirport($airport_icao, $filters = array()) |
|
| 4367 | 4367 | { |
| 4368 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 4369 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4370 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4368 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 4369 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4370 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4371 | 4371 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) |
| 4372 | 4372 | GROUP BY spotter_output.airline_country |
| 4373 | 4373 | ORDER BY airline_country_count DESC |
@@ -4380,7 +4380,7 @@ discard block |
||
| 4380 | 4380 | $airline_country_array = array(); |
| 4381 | 4381 | $temp_array = array(); |
| 4382 | 4382 | |
| 4383 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4383 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4384 | 4384 | { |
| 4385 | 4385 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4386 | 4386 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4397,11 +4397,11 @@ discard block |
||
| 4397 | 4397 | * @return Array the airline list |
| 4398 | 4398 | * |
| 4399 | 4399 | */ |
| 4400 | - public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 4400 | + public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 4401 | 4401 | { |
| 4402 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 4403 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4404 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4402 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 4403 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4404 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4405 | 4405 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 4406 | 4406 | GROUP BY spotter_output.airline_name |
| 4407 | 4407 | ORDER BY airline_count DESC"; |
@@ -4412,7 +4412,7 @@ discard block |
||
| 4412 | 4412 | $airline_array = array(); |
| 4413 | 4413 | $temp_array = array(); |
| 4414 | 4414 | |
| 4415 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4415 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4416 | 4416 | { |
| 4417 | 4417 | $temp_array['airline_name'] = $row['airline_name']; |
| 4418 | 4418 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4432,11 +4432,11 @@ discard block |
||
| 4432 | 4432 | * @return Array the airline country list |
| 4433 | 4433 | * |
| 4434 | 4434 | */ |
| 4435 | - public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 4435 | + public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 4436 | 4436 | { |
| 4437 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 4438 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4439 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4437 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 4438 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4439 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4440 | 4440 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 4441 | 4441 | GROUP BY spotter_output.airline_country |
| 4442 | 4442 | ORDER BY airline_country_count DESC |
@@ -4449,7 +4449,7 @@ discard block |
||
| 4449 | 4449 | $airline_country_array = array(); |
| 4450 | 4450 | $temp_array = array(); |
| 4451 | 4451 | |
| 4452 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4452 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4453 | 4453 | { |
| 4454 | 4454 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4455 | 4455 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4465,11 +4465,11 @@ discard block |
||
| 4465 | 4465 | * @return Array the airline list |
| 4466 | 4466 | * |
| 4467 | 4467 | */ |
| 4468 | - public function countAllAirlinesByDate($date,$filters = array()) |
|
| 4468 | + public function countAllAirlinesByDate($date, $filters = array()) |
|
| 4469 | 4469 | { |
| 4470 | 4470 | global $globalTimezone, $globalDBdriver; |
| 4471 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4472 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 4471 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4472 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 4473 | 4473 | if ($globalTimezone != '') { |
| 4474 | 4474 | date_default_timezone_set($globalTimezone); |
| 4475 | 4475 | $datetime = new DateTime($date); |
@@ -4477,12 +4477,12 @@ discard block |
||
| 4477 | 4477 | } else $offset = '+00:00'; |
| 4478 | 4478 | |
| 4479 | 4479 | if ($globalDBdriver == 'mysql') { |
| 4480 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4480 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4481 | 4481 | FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 4482 | 4482 | GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country |
| 4483 | 4483 | ORDER BY airline_count DESC"; |
| 4484 | 4484 | } else { |
| 4485 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4485 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4486 | 4486 | FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 4487 | 4487 | GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country |
| 4488 | 4488 | ORDER BY airline_count DESC"; |
@@ -4493,7 +4493,7 @@ discard block |
||
| 4493 | 4493 | |
| 4494 | 4494 | $airline_array = array(); |
| 4495 | 4495 | $temp_array = array(); |
| 4496 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4496 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4497 | 4497 | { |
| 4498 | 4498 | $temp_array['airline_name'] = $row['airline_name']; |
| 4499 | 4499 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4513,11 +4513,11 @@ discard block |
||
| 4513 | 4513 | * @return Array the airline country list |
| 4514 | 4514 | * |
| 4515 | 4515 | */ |
| 4516 | - public function countAllAirlineCountriesByDate($date,$filters = array()) |
|
| 4516 | + public function countAllAirlineCountriesByDate($date, $filters = array()) |
|
| 4517 | 4517 | { |
| 4518 | 4518 | global $globalTimezone, $globalDBdriver; |
| 4519 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4520 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 4519 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4520 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 4521 | 4521 | if ($globalTimezone != '') { |
| 4522 | 4522 | date_default_timezone_set($globalTimezone); |
| 4523 | 4523 | $datetime = new DateTime($date); |
@@ -4525,13 +4525,13 @@ discard block |
||
| 4525 | 4525 | } else $offset = '+00:00'; |
| 4526 | 4526 | |
| 4527 | 4527 | if ($globalDBdriver == 'mysql') { |
| 4528 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4528 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4529 | 4529 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 4530 | 4530 | GROUP BY spotter_output.airline_country |
| 4531 | 4531 | ORDER BY airline_country_count DESC |
| 4532 | 4532 | LIMIT 10 OFFSET 0"; |
| 4533 | 4533 | } else { |
| 4534 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4534 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4535 | 4535 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 4536 | 4536 | GROUP BY spotter_output.airline_country |
| 4537 | 4537 | ORDER BY airline_country_count DESC |
@@ -4543,7 +4543,7 @@ discard block |
||
| 4543 | 4543 | |
| 4544 | 4544 | $airline_country_array = array(); |
| 4545 | 4545 | $temp_array = array(); |
| 4546 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4546 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4547 | 4547 | { |
| 4548 | 4548 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4549 | 4549 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4560,11 +4560,11 @@ discard block |
||
| 4560 | 4560 | * @return Array the airline list |
| 4561 | 4561 | * |
| 4562 | 4562 | */ |
| 4563 | - public function countAllAirlinesByIdent($ident,$filters = array()) |
|
| 4563 | + public function countAllAirlinesByIdent($ident, $filters = array()) |
|
| 4564 | 4564 | { |
| 4565 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 4566 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4567 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4565 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 4566 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4567 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4568 | 4568 | FROM spotter_output".$filter_query." spotter_output.ident = :ident |
| 4569 | 4569 | GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country |
| 4570 | 4570 | ORDER BY airline_count DESC"; |
@@ -4581,11 +4581,11 @@ discard block |
||
| 4581 | 4581 | * @return Array the airline list |
| 4582 | 4582 | * |
| 4583 | 4583 | */ |
| 4584 | - public function countAllAirlinesByOwner($owner,$filters = array()) |
|
| 4584 | + public function countAllAirlinesByOwner($owner, $filters = array()) |
|
| 4585 | 4585 | { |
| 4586 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 4587 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4588 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4586 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 4587 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4588 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4589 | 4589 | FROM spotter_output".$filter_query." spotter_output.owner_name = :owner |
| 4590 | 4590 | GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country |
| 4591 | 4591 | ORDER BY airline_count DESC"; |
@@ -4602,16 +4602,16 @@ discard block |
||
| 4602 | 4602 | * @return String Duration of all flights |
| 4603 | 4603 | * |
| 4604 | 4604 | */ |
| 4605 | - public function getFlightDurationByOwner($owner,$filters = array()) |
|
| 4605 | + public function getFlightDurationByOwner($owner, $filters = array()) |
|
| 4606 | 4606 | { |
| 4607 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 4608 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4609 | - $query = "SELECT SUM(last_seen - date) AS duration |
|
| 4607 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 4608 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4609 | + $query = "SELECT SUM(last_seen - date) AS duration |
|
| 4610 | 4610 | FROM spotter_output".$filter_query." spotter_output.owner_name = :owner"; |
| 4611 | 4611 | $sth = $this->db->prepare($query); |
| 4612 | 4612 | $sth->execute(array(':owner' => $owner)); |
| 4613 | 4613 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 4614 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 4614 | + if (is_int($result[0]['duration'])) return gmdate('H:i:s', $result[0]['duration']); |
|
| 4615 | 4615 | else return $result[0]['duration']; |
| 4616 | 4616 | } |
| 4617 | 4617 | |
@@ -4621,16 +4621,16 @@ discard block |
||
| 4621 | 4621 | * @return String Duration of all flights |
| 4622 | 4622 | * |
| 4623 | 4623 | */ |
| 4624 | - public function getFlightDurationByPilot($pilot,$filters = array()) |
|
| 4624 | + public function getFlightDurationByPilot($pilot, $filters = array()) |
|
| 4625 | 4625 | { |
| 4626 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 4627 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4628 | - $query = "SELECT SUM(last_seen - date) AS duration |
|
| 4626 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 4627 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4628 | + $query = "SELECT SUM(last_seen - date) AS duration |
|
| 4629 | 4629 | FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot)"; |
| 4630 | 4630 | $sth = $this->db->prepare($query); |
| 4631 | 4631 | $sth->execute(array(':pilot' => $pilot)); |
| 4632 | 4632 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 4633 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 4633 | + if (is_int($result[0]['duration'])) return gmdate('H:i:s', $result[0]['duration']); |
|
| 4634 | 4634 | else return $result[0]['duration']; |
| 4635 | 4635 | } |
| 4636 | 4636 | |
@@ -4640,11 +4640,11 @@ discard block |
||
| 4640 | 4640 | * @return Array the airline list |
| 4641 | 4641 | * |
| 4642 | 4642 | */ |
| 4643 | - public function countAllAirlinesByPilot($pilot,$filters = array()) |
|
| 4643 | + public function countAllAirlinesByPilot($pilot, $filters = array()) |
|
| 4644 | 4644 | { |
| 4645 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 4646 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4647 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4645 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 4646 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4647 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4648 | 4648 | FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 4649 | 4649 | GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country |
| 4650 | 4650 | ORDER BY airline_count DESC"; |
@@ -4661,25 +4661,25 @@ discard block |
||
| 4661 | 4661 | * @return Array the airline list |
| 4662 | 4662 | * |
| 4663 | 4663 | */ |
| 4664 | - public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array()) |
|
| 4664 | + public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 4665 | 4665 | { |
| 4666 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4667 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4668 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4666 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4667 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4668 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4669 | 4669 | |
| 4670 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4670 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4671 | 4671 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 4672 | 4672 | GROUP BY spotter_output.airline_name |
| 4673 | 4673 | ORDER BY airline_count DESC"; |
| 4674 | 4674 | |
| 4675 | 4675 | |
| 4676 | 4676 | $sth = $this->db->prepare($query); |
| 4677 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4677 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4678 | 4678 | |
| 4679 | 4679 | $airline_array = array(); |
| 4680 | 4680 | $temp_array = array(); |
| 4681 | 4681 | |
| 4682 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4682 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4683 | 4683 | { |
| 4684 | 4684 | $temp_array['airline_name'] = $row['airline_name']; |
| 4685 | 4685 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4697,13 +4697,13 @@ discard block |
||
| 4697 | 4697 | * @return Array the airline country list |
| 4698 | 4698 | * |
| 4699 | 4699 | */ |
| 4700 | - public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array()) |
|
| 4700 | + public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 4701 | 4701 | { |
| 4702 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4703 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4704 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4702 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4703 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4704 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4705 | 4705 | |
| 4706 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4706 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4707 | 4707 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 4708 | 4708 | GROUP BY spotter_output.airline_country |
| 4709 | 4709 | ORDER BY airline_country_count DESC |
@@ -4711,11 +4711,11 @@ discard block |
||
| 4711 | 4711 | |
| 4712 | 4712 | |
| 4713 | 4713 | $sth = $this->db->prepare($query); |
| 4714 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4714 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4715 | 4715 | |
| 4716 | 4716 | $airline_country_array = array(); |
| 4717 | 4717 | $temp_array = array(); |
| 4718 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4718 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4719 | 4719 | { |
| 4720 | 4720 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4721 | 4721 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4733,11 +4733,11 @@ discard block |
||
| 4733 | 4733 | * @return Array the airline list |
| 4734 | 4734 | * |
| 4735 | 4735 | */ |
| 4736 | - public function countAllAirlinesByCountry($country,$filters = array()) |
|
| 4736 | + public function countAllAirlinesByCountry($country, $filters = array()) |
|
| 4737 | 4737 | { |
| 4738 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 4739 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4740 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4738 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 4739 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4740 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 4741 | 4741 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 4742 | 4742 | GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country |
| 4743 | 4743 | ORDER BY airline_count DESC"; |
@@ -4748,7 +4748,7 @@ discard block |
||
| 4748 | 4748 | |
| 4749 | 4749 | $airline_array = array(); |
| 4750 | 4750 | $temp_array = array(); |
| 4751 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4751 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4752 | 4752 | { |
| 4753 | 4753 | $temp_array['airline_name'] = $row['airline_name']; |
| 4754 | 4754 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -4767,11 +4767,11 @@ discard block |
||
| 4767 | 4767 | * @return Array the airline country list |
| 4768 | 4768 | * |
| 4769 | 4769 | */ |
| 4770 | - public function countAllAirlineCountriesByCountry($country,$filters = array()) |
|
| 4770 | + public function countAllAirlineCountriesByCountry($country, $filters = array()) |
|
| 4771 | 4771 | { |
| 4772 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4773 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 4774 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4772 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4773 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 4774 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4775 | 4775 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 4776 | 4776 | GROUP BY spotter_output.airline_country |
| 4777 | 4777 | ORDER BY airline_country_count DESC |
@@ -4783,7 +4783,7 @@ discard block |
||
| 4783 | 4783 | |
| 4784 | 4784 | $airline_country_array = array(); |
| 4785 | 4785 | $temp_array = array(); |
| 4786 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4786 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4787 | 4787 | { |
| 4788 | 4788 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4789 | 4789 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4803,35 +4803,35 @@ discard block |
||
| 4803 | 4803 | public function countAllAirlineCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '') |
| 4804 | 4804 | { |
| 4805 | 4805 | global $globalDBdriver; |
| 4806 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4807 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4806 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4807 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 4808 | 4808 | FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA'"; |
| 4809 | 4809 | $query_values = array(); |
| 4810 | 4810 | if ($year != '') { |
| 4811 | 4811 | if ($globalDBdriver == 'mysql') { |
| 4812 | 4812 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 4813 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4813 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4814 | 4814 | } else { |
| 4815 | 4815 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 4816 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4816 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4817 | 4817 | } |
| 4818 | 4818 | } |
| 4819 | 4819 | if ($month != '') { |
| 4820 | 4820 | if ($globalDBdriver == 'mysql') { |
| 4821 | 4821 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 4822 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4822 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4823 | 4823 | } else { |
| 4824 | 4824 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 4825 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4825 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4826 | 4826 | } |
| 4827 | 4827 | } |
| 4828 | 4828 | if ($day != '') { |
| 4829 | 4829 | if ($globalDBdriver == 'mysql') { |
| 4830 | 4830 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 4831 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4831 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4832 | 4832 | } else { |
| 4833 | 4833 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 4834 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4834 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4835 | 4835 | } |
| 4836 | 4836 | } |
| 4837 | 4837 | $query .= " GROUP BY spotter_output.airline_country |
@@ -4843,7 +4843,7 @@ discard block |
||
| 4843 | 4843 | |
| 4844 | 4844 | $airline_array = array(); |
| 4845 | 4845 | $temp_array = array(); |
| 4846 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4846 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4847 | 4847 | { |
| 4848 | 4848 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 4849 | 4849 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -4859,11 +4859,11 @@ discard block |
||
| 4859 | 4859 | * @return Array the airline country list |
| 4860 | 4860 | * |
| 4861 | 4861 | */ |
| 4862 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 4862 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 4863 | 4863 | { |
| 4864 | 4864 | global $globalDBdriver; |
| 4865 | 4865 | //$filter_query = $this->getFilter($filters,true,true); |
| 4866 | - $Connection= new Connection($this->db); |
|
| 4866 | + $Connection = new Connection($this->db); |
|
| 4867 | 4867 | if (!$Connection->tableExists('countries')) return array(); |
| 4868 | 4868 | /* |
| 4869 | 4869 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -4878,7 +4878,7 @@ discard block |
||
| 4878 | 4878 | */ |
| 4879 | 4879 | require_once('class.SpotterLive.php'); |
| 4880 | 4880 | $SpotterLive = new SpotterLive(); |
| 4881 | - $filter_query = $SpotterLive->getFilter($filters,true,true); |
|
| 4881 | + $filter_query = $SpotterLive->getFilter($filters, true, true); |
|
| 4882 | 4882 | $filter_query .= ' over_country IS NOT NULL'; |
| 4883 | 4883 | if ($olderthanmonths > 0) { |
| 4884 | 4884 | if ($globalDBdriver == 'mysql') { |
@@ -4905,7 +4905,7 @@ discard block |
||
| 4905 | 4905 | $flight_array = array(); |
| 4906 | 4906 | $temp_array = array(); |
| 4907 | 4907 | |
| 4908 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4908 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4909 | 4909 | { |
| 4910 | 4910 | $temp_array['flight_count'] = $row['nb']; |
| 4911 | 4911 | $temp_array['flight_country'] = $row['name']; |
@@ -4923,11 +4923,11 @@ discard block |
||
| 4923 | 4923 | * @return Array the aircraft list |
| 4924 | 4924 | * |
| 4925 | 4925 | */ |
| 4926 | - public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 4926 | + public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 4927 | 4927 | { |
| 4928 | 4928 | global $globalDBdriver; |
| 4929 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 4930 | - $query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 4929 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 4930 | + $query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 4931 | 4931 | FROM spotter_output ".$filter_query." spotter_output.aircraft_name <> '' AND spotter_output.aircraft_icao <> ''"; |
| 4932 | 4932 | if ($olderthanmonths > 0) { |
| 4933 | 4933 | if ($globalDBdriver == 'mysql') { |
@@ -4947,28 +4947,28 @@ discard block |
||
| 4947 | 4947 | if ($year != '') { |
| 4948 | 4948 | if ($globalDBdriver == 'mysql') { |
| 4949 | 4949 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 4950 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4950 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4951 | 4951 | } else { |
| 4952 | 4952 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 4953 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 4953 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 4954 | 4954 | } |
| 4955 | 4955 | } |
| 4956 | 4956 | if ($month != '') { |
| 4957 | 4957 | if ($globalDBdriver == 'mysql') { |
| 4958 | 4958 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 4959 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4959 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4960 | 4960 | } else { |
| 4961 | 4961 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 4962 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 4962 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 4963 | 4963 | } |
| 4964 | 4964 | } |
| 4965 | 4965 | if ($day != '') { |
| 4966 | 4966 | if ($globalDBdriver == 'mysql') { |
| 4967 | 4967 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 4968 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4968 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4969 | 4969 | } else { |
| 4970 | 4970 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 4971 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 4971 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 4972 | 4972 | } |
| 4973 | 4973 | } |
| 4974 | 4974 | |
@@ -4980,7 +4980,7 @@ discard block |
||
| 4980 | 4980 | |
| 4981 | 4981 | $aircraft_array = array(); |
| 4982 | 4982 | $temp_array = array(); |
| 4983 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4983 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4984 | 4984 | { |
| 4985 | 4985 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4986 | 4986 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4997,11 +4997,11 @@ discard block |
||
| 4997 | 4997 | * @return Array the aircraft list |
| 4998 | 4998 | * |
| 4999 | 4999 | */ |
| 5000 | - public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '', $day = '') |
|
| 5000 | + public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 5001 | 5001 | { |
| 5002 | 5002 | global $globalDBdriver; |
| 5003 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5004 | - $query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5003 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5004 | + $query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5005 | 5005 | FROM spotter_output".$filter_query." spotter_output.aircraft_name <> '' AND spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA'"; |
| 5006 | 5006 | if ($olderthanmonths > 0) { |
| 5007 | 5007 | if ($globalDBdriver == 'mysql') { |
@@ -5021,28 +5021,28 @@ discard block |
||
| 5021 | 5021 | if ($year != '') { |
| 5022 | 5022 | if ($globalDBdriver == 'mysql') { |
| 5023 | 5023 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 5024 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 5024 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 5025 | 5025 | } else { |
| 5026 | 5026 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 5027 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 5027 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 5028 | 5028 | } |
| 5029 | 5029 | } |
| 5030 | 5030 | if ($month != '') { |
| 5031 | 5031 | if ($globalDBdriver == 'mysql') { |
| 5032 | 5032 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 5033 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 5033 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 5034 | 5034 | } else { |
| 5035 | 5035 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 5036 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 5036 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 5037 | 5037 | } |
| 5038 | 5038 | } |
| 5039 | 5039 | if ($day != '') { |
| 5040 | 5040 | if ($globalDBdriver == 'mysql') { |
| 5041 | 5041 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 5042 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 5042 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 5043 | 5043 | } else { |
| 5044 | 5044 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 5045 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 5045 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 5046 | 5046 | } |
| 5047 | 5047 | } |
| 5048 | 5048 | |
@@ -5054,7 +5054,7 @@ discard block |
||
| 5054 | 5054 | |
| 5055 | 5055 | $aircraft_array = array(); |
| 5056 | 5056 | $temp_array = array(); |
| 5057 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5057 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5058 | 5058 | { |
| 5059 | 5059 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 5060 | 5060 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
@@ -5072,11 +5072,11 @@ discard block |
||
| 5072 | 5072 | * @return Array the aircraft list |
| 5073 | 5073 | * |
| 5074 | 5074 | */ |
| 5075 | - public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 5075 | + public function countAllAircraftTypesByMonths($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 5076 | 5076 | { |
| 5077 | 5077 | global $globalDBdriver; |
| 5078 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5079 | - $query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5078 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5079 | + $query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5080 | 5080 | FROM spotter_output".$filter_query." spotter_output.aircraft_name <> '' AND spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' "; |
| 5081 | 5081 | if ($olderthanmonths > 0) { |
| 5082 | 5082 | if ($globalDBdriver == 'mysql') { |
@@ -5101,7 +5101,7 @@ discard block |
||
| 5101 | 5101 | |
| 5102 | 5102 | $aircraft_array = array(); |
| 5103 | 5103 | $temp_array = array(); |
| 5104 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5104 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5105 | 5105 | { |
| 5106 | 5106 | //$temp_array['airline_icao'] = $row['airline_icao']; |
| 5107 | 5107 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
@@ -5120,13 +5120,13 @@ discard block |
||
| 5120 | 5120 | * @return Array the aircraft list |
| 5121 | 5121 | * |
| 5122 | 5122 | */ |
| 5123 | - public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array()) |
|
| 5123 | + public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array()) |
|
| 5124 | 5124 | { |
| 5125 | 5125 | $Image = new Image($this->db); |
| 5126 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5127 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 5126 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5127 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 5128 | 5128 | |
| 5129 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5129 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5130 | 5130 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 5131 | 5131 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
| 5132 | 5132 | ORDER BY registration_count DESC"; |
@@ -5137,14 +5137,14 @@ discard block |
||
| 5137 | 5137 | $aircraft_array = array(); |
| 5138 | 5138 | $temp_array = array(); |
| 5139 | 5139 | |
| 5140 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5140 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5141 | 5141 | { |
| 5142 | 5142 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5143 | 5143 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5144 | 5144 | $temp_array['registration'] = $row['registration']; |
| 5145 | 5145 | $temp_array['airline_name'] = $row['airline_name']; |
| 5146 | 5146 | $temp_array['image_thumbnail'] = ""; |
| 5147 | - if($row['registration'] != "") |
|
| 5147 | + if ($row['registration'] != "") |
|
| 5148 | 5148 | { |
| 5149 | 5149 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5150 | 5150 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5163,11 +5163,11 @@ discard block |
||
| 5163 | 5163 | * @return Array the aircraft list |
| 5164 | 5164 | * |
| 5165 | 5165 | */ |
| 5166 | - public function countAllAircraftTypesByAirline($airline_icao,$filters = array()) |
|
| 5166 | + public function countAllAircraftTypesByAirline($airline_icao, $filters = array()) |
|
| 5167 | 5167 | { |
| 5168 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5169 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5170 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5168 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5169 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5170 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5171 | 5171 | FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao |
| 5172 | 5172 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5173 | 5173 | ORDER BY aircraft_icao_count DESC"; |
@@ -5178,7 +5178,7 @@ discard block |
||
| 5178 | 5178 | $aircraft_array = array(); |
| 5179 | 5179 | $temp_array = array(); |
| 5180 | 5180 | |
| 5181 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5181 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5182 | 5182 | { |
| 5183 | 5183 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5184 | 5184 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5196,13 +5196,13 @@ discard block |
||
| 5196 | 5196 | * @return Array the aircraft list |
| 5197 | 5197 | * |
| 5198 | 5198 | */ |
| 5199 | - public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array()) |
|
| 5199 | + public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array()) |
|
| 5200 | 5200 | { |
| 5201 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5201 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5202 | 5202 | $Image = new Image($this->db); |
| 5203 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5203 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5204 | 5204 | |
| 5205 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5205 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5206 | 5206 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao |
| 5207 | 5207 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 5208 | 5208 | ORDER BY registration_count DESC"; |
@@ -5212,14 +5212,14 @@ discard block |
||
| 5212 | 5212 | |
| 5213 | 5213 | $aircraft_array = array(); |
| 5214 | 5214 | $temp_array = array(); |
| 5215 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5215 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5216 | 5216 | { |
| 5217 | 5217 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5218 | 5218 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5219 | 5219 | $temp_array['registration'] = $row['registration']; |
| 5220 | 5220 | $temp_array['airline_name'] = $row['airline_name']; |
| 5221 | 5221 | $temp_array['image_thumbnail'] = ""; |
| 5222 | - if($row['registration'] != "") |
|
| 5222 | + if ($row['registration'] != "") |
|
| 5223 | 5223 | { |
| 5224 | 5224 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5225 | 5225 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5238,11 +5238,11 @@ discard block |
||
| 5238 | 5238 | * @return Array the aircraft list |
| 5239 | 5239 | * |
| 5240 | 5240 | */ |
| 5241 | - public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array()) |
|
| 5241 | + public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array()) |
|
| 5242 | 5242 | { |
| 5243 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5244 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5245 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5243 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5244 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5245 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5246 | 5246 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao |
| 5247 | 5247 | GROUP BY spotter_output.aircraft_manufacturer |
| 5248 | 5248 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5253,7 +5253,7 @@ discard block |
||
| 5253 | 5253 | $aircraft_array = array(); |
| 5254 | 5254 | $temp_array = array(); |
| 5255 | 5255 | |
| 5256 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5256 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5257 | 5257 | { |
| 5258 | 5258 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 5259 | 5259 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -5270,12 +5270,12 @@ discard block |
||
| 5270 | 5270 | * @return Array the aircraft list |
| 5271 | 5271 | * |
| 5272 | 5272 | */ |
| 5273 | - public function countAllAircraftTypesByAirport($airport_icao,$filters = array()) |
|
| 5273 | + public function countAllAircraftTypesByAirport($airport_icao, $filters = array()) |
|
| 5274 | 5274 | { |
| 5275 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5276 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 5275 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5276 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 5277 | 5277 | |
| 5278 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5278 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5279 | 5279 | FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 5280 | 5280 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5281 | 5281 | ORDER BY aircraft_icao_count DESC"; |
@@ -5285,7 +5285,7 @@ discard block |
||
| 5285 | 5285 | |
| 5286 | 5286 | $aircraft_array = array(); |
| 5287 | 5287 | $temp_array = array(); |
| 5288 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5288 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5289 | 5289 | { |
| 5290 | 5290 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5291 | 5291 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5303,13 +5303,13 @@ discard block |
||
| 5303 | 5303 | * @return Array the aircraft list |
| 5304 | 5304 | * |
| 5305 | 5305 | */ |
| 5306 | - public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array()) |
|
| 5306 | + public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array()) |
|
| 5307 | 5307 | { |
| 5308 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5308 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5309 | 5309 | $Image = new Image($this->db); |
| 5310 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 5310 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 5311 | 5311 | |
| 5312 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5312 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5313 | 5313 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 5314 | 5314 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 5315 | 5315 | ORDER BY registration_count DESC"; |
@@ -5319,14 +5319,14 @@ discard block |
||
| 5319 | 5319 | |
| 5320 | 5320 | $aircraft_array = array(); |
| 5321 | 5321 | $temp_array = array(); |
| 5322 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5322 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5323 | 5323 | { |
| 5324 | 5324 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5325 | 5325 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5326 | 5326 | $temp_array['registration'] = $row['registration']; |
| 5327 | 5327 | $temp_array['airline_name'] = $row['airline_name']; |
| 5328 | 5328 | $temp_array['image_thumbnail'] = ""; |
| 5329 | - if($row['registration'] != "") |
|
| 5329 | + if ($row['registration'] != "") |
|
| 5330 | 5330 | { |
| 5331 | 5331 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5332 | 5332 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5344,11 +5344,11 @@ discard block |
||
| 5344 | 5344 | * @return Array the aircraft list |
| 5345 | 5345 | * |
| 5346 | 5346 | */ |
| 5347 | - public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array()) |
|
| 5347 | + public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array()) |
|
| 5348 | 5348 | { |
| 5349 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5350 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 5351 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5349 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5350 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 5351 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5352 | 5352 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 5353 | 5353 | GROUP BY spotter_output.aircraft_manufacturer |
| 5354 | 5354 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5359,7 +5359,7 @@ discard block |
||
| 5359 | 5359 | |
| 5360 | 5360 | $aircraft_array = array(); |
| 5361 | 5361 | $temp_array = array(); |
| 5362 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5362 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5363 | 5363 | { |
| 5364 | 5364 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 5365 | 5365 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -5374,12 +5374,12 @@ discard block |
||
| 5374 | 5374 | * @return Array the aircraft list |
| 5375 | 5375 | * |
| 5376 | 5376 | */ |
| 5377 | - public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 5377 | + public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 5378 | 5378 | { |
| 5379 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5380 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 5379 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5380 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 5381 | 5381 | |
| 5382 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5382 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5383 | 5383 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 5384 | 5384 | GROUP BY spotter_output.aircraft_name |
| 5385 | 5385 | ORDER BY aircraft_icao_count DESC"; |
@@ -5388,7 +5388,7 @@ discard block |
||
| 5388 | 5388 | $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
| 5389 | 5389 | $aircraft_array = array(); |
| 5390 | 5390 | $temp_array = array(); |
| 5391 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5391 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5392 | 5392 | { |
| 5393 | 5393 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5394 | 5394 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5407,11 +5407,11 @@ discard block |
||
| 5407 | 5407 | */ |
| 5408 | 5408 | public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array()) |
| 5409 | 5409 | { |
| 5410 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5410 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5411 | 5411 | $Image = new Image($this->db); |
| 5412 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 5412 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 5413 | 5413 | |
| 5414 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5414 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5415 | 5415 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 5416 | 5416 | GROUP BY spotter_output.registration |
| 5417 | 5417 | ORDER BY registration_count DESC"; |
@@ -5421,14 +5421,14 @@ discard block |
||
| 5421 | 5421 | $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
| 5422 | 5422 | $aircraft_array = array(); |
| 5423 | 5423 | $temp_array = array(); |
| 5424 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5424 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5425 | 5425 | { |
| 5426 | 5426 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5427 | 5427 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5428 | 5428 | $temp_array['registration'] = $row['registration']; |
| 5429 | 5429 | $temp_array['airline_name'] = $row['airline_name']; |
| 5430 | 5430 | $temp_array['image_thumbnail'] = ""; |
| 5431 | - if($row['registration'] != "") |
|
| 5431 | + if ($row['registration'] != "") |
|
| 5432 | 5432 | { |
| 5433 | 5433 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5434 | 5434 | $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5445,11 +5445,11 @@ discard block |
||
| 5445 | 5445 | * @return Array the aircraft list |
| 5446 | 5446 | * |
| 5447 | 5447 | */ |
| 5448 | - public function countAllAircraftTypesByDate($date,$filters = array()) |
|
| 5448 | + public function countAllAircraftTypesByDate($date, $filters = array()) |
|
| 5449 | 5449 | { |
| 5450 | 5450 | global $globalTimezone, $globalDBdriver; |
| 5451 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5452 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5451 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5452 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5453 | 5453 | if ($globalTimezone != '') { |
| 5454 | 5454 | date_default_timezone_set($globalTimezone); |
| 5455 | 5455 | $datetime = new DateTime($date); |
@@ -5457,12 +5457,12 @@ discard block |
||
| 5457 | 5457 | } else $offset = '+00:00'; |
| 5458 | 5458 | |
| 5459 | 5459 | if ($globalDBdriver == 'mysql') { |
| 5460 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5460 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5461 | 5461 | FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 5462 | 5462 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5463 | 5463 | ORDER BY aircraft_icao_count DESC"; |
| 5464 | 5464 | } else { |
| 5465 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5465 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5466 | 5466 | FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 5467 | 5467 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5468 | 5468 | ORDER BY aircraft_icao_count DESC"; |
@@ -5473,7 +5473,7 @@ discard block |
||
| 5473 | 5473 | |
| 5474 | 5474 | $aircraft_array = array(); |
| 5475 | 5475 | $temp_array = array(); |
| 5476 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5476 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5477 | 5477 | { |
| 5478 | 5478 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5479 | 5479 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5491,12 +5491,12 @@ discard block |
||
| 5491 | 5491 | * @return Array the aircraft list |
| 5492 | 5492 | * |
| 5493 | 5493 | */ |
| 5494 | - public function countAllAircraftRegistrationByDate($date,$filters = array()) |
|
| 5494 | + public function countAllAircraftRegistrationByDate($date, $filters = array()) |
|
| 5495 | 5495 | { |
| 5496 | 5496 | global $globalTimezone, $globalDBdriver; |
| 5497 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5497 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5498 | 5498 | $Image = new Image($this->db); |
| 5499 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5499 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5500 | 5500 | if ($globalTimezone != '') { |
| 5501 | 5501 | date_default_timezone_set($globalTimezone); |
| 5502 | 5502 | $datetime = new DateTime($date); |
@@ -5504,12 +5504,12 @@ discard block |
||
| 5504 | 5504 | } else $offset = '+00:00'; |
| 5505 | 5505 | |
| 5506 | 5506 | if ($globalDBdriver == 'mysql') { |
| 5507 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5507 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5508 | 5508 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 5509 | 5509 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 5510 | 5510 | ORDER BY registration_count DESC"; |
| 5511 | 5511 | } else { |
| 5512 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5512 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5513 | 5513 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 5514 | 5514 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 5515 | 5515 | ORDER BY registration_count DESC"; |
@@ -5520,14 +5520,14 @@ discard block |
||
| 5520 | 5520 | |
| 5521 | 5521 | $aircraft_array = array(); |
| 5522 | 5522 | $temp_array = array(); |
| 5523 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5523 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5524 | 5524 | { |
| 5525 | 5525 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5526 | 5526 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5527 | 5527 | $temp_array['registration'] = $row['registration']; |
| 5528 | 5528 | $temp_array['airline_name'] = $row['airline_name']; |
| 5529 | 5529 | $temp_array['image_thumbnail'] = ""; |
| 5530 | - if($row['registration'] != "") |
|
| 5530 | + if ($row['registration'] != "") |
|
| 5531 | 5531 | { |
| 5532 | 5532 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5533 | 5533 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5546,11 +5546,11 @@ discard block |
||
| 5546 | 5546 | * @return Array the aircraft manufacturer list |
| 5547 | 5547 | * |
| 5548 | 5548 | */ |
| 5549 | - public function countAllAircraftManufacturerByDate($date,$filters = array()) |
|
| 5549 | + public function countAllAircraftManufacturerByDate($date, $filters = array()) |
|
| 5550 | 5550 | { |
| 5551 | 5551 | global $globalTimezone, $globalDBdriver; |
| 5552 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5553 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5552 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5553 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5554 | 5554 | if ($globalTimezone != '') { |
| 5555 | 5555 | date_default_timezone_set($globalTimezone); |
| 5556 | 5556 | $datetime = new DateTime($date); |
@@ -5558,12 +5558,12 @@ discard block |
||
| 5558 | 5558 | } else $offset = '+00:00'; |
| 5559 | 5559 | |
| 5560 | 5560 | if ($globalDBdriver == 'mysql') { |
| 5561 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5561 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5562 | 5562 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 5563 | 5563 | GROUP BY spotter_output.aircraft_manufacturer |
| 5564 | 5564 | ORDER BY aircraft_manufacturer_count DESC"; |
| 5565 | 5565 | } else { |
| 5566 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5566 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5567 | 5567 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 5568 | 5568 | GROUP BY spotter_output.aircraft_manufacturer |
| 5569 | 5569 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5575,7 +5575,7 @@ discard block |
||
| 5575 | 5575 | $aircraft_array = array(); |
| 5576 | 5576 | $temp_array = array(); |
| 5577 | 5577 | |
| 5578 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5578 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5579 | 5579 | { |
| 5580 | 5580 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 5581 | 5581 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -5592,11 +5592,11 @@ discard block |
||
| 5592 | 5592 | * @return Array the aircraft list |
| 5593 | 5593 | * |
| 5594 | 5594 | */ |
| 5595 | - public function countAllAircraftTypesByIdent($ident,$filters = array()) |
|
| 5595 | + public function countAllAircraftTypesByIdent($ident, $filters = array()) |
|
| 5596 | 5596 | { |
| 5597 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5598 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 5599 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5597 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5598 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 5599 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5600 | 5600 | FROM spotter_output".$filter_query." spotter_output.ident = :ident |
| 5601 | 5601 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5602 | 5602 | ORDER BY aircraft_icao_count DESC"; |
@@ -5607,7 +5607,7 @@ discard block |
||
| 5607 | 5607 | $aircraft_array = array(); |
| 5608 | 5608 | $temp_array = array(); |
| 5609 | 5609 | |
| 5610 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5610 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5611 | 5611 | { |
| 5612 | 5612 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5613 | 5613 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5624,11 +5624,11 @@ discard block |
||
| 5624 | 5624 | * @return Array the aircraft list |
| 5625 | 5625 | * |
| 5626 | 5626 | */ |
| 5627 | - public function countAllAircraftTypesByPilot($pilot,$filters = array()) |
|
| 5627 | + public function countAllAircraftTypesByPilot($pilot, $filters = array()) |
|
| 5628 | 5628 | { |
| 5629 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5630 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 5631 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5629 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5630 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 5631 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5632 | 5632 | FROM spotter_output".$filter_query." (spotter_output.pilot_id = :pilot OR spotter_output.pilot_name = :pilot) |
| 5633 | 5633 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5634 | 5634 | ORDER BY aircraft_icao_count DESC"; |
@@ -5644,11 +5644,11 @@ discard block |
||
| 5644 | 5644 | * @return Array the aircraft list |
| 5645 | 5645 | * |
| 5646 | 5646 | */ |
| 5647 | - public function countAllAircraftTypesByOwner($owner,$filters = array()) |
|
| 5647 | + public function countAllAircraftTypesByOwner($owner, $filters = array()) |
|
| 5648 | 5648 | { |
| 5649 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5650 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 5651 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5649 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5650 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 5651 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer |
|
| 5652 | 5652 | FROM spotter_output".$filter_query." spotter_output.owner_name = :owner |
| 5653 | 5653 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.aircraft_icao |
| 5654 | 5654 | ORDER BY aircraft_icao_count DESC"; |
@@ -5664,13 +5664,13 @@ discard block |
||
| 5664 | 5664 | * @return Array the aircraft list |
| 5665 | 5665 | * |
| 5666 | 5666 | */ |
| 5667 | - public function countAllAircraftRegistrationByIdent($ident,$filters = array()) |
|
| 5667 | + public function countAllAircraftRegistrationByIdent($ident, $filters = array()) |
|
| 5668 | 5668 | { |
| 5669 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5669 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5670 | 5670 | $Image = new Image($this->db); |
| 5671 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 5671 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 5672 | 5672 | |
| 5673 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5673 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5674 | 5674 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident |
| 5675 | 5675 | GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 5676 | 5676 | ORDER BY registration_count DESC"; |
@@ -5682,14 +5682,14 @@ discard block |
||
| 5682 | 5682 | $aircraft_array = array(); |
| 5683 | 5683 | $temp_array = array(); |
| 5684 | 5684 | |
| 5685 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5685 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5686 | 5686 | { |
| 5687 | 5687 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5688 | 5688 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5689 | 5689 | $temp_array['registration'] = $row['registration']; |
| 5690 | 5690 | $temp_array['airline_name'] = $row['airline_name']; |
| 5691 | 5691 | $temp_array['image_thumbnail'] = ""; |
| 5692 | - if($row['registration'] != "") |
|
| 5692 | + if ($row['registration'] != "") |
|
| 5693 | 5693 | { |
| 5694 | 5694 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5695 | 5695 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5707,13 +5707,13 @@ discard block |
||
| 5707 | 5707 | * @return Array the aircraft list |
| 5708 | 5708 | * |
| 5709 | 5709 | */ |
| 5710 | - public function countAllAircraftRegistrationByOwner($owner,$filters = array()) |
|
| 5710 | + public function countAllAircraftRegistrationByOwner($owner, $filters = array()) |
|
| 5711 | 5711 | { |
| 5712 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5712 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5713 | 5713 | $Image = new Image($this->db); |
| 5714 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 5714 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 5715 | 5715 | |
| 5716 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name |
|
| 5716 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name |
|
| 5717 | 5717 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.owner_name = :owner |
| 5718 | 5718 | GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_name |
| 5719 | 5719 | ORDER BY registration_count DESC"; |
@@ -5725,7 +5725,7 @@ discard block |
||
| 5725 | 5725 | $aircraft_array = array(); |
| 5726 | 5726 | $temp_array = array(); |
| 5727 | 5727 | |
| 5728 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5728 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5729 | 5729 | { |
| 5730 | 5730 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5731 | 5731 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5733,7 +5733,7 @@ discard block |
||
| 5733 | 5733 | $temp_array['registration'] = $row['registration']; |
| 5734 | 5734 | $temp_array['airline_name'] = $row['airline_name']; |
| 5735 | 5735 | $temp_array['image_thumbnail'] = ""; |
| 5736 | - if($row['registration'] != "") |
|
| 5736 | + if ($row['registration'] != "") |
|
| 5737 | 5737 | { |
| 5738 | 5738 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5739 | 5739 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5751,13 +5751,13 @@ discard block |
||
| 5751 | 5751 | * @return Array the aircraft list |
| 5752 | 5752 | * |
| 5753 | 5753 | */ |
| 5754 | - public function countAllAircraftRegistrationByPilot($pilot,$filters = array()) |
|
| 5754 | + public function countAllAircraftRegistrationByPilot($pilot, $filters = array()) |
|
| 5755 | 5755 | { |
| 5756 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5756 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5757 | 5757 | $Image = new Image($this->db); |
| 5758 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 5758 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 5759 | 5759 | |
| 5760 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name |
|
| 5760 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name |
|
| 5761 | 5761 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 5762 | 5762 | GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_name |
| 5763 | 5763 | ORDER BY registration_count DESC"; |
@@ -5769,7 +5769,7 @@ discard block |
||
| 5769 | 5769 | $aircraft_array = array(); |
| 5770 | 5770 | $temp_array = array(); |
| 5771 | 5771 | |
| 5772 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5772 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5773 | 5773 | { |
| 5774 | 5774 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5775 | 5775 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5777,7 +5777,7 @@ discard block |
||
| 5777 | 5777 | $temp_array['registration'] = $row['registration']; |
| 5778 | 5778 | $temp_array['airline_name'] = $row['airline_name']; |
| 5779 | 5779 | $temp_array['image_thumbnail'] = ""; |
| 5780 | - if($row['registration'] != "") |
|
| 5780 | + if ($row['registration'] != "") |
|
| 5781 | 5781 | { |
| 5782 | 5782 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5783 | 5783 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5796,11 +5796,11 @@ discard block |
||
| 5796 | 5796 | * @return Array the aircraft manufacturer list |
| 5797 | 5797 | * |
| 5798 | 5798 | */ |
| 5799 | - public function countAllAircraftManufacturerByIdent($ident,$filters = array()) |
|
| 5799 | + public function countAllAircraftManufacturerByIdent($ident, $filters = array()) |
|
| 5800 | 5800 | { |
| 5801 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5802 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 5803 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5801 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5802 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 5803 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5804 | 5804 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident |
| 5805 | 5805 | GROUP BY spotter_output.aircraft_manufacturer |
| 5806 | 5806 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5810,7 +5810,7 @@ discard block |
||
| 5810 | 5810 | $sth->execute(array(':ident' => $ident)); |
| 5811 | 5811 | $aircraft_array = array(); |
| 5812 | 5812 | $temp_array = array(); |
| 5813 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5813 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5814 | 5814 | { |
| 5815 | 5815 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 5816 | 5816 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -5825,11 +5825,11 @@ discard block |
||
| 5825 | 5825 | * @return Array the aircraft manufacturer list |
| 5826 | 5826 | * |
| 5827 | 5827 | */ |
| 5828 | - public function countAllAircraftManufacturerByOwner($owner,$filters = array()) |
|
| 5828 | + public function countAllAircraftManufacturerByOwner($owner, $filters = array()) |
|
| 5829 | 5829 | { |
| 5830 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5831 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 5832 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5830 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5831 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 5832 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5833 | 5833 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.owner_name = :owner |
| 5834 | 5834 | GROUP BY spotter_output.aircraft_manufacturer |
| 5835 | 5835 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5846,11 +5846,11 @@ discard block |
||
| 5846 | 5846 | * @return Array the aircraft manufacturer list |
| 5847 | 5847 | * |
| 5848 | 5848 | */ |
| 5849 | - public function countAllAircraftManufacturerByPilot($pilot,$filters = array()) |
|
| 5849 | + public function countAllAircraftManufacturerByPilot($pilot, $filters = array()) |
|
| 5850 | 5850 | { |
| 5851 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5852 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 5853 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5851 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5852 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 5853 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5854 | 5854 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 5855 | 5855 | GROUP BY spotter_output.aircraft_manufacturer |
| 5856 | 5856 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -5868,24 +5868,24 @@ discard block |
||
| 5868 | 5868 | * @return Array the aircraft list |
| 5869 | 5869 | * |
| 5870 | 5870 | */ |
| 5871 | - public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array()) |
|
| 5871 | + public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 5872 | 5872 | { |
| 5873 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5874 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5875 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5873 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5874 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5875 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5876 | 5876 | |
| 5877 | 5877 | |
| 5878 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5878 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5879 | 5879 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 5880 | 5880 | GROUP BY spotter_output.aircraft_name |
| 5881 | 5881 | ORDER BY aircraft_icao_count DESC"; |
| 5882 | 5882 | |
| 5883 | 5883 | |
| 5884 | 5884 | $sth = $this->db->prepare($query); |
| 5885 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5885 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5886 | 5886 | $aircraft_array = array(); |
| 5887 | 5887 | $temp_array = array(); |
| 5888 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5888 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5889 | 5889 | { |
| 5890 | 5890 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5891 | 5891 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -5901,33 +5901,33 @@ discard block |
||
| 5901 | 5901 | * @return Array the aircraft list |
| 5902 | 5902 | * |
| 5903 | 5903 | */ |
| 5904 | - public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array()) |
|
| 5904 | + public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 5905 | 5905 | { |
| 5906 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5906 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5907 | 5907 | $Image = new Image($this->db); |
| 5908 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5909 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5908 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5909 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5910 | 5910 | |
| 5911 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5911 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 5912 | 5912 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 5913 | 5913 | GROUP BY spotter_output.registration |
| 5914 | 5914 | ORDER BY registration_count DESC"; |
| 5915 | 5915 | |
| 5916 | 5916 | |
| 5917 | 5917 | $sth = $this->db->prepare($query); |
| 5918 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5918 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5919 | 5919 | |
| 5920 | 5920 | $aircraft_array = array(); |
| 5921 | 5921 | $temp_array = array(); |
| 5922 | 5922 | |
| 5923 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5923 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5924 | 5924 | { |
| 5925 | 5925 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 5926 | 5926 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 5927 | 5927 | $temp_array['registration'] = $row['registration']; |
| 5928 | 5928 | $temp_array['airline_name'] = $row['airline_name']; |
| 5929 | 5929 | $temp_array['image_thumbnail'] = ""; |
| 5930 | - if($row['registration'] != "") |
|
| 5930 | + if ($row['registration'] != "") |
|
| 5931 | 5931 | { |
| 5932 | 5932 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5933 | 5933 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -5947,25 +5947,25 @@ discard block |
||
| 5947 | 5947 | * @return Array the aircraft manufacturer list |
| 5948 | 5948 | * |
| 5949 | 5949 | */ |
| 5950 | - public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array()) |
|
| 5950 | + public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 5951 | 5951 | { |
| 5952 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5953 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5954 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 5952 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5953 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5954 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 5955 | 5955 | |
| 5956 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5956 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 5957 | 5957 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 5958 | 5958 | GROUP BY spotter_output.aircraft_manufacturer |
| 5959 | 5959 | ORDER BY aircraft_manufacturer_count DESC"; |
| 5960 | 5960 | |
| 5961 | 5961 | |
| 5962 | 5962 | $sth = $this->db->prepare($query); |
| 5963 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5963 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 5964 | 5964 | |
| 5965 | 5965 | $aircraft_array = array(); |
| 5966 | 5966 | $temp_array = array(); |
| 5967 | 5967 | |
| 5968 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5968 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5969 | 5969 | { |
| 5970 | 5970 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 5971 | 5971 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -5985,11 +5985,11 @@ discard block |
||
| 5985 | 5985 | * @return Array the aircraft list |
| 5986 | 5986 | * |
| 5987 | 5987 | */ |
| 5988 | - public function countAllAircraftTypesByCountry($country,$filters = array()) |
|
| 5988 | + public function countAllAircraftTypesByCountry($country, $filters = array()) |
|
| 5989 | 5989 | { |
| 5990 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 5991 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 5992 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5990 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 5991 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 5992 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 5993 | 5993 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 5994 | 5994 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
| 5995 | 5995 | ORDER BY aircraft_icao_count DESC"; |
@@ -6001,7 +6001,7 @@ discard block |
||
| 6001 | 6001 | $aircraft_array = array(); |
| 6002 | 6002 | $temp_array = array(); |
| 6003 | 6003 | |
| 6004 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6004 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6005 | 6005 | { |
| 6006 | 6006 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 6007 | 6007 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -6020,12 +6020,12 @@ discard block |
||
| 6020 | 6020 | * @return Array the aircraft list |
| 6021 | 6021 | * |
| 6022 | 6022 | */ |
| 6023 | - public function countAllAircraftRegistrationByCountry($country,$filters = array()) |
|
| 6023 | + public function countAllAircraftRegistrationByCountry($country, $filters = array()) |
|
| 6024 | 6024 | { |
| 6025 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6025 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6026 | 6026 | $Image = new Image($this->db); |
| 6027 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 6028 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 6027 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 6028 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 6029 | 6029 | FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) |
| 6030 | 6030 | GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
| 6031 | 6031 | ORDER BY registration_count DESC"; |
@@ -6037,14 +6037,14 @@ discard block |
||
| 6037 | 6037 | $aircraft_array = array(); |
| 6038 | 6038 | $temp_array = array(); |
| 6039 | 6039 | |
| 6040 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6040 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6041 | 6041 | { |
| 6042 | 6042 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 6043 | 6043 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 6044 | 6044 | $temp_array['registration'] = $row['registration']; |
| 6045 | 6045 | $temp_array['airline_name'] = $row['airline_name']; |
| 6046 | 6046 | $temp_array['image_thumbnail'] = ""; |
| 6047 | - if($row['registration'] != "") |
|
| 6047 | + if ($row['registration'] != "") |
|
| 6048 | 6048 | { |
| 6049 | 6049 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6050 | 6050 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -6064,11 +6064,11 @@ discard block |
||
| 6064 | 6064 | * @return Array the aircraft manufacturer list |
| 6065 | 6065 | * |
| 6066 | 6066 | */ |
| 6067 | - public function countAllAircraftManufacturerByCountry($country,$filters = array()) |
|
| 6067 | + public function countAllAircraftManufacturerByCountry($country, $filters = array()) |
|
| 6068 | 6068 | { |
| 6069 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6070 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 6071 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 6069 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6070 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 6071 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 6072 | 6072 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) |
| 6073 | 6073 | GROUP BY spotter_output.aircraft_manufacturer |
| 6074 | 6074 | ORDER BY aircraft_manufacturer_count DESC"; |
@@ -6080,7 +6080,7 @@ discard block |
||
| 6080 | 6080 | $aircraft_array = array(); |
| 6081 | 6081 | $temp_array = array(); |
| 6082 | 6082 | |
| 6083 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6083 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6084 | 6084 | { |
| 6085 | 6085 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 6086 | 6086 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -6099,38 +6099,38 @@ discard block |
||
| 6099 | 6099 | * @return Array the aircraft list |
| 6100 | 6100 | * |
| 6101 | 6101 | */ |
| 6102 | - public function countAllAircraftManufacturers($filters = array(),$year = '',$month = '',$day = '') |
|
| 6102 | + public function countAllAircraftManufacturers($filters = array(), $year = '', $month = '', $day = '') |
|
| 6103 | 6103 | { |
| 6104 | 6104 | global $globalDBdriver; |
| 6105 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6106 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 6105 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6106 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 6107 | 6107 | FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'"; |
| 6108 | 6108 | $query_values = array(); |
| 6109 | 6109 | if ($year != '') { |
| 6110 | 6110 | if ($globalDBdriver == 'mysql') { |
| 6111 | 6111 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 6112 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6112 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6113 | 6113 | } else { |
| 6114 | 6114 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 6115 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6115 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6116 | 6116 | } |
| 6117 | 6117 | } |
| 6118 | 6118 | if ($month != '') { |
| 6119 | 6119 | if ($globalDBdriver == 'mysql') { |
| 6120 | 6120 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 6121 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6121 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6122 | 6122 | } else { |
| 6123 | 6123 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 6124 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6124 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6125 | 6125 | } |
| 6126 | 6126 | } |
| 6127 | 6127 | if ($day != '') { |
| 6128 | 6128 | if ($globalDBdriver == 'mysql') { |
| 6129 | 6129 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 6130 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6130 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6131 | 6131 | } else { |
| 6132 | 6132 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 6133 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6133 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6134 | 6134 | } |
| 6135 | 6135 | } |
| 6136 | 6136 | $query .= " GROUP BY spotter_output.aircraft_manufacturer |
@@ -6144,7 +6144,7 @@ discard block |
||
| 6144 | 6144 | $manufacturer_array = array(); |
| 6145 | 6145 | $temp_array = array(); |
| 6146 | 6146 | |
| 6147 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6147 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6148 | 6148 | { |
| 6149 | 6149 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 6150 | 6150 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -6163,12 +6163,12 @@ discard block |
||
| 6163 | 6163 | * @return Array the aircraft list |
| 6164 | 6164 | * |
| 6165 | 6165 | */ |
| 6166 | - public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 6166 | + public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 6167 | 6167 | { |
| 6168 | 6168 | global $globalDBdriver; |
| 6169 | 6169 | $Image = new Image($this->db); |
| 6170 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6171 | - $query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 6170 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6171 | + $query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 6172 | 6172 | FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'"; |
| 6173 | 6173 | if ($olderthanmonths > 0) { |
| 6174 | 6174 | if ($globalDBdriver == 'mysql') { |
@@ -6188,28 +6188,28 @@ discard block |
||
| 6188 | 6188 | if ($year != '') { |
| 6189 | 6189 | if ($globalDBdriver == 'mysql') { |
| 6190 | 6190 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 6191 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6191 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6192 | 6192 | } else { |
| 6193 | 6193 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 6194 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6194 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6195 | 6195 | } |
| 6196 | 6196 | } |
| 6197 | 6197 | if ($month != '') { |
| 6198 | 6198 | if ($globalDBdriver == 'mysql') { |
| 6199 | 6199 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 6200 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6200 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6201 | 6201 | } else { |
| 6202 | 6202 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 6203 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6203 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6204 | 6204 | } |
| 6205 | 6205 | } |
| 6206 | 6206 | if ($day != '') { |
| 6207 | 6207 | if ($globalDBdriver == 'mysql') { |
| 6208 | 6208 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 6209 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6209 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6210 | 6210 | } else { |
| 6211 | 6211 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 6212 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6212 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6213 | 6213 | } |
| 6214 | 6214 | } |
| 6215 | 6215 | $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC"; |
@@ -6221,7 +6221,7 @@ discard block |
||
| 6221 | 6221 | $aircraft_array = array(); |
| 6222 | 6222 | $temp_array = array(); |
| 6223 | 6223 | |
| 6224 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6224 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6225 | 6225 | { |
| 6226 | 6226 | $temp_array['registration'] = $row['registration']; |
| 6227 | 6227 | $temp_array['aircraft_registration_count'] = $row['aircraft_registration_count']; |
@@ -6229,7 +6229,7 @@ discard block |
||
| 6229 | 6229 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 6230 | 6230 | $temp_array['airline_name'] = $row['airline_name']; |
| 6231 | 6231 | $temp_array['image_thumbnail'] = ""; |
| 6232 | - if($row['registration'] != "") |
|
| 6232 | + if ($row['registration'] != "") |
|
| 6233 | 6233 | { |
| 6234 | 6234 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6235 | 6235 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -6248,12 +6248,12 @@ discard block |
||
| 6248 | 6248 | * @return Array the aircraft list |
| 6249 | 6249 | * |
| 6250 | 6250 | */ |
| 6251 | - public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 6251 | + public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 6252 | 6252 | { |
| 6253 | 6253 | global $globalDBdriver; |
| 6254 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6254 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6255 | 6255 | $Image = new Image($this->db); |
| 6256 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 6256 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 6257 | 6257 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' "; |
| 6258 | 6258 | if ($olderthanmonths > 0) { |
| 6259 | 6259 | if ($globalDBdriver == 'mysql') { |
@@ -6281,7 +6281,7 @@ discard block |
||
| 6281 | 6281 | $aircraft_array = array(); |
| 6282 | 6282 | $temp_array = array(); |
| 6283 | 6283 | |
| 6284 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6284 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6285 | 6285 | { |
| 6286 | 6286 | $temp_array['registration'] = $row['registration']; |
| 6287 | 6287 | $temp_array['aircraft_registration_count'] = $row['aircraft_registration_count']; |
@@ -6290,7 +6290,7 @@ discard block |
||
| 6290 | 6290 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 6291 | 6291 | $temp_array['airline_name'] = $row['airline_name']; |
| 6292 | 6292 | $temp_array['image_thumbnail'] = ""; |
| 6293 | - if($row['registration'] != "") |
|
| 6293 | + if ($row['registration'] != "") |
|
| 6294 | 6294 | { |
| 6295 | 6295 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6296 | 6296 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -6309,11 +6309,11 @@ discard block |
||
| 6309 | 6309 | * @return Array the airport list |
| 6310 | 6310 | * |
| 6311 | 6311 | */ |
| 6312 | - public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 6312 | + public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 6313 | 6313 | { |
| 6314 | 6314 | global $globalDBdriver; |
| 6315 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6316 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6315 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6316 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6317 | 6317 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''"; |
| 6318 | 6318 | if ($olderthanmonths > 0) { |
| 6319 | 6319 | if ($globalDBdriver == 'mysql') { |
@@ -6333,28 +6333,28 @@ discard block |
||
| 6333 | 6333 | if ($year != '') { |
| 6334 | 6334 | if ($globalDBdriver == 'mysql') { |
| 6335 | 6335 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 6336 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6336 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6337 | 6337 | } else { |
| 6338 | 6338 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 6339 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6339 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6340 | 6340 | } |
| 6341 | 6341 | } |
| 6342 | 6342 | if ($month != '') { |
| 6343 | 6343 | if ($globalDBdriver == 'mysql') { |
| 6344 | 6344 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 6345 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6345 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6346 | 6346 | } else { |
| 6347 | 6347 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 6348 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6348 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6349 | 6349 | } |
| 6350 | 6350 | } |
| 6351 | 6351 | if ($day != '') { |
| 6352 | 6352 | if ($globalDBdriver == 'mysql') { |
| 6353 | 6353 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 6354 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6354 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6355 | 6355 | } else { |
| 6356 | 6356 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 6357 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6357 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6358 | 6358 | } |
| 6359 | 6359 | } |
| 6360 | 6360 | $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
@@ -6366,7 +6366,7 @@ discard block |
||
| 6366 | 6366 | |
| 6367 | 6367 | $airport_array = array(); |
| 6368 | 6368 | $temp_array = array(); |
| 6369 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6369 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6370 | 6370 | { |
| 6371 | 6371 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6372 | 6372 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6385,11 +6385,11 @@ discard block |
||
| 6385 | 6385 | * @return Array the airport list |
| 6386 | 6386 | * |
| 6387 | 6387 | */ |
| 6388 | - public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array()) |
|
| 6388 | + public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 6389 | 6389 | { |
| 6390 | 6390 | global $globalDBdriver; |
| 6391 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6392 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6391 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6392 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6393 | 6393 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' "; |
| 6394 | 6394 | if ($olderthanmonths > 0) { |
| 6395 | 6395 | if ($globalDBdriver == 'mysql') { |
@@ -6418,7 +6418,7 @@ discard block |
||
| 6418 | 6418 | $airport_array = array(); |
| 6419 | 6419 | $temp_array = array(); |
| 6420 | 6420 | |
| 6421 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6421 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6422 | 6422 | { |
| 6423 | 6423 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 6424 | 6424 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6438,11 +6438,11 @@ discard block |
||
| 6438 | 6438 | * @return Array the airport list |
| 6439 | 6439 | * |
| 6440 | 6440 | */ |
| 6441 | - public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 6441 | + public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 6442 | 6442 | { |
| 6443 | 6443 | global $globalDBdriver; |
| 6444 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6445 | - $query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 6444 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6445 | + $query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 6446 | 6446 | FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao"; |
| 6447 | 6447 | if ($olderthanmonths > 0) { |
| 6448 | 6448 | if ($globalDBdriver == 'mysql') { |
@@ -6462,28 +6462,28 @@ discard block |
||
| 6462 | 6462 | if ($year != '') { |
| 6463 | 6463 | if ($globalDBdriver == 'mysql') { |
| 6464 | 6464 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 6465 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6465 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6466 | 6466 | } else { |
| 6467 | 6467 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 6468 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 6468 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 6469 | 6469 | } |
| 6470 | 6470 | } |
| 6471 | 6471 | if ($month != '') { |
| 6472 | 6472 | if ($globalDBdriver == 'mysql') { |
| 6473 | 6473 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 6474 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6474 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6475 | 6475 | } else { |
| 6476 | 6476 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 6477 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 6477 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 6478 | 6478 | } |
| 6479 | 6479 | } |
| 6480 | 6480 | if ($day != '') { |
| 6481 | 6481 | if ($globalDBdriver == 'mysql') { |
| 6482 | 6482 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 6483 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6483 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6484 | 6484 | } else { |
| 6485 | 6485 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 6486 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 6486 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 6487 | 6487 | } |
| 6488 | 6488 | } |
| 6489 | 6489 | $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country |
@@ -6496,7 +6496,7 @@ discard block |
||
| 6496 | 6496 | $airport_array = array(); |
| 6497 | 6497 | $temp_array = array(); |
| 6498 | 6498 | |
| 6499 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6499 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6500 | 6500 | { |
| 6501 | 6501 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6502 | 6502 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6515,11 +6515,11 @@ discard block |
||
| 6515 | 6515 | * @return Array the airport list |
| 6516 | 6516 | * |
| 6517 | 6517 | */ |
| 6518 | - public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array()) |
|
| 6518 | + public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 6519 | 6519 | { |
| 6520 | 6520 | global $globalDBdriver; |
| 6521 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6522 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 6521 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6522 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 6523 | 6523 | FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao "; |
| 6524 | 6524 | if ($olderthanmonths > 0) { |
| 6525 | 6525 | if ($globalDBdriver == 'mysql') { |
@@ -6548,7 +6548,7 @@ discard block |
||
| 6548 | 6548 | $airport_array = array(); |
| 6549 | 6549 | $temp_array = array(); |
| 6550 | 6550 | |
| 6551 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6551 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6552 | 6552 | { |
| 6553 | 6553 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 6554 | 6554 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6568,11 +6568,11 @@ discard block |
||
| 6568 | 6568 | * @return Array the airport list |
| 6569 | 6569 | * |
| 6570 | 6570 | */ |
| 6571 | - public function countAllDepartureAirportsByAirline($airline_icao,$filters = array()) |
|
| 6571 | + public function countAllDepartureAirportsByAirline($airline_icao, $filters = array()) |
|
| 6572 | 6572 | { |
| 6573 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6574 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 6575 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6573 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6574 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 6575 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6576 | 6576 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao AND spotter_output.departure_airport_icao <> '' |
| 6577 | 6577 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6578 | 6578 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6584,7 +6584,7 @@ discard block |
||
| 6584 | 6584 | $airport_array = array(); |
| 6585 | 6585 | $temp_array = array(); |
| 6586 | 6586 | |
| 6587 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6587 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6588 | 6588 | { |
| 6589 | 6589 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6590 | 6590 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6606,11 +6606,11 @@ discard block |
||
| 6606 | 6606 | * @return Array the airport list |
| 6607 | 6607 | * |
| 6608 | 6608 | */ |
| 6609 | - public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array()) |
|
| 6609 | + public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array()) |
|
| 6610 | 6610 | { |
| 6611 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6612 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 6613 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6611 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6612 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 6613 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6614 | 6614 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao |
| 6615 | 6615 | GROUP BY spotter_output.departure_airport_country |
| 6616 | 6616 | ORDER BY airport_departure_country_count DESC"; |
@@ -6622,7 +6622,7 @@ discard block |
||
| 6622 | 6622 | $airport_array = array(); |
| 6623 | 6623 | $temp_array = array(); |
| 6624 | 6624 | |
| 6625 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6625 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6626 | 6626 | { |
| 6627 | 6627 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 6628 | 6628 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -6641,11 +6641,11 @@ discard block |
||
| 6641 | 6641 | * @return Array the airport list |
| 6642 | 6642 | * |
| 6643 | 6643 | */ |
| 6644 | - public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array()) |
|
| 6644 | + public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array()) |
|
| 6645 | 6645 | { |
| 6646 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6647 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 6648 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6646 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6647 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 6648 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6649 | 6649 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao AND spotter_output.departure_airport_icao <> '' |
| 6650 | 6650 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6651 | 6651 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6657,7 +6657,7 @@ discard block |
||
| 6657 | 6657 | $airport_array = array(); |
| 6658 | 6658 | $temp_array = array(); |
| 6659 | 6659 | |
| 6660 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6660 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6661 | 6661 | { |
| 6662 | 6662 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6663 | 6663 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6678,11 +6678,11 @@ discard block |
||
| 6678 | 6678 | * @return Array the airport list |
| 6679 | 6679 | * |
| 6680 | 6680 | */ |
| 6681 | - public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array()) |
|
| 6681 | + public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array()) |
|
| 6682 | 6682 | { |
| 6683 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6684 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 6685 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6683 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6684 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 6685 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6686 | 6686 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 6687 | 6687 | GROUP BY spotter_output.departure_airport_country |
| 6688 | 6688 | ORDER BY airport_departure_country_count DESC"; |
@@ -6694,7 +6694,7 @@ discard block |
||
| 6694 | 6694 | $airport_array = array(); |
| 6695 | 6695 | $temp_array = array(); |
| 6696 | 6696 | |
| 6697 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6697 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6698 | 6698 | { |
| 6699 | 6699 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 6700 | 6700 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -6712,11 +6712,11 @@ discard block |
||
| 6712 | 6712 | * @return Array the airport list |
| 6713 | 6713 | * |
| 6714 | 6714 | */ |
| 6715 | - public function countAllDepartureAirportsByRegistration($registration,$filters = array()) |
|
| 6715 | + public function countAllDepartureAirportsByRegistration($registration, $filters = array()) |
|
| 6716 | 6716 | { |
| 6717 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6718 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 6719 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6717 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6718 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 6719 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6720 | 6720 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration AND spotter_output.departure_airport_icao <> '' |
| 6721 | 6721 | GROUP BY spotter_output.departure_airport_icao |
| 6722 | 6722 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6728,7 +6728,7 @@ discard block |
||
| 6728 | 6728 | $airport_array = array(); |
| 6729 | 6729 | $temp_array = array(); |
| 6730 | 6730 | |
| 6731 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6731 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6732 | 6732 | { |
| 6733 | 6733 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6734 | 6734 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6749,11 +6749,11 @@ discard block |
||
| 6749 | 6749 | * @return Array the airport list |
| 6750 | 6750 | * |
| 6751 | 6751 | */ |
| 6752 | - public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array()) |
|
| 6752 | + public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array()) |
|
| 6753 | 6753 | { |
| 6754 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6755 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 6756 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6754 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6755 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 6756 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6757 | 6757 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration |
| 6758 | 6758 | GROUP BY spotter_output.departure_airport_country |
| 6759 | 6759 | ORDER BY airport_departure_country_count DESC"; |
@@ -6765,7 +6765,7 @@ discard block |
||
| 6765 | 6765 | $airport_array = array(); |
| 6766 | 6766 | $temp_array = array(); |
| 6767 | 6767 | |
| 6768 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6768 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6769 | 6769 | { |
| 6770 | 6770 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 6771 | 6771 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -6783,11 +6783,11 @@ discard block |
||
| 6783 | 6783 | * @return Array the airport list |
| 6784 | 6784 | * |
| 6785 | 6785 | */ |
| 6786 | - public function countAllDepartureAirportsByAirport($airport_icao,$filters = array()) |
|
| 6786 | + public function countAllDepartureAirportsByAirport($airport_icao, $filters = array()) |
|
| 6787 | 6787 | { |
| 6788 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6789 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 6790 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6788 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6789 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 6790 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6791 | 6791 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao AND spotter_output.departure_airport_icao <> '' |
| 6792 | 6792 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6793 | 6793 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6799,7 +6799,7 @@ discard block |
||
| 6799 | 6799 | $airport_array = array(); |
| 6800 | 6800 | $temp_array = array(); |
| 6801 | 6801 | |
| 6802 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6802 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6803 | 6803 | { |
| 6804 | 6804 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6805 | 6805 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6820,11 +6820,11 @@ discard block |
||
| 6820 | 6820 | * @return Array the airport list |
| 6821 | 6821 | * |
| 6822 | 6822 | */ |
| 6823 | - public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array()) |
|
| 6823 | + public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array()) |
|
| 6824 | 6824 | { |
| 6825 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6826 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 6827 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6825 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6826 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 6827 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6828 | 6828 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao |
| 6829 | 6829 | GROUP BY spotter_output.departure_airport_country |
| 6830 | 6830 | ORDER BY airport_departure_country_count DESC"; |
@@ -6836,7 +6836,7 @@ discard block |
||
| 6836 | 6836 | $airport_array = array(); |
| 6837 | 6837 | $temp_array = array(); |
| 6838 | 6838 | |
| 6839 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6839 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6840 | 6840 | { |
| 6841 | 6841 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 6842 | 6842 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -6855,11 +6855,11 @@ discard block |
||
| 6855 | 6855 | * @return Array the airport list |
| 6856 | 6856 | * |
| 6857 | 6857 | */ |
| 6858 | - public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 6858 | + public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 6859 | 6859 | { |
| 6860 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6861 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 6862 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6860 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6861 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 6862 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6863 | 6863 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer AND spotter_output.departure_airport_icao <> '' |
| 6864 | 6864 | GROUP BY spotter_output.departure_airport_icao |
| 6865 | 6865 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6871,7 +6871,7 @@ discard block |
||
| 6871 | 6871 | $airport_array = array(); |
| 6872 | 6872 | $temp_array = array(); |
| 6873 | 6873 | |
| 6874 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6874 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6875 | 6875 | { |
| 6876 | 6876 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6877 | 6877 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6892,11 +6892,11 @@ discard block |
||
| 6892 | 6892 | * @return Array the airport list |
| 6893 | 6893 | * |
| 6894 | 6894 | */ |
| 6895 | - public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 6895 | + public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 6896 | 6896 | { |
| 6897 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6898 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 6899 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6897 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6898 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 6899 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6900 | 6900 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 6901 | 6901 | GROUP BY spotter_output.departure_airport_country |
| 6902 | 6902 | ORDER BY airport_departure_country_count DESC"; |
@@ -6908,7 +6908,7 @@ discard block |
||
| 6908 | 6908 | $airport_array = array(); |
| 6909 | 6909 | $temp_array = array(); |
| 6910 | 6910 | |
| 6911 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6911 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6912 | 6912 | { |
| 6913 | 6913 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 6914 | 6914 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -6926,11 +6926,11 @@ discard block |
||
| 6926 | 6926 | * @return Array the airport list |
| 6927 | 6927 | * |
| 6928 | 6928 | */ |
| 6929 | - public function countAllDepartureAirportsByDate($date,$filters = array()) |
|
| 6929 | + public function countAllDepartureAirportsByDate($date, $filters = array()) |
|
| 6930 | 6930 | { |
| 6931 | 6931 | global $globalTimezone, $globalDBdriver; |
| 6932 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6933 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 6932 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6933 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 6934 | 6934 | if ($globalTimezone != '') { |
| 6935 | 6935 | date_default_timezone_set($globalTimezone); |
| 6936 | 6936 | $datetime = new DateTime($date); |
@@ -6938,12 +6938,12 @@ discard block |
||
| 6938 | 6938 | } else $offset = '+00:00'; |
| 6939 | 6939 | |
| 6940 | 6940 | if ($globalDBdriver == 'mysql') { |
| 6941 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6941 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6942 | 6942 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 6943 | 6943 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6944 | 6944 | ORDER BY airport_departure_icao_count DESC"; |
| 6945 | 6945 | } else { |
| 6946 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6946 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 6947 | 6947 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 6948 | 6948 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6949 | 6949 | ORDER BY airport_departure_icao_count DESC"; |
@@ -6955,7 +6955,7 @@ discard block |
||
| 6955 | 6955 | $airport_array = array(); |
| 6956 | 6956 | $temp_array = array(); |
| 6957 | 6957 | |
| 6958 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6958 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6959 | 6959 | { |
| 6960 | 6960 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 6961 | 6961 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -6976,11 +6976,11 @@ discard block |
||
| 6976 | 6976 | * @return Array the airport list |
| 6977 | 6977 | * |
| 6978 | 6978 | */ |
| 6979 | - public function countAllDepartureAirportCountriesByDate($date,$filters = array()) |
|
| 6979 | + public function countAllDepartureAirportCountriesByDate($date, $filters = array()) |
|
| 6980 | 6980 | { |
| 6981 | 6981 | global $globalTimezone, $globalDBdriver; |
| 6982 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 6983 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 6982 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 6983 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 6984 | 6984 | if ($globalTimezone != '') { |
| 6985 | 6985 | date_default_timezone_set($globalTimezone); |
| 6986 | 6986 | $datetime = new DateTime($date); |
@@ -6988,12 +6988,12 @@ discard block |
||
| 6988 | 6988 | } else $offset = '+00:00'; |
| 6989 | 6989 | |
| 6990 | 6990 | if ($globalDBdriver == 'mysql') { |
| 6991 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6991 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6992 | 6992 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 6993 | 6993 | GROUP BY spotter_output.departure_airport_country |
| 6994 | 6994 | ORDER BY airport_departure_country_count DESC"; |
| 6995 | 6995 | } else { |
| 6996 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6996 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6997 | 6997 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 6998 | 6998 | GROUP BY spotter_output.departure_airport_country |
| 6999 | 6999 | ORDER BY airport_departure_country_count DESC"; |
@@ -7005,7 +7005,7 @@ discard block |
||
| 7005 | 7005 | $airport_array = array(); |
| 7006 | 7006 | $temp_array = array(); |
| 7007 | 7007 | |
| 7008 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7008 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7009 | 7009 | { |
| 7010 | 7010 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 7011 | 7011 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -7023,11 +7023,11 @@ discard block |
||
| 7023 | 7023 | * @return Array the airport list |
| 7024 | 7024 | * |
| 7025 | 7025 | */ |
| 7026 | - public function countAllDepartureAirportsByIdent($ident,$filters = array()) |
|
| 7026 | + public function countAllDepartureAirportsByIdent($ident, $filters = array()) |
|
| 7027 | 7027 | { |
| 7028 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7029 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 7030 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7028 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7029 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 7030 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7031 | 7031 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.ident = :ident |
| 7032 | 7032 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 7033 | 7033 | ORDER BY airport_departure_icao_count DESC"; |
@@ -7039,7 +7039,7 @@ discard block |
||
| 7039 | 7039 | $airport_array = array(); |
| 7040 | 7040 | $temp_array = array(); |
| 7041 | 7041 | |
| 7042 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7042 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7043 | 7043 | { |
| 7044 | 7044 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 7045 | 7045 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -7059,11 +7059,11 @@ discard block |
||
| 7059 | 7059 | * @return Array the airport list |
| 7060 | 7060 | * |
| 7061 | 7061 | */ |
| 7062 | - public function countAllDepartureAirportsByOwner($owner,$filters = array()) |
|
| 7062 | + public function countAllDepartureAirportsByOwner($owner, $filters = array()) |
|
| 7063 | 7063 | { |
| 7064 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7065 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 7066 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7064 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7065 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 7066 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7067 | 7067 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.owner_name = :owner |
| 7068 | 7068 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 7069 | 7069 | ORDER BY airport_departure_icao_count DESC"; |
@@ -7075,7 +7075,7 @@ discard block |
||
| 7075 | 7075 | $airport_array = array(); |
| 7076 | 7076 | $temp_array = array(); |
| 7077 | 7077 | |
| 7078 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7078 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7079 | 7079 | { |
| 7080 | 7080 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 7081 | 7081 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -7095,11 +7095,11 @@ discard block |
||
| 7095 | 7095 | * @return Array the airport list |
| 7096 | 7096 | * |
| 7097 | 7097 | */ |
| 7098 | - public function countAllDepartureAirportsByPilot($pilot,$filters = array()) |
|
| 7098 | + public function countAllDepartureAirportsByPilot($pilot, $filters = array()) |
|
| 7099 | 7099 | { |
| 7100 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7101 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 7102 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7100 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7101 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 7102 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7103 | 7103 | FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 7104 | 7104 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 7105 | 7105 | ORDER BY airport_departure_icao_count DESC"; |
@@ -7110,7 +7110,7 @@ discard block |
||
| 7110 | 7110 | $airport_array = array(); |
| 7111 | 7111 | $temp_array = array(); |
| 7112 | 7112 | |
| 7113 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7113 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7114 | 7114 | { |
| 7115 | 7115 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 7116 | 7116 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -7132,11 +7132,11 @@ discard block |
||
| 7132 | 7132 | * @return Array the airport list |
| 7133 | 7133 | * |
| 7134 | 7134 | */ |
| 7135 | - public function countAllDepartureAirportCountriesByIdent($ident,$filters = array()) |
|
| 7135 | + public function countAllDepartureAirportCountriesByIdent($ident, $filters = array()) |
|
| 7136 | 7136 | { |
| 7137 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7138 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 7139 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7137 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7138 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 7139 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7140 | 7140 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident |
| 7141 | 7141 | GROUP BY spotter_output.departure_airport_country |
| 7142 | 7142 | ORDER BY airport_departure_country_count DESC"; |
@@ -7148,7 +7148,7 @@ discard block |
||
| 7148 | 7148 | $airport_array = array(); |
| 7149 | 7149 | $temp_array = array(); |
| 7150 | 7150 | |
| 7151 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7151 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7152 | 7152 | { |
| 7153 | 7153 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 7154 | 7154 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -7165,11 +7165,11 @@ discard block |
||
| 7165 | 7165 | * @return Array the airport list |
| 7166 | 7166 | * |
| 7167 | 7167 | */ |
| 7168 | - public function countAllDepartureAirportCountriesByOwner($owner,$filters = array()) |
|
| 7168 | + public function countAllDepartureAirportCountriesByOwner($owner, $filters = array()) |
|
| 7169 | 7169 | { |
| 7170 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7171 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 7172 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7170 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7171 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 7172 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7173 | 7173 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.owner_name = :owner |
| 7174 | 7174 | GROUP BY spotter_output.departure_airport_country |
| 7175 | 7175 | ORDER BY airport_departure_country_count DESC"; |
@@ -7185,11 +7185,11 @@ discard block |
||
| 7185 | 7185 | * @return Array the airport list |
| 7186 | 7186 | * |
| 7187 | 7187 | */ |
| 7188 | - public function countAllDepartureAirportCountriesByPilot($pilot,$filters = array()) |
|
| 7188 | + public function countAllDepartureAirportCountriesByPilot($pilot, $filters = array()) |
|
| 7189 | 7189 | { |
| 7190 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7191 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 7192 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7190 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7191 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 7192 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7193 | 7193 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 7194 | 7194 | GROUP BY spotter_output.departure_airport_country |
| 7195 | 7195 | ORDER BY airport_departure_country_count DESC"; |
@@ -7207,12 +7207,12 @@ discard block |
||
| 7207 | 7207 | * @return Array the airport list |
| 7208 | 7208 | * |
| 7209 | 7209 | */ |
| 7210 | - public function countAllDepartureAirportsByCountry($country,$filters = array()) |
|
| 7210 | + public function countAllDepartureAirportsByCountry($country, $filters = array()) |
|
| 7211 | 7211 | { |
| 7212 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7213 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 7212 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7213 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 7214 | 7214 | |
| 7215 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7215 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 7216 | 7216 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 7217 | 7217 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 7218 | 7218 | ORDER BY airport_departure_icao_count DESC"; |
@@ -7224,7 +7224,7 @@ discard block |
||
| 7224 | 7224 | $airport_array = array(); |
| 7225 | 7225 | $temp_array = array(); |
| 7226 | 7226 | |
| 7227 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7227 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7228 | 7228 | { |
| 7229 | 7229 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 7230 | 7230 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -7245,11 +7245,11 @@ discard block |
||
| 7245 | 7245 | * @return Array the airport list |
| 7246 | 7246 | * |
| 7247 | 7247 | */ |
| 7248 | - public function countAllDepartureAirportCountriesByCountry($country,$filters = array()) |
|
| 7248 | + public function countAllDepartureAirportCountriesByCountry($country, $filters = array()) |
|
| 7249 | 7249 | { |
| 7250 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7251 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 7252 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7250 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7251 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 7252 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 7253 | 7253 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 7254 | 7254 | GROUP BY spotter_output.departure_airport_country |
| 7255 | 7255 | ORDER BY airport_departure_country_count DESC"; |
@@ -7261,7 +7261,7 @@ discard block |
||
| 7261 | 7261 | $airport_array = array(); |
| 7262 | 7262 | $temp_array = array(); |
| 7263 | 7263 | |
| 7264 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7264 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7265 | 7265 | { |
| 7266 | 7266 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 7267 | 7267 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -7284,11 +7284,11 @@ discard block |
||
| 7284 | 7284 | * @return Array the airport list |
| 7285 | 7285 | * |
| 7286 | 7286 | */ |
| 7287 | - public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '') |
|
| 7287 | + public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array(), $year = '', $month = '', $day = '') |
|
| 7288 | 7288 | { |
| 7289 | 7289 | global $globalDBdriver; |
| 7290 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7291 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7290 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7291 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7292 | 7292 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''"; |
| 7293 | 7293 | if ($olderthanmonths > 0) { |
| 7294 | 7294 | if ($globalDBdriver == 'mysql') { |
@@ -7308,28 +7308,28 @@ discard block |
||
| 7308 | 7308 | if ($year != '') { |
| 7309 | 7309 | if ($globalDBdriver == 'mysql') { |
| 7310 | 7310 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 7311 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 7311 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 7312 | 7312 | } else { |
| 7313 | 7313 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 7314 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 7314 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 7315 | 7315 | } |
| 7316 | 7316 | } |
| 7317 | 7317 | if ($month != '') { |
| 7318 | 7318 | if ($globalDBdriver == 'mysql') { |
| 7319 | 7319 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 7320 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 7320 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 7321 | 7321 | } else { |
| 7322 | 7322 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 7323 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 7323 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 7324 | 7324 | } |
| 7325 | 7325 | } |
| 7326 | 7326 | if ($day != '') { |
| 7327 | 7327 | if ($globalDBdriver == 'mysql') { |
| 7328 | 7328 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 7329 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 7329 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 7330 | 7330 | } else { |
| 7331 | 7331 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 7332 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 7332 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 7333 | 7333 | } |
| 7334 | 7334 | } |
| 7335 | 7335 | $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
@@ -7343,7 +7343,7 @@ discard block |
||
| 7343 | 7343 | $airport_array = array(); |
| 7344 | 7344 | $temp_array = array(); |
| 7345 | 7345 | |
| 7346 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7346 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7347 | 7347 | { |
| 7348 | 7348 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7349 | 7349 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7366,11 +7366,11 @@ discard block |
||
| 7366 | 7366 | * @return Array the airport list |
| 7367 | 7367 | * |
| 7368 | 7368 | */ |
| 7369 | - public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array()) |
|
| 7369 | + public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array()) |
|
| 7370 | 7370 | { |
| 7371 | 7371 | global $globalDBdriver; |
| 7372 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7373 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7372 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7373 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7374 | 7374 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' "; |
| 7375 | 7375 | if ($olderthanmonths > 0) { |
| 7376 | 7376 | if ($globalDBdriver == 'mysql') { |
@@ -7400,7 +7400,7 @@ discard block |
||
| 7400 | 7400 | $airport_array = array(); |
| 7401 | 7401 | $temp_array = array(); |
| 7402 | 7402 | |
| 7403 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7403 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7404 | 7404 | { |
| 7405 | 7405 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 7406 | 7406 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
@@ -7425,11 +7425,11 @@ discard block |
||
| 7425 | 7425 | * @return Array the airport list |
| 7426 | 7426 | * |
| 7427 | 7427 | */ |
| 7428 | - public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '') |
|
| 7428 | + public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array(), $year = '', $month = '', $day = '') |
|
| 7429 | 7429 | { |
| 7430 | 7430 | global $globalDBdriver; |
| 7431 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7432 | - $query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 7431 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7432 | + $query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 7433 | 7433 | FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao"; |
| 7434 | 7434 | if ($olderthanmonths > 0) { |
| 7435 | 7435 | if ($globalDBdriver == 'mysql') { |
@@ -7449,28 +7449,28 @@ discard block |
||
| 7449 | 7449 | if ($year != '') { |
| 7450 | 7450 | if ($globalDBdriver == 'mysql') { |
| 7451 | 7451 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 7452 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 7452 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 7453 | 7453 | } else { |
| 7454 | 7454 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 7455 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 7455 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 7456 | 7456 | } |
| 7457 | 7457 | } |
| 7458 | 7458 | if ($month != '') { |
| 7459 | 7459 | if ($globalDBdriver == 'mysql') { |
| 7460 | 7460 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 7461 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 7461 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 7462 | 7462 | } else { |
| 7463 | 7463 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 7464 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 7464 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 7465 | 7465 | } |
| 7466 | 7466 | } |
| 7467 | 7467 | if ($day != '') { |
| 7468 | 7468 | if ($globalDBdriver == 'mysql') { |
| 7469 | 7469 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 7470 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 7470 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 7471 | 7471 | } else { |
| 7472 | 7472 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 7473 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 7473 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 7474 | 7474 | } |
| 7475 | 7475 | } |
| 7476 | 7476 | $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country |
@@ -7483,7 +7483,7 @@ discard block |
||
| 7483 | 7483 | |
| 7484 | 7484 | $airport_array = array(); |
| 7485 | 7485 | $temp_array = array(); |
| 7486 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7486 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7487 | 7487 | { |
| 7488 | 7488 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7489 | 7489 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7506,11 +7506,11 @@ discard block |
||
| 7506 | 7506 | * @return Array the airport list |
| 7507 | 7507 | * |
| 7508 | 7508 | */ |
| 7509 | - public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array()) |
|
| 7509 | + public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array()) |
|
| 7510 | 7510 | { |
| 7511 | 7511 | global $globalDBdriver; |
| 7512 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7513 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 7512 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7513 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 7514 | 7514 | FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao "; |
| 7515 | 7515 | if ($olderthanmonths > 0) { |
| 7516 | 7516 | if ($globalDBdriver == 'mysql') { |
@@ -7540,7 +7540,7 @@ discard block |
||
| 7540 | 7540 | $airport_array = array(); |
| 7541 | 7541 | $temp_array = array(); |
| 7542 | 7542 | |
| 7543 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7543 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7544 | 7544 | { |
| 7545 | 7545 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7546 | 7546 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7566,9 +7566,9 @@ discard block |
||
| 7566 | 7566 | */ |
| 7567 | 7567 | public function countAllArrivalAirportsByAirline($airline_icao, $filters = array()) |
| 7568 | 7568 | { |
| 7569 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7570 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 7571 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7569 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7570 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 7571 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7572 | 7572 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.airline_icao = :airline_icao |
| 7573 | 7573 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7574 | 7574 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7579,7 +7579,7 @@ discard block |
||
| 7579 | 7579 | $airport_array = array(); |
| 7580 | 7580 | $temp_array = array(); |
| 7581 | 7581 | |
| 7582 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7582 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7583 | 7583 | { |
| 7584 | 7584 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7585 | 7585 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7600,12 +7600,12 @@ discard block |
||
| 7600 | 7600 | * @return Array the airport list |
| 7601 | 7601 | * |
| 7602 | 7602 | */ |
| 7603 | - public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array()) |
|
| 7603 | + public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array()) |
|
| 7604 | 7604 | { |
| 7605 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7606 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 7605 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7606 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 7607 | 7607 | |
| 7608 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7608 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7609 | 7609 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao |
| 7610 | 7610 | GROUP BY spotter_output.arrival_airport_country |
| 7611 | 7611 | ORDER BY airport_arrival_country_count DESC"; |
@@ -7617,7 +7617,7 @@ discard block |
||
| 7617 | 7617 | $airport_array = array(); |
| 7618 | 7618 | $temp_array = array(); |
| 7619 | 7619 | |
| 7620 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7620 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7621 | 7621 | { |
| 7622 | 7622 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 7623 | 7623 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -7635,11 +7635,11 @@ discard block |
||
| 7635 | 7635 | * @return Array the airport list |
| 7636 | 7636 | * |
| 7637 | 7637 | */ |
| 7638 | - public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array()) |
|
| 7638 | + public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array()) |
|
| 7639 | 7639 | { |
| 7640 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7641 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 7642 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7640 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7641 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 7642 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7643 | 7643 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 7644 | 7644 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7645 | 7645 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7651,7 +7651,7 @@ discard block |
||
| 7651 | 7651 | $airport_array = array(); |
| 7652 | 7652 | $temp_array = array(); |
| 7653 | 7653 | |
| 7654 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7654 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7655 | 7655 | { |
| 7656 | 7656 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7657 | 7657 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7673,11 +7673,11 @@ discard block |
||
| 7673 | 7673 | * @return Array the airport list |
| 7674 | 7674 | * |
| 7675 | 7675 | */ |
| 7676 | - public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array()) |
|
| 7676 | + public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array()) |
|
| 7677 | 7677 | { |
| 7678 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7679 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 7680 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7678 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7679 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 7680 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7681 | 7681 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 7682 | 7682 | GROUP BY spotter_output.arrival_airport_country |
| 7683 | 7683 | ORDER BY airport_arrival_country_count DESC"; |
@@ -7689,7 +7689,7 @@ discard block |
||
| 7689 | 7689 | $airport_array = array(); |
| 7690 | 7690 | $temp_array = array(); |
| 7691 | 7691 | |
| 7692 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7692 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7693 | 7693 | { |
| 7694 | 7694 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 7695 | 7695 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -7707,12 +7707,12 @@ discard block |
||
| 7707 | 7707 | * @return Array the airport list |
| 7708 | 7708 | * |
| 7709 | 7709 | */ |
| 7710 | - public function countAllArrivalAirportsByRegistration($registration,$filters = array()) |
|
| 7710 | + public function countAllArrivalAirportsByRegistration($registration, $filters = array()) |
|
| 7711 | 7711 | { |
| 7712 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7713 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 7712 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7713 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 7714 | 7714 | |
| 7715 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7715 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7716 | 7716 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.registration = :registration |
| 7717 | 7717 | GROUP BY spotter_output.arrival_airport_icao |
| 7718 | 7718 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7724,7 +7724,7 @@ discard block |
||
| 7724 | 7724 | $airport_array = array(); |
| 7725 | 7725 | $temp_array = array(); |
| 7726 | 7726 | |
| 7727 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7727 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7728 | 7728 | { |
| 7729 | 7729 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7730 | 7730 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7745,11 +7745,11 @@ discard block |
||
| 7745 | 7745 | * @return Array the airport list |
| 7746 | 7746 | * |
| 7747 | 7747 | */ |
| 7748 | - public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array()) |
|
| 7748 | + public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array()) |
|
| 7749 | 7749 | { |
| 7750 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7751 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 7752 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7750 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7751 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 7752 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7753 | 7753 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration |
| 7754 | 7754 | GROUP BY spotter_output.arrival_airport_country |
| 7755 | 7755 | ORDER BY airport_arrival_country_count DESC"; |
@@ -7761,7 +7761,7 @@ discard block |
||
| 7761 | 7761 | $airport_array = array(); |
| 7762 | 7762 | $temp_array = array(); |
| 7763 | 7763 | |
| 7764 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7764 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7765 | 7765 | { |
| 7766 | 7766 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 7767 | 7767 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -7780,11 +7780,11 @@ discard block |
||
| 7780 | 7780 | * @return Array the airport list |
| 7781 | 7781 | * |
| 7782 | 7782 | */ |
| 7783 | - public function countAllArrivalAirportsByAirport($airport_icao,$filters = array()) |
|
| 7783 | + public function countAllArrivalAirportsByAirport($airport_icao, $filters = array()) |
|
| 7784 | 7784 | { |
| 7785 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7786 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 7787 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7785 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7786 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 7787 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7788 | 7788 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.departure_airport_icao = :airport_icao |
| 7789 | 7789 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7790 | 7790 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7796,7 +7796,7 @@ discard block |
||
| 7796 | 7796 | $airport_array = array(); |
| 7797 | 7797 | $temp_array = array(); |
| 7798 | 7798 | |
| 7799 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7799 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7800 | 7800 | { |
| 7801 | 7801 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7802 | 7802 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7817,11 +7817,11 @@ discard block |
||
| 7817 | 7817 | * @return Array the airport list |
| 7818 | 7818 | * |
| 7819 | 7819 | */ |
| 7820 | - public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array()) |
|
| 7820 | + public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array()) |
|
| 7821 | 7821 | { |
| 7822 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7823 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 7824 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7822 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7823 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 7824 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7825 | 7825 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao |
| 7826 | 7826 | GROUP BY spotter_output.arrival_airport_country |
| 7827 | 7827 | ORDER BY airport_arrival_country_count DESC"; |
@@ -7833,7 +7833,7 @@ discard block |
||
| 7833 | 7833 | $airport_array = array(); |
| 7834 | 7834 | $temp_array = array(); |
| 7835 | 7835 | |
| 7836 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7836 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7837 | 7837 | { |
| 7838 | 7838 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 7839 | 7839 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -7851,11 +7851,11 @@ discard block |
||
| 7851 | 7851 | * @return Array the airport list |
| 7852 | 7852 | * |
| 7853 | 7853 | */ |
| 7854 | - public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 7854 | + public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 7855 | 7855 | { |
| 7856 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7857 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 7858 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7856 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7857 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 7858 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7859 | 7859 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 7860 | 7860 | GROUP BY spotter_output.arrival_airport_icao |
| 7861 | 7861 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7867,7 +7867,7 @@ discard block |
||
| 7867 | 7867 | $airport_array = array(); |
| 7868 | 7868 | $temp_array = array(); |
| 7869 | 7869 | |
| 7870 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7870 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7871 | 7871 | { |
| 7872 | 7872 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7873 | 7873 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7889,11 +7889,11 @@ discard block |
||
| 7889 | 7889 | * @return Array the airport list |
| 7890 | 7890 | * |
| 7891 | 7891 | */ |
| 7892 | - public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array()) |
|
| 7892 | + public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 7893 | 7893 | { |
| 7894 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7895 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 7896 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7894 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7895 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 7896 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7897 | 7897 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 7898 | 7898 | GROUP BY spotter_output.arrival_airport_country |
| 7899 | 7899 | ORDER BY airport_arrival_country_count DESC"; |
@@ -7905,7 +7905,7 @@ discard block |
||
| 7905 | 7905 | $airport_array = array(); |
| 7906 | 7906 | $temp_array = array(); |
| 7907 | 7907 | |
| 7908 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7908 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7909 | 7909 | { |
| 7910 | 7910 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 7911 | 7911 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -7924,11 +7924,11 @@ discard block |
||
| 7924 | 7924 | * @return Array the airport list |
| 7925 | 7925 | * |
| 7926 | 7926 | */ |
| 7927 | - public function countAllArrivalAirportsByDate($date,$filters = array()) |
|
| 7927 | + public function countAllArrivalAirportsByDate($date, $filters = array()) |
|
| 7928 | 7928 | { |
| 7929 | 7929 | global $globalTimezone, $globalDBdriver; |
| 7930 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7931 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 7930 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7931 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 7932 | 7932 | if ($globalTimezone != '') { |
| 7933 | 7933 | date_default_timezone_set($globalTimezone); |
| 7934 | 7934 | $datetime = new DateTime($date); |
@@ -7936,12 +7936,12 @@ discard block |
||
| 7936 | 7936 | } else $offset = '+00:00'; |
| 7937 | 7937 | |
| 7938 | 7938 | if ($globalDBdriver == 'mysql') { |
| 7939 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7939 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7940 | 7940 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 7941 | 7941 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7942 | 7942 | ORDER BY airport_arrival_icao_count DESC"; |
| 7943 | 7943 | } else { |
| 7944 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7944 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 7945 | 7945 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 7946 | 7946 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7947 | 7947 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -7953,7 +7953,7 @@ discard block |
||
| 7953 | 7953 | $airport_array = array(); |
| 7954 | 7954 | $temp_array = array(); |
| 7955 | 7955 | |
| 7956 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7956 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7957 | 7957 | { |
| 7958 | 7958 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 7959 | 7959 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -7977,8 +7977,8 @@ discard block |
||
| 7977 | 7977 | public function countAllArrivalAirportCountriesByDate($date, $filters = array()) |
| 7978 | 7978 | { |
| 7979 | 7979 | global $globalTimezone, $globalDBdriver; |
| 7980 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 7981 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 7980 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 7981 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 7982 | 7982 | if ($globalTimezone != '') { |
| 7983 | 7983 | date_default_timezone_set($globalTimezone); |
| 7984 | 7984 | $datetime = new DateTime($date); |
@@ -7986,12 +7986,12 @@ discard block |
||
| 7986 | 7986 | } else $offset = '+00:00'; |
| 7987 | 7987 | |
| 7988 | 7988 | if ($globalDBdriver == 'mysql') { |
| 7989 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7989 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7990 | 7990 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 7991 | 7991 | GROUP BY spotter_output.arrival_airport_country |
| 7992 | 7992 | ORDER BY airport_arrival_country_count DESC"; |
| 7993 | 7993 | } else { |
| 7994 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7994 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 7995 | 7995 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 7996 | 7996 | GROUP BY spotter_output.arrival_airport_country |
| 7997 | 7997 | ORDER BY airport_arrival_country_count DESC"; |
@@ -8003,7 +8003,7 @@ discard block |
||
| 8003 | 8003 | $airport_array = array(); |
| 8004 | 8004 | $temp_array = array(); |
| 8005 | 8005 | |
| 8006 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8006 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8007 | 8007 | { |
| 8008 | 8008 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 8009 | 8009 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -8021,11 +8021,11 @@ discard block |
||
| 8021 | 8021 | * @return Array the airport list |
| 8022 | 8022 | * |
| 8023 | 8023 | */ |
| 8024 | - public function countAllArrivalAirportsByIdent($ident,$filters = array()) |
|
| 8024 | + public function countAllArrivalAirportsByIdent($ident, $filters = array()) |
|
| 8025 | 8025 | { |
| 8026 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8027 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 8028 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8026 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8027 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 8028 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8029 | 8029 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.ident = :ident |
| 8030 | 8030 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8031 | 8031 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -8037,7 +8037,7 @@ discard block |
||
| 8037 | 8037 | $airport_array = array(); |
| 8038 | 8038 | $temp_array = array(); |
| 8039 | 8039 | |
| 8040 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8040 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8041 | 8041 | { |
| 8042 | 8042 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 8043 | 8043 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -8057,11 +8057,11 @@ discard block |
||
| 8057 | 8057 | * @return Array the airport list |
| 8058 | 8058 | * |
| 8059 | 8059 | */ |
| 8060 | - public function countAllArrivalAirportsByOwner($owner,$filters = array()) |
|
| 8060 | + public function countAllArrivalAirportsByOwner($owner, $filters = array()) |
|
| 8061 | 8061 | { |
| 8062 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8063 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 8064 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8062 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8063 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 8064 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8065 | 8065 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.owner_name = :owner |
| 8066 | 8066 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8067 | 8067 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -8072,7 +8072,7 @@ discard block |
||
| 8072 | 8072 | $airport_array = array(); |
| 8073 | 8073 | $temp_array = array(); |
| 8074 | 8074 | |
| 8075 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8075 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8076 | 8076 | { |
| 8077 | 8077 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 8078 | 8078 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -8092,11 +8092,11 @@ discard block |
||
| 8092 | 8092 | * @return Array the airport list |
| 8093 | 8093 | * |
| 8094 | 8094 | */ |
| 8095 | - public function countAllArrivalAirportsByPilot($pilot,$filters = array()) |
|
| 8095 | + public function countAllArrivalAirportsByPilot($pilot, $filters = array()) |
|
| 8096 | 8096 | { |
| 8097 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8098 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 8099 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8097 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8098 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 8099 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8100 | 8100 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 8101 | 8101 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8102 | 8102 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -8107,7 +8107,7 @@ discard block |
||
| 8107 | 8107 | $airport_array = array(); |
| 8108 | 8108 | $temp_array = array(); |
| 8109 | 8109 | |
| 8110 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8110 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8111 | 8111 | { |
| 8112 | 8112 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 8113 | 8113 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -8129,9 +8129,9 @@ discard block |
||
| 8129 | 8129 | */ |
| 8130 | 8130 | public function countAllArrivalAirportCountriesByIdent($ident, $filters = array()) |
| 8131 | 8131 | { |
| 8132 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8133 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 8134 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8132 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8133 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 8134 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8135 | 8135 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident |
| 8136 | 8136 | GROUP BY spotter_output.arrival_airport_country |
| 8137 | 8137 | ORDER BY airport_arrival_country_count DESC"; |
@@ -8143,7 +8143,7 @@ discard block |
||
| 8143 | 8143 | $airport_array = array(); |
| 8144 | 8144 | $temp_array = array(); |
| 8145 | 8145 | |
| 8146 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8146 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8147 | 8147 | { |
| 8148 | 8148 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 8149 | 8149 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -8162,9 +8162,9 @@ discard block |
||
| 8162 | 8162 | */ |
| 8163 | 8163 | public function countAllArrivalAirportCountriesByOwner($owner, $filters = array()) |
| 8164 | 8164 | { |
| 8165 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8166 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 8167 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8165 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8166 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 8167 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8168 | 8168 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.owner_name = :owner |
| 8169 | 8169 | GROUP BY spotter_output.arrival_airport_country |
| 8170 | 8170 | ORDER BY airport_arrival_country_count DESC"; |
@@ -8182,9 +8182,9 @@ discard block |
||
| 8182 | 8182 | */ |
| 8183 | 8183 | public function countAllArrivalAirportCountriesByPilot($pilot, $filters = array()) |
| 8184 | 8184 | { |
| 8185 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8186 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 8187 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8185 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8186 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 8187 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8188 | 8188 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 8189 | 8189 | GROUP BY spotter_output.arrival_airport_country |
| 8190 | 8190 | ORDER BY airport_arrival_country_count DESC"; |
@@ -8202,11 +8202,11 @@ discard block |
||
| 8202 | 8202 | * @return Array the airport list |
| 8203 | 8203 | * |
| 8204 | 8204 | */ |
| 8205 | - public function countAllArrivalAirportsByCountry($country,$filters = array()) |
|
| 8205 | + public function countAllArrivalAirportsByCountry($country, $filters = array()) |
|
| 8206 | 8206 | { |
| 8207 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8208 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 8209 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8207 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8208 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 8209 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 8210 | 8210 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 8211 | 8211 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8212 | 8212 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -8218,7 +8218,7 @@ discard block |
||
| 8218 | 8218 | $airport_array = array(); |
| 8219 | 8219 | $temp_array = array(); |
| 8220 | 8220 | |
| 8221 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8221 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8222 | 8222 | { |
| 8223 | 8223 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 8224 | 8224 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -8239,12 +8239,12 @@ discard block |
||
| 8239 | 8239 | * @return Array the airport list |
| 8240 | 8240 | * |
| 8241 | 8241 | */ |
| 8242 | - public function countAllArrivalAirportCountriesByCountry($country,$filters = array()) |
|
| 8242 | + public function countAllArrivalAirportCountriesByCountry($country, $filters = array()) |
|
| 8243 | 8243 | { |
| 8244 | 8244 | global $globalDBdriver; |
| 8245 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8246 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 8247 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8245 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8246 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 8247 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8248 | 8248 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 8249 | 8249 | GROUP BY spotter_output.arrival_airport_country |
| 8250 | 8250 | ORDER BY airport_arrival_country_count DESC"; |
@@ -8256,7 +8256,7 @@ discard block |
||
| 8256 | 8256 | $airport_array = array(); |
| 8257 | 8257 | $temp_array = array(); |
| 8258 | 8258 | |
| 8259 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8259 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8260 | 8260 | { |
| 8261 | 8261 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 8262 | 8262 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -8275,38 +8275,38 @@ discard block |
||
| 8275 | 8275 | * @return Array the airport departure list |
| 8276 | 8276 | * |
| 8277 | 8277 | */ |
| 8278 | - public function countAllDepartureCountries($filters = array(),$year = '',$month = '', $day = '') |
|
| 8278 | + public function countAllDepartureCountries($filters = array(), $year = '', $month = '', $day = '') |
|
| 8279 | 8279 | { |
| 8280 | 8280 | global $globalDBdriver; |
| 8281 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8282 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 8281 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8282 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 8283 | 8283 | FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''"; |
| 8284 | 8284 | $query_values = array(); |
| 8285 | 8285 | if ($year != '') { |
| 8286 | 8286 | if ($globalDBdriver == 'mysql') { |
| 8287 | 8287 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 8288 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8288 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8289 | 8289 | } else { |
| 8290 | 8290 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 8291 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8291 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8292 | 8292 | } |
| 8293 | 8293 | } |
| 8294 | 8294 | if ($month != '') { |
| 8295 | 8295 | if ($globalDBdriver == 'mysql') { |
| 8296 | 8296 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 8297 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8297 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8298 | 8298 | } else { |
| 8299 | 8299 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 8300 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8300 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8301 | 8301 | } |
| 8302 | 8302 | } |
| 8303 | 8303 | if ($day != '') { |
| 8304 | 8304 | if ($globalDBdriver == 'mysql') { |
| 8305 | 8305 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 8306 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8306 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8307 | 8307 | } else { |
| 8308 | 8308 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 8309 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8309 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8310 | 8310 | } |
| 8311 | 8311 | } |
| 8312 | 8312 | $query .= " GROUP BY spotter_output.departure_airport_country |
@@ -8320,7 +8320,7 @@ discard block |
||
| 8320 | 8320 | $airport_array = array(); |
| 8321 | 8321 | $temp_array = array(); |
| 8322 | 8322 | |
| 8323 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8323 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8324 | 8324 | { |
| 8325 | 8325 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
| 8326 | 8326 | $temp_array['airport_departure_country'] = $row['departure_airport_country']; |
@@ -8338,38 +8338,38 @@ discard block |
||
| 8338 | 8338 | * @return Array the airport arrival list |
| 8339 | 8339 | * |
| 8340 | 8340 | */ |
| 8341 | - public function countAllArrivalCountries($limit = true,$filters = array(),$year = '',$month = '',$day = '') |
|
| 8341 | + public function countAllArrivalCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '') |
|
| 8342 | 8342 | { |
| 8343 | 8343 | global $globalDBdriver; |
| 8344 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8345 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8344 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8345 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 8346 | 8346 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''"; |
| 8347 | 8347 | $query_values = array(); |
| 8348 | 8348 | if ($year != '') { |
| 8349 | 8349 | if ($globalDBdriver == 'mysql') { |
| 8350 | 8350 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 8351 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8351 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8352 | 8352 | } else { |
| 8353 | 8353 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 8354 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8354 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8355 | 8355 | } |
| 8356 | 8356 | } |
| 8357 | 8357 | if ($month != '') { |
| 8358 | 8358 | if ($globalDBdriver == 'mysql') { |
| 8359 | 8359 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 8360 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8360 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8361 | 8361 | } else { |
| 8362 | 8362 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 8363 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8363 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8364 | 8364 | } |
| 8365 | 8365 | } |
| 8366 | 8366 | if ($day != '') { |
| 8367 | 8367 | if ($globalDBdriver == 'mysql') { |
| 8368 | 8368 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 8369 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8369 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8370 | 8370 | } else { |
| 8371 | 8371 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 8372 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8372 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8373 | 8373 | } |
| 8374 | 8374 | } |
| 8375 | 8375 | $query .= " GROUP BY spotter_output.arrival_airport_country |
@@ -8383,7 +8383,7 @@ discard block |
||
| 8383 | 8383 | $airport_array = array(); |
| 8384 | 8384 | $temp_array = array(); |
| 8385 | 8385 | |
| 8386 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8386 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8387 | 8387 | { |
| 8388 | 8388 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
| 8389 | 8389 | $temp_array['airport_arrival_country'] = $row['arrival_airport_country']; |
@@ -8406,8 +8406,8 @@ discard block |
||
| 8406 | 8406 | */ |
| 8407 | 8407 | public function countAllRoutes($filters = array()) |
| 8408 | 8408 | { |
| 8409 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8410 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8409 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8410 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8411 | 8411 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' |
| 8412 | 8412 | GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 8413 | 8413 | ORDER BY route_count DESC |
@@ -8420,7 +8420,7 @@ discard block |
||
| 8420 | 8420 | $routes_array = array(); |
| 8421 | 8421 | $temp_array = array(); |
| 8422 | 8422 | |
| 8423 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8423 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8424 | 8424 | { |
| 8425 | 8425 | $temp_array['route_count'] = $row['route_count']; |
| 8426 | 8426 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8447,11 +8447,11 @@ discard block |
||
| 8447 | 8447 | * @return Array the route list |
| 8448 | 8448 | * |
| 8449 | 8449 | */ |
| 8450 | - public function countAllRoutesByAircraft($aircraft_icao,$filters = array()) |
|
| 8450 | + public function countAllRoutesByAircraft($aircraft_icao, $filters = array()) |
|
| 8451 | 8451 | { |
| 8452 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8453 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 8454 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8452 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8453 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 8454 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8455 | 8455 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 8456 | 8456 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8457 | 8457 | ORDER BY route_count DESC"; |
@@ -8462,7 +8462,7 @@ discard block |
||
| 8462 | 8462 | $routes_array = array(); |
| 8463 | 8463 | $temp_array = array(); |
| 8464 | 8464 | |
| 8465 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8465 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8466 | 8466 | { |
| 8467 | 8467 | $temp_array['route_count'] = $row['route_count']; |
| 8468 | 8468 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8489,9 +8489,9 @@ discard block |
||
| 8489 | 8489 | */ |
| 8490 | 8490 | public function countAllRoutesByRegistration($registration, $filters = array()) |
| 8491 | 8491 | { |
| 8492 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8492 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8493 | 8493 | $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
| 8494 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8494 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8495 | 8495 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration |
| 8496 | 8496 | GROUP BY route |
| 8497 | 8497 | ORDER BY route_count DESC"; |
@@ -8503,7 +8503,7 @@ discard block |
||
| 8503 | 8503 | $routes_array = array(); |
| 8504 | 8504 | $temp_array = array(); |
| 8505 | 8505 | |
| 8506 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8506 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8507 | 8507 | { |
| 8508 | 8508 | $temp_array['route_count'] = $row['route_count']; |
| 8509 | 8509 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8531,9 +8531,9 @@ discard block |
||
| 8531 | 8531 | */ |
| 8532 | 8532 | public function countAllRoutesByAirline($airline_icao, $filters = array()) |
| 8533 | 8533 | { |
| 8534 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8535 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 8536 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8534 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8535 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 8536 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8537 | 8537 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao |
| 8538 | 8538 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8539 | 8539 | ORDER BY route_count DESC"; |
@@ -8545,7 +8545,7 @@ discard block |
||
| 8545 | 8545 | $routes_array = array(); |
| 8546 | 8546 | $temp_array = array(); |
| 8547 | 8547 | |
| 8548 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8548 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8549 | 8549 | { |
| 8550 | 8550 | $temp_array['route_count'] = $row['route_count']; |
| 8551 | 8551 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8573,9 +8573,9 @@ discard block |
||
| 8573 | 8573 | */ |
| 8574 | 8574 | public function countAllRoutesByAirport($airport_icao, $filters = array()) |
| 8575 | 8575 | { |
| 8576 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8577 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 8578 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8576 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8577 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 8578 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8579 | 8579 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 8580 | 8580 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8581 | 8581 | ORDER BY route_count DESC"; |
@@ -8586,7 +8586,7 @@ discard block |
||
| 8586 | 8586 | $routes_array = array(); |
| 8587 | 8587 | $temp_array = array(); |
| 8588 | 8588 | |
| 8589 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8589 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8590 | 8590 | { |
| 8591 | 8591 | $temp_array['route_count'] = $row['route_count']; |
| 8592 | 8592 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8614,9 +8614,9 @@ discard block |
||
| 8614 | 8614 | */ |
| 8615 | 8615 | public function countAllRoutesByCountry($country, $filters = array()) |
| 8616 | 8616 | { |
| 8617 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8618 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 8619 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8617 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8618 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 8619 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8620 | 8620 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 8621 | 8621 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8622 | 8622 | ORDER BY route_count DESC"; |
@@ -8627,7 +8627,7 @@ discard block |
||
| 8627 | 8627 | $routes_array = array(); |
| 8628 | 8628 | $temp_array = array(); |
| 8629 | 8629 | |
| 8630 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8630 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8631 | 8631 | { |
| 8632 | 8632 | $temp_array['route_count'] = $row['route_count']; |
| 8633 | 8633 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8655,8 +8655,8 @@ discard block |
||
| 8655 | 8655 | public function countAllRoutesByDate($date, $filters = array()) |
| 8656 | 8656 | { |
| 8657 | 8657 | global $globalTimezone, $globalDBdriver; |
| 8658 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8659 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 8658 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8659 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 8660 | 8660 | if ($globalTimezone != '') { |
| 8661 | 8661 | date_default_timezone_set($globalTimezone); |
| 8662 | 8662 | $datetime = new DateTime($date); |
@@ -8664,12 +8664,12 @@ discard block |
||
| 8664 | 8664 | } else $offset = '+00:00'; |
| 8665 | 8665 | |
| 8666 | 8666 | if ($globalDBdriver == 'mysql') { |
| 8667 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8667 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8668 | 8668 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 8669 | 8669 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8670 | 8670 | ORDER BY route_count DESC"; |
| 8671 | 8671 | } else { |
| 8672 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8672 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8673 | 8673 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 8674 | 8674 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8675 | 8675 | ORDER BY route_count DESC"; |
@@ -8681,7 +8681,7 @@ discard block |
||
| 8681 | 8681 | $routes_array = array(); |
| 8682 | 8682 | $temp_array = array(); |
| 8683 | 8683 | |
| 8684 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8684 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8685 | 8685 | { |
| 8686 | 8686 | $temp_array['route_count'] = $row['route_count']; |
| 8687 | 8687 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8708,9 +8708,9 @@ discard block |
||
| 8708 | 8708 | */ |
| 8709 | 8709 | public function countAllRoutesByIdent($ident, $filters = array()) |
| 8710 | 8710 | { |
| 8711 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8712 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 8713 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8711 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8712 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 8713 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8714 | 8714 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident |
| 8715 | 8715 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8716 | 8716 | ORDER BY route_count DESC"; |
@@ -8722,7 +8722,7 @@ discard block |
||
| 8722 | 8722 | $routes_array = array(); |
| 8723 | 8723 | $temp_array = array(); |
| 8724 | 8724 | |
| 8725 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8725 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8726 | 8726 | { |
| 8727 | 8727 | $temp_array['route_count'] = $row['route_count']; |
| 8728 | 8728 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8746,11 +8746,11 @@ discard block |
||
| 8746 | 8746 | * @return Array the route list |
| 8747 | 8747 | * |
| 8748 | 8748 | */ |
| 8749 | - public function countAllRoutesByOwner($owner,$filters = array()) |
|
| 8749 | + public function countAllRoutesByOwner($owner, $filters = array()) |
|
| 8750 | 8750 | { |
| 8751 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8752 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 8753 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8751 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8752 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 8753 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8754 | 8754 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.owner_name = :owner |
| 8755 | 8755 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8756 | 8756 | ORDER BY route_count DESC"; |
@@ -8762,7 +8762,7 @@ discard block |
||
| 8762 | 8762 | $routes_array = array(); |
| 8763 | 8763 | $temp_array = array(); |
| 8764 | 8764 | |
| 8765 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8765 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8766 | 8766 | { |
| 8767 | 8767 | $temp_array['route_count'] = $row['route_count']; |
| 8768 | 8768 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8786,11 +8786,11 @@ discard block |
||
| 8786 | 8786 | * @return Array the route list |
| 8787 | 8787 | * |
| 8788 | 8788 | */ |
| 8789 | - public function countAllRoutesByPilot($pilot,$filters = array()) |
|
| 8789 | + public function countAllRoutesByPilot($pilot, $filters = array()) |
|
| 8790 | 8790 | { |
| 8791 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8792 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 8793 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8791 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8792 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 8793 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8794 | 8794 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 8795 | 8795 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8796 | 8796 | ORDER BY route_count DESC"; |
@@ -8802,7 +8802,7 @@ discard block |
||
| 8802 | 8802 | $routes_array = array(); |
| 8803 | 8803 | $temp_array = array(); |
| 8804 | 8804 | |
| 8805 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8805 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8806 | 8806 | { |
| 8807 | 8807 | $temp_array['route_count'] = $row['route_count']; |
| 8808 | 8808 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8829,9 +8829,9 @@ discard block |
||
| 8829 | 8829 | */ |
| 8830 | 8830 | public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array()) |
| 8831 | 8831 | { |
| 8832 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8833 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 8834 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8832 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8833 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 8834 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8835 | 8835 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 8836 | 8836 | GROUP BY route |
| 8837 | 8837 | ORDER BY route_count DESC"; |
@@ -8843,7 +8843,7 @@ discard block |
||
| 8843 | 8843 | $routes_array = array(); |
| 8844 | 8844 | $temp_array = array(); |
| 8845 | 8845 | |
| 8846 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8846 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8847 | 8847 | { |
| 8848 | 8848 | $temp_array['route_count'] = $row['route_count']; |
| 8849 | 8849 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -8871,8 +8871,8 @@ discard block |
||
| 8871 | 8871 | */ |
| 8872 | 8872 | public function countAllRoutesWithWaypoints($filters = array()) |
| 8873 | 8873 | { |
| 8874 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8875 | - $query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8874 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8875 | + $query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 8876 | 8876 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> '' |
| 8877 | 8877 | GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 8878 | 8878 | ORDER BY route_count DESC |
@@ -8885,7 +8885,7 @@ discard block |
||
| 8885 | 8885 | $routes_array = array(); |
| 8886 | 8886 | $temp_array = array(); |
| 8887 | 8887 | |
| 8888 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8888 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8889 | 8889 | { |
| 8890 | 8890 | $temp_array['spotter_id'] = $row['spotter_id']; |
| 8891 | 8891 | $temp_array['route_count'] = $row['route_count']; |
@@ -8910,11 +8910,11 @@ discard block |
||
| 8910 | 8910 | * @return Array the callsign list |
| 8911 | 8911 | * |
| 8912 | 8912 | */ |
| 8913 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 8913 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 8914 | 8914 | { |
| 8915 | 8915 | global $globalDBdriver; |
| 8916 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8917 | - $query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao |
|
| 8916 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8917 | + $query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao |
|
| 8918 | 8918 | FROM spotter_output".$filter_query." spotter_output.ident <> ''"; |
| 8919 | 8919 | if ($olderthanmonths > 0) { |
| 8920 | 8920 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -8928,28 +8928,28 @@ discard block |
||
| 8928 | 8928 | if ($year != '') { |
| 8929 | 8929 | if ($globalDBdriver == 'mysql') { |
| 8930 | 8930 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 8931 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8931 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8932 | 8932 | } else { |
| 8933 | 8933 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 8934 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 8934 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 8935 | 8935 | } |
| 8936 | 8936 | } |
| 8937 | 8937 | if ($month != '') { |
| 8938 | 8938 | if ($globalDBdriver == 'mysql') { |
| 8939 | 8939 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 8940 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8940 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8941 | 8941 | } else { |
| 8942 | 8942 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 8943 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 8943 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 8944 | 8944 | } |
| 8945 | 8945 | } |
| 8946 | 8946 | if ($day != '') { |
| 8947 | 8947 | if ($globalDBdriver == 'mysql') { |
| 8948 | 8948 | $query .= " AND DAY(spotter_output.date) = :day"; |
| 8949 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8949 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8950 | 8950 | } else { |
| 8951 | 8951 | $query .= " AND EXTRACT(DAY FROM spotter_output.date) = :day"; |
| 8952 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 8952 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 8953 | 8953 | } |
| 8954 | 8954 | } |
| 8955 | 8955 | $query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC"; |
@@ -8961,7 +8961,7 @@ discard block |
||
| 8961 | 8961 | $callsign_array = array(); |
| 8962 | 8962 | $temp_array = array(); |
| 8963 | 8963 | |
| 8964 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8964 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8965 | 8965 | { |
| 8966 | 8966 | $temp_array['callsign_icao'] = $row['ident']; |
| 8967 | 8967 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -8983,8 +8983,8 @@ discard block |
||
| 8983 | 8983 | public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
| 8984 | 8984 | { |
| 8985 | 8985 | global $globalDBdriver; |
| 8986 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 8987 | - $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name |
|
| 8986 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 8987 | + $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name |
|
| 8988 | 8988 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao <> '' "; |
| 8989 | 8989 | if ($olderthanmonths > 0) { |
| 8990 | 8990 | if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
@@ -9003,7 +9003,7 @@ discard block |
||
| 9003 | 9003 | $callsign_array = array(); |
| 9004 | 9004 | $temp_array = array(); |
| 9005 | 9005 | |
| 9006 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9006 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9007 | 9007 | { |
| 9008 | 9008 | $temp_array['callsign_icao'] = $row['ident']; |
| 9009 | 9009 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -9057,7 +9057,7 @@ discard block |
||
| 9057 | 9057 | $date_array = array(); |
| 9058 | 9058 | $temp_array = array(); |
| 9059 | 9059 | |
| 9060 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9060 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9061 | 9061 | { |
| 9062 | 9062 | $temp_array['date_name'] = $row['date_name']; |
| 9063 | 9063 | $temp_array['date_count'] = $row['date_count']; |
@@ -9082,15 +9082,15 @@ discard block |
||
| 9082 | 9082 | $datetime = new DateTime(); |
| 9083 | 9083 | $offset = $datetime->format('P'); |
| 9084 | 9084 | } else $offset = '+00:00'; |
| 9085 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9085 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9086 | 9086 | if ($globalDBdriver == 'mysql') { |
| 9087 | - $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 9087 | + $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 9088 | 9088 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' |
| 9089 | 9089 | GROUP BY spotter_output.airline_icao, date_name |
| 9090 | 9090 | ORDER BY date_count DESC |
| 9091 | 9091 | LIMIT 10 OFFSET 0"; |
| 9092 | 9092 | } else { |
| 9093 | - $query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 9093 | + $query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 9094 | 9094 | FROM spotter_output |
| 9095 | 9095 | WHERE spotter_output.airline_icao <> '' |
| 9096 | 9096 | GROUP BY spotter_output.airline_icao, date_name |
@@ -9105,7 +9105,7 @@ discard block |
||
| 9105 | 9105 | $date_array = array(); |
| 9106 | 9106 | $temp_array = array(); |
| 9107 | 9107 | |
| 9108 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9108 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9109 | 9109 | { |
| 9110 | 9110 | $temp_array['date_name'] = $row['date_name']; |
| 9111 | 9111 | $temp_array['date_count'] = $row['date_count']; |
@@ -9131,7 +9131,7 @@ discard block |
||
| 9131 | 9131 | $datetime = new DateTime(); |
| 9132 | 9132 | $offset = $datetime->format('P'); |
| 9133 | 9133 | } else $offset = '+00:00'; |
| 9134 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9134 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9135 | 9135 | if ($globalDBdriver == 'mysql') { |
| 9136 | 9136 | $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 9137 | 9137 | FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -9152,7 +9152,7 @@ discard block |
||
| 9152 | 9152 | $date_array = array(); |
| 9153 | 9153 | $temp_array = array(); |
| 9154 | 9154 | |
| 9155 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9155 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9156 | 9156 | { |
| 9157 | 9157 | $temp_array['date_name'] = $row['date_name']; |
| 9158 | 9158 | $temp_array['date_count'] = $row['date_count']; |
@@ -9177,7 +9177,7 @@ discard block |
||
| 9177 | 9177 | $datetime = new DateTime(); |
| 9178 | 9178 | $offset = $datetime->format('P'); |
| 9179 | 9179 | } else $offset = '+00:00'; |
| 9180 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9180 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9181 | 9181 | if ($globalDBdriver == 'mysql') { |
| 9182 | 9182 | $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 9183 | 9183 | FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -9198,7 +9198,7 @@ discard block |
||
| 9198 | 9198 | $date_array = array(); |
| 9199 | 9199 | $temp_array = array(); |
| 9200 | 9200 | |
| 9201 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9201 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9202 | 9202 | { |
| 9203 | 9203 | $temp_array['date_name'] = $row['date_name']; |
| 9204 | 9204 | $temp_array['date_count'] = $row['date_count']; |
@@ -9219,7 +9219,7 @@ discard block |
||
| 9219 | 9219 | public function countAllDatesLastMonthByAirlines($filters = array()) |
| 9220 | 9220 | { |
| 9221 | 9221 | global $globalTimezone, $globalDBdriver; |
| 9222 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9222 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9223 | 9223 | if ($globalTimezone != '') { |
| 9224 | 9224 | date_default_timezone_set($globalTimezone); |
| 9225 | 9225 | $datetime = new DateTime(); |
@@ -9227,13 +9227,13 @@ discard block |
||
| 9227 | 9227 | } else $offset = '+00:00'; |
| 9228 | 9228 | |
| 9229 | 9229 | if ($globalDBdriver == 'mysql') { |
| 9230 | - $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 9230 | + $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 9231 | 9231 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH) |
| 9232 | 9232 | GROUP BY spotter_output.airline_icao, date_name |
| 9233 | 9233 | ORDER BY spotter_output.date ASC"; |
| 9234 | 9234 | $query_data = array(':offset' => $offset); |
| 9235 | 9235 | } else { |
| 9236 | - $query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 9236 | + $query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 9237 | 9237 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS' |
| 9238 | 9238 | GROUP BY spotter_output.airline_icao, date_name |
| 9239 | 9239 | ORDER BY date_name ASC"; |
@@ -9246,7 +9246,7 @@ discard block |
||
| 9246 | 9246 | $date_array = array(); |
| 9247 | 9247 | $temp_array = array(); |
| 9248 | 9248 | |
| 9249 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9249 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9250 | 9250 | { |
| 9251 | 9251 | $temp_array['date_name'] = $row['date_name']; |
| 9252 | 9252 | $temp_array['date_count'] = $row['date_count']; |
@@ -9293,7 +9293,7 @@ discard block |
||
| 9293 | 9293 | $date_array = array(); |
| 9294 | 9294 | $temp_array = array(); |
| 9295 | 9295 | |
| 9296 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9296 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9297 | 9297 | { |
| 9298 | 9298 | $temp_array['month_name'] = $row['month_name']; |
| 9299 | 9299 | $temp_array['year_name'] = $row['year_name']; |
@@ -9314,7 +9314,7 @@ discard block |
||
| 9314 | 9314 | public function countAllMonthsByAirlines($filters = array()) |
| 9315 | 9315 | { |
| 9316 | 9316 | global $globalTimezone, $globalDBdriver; |
| 9317 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9317 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9318 | 9318 | if ($globalTimezone != '') { |
| 9319 | 9319 | date_default_timezone_set($globalTimezone); |
| 9320 | 9320 | $datetime = new DateTime(); |
@@ -9322,12 +9322,12 @@ discard block |
||
| 9322 | 9322 | } else $offset = '+00:00'; |
| 9323 | 9323 | |
| 9324 | 9324 | if ($globalDBdriver == 'mysql') { |
| 9325 | - $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 9325 | + $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 9326 | 9326 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' |
| 9327 | 9327 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9328 | 9328 | ORDER BY date_count DESC"; |
| 9329 | 9329 | } else { |
| 9330 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 9330 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 9331 | 9331 | FROM spotter_output |
| 9332 | 9332 | WHERE spotter_output.airline_icao <> '' |
| 9333 | 9333 | GROUP BY spotter_output.airline_icao, year_name, month_name |
@@ -9341,7 +9341,7 @@ discard block |
||
| 9341 | 9341 | $date_array = array(); |
| 9342 | 9342 | $temp_array = array(); |
| 9343 | 9343 | |
| 9344 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9344 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9345 | 9345 | { |
| 9346 | 9346 | $temp_array['month_name'] = $row['month_name']; |
| 9347 | 9347 | $temp_array['year_name'] = $row['year_name']; |
@@ -9368,14 +9368,14 @@ discard block |
||
| 9368 | 9368 | $datetime = new DateTime(); |
| 9369 | 9369 | $offset = $datetime->format('P'); |
| 9370 | 9370 | } else $offset = '+00:00'; |
| 9371 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9371 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9372 | 9372 | if ($globalDBdriver == 'mysql') { |
| 9373 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 9373 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 9374 | 9374 | FROM spotter_output".$filter_query." spotter_output.airline_type = 'military' |
| 9375 | 9375 | GROUP BY year_name, month_name |
| 9376 | 9376 | ORDER BY date_count DESC"; |
| 9377 | 9377 | } else { |
| 9378 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 9378 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 9379 | 9379 | FROM spotter_output".$filter_query." spotter_output.airline_type = 'military' |
| 9380 | 9380 | GROUP BY year_name, month_name |
| 9381 | 9381 | ORDER BY date_count DESC"; |
@@ -9387,7 +9387,7 @@ discard block |
||
| 9387 | 9387 | $date_array = array(); |
| 9388 | 9388 | $temp_array = array(); |
| 9389 | 9389 | |
| 9390 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9390 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9391 | 9391 | { |
| 9392 | 9392 | $temp_array['month_name'] = $row['month_name']; |
| 9393 | 9393 | $temp_array['year_name'] = $row['year_name']; |
@@ -9413,15 +9413,15 @@ discard block |
||
| 9413 | 9413 | $datetime = new DateTime(); |
| 9414 | 9414 | $offset = $datetime->format('P'); |
| 9415 | 9415 | } else $offset = '+00:00'; |
| 9416 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9416 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9417 | 9417 | |
| 9418 | 9418 | if ($globalDBdriver == 'mysql') { |
| 9419 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 9419 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 9420 | 9420 | FROM spotter_output".$filter_query." owner_name <> '' |
| 9421 | 9421 | GROUP BY year_name, month_name |
| 9422 | 9422 | ORDER BY date_count DESC"; |
| 9423 | 9423 | } else { |
| 9424 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 9424 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 9425 | 9425 | FROM spotter_output".$filter_query." owner_name <> '' |
| 9426 | 9426 | GROUP BY year_name, month_name |
| 9427 | 9427 | ORDER BY date_count DESC"; |
@@ -9433,7 +9433,7 @@ discard block |
||
| 9433 | 9433 | $date_array = array(); |
| 9434 | 9434 | $temp_array = array(); |
| 9435 | 9435 | |
| 9436 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9436 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9437 | 9437 | { |
| 9438 | 9438 | $temp_array['month_name'] = $row['month_name']; |
| 9439 | 9439 | $temp_array['year_name'] = $row['year_name']; |
@@ -9454,7 +9454,7 @@ discard block |
||
| 9454 | 9454 | public function countAllMonthsOwnersByAirlines($filters = array()) |
| 9455 | 9455 | { |
| 9456 | 9456 | global $globalTimezone, $globalDBdriver; |
| 9457 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9457 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9458 | 9458 | if ($globalTimezone != '') { |
| 9459 | 9459 | date_default_timezone_set($globalTimezone); |
| 9460 | 9460 | $datetime = new DateTime(); |
@@ -9462,12 +9462,12 @@ discard block |
||
| 9462 | 9462 | } else $offset = '+00:00'; |
| 9463 | 9463 | |
| 9464 | 9464 | if ($globalDBdriver == 'mysql') { |
| 9465 | - $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 9465 | + $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 9466 | 9466 | FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' |
| 9467 | 9467 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9468 | 9468 | ORDER BY date_count DESC"; |
| 9469 | 9469 | } else { |
| 9470 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 9470 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 9471 | 9471 | FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' |
| 9472 | 9472 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9473 | 9473 | ORDER BY date_count DESC"; |
@@ -9479,7 +9479,7 @@ discard block |
||
| 9479 | 9479 | $date_array = array(); |
| 9480 | 9480 | $temp_array = array(); |
| 9481 | 9481 | |
| 9482 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9482 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9483 | 9483 | { |
| 9484 | 9484 | $temp_array['month_name'] = $row['month_name']; |
| 9485 | 9485 | $temp_array['year_name'] = $row['year_name']; |
@@ -9506,15 +9506,15 @@ discard block |
||
| 9506 | 9506 | $datetime = new DateTime(); |
| 9507 | 9507 | $offset = $datetime->format('P'); |
| 9508 | 9508 | } else $offset = '+00:00'; |
| 9509 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9509 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9510 | 9510 | |
| 9511 | 9511 | if ($globalDBdriver == 'mysql') { |
| 9512 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 9512 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 9513 | 9513 | FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL |
| 9514 | 9514 | GROUP BY year_name, month_name |
| 9515 | 9515 | ORDER BY date_count DESC"; |
| 9516 | 9516 | } else { |
| 9517 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 9517 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 9518 | 9518 | FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL |
| 9519 | 9519 | GROUP BY year_name, month_name |
| 9520 | 9520 | ORDER BY date_count DESC"; |
@@ -9526,7 +9526,7 @@ discard block |
||
| 9526 | 9526 | $date_array = array(); |
| 9527 | 9527 | $temp_array = array(); |
| 9528 | 9528 | |
| 9529 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9529 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9530 | 9530 | { |
| 9531 | 9531 | $temp_array['month_name'] = $row['month_name']; |
| 9532 | 9532 | $temp_array['year_name'] = $row['year_name']; |
@@ -9547,7 +9547,7 @@ discard block |
||
| 9547 | 9547 | public function countAllMonthsPilotsByAirlines($filters = array()) |
| 9548 | 9548 | { |
| 9549 | 9549 | global $globalTimezone, $globalDBdriver; |
| 9550 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9550 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9551 | 9551 | if ($globalTimezone != '') { |
| 9552 | 9552 | date_default_timezone_set($globalTimezone); |
| 9553 | 9553 | $datetime = new DateTime(); |
@@ -9555,12 +9555,12 @@ discard block |
||
| 9555 | 9555 | } else $offset = '+00:00'; |
| 9556 | 9556 | |
| 9557 | 9557 | if ($globalDBdriver == 'mysql') { |
| 9558 | - $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 9558 | + $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 9559 | 9559 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL |
| 9560 | 9560 | GROUP BY spotter_output.airline_icao,year_name, month_name |
| 9561 | 9561 | ORDER BY date_count DESC"; |
| 9562 | 9562 | } else { |
| 9563 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 9563 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 9564 | 9564 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL |
| 9565 | 9565 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9566 | 9566 | ORDER BY date_count DESC"; |
@@ -9572,7 +9572,7 @@ discard block |
||
| 9572 | 9572 | $date_array = array(); |
| 9573 | 9573 | $temp_array = array(); |
| 9574 | 9574 | |
| 9575 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9575 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9576 | 9576 | { |
| 9577 | 9577 | $temp_array['month_name'] = $row['month_name']; |
| 9578 | 9578 | $temp_array['year_name'] = $row['year_name']; |
@@ -9594,7 +9594,7 @@ discard block |
||
| 9594 | 9594 | public function countAllMonthsAirlines($filters = array()) |
| 9595 | 9595 | { |
| 9596 | 9596 | global $globalTimezone, $globalDBdriver; |
| 9597 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9597 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9598 | 9598 | if ($globalTimezone != '') { |
| 9599 | 9599 | date_default_timezone_set($globalTimezone); |
| 9600 | 9600 | $datetime = new DateTime(); |
@@ -9602,12 +9602,12 @@ discard block |
||
| 9602 | 9602 | } else $offset = '+00:00'; |
| 9603 | 9603 | |
| 9604 | 9604 | if ($globalDBdriver == 'mysql') { |
| 9605 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count |
|
| 9605 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count |
|
| 9606 | 9606 | FROM spotter_output".$filter_query." airline_icao <> '' |
| 9607 | 9607 | GROUP BY year_name, month_name |
| 9608 | 9608 | ORDER BY date_count DESC"; |
| 9609 | 9609 | } else { |
| 9610 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count |
|
| 9610 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count |
|
| 9611 | 9611 | FROM spotter_output".$filter_query." airline_icao <> '' |
| 9612 | 9612 | GROUP BY year_name, month_name |
| 9613 | 9613 | ORDER BY date_count DESC"; |
@@ -9619,7 +9619,7 @@ discard block |
||
| 9619 | 9619 | $date_array = array(); |
| 9620 | 9620 | $temp_array = array(); |
| 9621 | 9621 | |
| 9622 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9622 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9623 | 9623 | { |
| 9624 | 9624 | $temp_array['month_name'] = $row['month_name']; |
| 9625 | 9625 | $temp_array['year_name'] = $row['year_name']; |
@@ -9645,15 +9645,15 @@ discard block |
||
| 9645 | 9645 | $datetime = new DateTime(); |
| 9646 | 9646 | $offset = $datetime->format('P'); |
| 9647 | 9647 | } else $offset = '+00:00'; |
| 9648 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9648 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9649 | 9649 | |
| 9650 | 9650 | if ($globalDBdriver == 'mysql') { |
| 9651 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9651 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9652 | 9652 | FROM spotter_output".$filter_query." aircraft_icao <> '' |
| 9653 | 9653 | GROUP BY year_name, month_name |
| 9654 | 9654 | ORDER BY date_count DESC"; |
| 9655 | 9655 | } else { |
| 9656 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9656 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9657 | 9657 | FROM spotter_output".$filter_query." aircraft_icao <> '' |
| 9658 | 9658 | GROUP BY year_name, month_name |
| 9659 | 9659 | ORDER BY date_count DESC"; |
@@ -9665,7 +9665,7 @@ discard block |
||
| 9665 | 9665 | $date_array = array(); |
| 9666 | 9666 | $temp_array = array(); |
| 9667 | 9667 | |
| 9668 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9668 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9669 | 9669 | { |
| 9670 | 9670 | $temp_array['month_name'] = $row['month_name']; |
| 9671 | 9671 | $temp_array['year_name'] = $row['year_name']; |
@@ -9687,7 +9687,7 @@ discard block |
||
| 9687 | 9687 | public function countAllMonthsAircraftsByAirlines($filters = array()) |
| 9688 | 9688 | { |
| 9689 | 9689 | global $globalTimezone, $globalDBdriver; |
| 9690 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9690 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9691 | 9691 | if ($globalTimezone != '') { |
| 9692 | 9692 | date_default_timezone_set($globalTimezone); |
| 9693 | 9693 | $datetime = new DateTime(); |
@@ -9695,12 +9695,12 @@ discard block |
||
| 9695 | 9695 | } else $offset = '+00:00'; |
| 9696 | 9696 | |
| 9697 | 9697 | if ($globalDBdriver == 'mysql') { |
| 9698 | - $query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9698 | + $query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9699 | 9699 | FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> '' |
| 9700 | 9700 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9701 | 9701 | ORDER BY date_count DESC"; |
| 9702 | 9702 | } else { |
| 9703 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9703 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 9704 | 9704 | FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> '' |
| 9705 | 9705 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9706 | 9706 | ORDER BY date_count DESC"; |
@@ -9712,7 +9712,7 @@ discard block |
||
| 9712 | 9712 | $date_array = array(); |
| 9713 | 9713 | $temp_array = array(); |
| 9714 | 9714 | |
| 9715 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9715 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9716 | 9716 | { |
| 9717 | 9717 | $temp_array['month_name'] = $row['month_name']; |
| 9718 | 9718 | $temp_array['year_name'] = $row['year_name']; |
@@ -9739,15 +9739,15 @@ discard block |
||
| 9739 | 9739 | $datetime = new DateTime(); |
| 9740 | 9740 | $offset = $datetime->format('P'); |
| 9741 | 9741 | } else $offset = '+00:00'; |
| 9742 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9742 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9743 | 9743 | |
| 9744 | 9744 | if ($globalDBdriver == 'mysql') { |
| 9745 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9745 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9746 | 9746 | FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' |
| 9747 | 9747 | GROUP BY year_name, month_name |
| 9748 | 9748 | ORDER BY date_count DESC"; |
| 9749 | 9749 | } else { |
| 9750 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9750 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9751 | 9751 | FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' |
| 9752 | 9752 | GROUP BY year_name, month_name |
| 9753 | 9753 | ORDER BY date_count DESC"; |
@@ -9759,7 +9759,7 @@ discard block |
||
| 9759 | 9759 | $date_array = array(); |
| 9760 | 9760 | $temp_array = array(); |
| 9761 | 9761 | |
| 9762 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9762 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9763 | 9763 | { |
| 9764 | 9764 | $temp_array['month_name'] = $row['month_name']; |
| 9765 | 9765 | $temp_array['year_name'] = $row['year_name']; |
@@ -9781,7 +9781,7 @@ discard block |
||
| 9781 | 9781 | public function countAllMonthsRealArrivalsByAirlines($filters = array()) |
| 9782 | 9782 | { |
| 9783 | 9783 | global $globalTimezone, $globalDBdriver; |
| 9784 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9784 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9785 | 9785 | if ($globalTimezone != '') { |
| 9786 | 9786 | date_default_timezone_set($globalTimezone); |
| 9787 | 9787 | $datetime = new DateTime(); |
@@ -9789,12 +9789,12 @@ discard block |
||
| 9789 | 9789 | } else $offset = '+00:00'; |
| 9790 | 9790 | |
| 9791 | 9791 | if ($globalDBdriver == 'mysql') { |
| 9792 | - $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9792 | + $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9793 | 9793 | FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' |
| 9794 | 9794 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9795 | 9795 | ORDER BY date_count DESC"; |
| 9796 | 9796 | } else { |
| 9797 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9797 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 9798 | 9798 | FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' |
| 9799 | 9799 | GROUP BY spotter_output.airline_icao, year_name, month_name |
| 9800 | 9800 | ORDER BY date_count DESC"; |
@@ -9806,7 +9806,7 @@ discard block |
||
| 9806 | 9806 | $date_array = array(); |
| 9807 | 9807 | $temp_array = array(); |
| 9808 | 9808 | |
| 9809 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9809 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9810 | 9810 | { |
| 9811 | 9811 | $temp_array['month_name'] = $row['month_name']; |
| 9812 | 9812 | $temp_array['year_name'] = $row['year_name']; |
@@ -9834,7 +9834,7 @@ discard block |
||
| 9834 | 9834 | $datetime = new DateTime(); |
| 9835 | 9835 | $offset = $datetime->format('P'); |
| 9836 | 9836 | } else $offset = '+00:00'; |
| 9837 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9837 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9838 | 9838 | if ($globalDBdriver == 'mysql') { |
| 9839 | 9839 | $query = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 9840 | 9840 | FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -9855,7 +9855,7 @@ discard block |
||
| 9855 | 9855 | $date_array = array(); |
| 9856 | 9856 | $temp_array = array(); |
| 9857 | 9857 | |
| 9858 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9858 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9859 | 9859 | { |
| 9860 | 9860 | $temp_array['year_name'] = $row['year_name']; |
| 9861 | 9861 | $temp_array['month_name'] = $row['month_name']; |
@@ -9875,7 +9875,7 @@ discard block |
||
| 9875 | 9875 | * @return Array the hour list |
| 9876 | 9876 | * |
| 9877 | 9877 | */ |
| 9878 | - public function countAllHours($orderby,$filters = array()) |
|
| 9878 | + public function countAllHours($orderby, $filters = array()) |
|
| 9879 | 9879 | { |
| 9880 | 9880 | global $globalTimezone, $globalDBdriver; |
| 9881 | 9881 | if ($globalTimezone != '') { |
@@ -9923,7 +9923,7 @@ discard block |
||
| 9923 | 9923 | $hour_array = array(); |
| 9924 | 9924 | $temp_array = array(); |
| 9925 | 9925 | |
| 9926 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9926 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9927 | 9927 | { |
| 9928 | 9928 | $temp_array['hour_name'] = $row['hour_name']; |
| 9929 | 9929 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -9943,7 +9943,7 @@ discard block |
||
| 9943 | 9943 | public function countAllHoursByAirlines($orderby, $filters = array()) |
| 9944 | 9944 | { |
| 9945 | 9945 | global $globalTimezone, $globalDBdriver; |
| 9946 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 9946 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 9947 | 9947 | if ($globalTimezone != '') { |
| 9948 | 9948 | date_default_timezone_set($globalTimezone); |
| 9949 | 9949 | $datetime = new DateTime(); |
@@ -9961,7 +9961,7 @@ discard block |
||
| 9961 | 9961 | } |
| 9962 | 9962 | |
| 9963 | 9963 | if ($globalDBdriver == 'mysql') { |
| 9964 | - $query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 9964 | + $query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 9965 | 9965 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' |
| 9966 | 9966 | GROUP BY spotter_output.airline_icao, hour_name |
| 9967 | 9967 | ".$orderby_sql; |
@@ -9974,7 +9974,7 @@ discard block |
||
| 9974 | 9974 | */ |
| 9975 | 9975 | $query_data = array(':offset' => $offset); |
| 9976 | 9976 | } else { |
| 9977 | - $query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 9977 | + $query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 9978 | 9978 | FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' |
| 9979 | 9979 | GROUP BY spotter_output.airline_icao, hour_name |
| 9980 | 9980 | ".$orderby_sql; |
@@ -9987,7 +9987,7 @@ discard block |
||
| 9987 | 9987 | $hour_array = array(); |
| 9988 | 9988 | $temp_array = array(); |
| 9989 | 9989 | |
| 9990 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9990 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 9991 | 9991 | { |
| 9992 | 9992 | $temp_array['hour_name'] = $row['hour_name']; |
| 9993 | 9993 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10010,34 +10010,34 @@ discard block |
||
| 10010 | 10010 | public function countAllHoursByAirline($airline_icao, $filters = array()) |
| 10011 | 10011 | { |
| 10012 | 10012 | global $globalTimezone, $globalDBdriver; |
| 10013 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10013 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10014 | 10014 | if ($globalTimezone != '') { |
| 10015 | 10015 | date_default_timezone_set($globalTimezone); |
| 10016 | 10016 | $datetime = new DateTime(); |
| 10017 | 10017 | $offset = $datetime->format('P'); |
| 10018 | 10018 | } else $offset = '+00:00'; |
| 10019 | 10019 | |
| 10020 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 10020 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 10021 | 10021 | |
| 10022 | 10022 | if ($globalDBdriver == 'mysql') { |
| 10023 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10023 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10024 | 10024 | FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao |
| 10025 | 10025 | GROUP BY hour_name |
| 10026 | 10026 | ORDER BY hour_name ASC"; |
| 10027 | 10027 | } else { |
| 10028 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10028 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10029 | 10029 | FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao |
| 10030 | 10030 | GROUP BY hour_name |
| 10031 | 10031 | ORDER BY hour_name ASC"; |
| 10032 | 10032 | } |
| 10033 | 10033 | |
| 10034 | 10034 | $sth = $this->db->prepare($query); |
| 10035 | - $sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset)); |
|
| 10035 | + $sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset)); |
|
| 10036 | 10036 | |
| 10037 | 10037 | $hour_array = array(); |
| 10038 | 10038 | $temp_array = array(); |
| 10039 | 10039 | |
| 10040 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10040 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10041 | 10041 | { |
| 10042 | 10042 | $temp_array['hour_name'] = $row['hour_name']; |
| 10043 | 10043 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10060,8 +10060,8 @@ discard block |
||
| 10060 | 10060 | public function countAllHoursByAircraft($aircraft_icao, $filters = array()) |
| 10061 | 10061 | { |
| 10062 | 10062 | global $globalTimezone, $globalDBdriver; |
| 10063 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10064 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 10063 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10064 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 10065 | 10065 | if ($globalTimezone != '') { |
| 10066 | 10066 | date_default_timezone_set($globalTimezone); |
| 10067 | 10067 | $datetime = new DateTime(); |
@@ -10069,24 +10069,24 @@ discard block |
||
| 10069 | 10069 | } else $offset = '+00:00'; |
| 10070 | 10070 | |
| 10071 | 10071 | if ($globalDBdriver == 'mysql') { |
| 10072 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10072 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10073 | 10073 | FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao |
| 10074 | 10074 | GROUP BY hour_name |
| 10075 | 10075 | ORDER BY hour_name ASC"; |
| 10076 | 10076 | } else { |
| 10077 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10077 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10078 | 10078 | FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao |
| 10079 | 10079 | GROUP BY hour_name |
| 10080 | 10080 | ORDER BY hour_name ASC"; |
| 10081 | 10081 | } |
| 10082 | 10082 | |
| 10083 | 10083 | $sth = $this->db->prepare($query); |
| 10084 | - $sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset)); |
|
| 10084 | + $sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset)); |
|
| 10085 | 10085 | |
| 10086 | 10086 | $hour_array = array(); |
| 10087 | 10087 | $temp_array = array(); |
| 10088 | 10088 | |
| 10089 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10089 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10090 | 10090 | { |
| 10091 | 10091 | $temp_array['hour_name'] = $row['hour_name']; |
| 10092 | 10092 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10107,8 +10107,8 @@ discard block |
||
| 10107 | 10107 | public function countAllHoursByRegistration($registration, $filters = array()) |
| 10108 | 10108 | { |
| 10109 | 10109 | global $globalTimezone, $globalDBdriver; |
| 10110 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10111 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 10110 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10111 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 10112 | 10112 | if ($globalTimezone != '') { |
| 10113 | 10113 | date_default_timezone_set($globalTimezone); |
| 10114 | 10114 | $datetime = new DateTime(); |
@@ -10116,24 +10116,24 @@ discard block |
||
| 10116 | 10116 | } else $offset = '+00:00'; |
| 10117 | 10117 | |
| 10118 | 10118 | if ($globalDBdriver == 'mysql') { |
| 10119 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10119 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10120 | 10120 | FROM spotter_output".$filter_query." spotter_output.registration = :registration |
| 10121 | 10121 | GROUP BY hour_name |
| 10122 | 10122 | ORDER BY hour_name ASC"; |
| 10123 | 10123 | } else { |
| 10124 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10124 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10125 | 10125 | FROM spotter_output".$filter_query." spotter_output.registration = :registration |
| 10126 | 10126 | GROUP BY hour_name |
| 10127 | 10127 | ORDER BY hour_name ASC"; |
| 10128 | 10128 | } |
| 10129 | 10129 | |
| 10130 | 10130 | $sth = $this->db->prepare($query); |
| 10131 | - $sth->execute(array(':registration' => $registration,':offset' => $offset)); |
|
| 10131 | + $sth->execute(array(':registration' => $registration, ':offset' => $offset)); |
|
| 10132 | 10132 | |
| 10133 | 10133 | $hour_array = array(); |
| 10134 | 10134 | $temp_array = array(); |
| 10135 | 10135 | |
| 10136 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10136 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10137 | 10137 | { |
| 10138 | 10138 | $temp_array['hour_name'] = $row['hour_name']; |
| 10139 | 10139 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10154,8 +10154,8 @@ discard block |
||
| 10154 | 10154 | public function countAllHoursByAirport($airport_icao, $filters = array()) |
| 10155 | 10155 | { |
| 10156 | 10156 | global $globalTimezone, $globalDBdriver; |
| 10157 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10158 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 10157 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10158 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 10159 | 10159 | if ($globalTimezone != '') { |
| 10160 | 10160 | date_default_timezone_set($globalTimezone); |
| 10161 | 10161 | $datetime = new DateTime(); |
@@ -10163,24 +10163,24 @@ discard block |
||
| 10163 | 10163 | } else $offset = '+00:00'; |
| 10164 | 10164 | |
| 10165 | 10165 | if ($globalDBdriver == 'mysql') { |
| 10166 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10166 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10167 | 10167 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 10168 | 10168 | GROUP BY hour_name |
| 10169 | 10169 | ORDER BY hour_name ASC"; |
| 10170 | 10170 | } else { |
| 10171 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10171 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10172 | 10172 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 10173 | 10173 | GROUP BY hour_name |
| 10174 | 10174 | ORDER BY hour_name ASC"; |
| 10175 | 10175 | } |
| 10176 | 10176 | |
| 10177 | 10177 | $sth = $this->db->prepare($query); |
| 10178 | - $sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset)); |
|
| 10178 | + $sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset)); |
|
| 10179 | 10179 | |
| 10180 | 10180 | $hour_array = array(); |
| 10181 | 10181 | $temp_array = array(); |
| 10182 | 10182 | |
| 10183 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10183 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10184 | 10184 | { |
| 10185 | 10185 | $temp_array['hour_name'] = $row['hour_name']; |
| 10186 | 10186 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10199,11 +10199,11 @@ discard block |
||
| 10199 | 10199 | * @return Array the hour list |
| 10200 | 10200 | * |
| 10201 | 10201 | */ |
| 10202 | - public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array()) |
|
| 10202 | + public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array()) |
|
| 10203 | 10203 | { |
| 10204 | 10204 | global $globalTimezone, $globalDBdriver; |
| 10205 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10206 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 10205 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10206 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 10207 | 10207 | if ($globalTimezone != '') { |
| 10208 | 10208 | date_default_timezone_set($globalTimezone); |
| 10209 | 10209 | $datetime = new DateTime(); |
@@ -10211,24 +10211,24 @@ discard block |
||
| 10211 | 10211 | } else $offset = '+00:00'; |
| 10212 | 10212 | |
| 10213 | 10213 | if ($globalDBdriver == 'mysql') { |
| 10214 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10214 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10215 | 10215 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 10216 | 10216 | GROUP BY hour_name |
| 10217 | 10217 | ORDER BY hour_name ASC"; |
| 10218 | 10218 | } else { |
| 10219 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10219 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10220 | 10220 | FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 10221 | 10221 | GROUP BY hour_name |
| 10222 | 10222 | ORDER BY hour_name ASC"; |
| 10223 | 10223 | } |
| 10224 | 10224 | |
| 10225 | 10225 | $sth = $this->db->prepare($query); |
| 10226 | - $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset)); |
|
| 10226 | + $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset)); |
|
| 10227 | 10227 | |
| 10228 | 10228 | $hour_array = array(); |
| 10229 | 10229 | $temp_array = array(); |
| 10230 | 10230 | |
| 10231 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10231 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10232 | 10232 | { |
| 10233 | 10233 | $temp_array['hour_name'] = $row['hour_name']; |
| 10234 | 10234 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10250,8 +10250,8 @@ discard block |
||
| 10250 | 10250 | public function countAllHoursByDate($date, $filters = array()) |
| 10251 | 10251 | { |
| 10252 | 10252 | global $globalTimezone, $globalDBdriver; |
| 10253 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10254 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 10253 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10254 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 10255 | 10255 | if ($globalTimezone != '') { |
| 10256 | 10256 | date_default_timezone_set($globalTimezone); |
| 10257 | 10257 | $datetime = new DateTime($date); |
@@ -10259,12 +10259,12 @@ discard block |
||
| 10259 | 10259 | } else $offset = '+00:00'; |
| 10260 | 10260 | |
| 10261 | 10261 | if ($globalDBdriver == 'mysql') { |
| 10262 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10262 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10263 | 10263 | FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 10264 | 10264 | GROUP BY hour_name |
| 10265 | 10265 | ORDER BY hour_name ASC"; |
| 10266 | 10266 | } else { |
| 10267 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10267 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10268 | 10268 | FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 10269 | 10269 | GROUP BY hour_name |
| 10270 | 10270 | ORDER BY hour_name ASC"; |
@@ -10276,7 +10276,7 @@ discard block |
||
| 10276 | 10276 | $hour_array = array(); |
| 10277 | 10277 | $temp_array = array(); |
| 10278 | 10278 | |
| 10279 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10279 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10280 | 10280 | { |
| 10281 | 10281 | $temp_array['hour_name'] = $row['hour_name']; |
| 10282 | 10282 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10298,8 +10298,8 @@ discard block |
||
| 10298 | 10298 | public function countAllHoursByIdent($ident, $filters = array()) |
| 10299 | 10299 | { |
| 10300 | 10300 | global $globalTimezone, $globalDBdriver; |
| 10301 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10302 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 10301 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10302 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 10303 | 10303 | if ($globalTimezone != '') { |
| 10304 | 10304 | date_default_timezone_set($globalTimezone); |
| 10305 | 10305 | $datetime = new DateTime(); |
@@ -10307,12 +10307,12 @@ discard block |
||
| 10307 | 10307 | } else $offset = '+00:00'; |
| 10308 | 10308 | |
| 10309 | 10309 | if ($globalDBdriver == 'mysql') { |
| 10310 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10310 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10311 | 10311 | FROM spotter_output".$filter_query." spotter_output.ident = :ident |
| 10312 | 10312 | GROUP BY hour_name |
| 10313 | 10313 | ORDER BY hour_name ASC"; |
| 10314 | 10314 | } else { |
| 10315 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10315 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10316 | 10316 | FROM spotter_output".$filter_query." spotter_output.ident = :ident |
| 10317 | 10317 | GROUP BY hour_name |
| 10318 | 10318 | ORDER BY hour_name ASC"; |
@@ -10320,12 +10320,12 @@ discard block |
||
| 10320 | 10320 | |
| 10321 | 10321 | |
| 10322 | 10322 | $sth = $this->db->prepare($query); |
| 10323 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 10323 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 10324 | 10324 | |
| 10325 | 10325 | $hour_array = array(); |
| 10326 | 10326 | $temp_array = array(); |
| 10327 | 10327 | |
| 10328 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10328 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10329 | 10329 | { |
| 10330 | 10330 | $temp_array['hour_name'] = $row['hour_name']; |
| 10331 | 10331 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10345,8 +10345,8 @@ discard block |
||
| 10345 | 10345 | public function countAllHoursByOwner($owner, $filters = array()) |
| 10346 | 10346 | { |
| 10347 | 10347 | global $globalTimezone, $globalDBdriver; |
| 10348 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10349 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 10348 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10349 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 10350 | 10350 | if ($globalTimezone != '') { |
| 10351 | 10351 | date_default_timezone_set($globalTimezone); |
| 10352 | 10352 | $datetime = new DateTime(); |
@@ -10354,12 +10354,12 @@ discard block |
||
| 10354 | 10354 | } else $offset = '+00:00'; |
| 10355 | 10355 | |
| 10356 | 10356 | if ($globalDBdriver == 'mysql') { |
| 10357 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10357 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10358 | 10358 | FROM spotter_output".$filter_query." spotter_output.owner_name = :owner |
| 10359 | 10359 | GROUP BY hour_name |
| 10360 | 10360 | ORDER BY hour_name ASC"; |
| 10361 | 10361 | } else { |
| 10362 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10362 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10363 | 10363 | FROM spotter_output".$filter_query." spotter_output.owner_name = :owner |
| 10364 | 10364 | GROUP BY hour_name |
| 10365 | 10365 | ORDER BY hour_name ASC"; |
@@ -10367,12 +10367,12 @@ discard block |
||
| 10367 | 10367 | |
| 10368 | 10368 | |
| 10369 | 10369 | $sth = $this->db->prepare($query); |
| 10370 | - $sth->execute(array(':owner' => $owner,':offset' => $offset)); |
|
| 10370 | + $sth->execute(array(':owner' => $owner, ':offset' => $offset)); |
|
| 10371 | 10371 | |
| 10372 | 10372 | $hour_array = array(); |
| 10373 | 10373 | $temp_array = array(); |
| 10374 | 10374 | |
| 10375 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10375 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10376 | 10376 | { |
| 10377 | 10377 | $temp_array['hour_name'] = $row['hour_name']; |
| 10378 | 10378 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10392,8 +10392,8 @@ discard block |
||
| 10392 | 10392 | public function countAllHoursByPilot($pilot, $filters = array()) |
| 10393 | 10393 | { |
| 10394 | 10394 | global $globalTimezone, $globalDBdriver; |
| 10395 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10396 | - $pilot = filter_var($pilot,FILTER_SANITIZE_STRING); |
|
| 10395 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10396 | + $pilot = filter_var($pilot, FILTER_SANITIZE_STRING); |
|
| 10397 | 10397 | if ($globalTimezone != '') { |
| 10398 | 10398 | date_default_timezone_set($globalTimezone); |
| 10399 | 10399 | $datetime = new DateTime(); |
@@ -10401,12 +10401,12 @@ discard block |
||
| 10401 | 10401 | } else $offset = '+00:00'; |
| 10402 | 10402 | |
| 10403 | 10403 | if ($globalDBdriver == 'mysql') { |
| 10404 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10404 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10405 | 10405 | FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 10406 | 10406 | GROUP BY hour_name |
| 10407 | 10407 | ORDER BY hour_name ASC"; |
| 10408 | 10408 | } else { |
| 10409 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10409 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10410 | 10410 | FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) |
| 10411 | 10411 | GROUP BY hour_name |
| 10412 | 10412 | ORDER BY hour_name ASC"; |
@@ -10414,12 +10414,12 @@ discard block |
||
| 10414 | 10414 | |
| 10415 | 10415 | |
| 10416 | 10416 | $sth = $this->db->prepare($query); |
| 10417 | - $sth->execute(array(':pilot' => $pilot,':offset' => $offset)); |
|
| 10417 | + $sth->execute(array(':pilot' => $pilot, ':offset' => $offset)); |
|
| 10418 | 10418 | |
| 10419 | 10419 | $hour_array = array(); |
| 10420 | 10420 | $temp_array = array(); |
| 10421 | 10421 | |
| 10422 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10422 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10423 | 10423 | { |
| 10424 | 10424 | $temp_array['hour_name'] = $row['hour_name']; |
| 10425 | 10425 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10438,12 +10438,12 @@ discard block |
||
| 10438 | 10438 | * @return Array the hour list |
| 10439 | 10439 | * |
| 10440 | 10440 | */ |
| 10441 | - public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array()) |
|
| 10441 | + public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array()) |
|
| 10442 | 10442 | { |
| 10443 | 10443 | global $globalTimezone, $globalDBdriver; |
| 10444 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10445 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 10446 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 10444 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10445 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 10446 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 10447 | 10447 | if ($globalTimezone != '') { |
| 10448 | 10448 | date_default_timezone_set($globalTimezone); |
| 10449 | 10449 | $datetime = new DateTime(); |
@@ -10451,24 +10451,24 @@ discard block |
||
| 10451 | 10451 | } else $offset = '+00:00'; |
| 10452 | 10452 | |
| 10453 | 10453 | if ($globalDBdriver == 'mysql') { |
| 10454 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10454 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10455 | 10455 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 10456 | 10456 | GROUP BY hour_name |
| 10457 | 10457 | ORDER BY hour_name ASC"; |
| 10458 | 10458 | } else { |
| 10459 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10459 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10460 | 10460 | FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 10461 | 10461 | GROUP BY hour_name |
| 10462 | 10462 | ORDER BY hour_name ASC"; |
| 10463 | 10463 | } |
| 10464 | 10464 | |
| 10465 | 10465 | $sth = $this->db->prepare($query); |
| 10466 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset)); |
|
| 10466 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset)); |
|
| 10467 | 10467 | |
| 10468 | 10468 | $hour_array = array(); |
| 10469 | 10469 | $temp_array = array(); |
| 10470 | 10470 | |
| 10471 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10471 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10472 | 10472 | { |
| 10473 | 10473 | $temp_array['hour_name'] = $row['hour_name']; |
| 10474 | 10474 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10489,8 +10489,8 @@ discard block |
||
| 10489 | 10489 | public function countAllHoursByCountry($country, $filters = array()) |
| 10490 | 10490 | { |
| 10491 | 10491 | global $globalTimezone, $globalDBdriver; |
| 10492 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10493 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 10492 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10493 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 10494 | 10494 | if ($globalTimezone != '') { |
| 10495 | 10495 | date_default_timezone_set($globalTimezone); |
| 10496 | 10496 | $datetime = new DateTime(); |
@@ -10498,24 +10498,24 @@ discard block |
||
| 10498 | 10498 | } else $offset = '+00:00'; |
| 10499 | 10499 | |
| 10500 | 10500 | if ($globalDBdriver == 'mysql') { |
| 10501 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10501 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10502 | 10502 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 10503 | 10503 | GROUP BY hour_name |
| 10504 | 10504 | ORDER BY hour_name ASC"; |
| 10505 | 10505 | } else { |
| 10506 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10506 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10507 | 10507 | FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 10508 | 10508 | GROUP BY hour_name |
| 10509 | 10509 | ORDER BY hour_name ASC"; |
| 10510 | 10510 | } |
| 10511 | 10511 | |
| 10512 | 10512 | $sth = $this->db->prepare($query); |
| 10513 | - $sth->execute(array(':country' => $country,':offset' => $offset)); |
|
| 10513 | + $sth->execute(array(':country' => $country, ':offset' => $offset)); |
|
| 10514 | 10514 | |
| 10515 | 10515 | $hour_array = array(); |
| 10516 | 10516 | $temp_array = array(); |
| 10517 | 10517 | |
| 10518 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10518 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10519 | 10519 | { |
| 10520 | 10520 | $temp_array['hour_name'] = $row['hour_name']; |
| 10521 | 10521 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10535,29 +10535,29 @@ discard block |
||
| 10535 | 10535 | * @return Integer the number of aircrafts |
| 10536 | 10536 | * |
| 10537 | 10537 | */ |
| 10538 | - public function countOverallAircrafts($filters = array(),$year = '',$month = '') |
|
| 10538 | + public function countOverallAircrafts($filters = array(), $year = '', $month = '') |
|
| 10539 | 10539 | { |
| 10540 | 10540 | global $globalDBdriver; |
| 10541 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10542 | - $query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count |
|
| 10541 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10542 | + $query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count |
|
| 10543 | 10543 | FROM spotter_output".$filter_query." spotter_output.ident <> ''"; |
| 10544 | 10544 | $query_values = array(); |
| 10545 | 10545 | if ($year != '') { |
| 10546 | 10546 | if ($globalDBdriver == 'mysql') { |
| 10547 | 10547 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10548 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10548 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10549 | 10549 | } else { |
| 10550 | 10550 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10551 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10551 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10552 | 10552 | } |
| 10553 | 10553 | } |
| 10554 | 10554 | if ($month != '') { |
| 10555 | 10555 | if ($globalDBdriver == 'mysql') { |
| 10556 | 10556 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10557 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10557 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10558 | 10558 | } else { |
| 10559 | 10559 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10560 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10560 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10561 | 10561 | } |
| 10562 | 10562 | } |
| 10563 | 10563 | |
@@ -10572,29 +10572,29 @@ discard block |
||
| 10572 | 10572 | * @return Integer the number of aircrafts |
| 10573 | 10573 | * |
| 10574 | 10574 | */ |
| 10575 | - public function countOverallArrival($filters = array(),$year = '',$month = '') |
|
| 10575 | + public function countOverallArrival($filters = array(), $year = '', $month = '') |
|
| 10576 | 10576 | { |
| 10577 | 10577 | global $globalDBdriver; |
| 10578 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10579 | - $query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count |
|
| 10578 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10579 | + $query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count |
|
| 10580 | 10580 | FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''"; |
| 10581 | 10581 | $query_values = array(); |
| 10582 | 10582 | if ($year != '') { |
| 10583 | 10583 | if ($globalDBdriver == 'mysql') { |
| 10584 | 10584 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10585 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10585 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10586 | 10586 | } else { |
| 10587 | 10587 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10588 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10588 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10589 | 10589 | } |
| 10590 | 10590 | } |
| 10591 | 10591 | if ($month != '') { |
| 10592 | 10592 | if ($globalDBdriver == 'mysql') { |
| 10593 | 10593 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10594 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10594 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10595 | 10595 | } else { |
| 10596 | 10596 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10597 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10597 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10598 | 10598 | } |
| 10599 | 10599 | } |
| 10600 | 10600 | |
@@ -10609,29 +10609,29 @@ discard block |
||
| 10609 | 10609 | * @return Integer the number of pilots |
| 10610 | 10610 | * |
| 10611 | 10611 | */ |
| 10612 | - public function countOverallPilots($filters = array(),$year = '',$month = '') |
|
| 10612 | + public function countOverallPilots($filters = array(), $year = '', $month = '') |
|
| 10613 | 10613 | { |
| 10614 | 10614 | global $globalDBdriver; |
| 10615 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10616 | - $query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count |
|
| 10615 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10616 | + $query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count |
|
| 10617 | 10617 | FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''"; |
| 10618 | 10618 | $query_values = array(); |
| 10619 | 10619 | if ($year != '') { |
| 10620 | 10620 | if ($globalDBdriver == 'mysql') { |
| 10621 | 10621 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10622 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10622 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10623 | 10623 | } else { |
| 10624 | 10624 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10625 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10625 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10626 | 10626 | } |
| 10627 | 10627 | } |
| 10628 | 10628 | if ($month != '') { |
| 10629 | 10629 | if ($globalDBdriver == 'mysql') { |
| 10630 | 10630 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10631 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10631 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10632 | 10632 | } else { |
| 10633 | 10633 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10634 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10634 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10635 | 10635 | } |
| 10636 | 10636 | } |
| 10637 | 10637 | $sth = $this->db->prepare($query); |
@@ -10645,29 +10645,29 @@ discard block |
||
| 10645 | 10645 | * @return Integer the number of owners |
| 10646 | 10646 | * |
| 10647 | 10647 | */ |
| 10648 | - public function countOverallOwners($filters = array(),$year = '',$month = '') |
|
| 10648 | + public function countOverallOwners($filters = array(), $year = '', $month = '') |
|
| 10649 | 10649 | { |
| 10650 | 10650 | global $globalDBdriver; |
| 10651 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10652 | - $query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count |
|
| 10651 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10652 | + $query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count |
|
| 10653 | 10653 | FROM spotter_output".$filter_query." spotter_output.owner_name <> ''"; |
| 10654 | 10654 | $query_values = array(); |
| 10655 | 10655 | if ($year != '') { |
| 10656 | 10656 | if ($globalDBdriver == 'mysql') { |
| 10657 | 10657 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10658 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10658 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10659 | 10659 | } else { |
| 10660 | 10660 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10661 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10661 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10662 | 10662 | } |
| 10663 | 10663 | } |
| 10664 | 10664 | if ($month != '') { |
| 10665 | 10665 | if ($globalDBdriver == 'mysql') { |
| 10666 | 10666 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10667 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10667 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10668 | 10668 | } else { |
| 10669 | 10669 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10670 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10670 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10671 | 10671 | } |
| 10672 | 10672 | } |
| 10673 | 10673 | $sth = $this->db->prepare($query); |
@@ -10682,32 +10682,32 @@ discard block |
||
| 10682 | 10682 | * @return Integer the number of flights |
| 10683 | 10683 | * |
| 10684 | 10684 | */ |
| 10685 | - public function countOverallFlights($filters = array(),$year = '',$month = '') |
|
| 10685 | + public function countOverallFlights($filters = array(), $year = '', $month = '') |
|
| 10686 | 10686 | { |
| 10687 | 10687 | global $globalDBdriver; |
| 10688 | - $queryi = "SELECT COUNT(spotter_output.spotter_id) AS flight_count FROM spotter_output"; |
|
| 10688 | + $queryi = "SELECT COUNT(spotter_output.spotter_id) AS flight_count FROM spotter_output"; |
|
| 10689 | 10689 | $query_values = array(); |
| 10690 | 10690 | $query = ''; |
| 10691 | 10691 | if ($year != '') { |
| 10692 | 10692 | if ($globalDBdriver == 'mysql') { |
| 10693 | 10693 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10694 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10694 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10695 | 10695 | } else { |
| 10696 | 10696 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10697 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10697 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10698 | 10698 | } |
| 10699 | 10699 | } |
| 10700 | 10700 | if ($month != '') { |
| 10701 | 10701 | if ($globalDBdriver == 'mysql') { |
| 10702 | 10702 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10703 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10703 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10704 | 10704 | } else { |
| 10705 | 10705 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10706 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10706 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10707 | 10707 | } |
| 10708 | 10708 | } |
| 10709 | 10709 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 10710 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 10710 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 10711 | 10711 | |
| 10712 | 10712 | //echo $query; |
| 10713 | 10713 | $sth = $this->db->prepare($queryi); |
@@ -10721,29 +10721,29 @@ discard block |
||
| 10721 | 10721 | * @return Integer the number of flights |
| 10722 | 10722 | * |
| 10723 | 10723 | */ |
| 10724 | - public function countOverallMilitaryFlights($filters = array(),$year = '',$month = '') |
|
| 10724 | + public function countOverallMilitaryFlights($filters = array(), $year = '', $month = '') |
|
| 10725 | 10725 | { |
| 10726 | 10726 | global $globalDBdriver; |
| 10727 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10728 | - $query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count |
|
| 10727 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10728 | + $query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count |
|
| 10729 | 10729 | FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'"; |
| 10730 | 10730 | $query_values = array(); |
| 10731 | 10731 | if ($year != '') { |
| 10732 | 10732 | if ($globalDBdriver == 'mysql') { |
| 10733 | 10733 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10734 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10734 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10735 | 10735 | } else { |
| 10736 | 10736 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10737 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10737 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10738 | 10738 | } |
| 10739 | 10739 | } |
| 10740 | 10740 | if ($month != '') { |
| 10741 | 10741 | if ($globalDBdriver == 'mysql') { |
| 10742 | 10742 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10743 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10743 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10744 | 10744 | } else { |
| 10745 | 10745 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10746 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10746 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10747 | 10747 | } |
| 10748 | 10748 | } |
| 10749 | 10749 | |
@@ -10760,10 +10760,10 @@ discard block |
||
| 10760 | 10760 | * @return Integer the number of airlines |
| 10761 | 10761 | * |
| 10762 | 10762 | */ |
| 10763 | - public function countOverallAirlines($filters = array(),$year = '',$month = '') |
|
| 10763 | + public function countOverallAirlines($filters = array(), $year = '', $month = '') |
|
| 10764 | 10764 | { |
| 10765 | 10765 | global $globalDBdriver; |
| 10766 | - $queryi = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count |
|
| 10766 | + $queryi = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count |
|
| 10767 | 10767 | FROM spotter_output"; |
| 10768 | 10768 | |
| 10769 | 10769 | $query_values = array(); |
@@ -10771,23 +10771,23 @@ discard block |
||
| 10771 | 10771 | if ($year != '') { |
| 10772 | 10772 | if ($globalDBdriver == 'mysql') { |
| 10773 | 10773 | $query .= " AND YEAR(spotter_output.date) = :year"; |
| 10774 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10774 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10775 | 10775 | } else { |
| 10776 | 10776 | $query .= " AND EXTRACT(YEAR FROM spotter_output.date) = :year"; |
| 10777 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 10777 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 10778 | 10778 | } |
| 10779 | 10779 | } |
| 10780 | 10780 | if ($month != '') { |
| 10781 | 10781 | if ($globalDBdriver == 'mysql') { |
| 10782 | 10782 | $query .= " AND MONTH(spotter_output.date) = :month"; |
| 10783 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10783 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10784 | 10784 | } else { |
| 10785 | 10785 | $query .= " AND EXTRACT(MONTH FROM spotter_output.date) = :month"; |
| 10786 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 10786 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 10787 | 10787 | } |
| 10788 | 10788 | } |
| 10789 | 10789 | if ($query == '') $queryi .= $this->getFilter($filters); |
| 10790 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 10790 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 10791 | 10791 | |
| 10792 | 10792 | |
| 10793 | 10793 | $sth = $this->db->prepare($queryi); |
@@ -10805,7 +10805,7 @@ discard block |
||
| 10805 | 10805 | public function countAllHoursFromToday($filters = array()) |
| 10806 | 10806 | { |
| 10807 | 10807 | global $globalTimezone, $globalDBdriver; |
| 10808 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10808 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10809 | 10809 | if ($globalTimezone != '') { |
| 10810 | 10810 | date_default_timezone_set($globalTimezone); |
| 10811 | 10811 | $datetime = new DateTime(); |
@@ -10813,12 +10813,12 @@ discard block |
||
| 10813 | 10813 | } else $offset = '+00:00'; |
| 10814 | 10814 | |
| 10815 | 10815 | if ($globalDBdriver == 'mysql') { |
| 10816 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10816 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 10817 | 10817 | FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE() |
| 10818 | 10818 | GROUP BY hour_name |
| 10819 | 10819 | ORDER BY hour_name ASC"; |
| 10820 | 10820 | } else { |
| 10821 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10821 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 10822 | 10822 | FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 10823 | 10823 | GROUP BY hour_name |
| 10824 | 10824 | ORDER BY hour_name ASC"; |
@@ -10830,7 +10830,7 @@ discard block |
||
| 10830 | 10830 | $hour_array = array(); |
| 10831 | 10831 | $temp_array = array(); |
| 10832 | 10832 | |
| 10833 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10833 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10834 | 10834 | { |
| 10835 | 10835 | $temp_array['hour_name'] = $row['hour_name']; |
| 10836 | 10836 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -10849,14 +10849,14 @@ discard block |
||
| 10849 | 10849 | public function getUpcomingFlights($limit = '', $sort = '', $filters = array()) |
| 10850 | 10850 | { |
| 10851 | 10851 | global $global_query, $globalDBdriver, $globalTimezone; |
| 10852 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 10852 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 10853 | 10853 | date_default_timezone_set('UTC'); |
| 10854 | 10854 | $limit_query = ''; |
| 10855 | 10855 | if ($limit != "") |
| 10856 | 10856 | { |
| 10857 | 10857 | $limit_array = explode(",", $limit); |
| 10858 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 10859 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 10858 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 10859 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 10860 | 10860 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 10861 | 10861 | { |
| 10862 | 10862 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -10909,7 +10909,7 @@ discard block |
||
| 10909 | 10909 | GROUP BY spotter_output.ident,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time, to_char(spotter_output.date,'HH') |
| 10910 | 10910 | HAVING count(spotter_output.ident) > 5$orderby_query"; |
| 10911 | 10911 | //echo $query; |
| 10912 | - $spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone)); |
|
| 10912 | + $spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone)); |
|
| 10913 | 10913 | /* |
| 10914 | 10914 | $sth = $this->db->prepare($query); |
| 10915 | 10915 | $sth->execute(array(':timezone' => $globalTimezone)); |
@@ -10928,9 +10928,9 @@ discard block |
||
| 10928 | 10928 | */ |
| 10929 | 10929 | public function getSpotterIDBasedOnFlightAwareID($flightaware_id) |
| 10930 | 10930 | { |
| 10931 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 10931 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 10932 | 10932 | |
| 10933 | - $query = "SELECT spotter_output.spotter_id |
|
| 10933 | + $query = "SELECT spotter_output.spotter_id |
|
| 10934 | 10934 | FROM spotter_output |
| 10935 | 10935 | WHERE spotter_output.flightaware_id = '".$flightaware_id."'"; |
| 10936 | 10936 | |
@@ -10938,7 +10938,7 @@ discard block |
||
| 10938 | 10938 | $sth = $this->db->prepare($query); |
| 10939 | 10939 | $sth->execute(); |
| 10940 | 10940 | |
| 10941 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10941 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 10942 | 10942 | { |
| 10943 | 10943 | return $row['spotter_id']; |
| 10944 | 10944 | } |
@@ -10963,23 +10963,23 @@ discard block |
||
| 10963 | 10963 | } |
| 10964 | 10964 | |
| 10965 | 10965 | $current_date = date("Y-m-d H:i:s"); |
| 10966 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 10966 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 10967 | 10967 | |
| 10968 | 10968 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 10969 | 10969 | |
| 10970 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 10970 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 10971 | 10971 | $years = $time_array['years']; |
| 10972 | 10972 | |
| 10973 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 10973 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 10974 | 10974 | $months = $time_array['months']; |
| 10975 | 10975 | |
| 10976 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 10976 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 10977 | 10977 | $days = $time_array['days']; |
| 10978 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 10978 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 10979 | 10979 | $hours = $time_array['hours']; |
| 10980 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 10980 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 10981 | 10981 | $minutes = $time_array['minutes']; |
| 10982 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 10982 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 10983 | 10983 | |
| 10984 | 10984 | return $time_array; |
| 10985 | 10985 | } |
@@ -11005,63 +11005,63 @@ discard block |
||
| 11005 | 11005 | $temp_array['direction_degree'] = $direction; |
| 11006 | 11006 | $temp_array['direction_shortname'] = "N"; |
| 11007 | 11007 | $temp_array['direction_fullname'] = "North"; |
| 11008 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 11008 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 11009 | 11009 | $temp_array['direction_degree'] = $direction; |
| 11010 | 11010 | $temp_array['direction_shortname'] = "NNE"; |
| 11011 | 11011 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 11012 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 11012 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 11013 | 11013 | $temp_array['direction_degree'] = $direction; |
| 11014 | 11014 | $temp_array['direction_shortname'] = "NE"; |
| 11015 | 11015 | $temp_array['direction_fullname'] = "Northeast"; |
| 11016 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 11016 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 11017 | 11017 | $temp_array['direction_degree'] = $direction; |
| 11018 | 11018 | $temp_array['direction_shortname'] = "ENE"; |
| 11019 | 11019 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 11020 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 11020 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 11021 | 11021 | $temp_array['direction_degree'] = $direction; |
| 11022 | 11022 | $temp_array['direction_shortname'] = "E"; |
| 11023 | 11023 | $temp_array['direction_fullname'] = "East"; |
| 11024 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 11024 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 11025 | 11025 | $temp_array['direction_degree'] = $direction; |
| 11026 | 11026 | $temp_array['direction_shortname'] = "ESE"; |
| 11027 | 11027 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 11028 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 11028 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 11029 | 11029 | $temp_array['direction_degree'] = $direction; |
| 11030 | 11030 | $temp_array['direction_shortname'] = "SE"; |
| 11031 | 11031 | $temp_array['direction_fullname'] = "Southeast"; |
| 11032 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 11032 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 11033 | 11033 | $temp_array['direction_degree'] = $direction; |
| 11034 | 11034 | $temp_array['direction_shortname'] = "SSE"; |
| 11035 | 11035 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 11036 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 11036 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 11037 | 11037 | $temp_array['direction_degree'] = $direction; |
| 11038 | 11038 | $temp_array['direction_shortname'] = "S"; |
| 11039 | 11039 | $temp_array['direction_fullname'] = "South"; |
| 11040 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 11040 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 11041 | 11041 | $temp_array['direction_degree'] = $direction; |
| 11042 | 11042 | $temp_array['direction_shortname'] = "SSW"; |
| 11043 | 11043 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 11044 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 11044 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 11045 | 11045 | $temp_array['direction_degree'] = $direction; |
| 11046 | 11046 | $temp_array['direction_shortname'] = "SW"; |
| 11047 | 11047 | $temp_array['direction_fullname'] = "Southwest"; |
| 11048 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 11048 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 11049 | 11049 | $temp_array['direction_degree'] = $direction; |
| 11050 | 11050 | $temp_array['direction_shortname'] = "WSW"; |
| 11051 | 11051 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 11052 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 11052 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 11053 | 11053 | $temp_array['direction_degree'] = $direction; |
| 11054 | 11054 | $temp_array['direction_shortname'] = "W"; |
| 11055 | 11055 | $temp_array['direction_fullname'] = "West"; |
| 11056 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 11056 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 11057 | 11057 | $temp_array['direction_degree'] = $direction; |
| 11058 | 11058 | $temp_array['direction_shortname'] = "WNW"; |
| 11059 | 11059 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 11060 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 11060 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 11061 | 11061 | $temp_array['direction_degree'] = $direction; |
| 11062 | 11062 | $temp_array['direction_shortname'] = "NW"; |
| 11063 | 11063 | $temp_array['direction_fullname'] = "Northwest"; |
| 11064 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 11064 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 11065 | 11065 | $temp_array['direction_degree'] = $direction; |
| 11066 | 11066 | $temp_array['direction_shortname'] = "NNW"; |
| 11067 | 11067 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -11114,9 +11114,9 @@ discard block |
||
| 11114 | 11114 | */ |
| 11115 | 11115 | public function getAircraftRegistrationBymodeS($aircraft_modes) |
| 11116 | 11116 | { |
| 11117 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 11117 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 11118 | 11118 | |
| 11119 | - $query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 11119 | + $query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 11120 | 11120 | |
| 11121 | 11121 | $sth = $this->db->prepare($query); |
| 11122 | 11122 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -11139,9 +11139,9 @@ discard block |
||
| 11139 | 11139 | */ |
| 11140 | 11140 | public function getAircraftTypeBymodeS($aircraft_modes) |
| 11141 | 11141 | { |
| 11142 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 11142 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 11143 | 11143 | |
| 11144 | - $query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 11144 | + $query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1"; |
|
| 11145 | 11145 | |
| 11146 | 11146 | $sth = $this->db->prepare($query); |
| 11147 | 11147 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -11162,11 +11162,11 @@ discard block |
||
| 11162 | 11162 | * @param Float $longitude longitute of the flight |
| 11163 | 11163 | * @return String the countrie |
| 11164 | 11164 | */ |
| 11165 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 11165 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 11166 | 11166 | { |
| 11167 | 11167 | global $globalDBdriver, $globalDebug; |
| 11168 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 11169 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 11168 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 11169 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 11170 | 11170 | |
| 11171 | 11171 | $Connection = new Connection($this->db); |
| 11172 | 11172 | if (!$Connection->tableExists('countries')) return ''; |
@@ -11206,7 +11206,7 @@ discard block |
||
| 11206 | 11206 | public function getCountryFromISO2($iso2) |
| 11207 | 11207 | { |
| 11208 | 11208 | global $globalDBdriver, $globalDebug; |
| 11209 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 11209 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 11210 | 11210 | |
| 11211 | 11211 | $Connection = new Connection($this->db); |
| 11212 | 11212 | if (!$Connection->tableExists('countries')) return ''; |
@@ -11238,19 +11238,19 @@ discard block |
||
| 11238 | 11238 | */ |
| 11239 | 11239 | public function convertAircraftRegistration($registration) |
| 11240 | 11240 | { |
| 11241 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 11241 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 11242 | 11242 | $registration_prefix = ''; |
| 11243 | 11243 | $registration_1 = substr($registration, 0, 1); |
| 11244 | 11244 | $registration_2 = substr($registration, 0, 2); |
| 11245 | 11245 | |
| 11246 | 11246 | //first get the prefix based on two characters |
| 11247 | - $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2"; |
|
| 11247 | + $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2"; |
|
| 11248 | 11248 | |
| 11249 | 11249 | |
| 11250 | 11250 | $sth = $this->db->prepare($query); |
| 11251 | 11251 | $sth->execute(array(':registration_2' => $registration_2)); |
| 11252 | 11252 | |
| 11253 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11253 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11254 | 11254 | { |
| 11255 | 11255 | $registration_prefix = $row['registration_prefix']; |
| 11256 | 11256 | } |
@@ -11258,11 +11258,11 @@ discard block |
||
| 11258 | 11258 | //if we didn't find a two chracter prefix lets just search the one with one character |
| 11259 | 11259 | if ($registration_prefix == '') |
| 11260 | 11260 | { |
| 11261 | - $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1"; |
|
| 11261 | + $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1"; |
|
| 11262 | 11262 | $sth = $this->db->prepare($query); |
| 11263 | 11263 | $sth->execute(array(':registration_1' => $registration_1)); |
| 11264 | 11264 | |
| 11265 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11265 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11266 | 11266 | { |
| 11267 | 11267 | $registration_prefix = $row['registration_prefix']; |
| 11268 | 11268 | } |
@@ -11276,7 +11276,7 @@ discard block |
||
| 11276 | 11276 | } else { |
| 11277 | 11277 | $registration = preg_replace("/^(.{1})/", "$1-", $registration); |
| 11278 | 11278 | } |
| 11279 | - } else if(strlen($registration_prefix) == 2){ |
|
| 11279 | + } else if (strlen($registration_prefix) == 2) { |
|
| 11280 | 11280 | if (0 === strpos($registration, 'N')) { |
| 11281 | 11281 | $registration = preg_replace("/^(.{2})/", "$1", $registration); |
| 11282 | 11282 | } else { |
@@ -11295,17 +11295,17 @@ discard block |
||
| 11295 | 11295 | */ |
| 11296 | 11296 | public function countryFromAircraftRegistration($registration) |
| 11297 | 11297 | { |
| 11298 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 11298 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 11299 | 11299 | |
| 11300 | 11300 | $registration_prefix = ''; |
| 11301 | - $registration_test = explode('-',$registration); |
|
| 11301 | + $registration_test = explode('-', $registration); |
|
| 11302 | 11302 | $country = ''; |
| 11303 | 11303 | if ($registration_test[0] != $registration) { |
| 11304 | 11304 | $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
| 11305 | 11305 | |
| 11306 | 11306 | $sth = $this->db->prepare($query); |
| 11307 | 11307 | $sth->execute(array(':registration_1' => $registration_test[0])); |
| 11308 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11308 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11309 | 11309 | { |
| 11310 | 11310 | //$registration_prefix = $row['registration_prefix']; |
| 11311 | 11311 | $country = $row['country']; |
@@ -11316,13 +11316,13 @@ discard block |
||
| 11316 | 11316 | |
| 11317 | 11317 | $country = ''; |
| 11318 | 11318 | //first get the prefix based on two characters |
| 11319 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 11319 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 11320 | 11320 | |
| 11321 | 11321 | |
| 11322 | 11322 | $sth = $this->db->prepare($query); |
| 11323 | 11323 | $sth->execute(array(':registration_2' => $registration_2)); |
| 11324 | 11324 | |
| 11325 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11325 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11326 | 11326 | { |
| 11327 | 11327 | $registration_prefix = $row['registration_prefix']; |
| 11328 | 11328 | $country = $row['country']; |
@@ -11331,12 +11331,12 @@ discard block |
||
| 11331 | 11331 | //if we didn't find a two chracter prefix lets just search the one with one character |
| 11332 | 11332 | if ($registration_prefix == "") |
| 11333 | 11333 | { |
| 11334 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11334 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11335 | 11335 | |
| 11336 | 11336 | $sth = $this->db->prepare($query); |
| 11337 | 11337 | $sth->execute(array(':registration_1' => $registration_1)); |
| 11338 | 11338 | |
| 11339 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11339 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11340 | 11340 | { |
| 11341 | 11341 | //$registration_prefix = $row['registration_prefix']; |
| 11342 | 11342 | $country = $row['country']; |
@@ -11356,17 +11356,17 @@ discard block |
||
| 11356 | 11356 | */ |
| 11357 | 11357 | public function registrationPrefixFromAircraftRegistration($registration) |
| 11358 | 11358 | { |
| 11359 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 11359 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 11360 | 11360 | |
| 11361 | 11361 | $registration_prefix = ''; |
| 11362 | - $registration_test = explode('-',$registration); |
|
| 11362 | + $registration_test = explode('-', $registration); |
|
| 11363 | 11363 | //$country = ''; |
| 11364 | 11364 | if ($registration_test[0] != $registration) { |
| 11365 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11365 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11366 | 11366 | |
| 11367 | 11367 | $sth = $this->db->prepare($query); |
| 11368 | 11368 | $sth->execute(array(':registration_1' => $registration_test[0])); |
| 11369 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11369 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11370 | 11370 | { |
| 11371 | 11371 | $registration_prefix = $row['registration_prefix']; |
| 11372 | 11372 | //$country = $row['country']; |
@@ -11376,13 +11376,13 @@ discard block |
||
| 11376 | 11376 | $registration_2 = substr($registration, 0, 2); |
| 11377 | 11377 | |
| 11378 | 11378 | //first get the prefix based on two characters |
| 11379 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 11379 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 11380 | 11380 | |
| 11381 | 11381 | |
| 11382 | 11382 | $sth = $this->db->prepare($query); |
| 11383 | 11383 | $sth->execute(array(':registration_2' => $registration_2)); |
| 11384 | 11384 | |
| 11385 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11385 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11386 | 11386 | { |
| 11387 | 11387 | $registration_prefix = $row['registration_prefix']; |
| 11388 | 11388 | //$country = $row['country']; |
@@ -11391,12 +11391,12 @@ discard block |
||
| 11391 | 11391 | //if we didn't find a two chracter prefix lets just search the one with one character |
| 11392 | 11392 | if ($registration_prefix == "") |
| 11393 | 11393 | { |
| 11394 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11394 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 11395 | 11395 | |
| 11396 | 11396 | $sth = $this->db->prepare($query); |
| 11397 | 11397 | $sth->execute(array(':registration_1' => $registration_1)); |
| 11398 | 11398 | |
| 11399 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11399 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11400 | 11400 | { |
| 11401 | 11401 | $registration_prefix = $row['registration_prefix']; |
| 11402 | 11402 | //$country = $row['country']; |
@@ -11417,13 +11417,13 @@ discard block |
||
| 11417 | 11417 | */ |
| 11418 | 11418 | public function countryFromAircraftRegistrationCode($registration) |
| 11419 | 11419 | { |
| 11420 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 11420 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 11421 | 11421 | |
| 11422 | 11422 | $country = ''; |
| 11423 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1"; |
|
| 11423 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1"; |
|
| 11424 | 11424 | $sth = $this->db->prepare($query); |
| 11425 | 11425 | $sth->execute(array(':registration' => $registration)); |
| 11426 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11426 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11427 | 11427 | { |
| 11428 | 11428 | $country = $row['country']; |
| 11429 | 11429 | } |
@@ -11436,9 +11436,9 @@ discard block |
||
| 11436 | 11436 | * @param String $flightaware_id flightaware_id from spotter_output table |
| 11437 | 11437 | * @param String $highlight New highlight value |
| 11438 | 11438 | */ |
| 11439 | - public function setHighlightFlight($flightaware_id,$highlight) { |
|
| 11439 | + public function setHighlightFlight($flightaware_id, $highlight) { |
|
| 11440 | 11440 | |
| 11441 | - $query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id"; |
|
| 11441 | + $query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id"; |
|
| 11442 | 11442 | $sth = $this->db->prepare($query); |
| 11443 | 11443 | $sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight)); |
| 11444 | 11444 | } |
@@ -11450,13 +11450,13 @@ discard block |
||
| 11450 | 11450 | * @param String $date Date of spotted aircraft |
| 11451 | 11451 | * @param String $highlight New highlight value |
| 11452 | 11452 | */ |
| 11453 | - public function setHighlightFlightByRegistration($registration,$highlight, $date = '') { |
|
| 11453 | + public function setHighlightFlightByRegistration($registration, $highlight, $date = '') { |
|
| 11454 | 11454 | if ($date == '') { |
| 11455 | 11455 | $query = "UPDATE spotter_output SET highlight = :highlight WHERE spotter_id IN (SELECT MAX(spotter_id) FROM spotter_output WHERE registration = :registration)"; |
| 11456 | 11456 | $query_values = array(':registration' => $registration, ':highlight' => $highlight); |
| 11457 | 11457 | } else { |
| 11458 | 11458 | $query = "UPDATE spotter_output SET highlight = :highlight WHERE registration = :registration AND date(date) = :date"; |
| 11459 | - $query_values = array(':registration' => $registration, ':highlight' => $highlight,':date' => $date); |
|
| 11459 | + $query_values = array(':registration' => $registration, ':highlight' => $highlight, ':date' => $date); |
|
| 11460 | 11460 | } |
| 11461 | 11461 | $sth = $this->db->prepare($query); |
| 11462 | 11462 | $sth->execute($query_values); |
@@ -11486,7 +11486,7 @@ discard block |
||
| 11486 | 11486 | |
| 11487 | 11487 | $bitly_data = json_decode($bitly_data); |
| 11488 | 11488 | $bitly_url = ''; |
| 11489 | - if ($bitly_data->status_txt = "OK"){ |
|
| 11489 | + if ($bitly_data->status_txt = "OK") { |
|
| 11490 | 11490 | $bitly_url = $bitly_data->data->url; |
| 11491 | 11491 | } |
| 11492 | 11492 | |
@@ -11496,7 +11496,7 @@ discard block |
||
| 11496 | 11496 | |
| 11497 | 11497 | public function getOrderBy() |
| 11498 | 11498 | { |
| 11499 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 11499 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 11500 | 11500 | |
| 11501 | 11501 | return $orderby; |
| 11502 | 11502 | |
@@ -11630,14 +11630,14 @@ discard block |
||
| 11630 | 11630 | } |
| 11631 | 11631 | $sth = $this->db->prepare($query); |
| 11632 | 11632 | $sth->execute(); |
| 11633 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11633 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11634 | 11634 | { |
| 11635 | 11635 | $departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']); |
| 11636 | 11636 | $arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']); |
| 11637 | 11637 | if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) { |
| 11638 | - $update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id"; |
|
| 11638 | + $update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id"; |
|
| 11639 | 11639 | $sthu = $this->db->prepare($update_query); |
| 11640 | - $sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country'])); |
|
| 11640 | + $sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country'])); |
|
| 11641 | 11641 | } |
| 11642 | 11642 | } |
| 11643 | 11643 | |
@@ -11650,7 +11650,7 @@ discard block |
||
| 11650 | 11650 | } |
| 11651 | 11651 | $sth = $this->db->prepare($query); |
| 11652 | 11652 | $sth->execute(); |
| 11653 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11653 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11654 | 11654 | { |
| 11655 | 11655 | if (is_numeric(substr($row['ident'], -1, 1))) |
| 11656 | 11656 | { |
@@ -11659,11 +11659,11 @@ discard block |
||
| 11659 | 11659 | elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 11660 | 11660 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 11661 | 11661 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 11662 | - $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource); |
|
| 11662 | + $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource); |
|
| 11663 | 11663 | if (isset($airline_array[0]['name'])) { |
| 11664 | - $update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 11664 | + $update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 11665 | 11665 | $sthu = $this->db->prepare($update_query); |
| 11666 | - $sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id'])); |
|
| 11666 | + $sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id'])); |
|
| 11667 | 11667 | } |
| 11668 | 11668 | } |
| 11669 | 11669 | } |
@@ -11683,18 +11683,18 @@ discard block |
||
| 11683 | 11683 | } |
| 11684 | 11684 | $sth = $this->db->prepare($query); |
| 11685 | 11685 | $sth->execute(); |
| 11686 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11686 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11687 | 11687 | { |
| 11688 | 11688 | if ($row['aircraft_icao'] != '') { |
| 11689 | 11689 | $aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']); |
| 11690 | - if ($row['registration'] != ""){ |
|
| 11690 | + if ($row['registration'] != "") { |
|
| 11691 | 11691 | $image_array = $Image->getSpotterImage($row['registration']); |
| 11692 | 11692 | if (!isset($image_array[0]['registration'])) { |
| 11693 | 11693 | $Image->addSpotterImage($row['registration']); |
| 11694 | 11694 | } |
| 11695 | 11695 | } |
| 11696 | 11696 | if (count($aircraft_name) > 0) { |
| 11697 | - $update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 11697 | + $update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 11698 | 11698 | $sthu = $this->db->prepare($update_query); |
| 11699 | 11699 | $sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id'])); |
| 11700 | 11700 | } |
@@ -11709,10 +11709,10 @@ discard block |
||
| 11709 | 11709 | $query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output"; |
| 11710 | 11710 | $sth = $this->db->prepare($query); |
| 11711 | 11711 | $sth->execute(); |
| 11712 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11712 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 11713 | 11713 | { |
| 11714 | 11714 | if ($row['last_latitude'] != '' && $row['last_longitude'] != '') { |
| 11715 | - $closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist); |
|
| 11715 | + $closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist); |
|
| 11716 | 11716 | $airport_icao = ''; |
| 11717 | 11717 | if (isset($closestAirports[0])) { |
| 11718 | 11718 | if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) { |
@@ -11726,7 +11726,7 @@ discard block |
||
| 11726 | 11726 | break; |
| 11727 | 11727 | } |
| 11728 | 11728 | } |
| 11729 | - } elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) { |
|
| 11729 | + } elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) { |
|
| 11730 | 11730 | $airport_icao = $closestAirports[0]['icao']; |
| 11731 | 11731 | if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." ! Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
| 11732 | 11732 | } else { |
@@ -11737,28 +11737,28 @@ discard block |
||
| 11737 | 11737 | } |
| 11738 | 11738 | if ($row['real_arrival_airport_icao'] != $airport_icao) { |
| 11739 | 11739 | if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n"; |
| 11740 | - $update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id"; |
|
| 11740 | + $update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id"; |
|
| 11741 | 11741 | $sthu = $this->db->prepare($update_query); |
| 11742 | - $sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id'])); |
|
| 11742 | + $sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id'])); |
|
| 11743 | 11743 | } |
| 11744 | 11744 | } |
| 11745 | 11745 | } |
| 11746 | 11746 | } |
| 11747 | 11747 | |
| 11748 | - public function closestAirports($origLat,$origLon,$dist = 10) { |
|
| 11748 | + public function closestAirports($origLat, $origLon, $dist = 10) { |
|
| 11749 | 11749 | global $globalDBdriver; |
| 11750 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 11750 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 11751 | 11751 | /* |
| 11752 | 11752 | $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
| 11753 | 11753 | FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 11754 | 11754 | having distance < $dist ORDER BY distance limit 100;"; |
| 11755 | 11755 | */ |
| 11756 | 11756 | if ($globalDBdriver == 'mysql') { |
| 11757 | - $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
|
| 11757 | + $query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
|
| 11758 | 11758 | FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 11759 | 11759 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;"; |
| 11760 | 11760 | } else { |
| 11761 | - $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance |
|
| 11761 | + $query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance |
|
| 11762 | 11762 | FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 11763 | 11763 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;"; |
| 11764 | 11764 | } |
@@ -69,7 +69,9 @@ discard block |
||
| 69 | 69 | $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 72 | + if (is_array($globalFilter)) { |
|
| 73 | + $filter = array_merge($filter,$globalFilter); |
|
| 74 | + } |
|
| 73 | 75 | $filter_query_join = ''; |
| 74 | 76 | $filter_query_where = ''; |
| 75 | 77 | foreach($filters as $flt) { |
@@ -122,8 +124,11 @@ discard block |
||
| 122 | 124 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 123 | 125 | } |
| 124 | 126 | } |
| 125 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 126 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 127 | + if ($filter_query_where == '' && $where) { |
|
| 128 | + $filter_query_where = ' WHERE'; |
|
| 129 | + } elseif ($filter_query_where != '' && $and) { |
|
| 130 | + $filter_query_where .= ' AND'; |
|
| 131 | + } |
|
| 127 | 132 | $filter_query = $filter_query_join.$filter_query_where; |
| 128 | 133 | return $filter_query; |
| 129 | 134 | } |
@@ -143,10 +148,18 @@ discard block |
||
| 143 | 148 | $Image = new Image($this->db); |
| 144 | 149 | $Schedule = new Schedule($this->db); |
| 145 | 150 | $ACARS = new ACARS($this->db); |
| 146 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
| 147 | - if (!isset($globalVATSIM)) $globalVATSIM = FALSE; |
|
| 148 | - if (!isset($globalphpVMS)) $globalphpVMS = FALSE; |
|
| 149 | - if (!isset($globalVAM)) $globalVAM = FALSE; |
|
| 151 | + if (!isset($globalIVAO)) { |
|
| 152 | + $globalIVAO = FALSE; |
|
| 153 | + } |
|
| 154 | + if (!isset($globalVATSIM)) { |
|
| 155 | + $globalVATSIM = FALSE; |
|
| 156 | + } |
|
| 157 | + if (!isset($globalphpVMS)) { |
|
| 158 | + $globalphpVMS = FALSE; |
|
| 159 | + } |
|
| 160 | + if (!isset($globalVAM)) { |
|
| 161 | + $globalVAM = FALSE; |
|
| 162 | + } |
|
| 150 | 163 | date_default_timezone_set('UTC'); |
| 151 | 164 | |
| 152 | 165 | if (!is_string($query)) |
@@ -193,21 +206,35 @@ discard block |
||
| 193 | 206 | } else { |
| 194 | 207 | $temp_array['spotter_id'] = ''; |
| 195 | 208 | } |
| 196 | - if (isset($row['flightaware_id'])) $temp_array['flightaware_id'] = $row['flightaware_id']; |
|
| 197 | - if (isset($row['modes'])) $temp_array['modes'] = $row['modes']; |
|
| 209 | + if (isset($row['flightaware_id'])) { |
|
| 210 | + $temp_array['flightaware_id'] = $row['flightaware_id']; |
|
| 211 | + } |
|
| 212 | + if (isset($row['modes'])) { |
|
| 213 | + $temp_array['modes'] = $row['modes']; |
|
| 214 | + } |
|
| 198 | 215 | $temp_array['ident'] = $row['ident']; |
| 199 | 216 | if (isset($row['registration']) && $row['registration'] != '') { |
| 200 | 217 | $temp_array['registration'] = $row['registration']; |
| 201 | 218 | } elseif (isset($temp_array['modes'])) { |
| 202 | 219 | $temp_array['registration'] = $this->getAircraftRegistrationBymodeS($temp_array['modes']); |
| 203 | - } else $temp_array['registration'] = ''; |
|
| 204 | - if (isset($row['aircraft_icao'])) $temp_array['aircraft_type'] = $row['aircraft_icao']; |
|
| 220 | + } else { |
|
| 221 | + $temp_array['registration'] = ''; |
|
| 222 | + } |
|
| 223 | + if (isset($row['aircraft_icao'])) { |
|
| 224 | + $temp_array['aircraft_type'] = $row['aircraft_icao']; |
|
| 225 | + } |
|
| 205 | 226 | |
| 206 | 227 | $temp_array['departure_airport'] = $row['departure_airport_icao']; |
| 207 | 228 | $temp_array['arrival_airport'] = $row['arrival_airport_icao']; |
| 208 | - if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) $temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao']; |
|
| 209 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
| 210 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
| 229 | + if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) { |
|
| 230 | + $temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao']; |
|
| 231 | + } |
|
| 232 | + if (isset($row['latitude'])) { |
|
| 233 | + $temp_array['latitude'] = $row['latitude']; |
|
| 234 | + } |
|
| 235 | + if (isset($row['longitude'])) { |
|
| 236 | + $temp_array['longitude'] = $row['longitude']; |
|
| 237 | + } |
|
| 211 | 238 | /* |
| 212 | 239 | if (Connection->tableExists('countries')) { |
| 213 | 240 | $country_info = $this->getCountryFromLatitudeLongitude($temp_array['latitude'],$temp_array['longitude']); |
@@ -217,8 +244,12 @@ discard block |
||
| 217 | 244 | } |
| 218 | 245 | } |
| 219 | 246 | */ |
| 220 | - if (isset($row['waypoints'])) $temp_array['waypoints'] = $row['waypoints']; |
|
| 221 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
| 247 | + if (isset($row['waypoints'])) { |
|
| 248 | + $temp_array['waypoints'] = $row['waypoints']; |
|
| 249 | + } |
|
| 250 | + if (isset($row['format_source'])) { |
|
| 251 | + $temp_array['format_source'] = $row['format_source']; |
|
| 252 | + } |
|
| 222 | 253 | if (isset($row['route_stop']) && $row['route_stop'] != '') { |
| 223 | 254 | $temp_array['route_stop'] = $row['route_stop']; |
| 224 | 255 | $allroute = explode(' ',$row['route_stop']); |
@@ -234,13 +265,19 @@ discard block |
||
| 234 | 265 | } |
| 235 | 266 | } |
| 236 | 267 | } |
| 237 | - if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude']; |
|
| 268 | + if (isset($row['altitude'])) { |
|
| 269 | + $temp_array['altitude'] = $row['altitude']; |
|
| 270 | + } |
|
| 238 | 271 | if (isset($row['heading'])) { |
| 239 | 272 | $temp_array['heading'] = $row['heading']; |
| 240 | 273 | $heading_direction = $this->parseDirection($row['heading']); |
| 241 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 274 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
| 275 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + if (isset($row['ground_speed'])) { |
|
| 279 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 242 | 280 | } |
| 243 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 244 | 281 | $temp_array['image'] = ""; |
| 245 | 282 | $temp_array['image_thumbnail'] = ""; |
| 246 | 283 | $temp_array['image_source'] = ""; |
@@ -248,7 +285,9 @@ discard block |
||
| 248 | 285 | |
| 249 | 286 | if (isset($row['highlight'])) { |
| 250 | 287 | $temp_array['highlight'] = $row['highlight']; |
| 251 | - } else $temp_array['highlight'] = ''; |
|
| 288 | + } else { |
|
| 289 | + $temp_array['highlight'] = ''; |
|
| 290 | + } |
|
| 252 | 291 | |
| 253 | 292 | if (isset($row['date'])) { |
| 254 | 293 | $dateArray = $this->parseDateString($row['date']); |
@@ -302,7 +341,9 @@ discard block |
||
| 302 | 341 | |
| 303 | 342 | if ($aircraft_array[0]['aircraft_shadow'] != NULL) { |
| 304 | 343 | $temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow']; |
| 305 | - } else $temp_array['aircraft_shadow'] = 'default.png'; |
|
| 344 | + } else { |
|
| 345 | + $temp_array['aircraft_shadow'] = 'default.png'; |
|
| 346 | + } |
|
| 306 | 347 | } else { |
| 307 | 348 | $temp_array['aircraft_shadow'] = 'default.png'; |
| 308 | 349 | $temp_array['aircraft_name'] = 'N/A'; |
@@ -310,11 +351,17 @@ discard block |
||
| 310 | 351 | } |
| 311 | 352 | } |
| 312 | 353 | $fromsource = NULL; |
| 313 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 314 | - elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 315 | - elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 316 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 317 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 354 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 355 | + $fromsource = $globalAirlinesSource; |
|
| 356 | + } elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') { |
|
| 357 | + $fromsource = 'vatsim'; |
|
| 358 | + } elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') { |
|
| 359 | + $fromsource = 'ivao'; |
|
| 360 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 361 | + $fromsource = 'vatsim'; |
|
| 362 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 363 | + $fromsource = 'ivao'; |
|
| 364 | + } |
|
| 318 | 365 | if (!isset($row['airline_name']) || $row['airline_name'] == '') { |
| 319 | 366 | if (!is_numeric(substr($row['ident'], 0, 3))) { |
| 320 | 367 | if (is_numeric(substr($row['ident'], 2, 1))) { |
@@ -337,12 +384,18 @@ discard block |
||
| 337 | 384 | } |
| 338 | 385 | } else { |
| 339 | 386 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 340 | - if (isset($row['airline_iata'])) $temp_array['airline_iata'] = $row['airline_iata']; |
|
| 341 | - else $temp_array['airline_iata'] = 'N/A'; |
|
| 387 | + if (isset($row['airline_iata'])) { |
|
| 388 | + $temp_array['airline_iata'] = $row['airline_iata']; |
|
| 389 | + } else { |
|
| 390 | + $temp_array['airline_iata'] = 'N/A'; |
|
| 391 | + } |
|
| 342 | 392 | $temp_array['airline_name'] = $row['airline_name']; |
| 343 | 393 | $temp_array['airline_country'] = $row['airline_country']; |
| 344 | - if (isset($row['airline_callsign'])) $temp_array['airline_callsign'] = $row['airline_callsign']; |
|
| 345 | - else $temp_array['airline_callsign'] = 'N/A'; |
|
| 394 | + if (isset($row['airline_callsign'])) { |
|
| 395 | + $temp_array['airline_callsign'] = $row['airline_callsign']; |
|
| 396 | + } else { |
|
| 397 | + $temp_array['airline_callsign'] = 'N/A'; |
|
| 398 | + } |
|
| 346 | 399 | $temp_array['airline_type'] = $row['airline_type']; |
| 347 | 400 | if ($temp_array['airline_icao'] != '' && $temp_array['airline_iata'] == 'N/A') { |
| 348 | 401 | $airline_array = $this->getAllAirlineInfo($temp_array['airline_icao']); |
@@ -369,7 +422,9 @@ discard block |
||
| 369 | 422 | } |
| 370 | 423 | if ($temp_array['registration'] != "" && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && !isset($temp_array['aircraft_owner'])) { |
| 371 | 424 | $owner_info = $this->getAircraftOwnerByRegistration($temp_array['registration']); |
| 372 | - if ($owner_info['owner'] != '') $temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner'])); |
|
| 425 | + if ($owner_info['owner'] != '') { |
|
| 426 | + $temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner'])); |
|
| 427 | + } |
|
| 373 | 428 | $temp_array['aircraft_base'] = $owner_info['base']; |
| 374 | 429 | $temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg']; |
| 375 | 430 | } |
@@ -377,9 +432,14 @@ discard block |
||
| 377 | 432 | if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != '')) |
| 378 | 433 | { |
| 379 | 434 | if ($globalIVAO) { |
| 380 | - if (isset($temp_array['airline_icao'])) $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']); |
|
| 381 | - else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']); |
|
| 382 | - } else $image_array = $Image->getSpotterImage($temp_array['registration']); |
|
| 435 | + if (isset($temp_array['airline_icao'])) { |
|
| 436 | + $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']); |
|
| 437 | + } else { |
|
| 438 | + $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']); |
|
| 439 | + } |
|
| 440 | + } else { |
|
| 441 | + $image_array = $Image->getSpotterImage($temp_array['registration']); |
|
| 442 | + } |
|
| 383 | 443 | if (count($image_array) > 0) { |
| 384 | 444 | $temp_array['image'] = $image_array[0]['image']; |
| 385 | 445 | $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -431,7 +491,9 @@ discard block |
||
| 431 | 491 | //if ($row['departure_airport_icao'] != '' && $row['departure_airport_name'] == '') { |
| 432 | 492 | if ($row['departure_airport_icao'] != '') { |
| 433 | 493 | $departure_airport_array = $this->getAllAirportInfo($row['departure_airport_icao']); |
| 434 | - if (!isset($departure_airport_array[0]['name'])) $departure_airport_array = $this->getAllAirportInfo('NA'); |
|
| 494 | + if (!isset($departure_airport_array[0]['name'])) { |
|
| 495 | + $departure_airport_array = $this->getAllAirportInfo('NA'); |
|
| 496 | + } |
|
| 435 | 497 | /* |
| 436 | 498 | } elseif ($row['departure_airport_name'] != '') { |
| 437 | 499 | $temp_array['departure_airport_name'] = $row['departure_airport_name']; |
@@ -439,7 +501,9 @@ discard block |
||
| 439 | 501 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 440 | 502 | $temp_array['departure_airport_icao'] = $row['departure_airport_icao']; |
| 441 | 503 | */ |
| 442 | - } else $departure_airport_array = $this->getAllAirportInfo('NA'); |
|
| 504 | + } else { |
|
| 505 | + $departure_airport_array = $this->getAllAirportInfo('NA'); |
|
| 506 | + } |
|
| 443 | 507 | if (isset($departure_airport_array[0]['name'])) { |
| 444 | 508 | $temp_array['departure_airport_name'] = $departure_airport_array[0]['name']; |
| 445 | 509 | $temp_array['departure_airport_city'] = $departure_airport_array[0]['city']; |
@@ -459,8 +523,12 @@ discard block |
||
| 459 | 523 | |
| 460 | 524 | if ($row['arrival_airport_icao'] != '') { |
| 461 | 525 | $arrival_airport_array = $this->getAllAirportInfo($row['arrival_airport_icao']); |
| 462 | - if (count($arrival_airport_array) == 0) $arrival_airport_array = $this->getAllAirportInfo('NA'); |
|
| 463 | - } else $arrival_airport_array = $this->getAllAirportInfo('NA'); |
|
| 526 | + if (count($arrival_airport_array) == 0) { |
|
| 527 | + $arrival_airport_array = $this->getAllAirportInfo('NA'); |
|
| 528 | + } |
|
| 529 | + } else { |
|
| 530 | + $arrival_airport_array = $this->getAllAirportInfo('NA'); |
|
| 531 | + } |
|
| 464 | 532 | if (isset($arrival_airport_array[0]['name'])) { |
| 465 | 533 | $temp_array['arrival_airport_name'] = $arrival_airport_array[0]['name']; |
| 466 | 534 | $temp_array['arrival_airport_city'] = $arrival_airport_array[0]['city']; |
@@ -476,27 +544,45 @@ discard block |
||
| 476 | 544 | $temp_array['arrival_airport_time'] = $row['arrival_airport_time']; |
| 477 | 545 | } |
| 478 | 546 | */ |
| 479 | - if (isset($row['pilot_id']) && $row['pilot_id'] != '') $temp_array['pilot_id'] = $row['pilot_id']; |
|
| 480 | - if (isset($row['pilot_name']) && $row['pilot_name'] != '') $temp_array['pilot_name'] = $row['pilot_name']; |
|
| 481 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
| 482 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
| 483 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 547 | + if (isset($row['pilot_id']) && $row['pilot_id'] != '') { |
|
| 548 | + $temp_array['pilot_id'] = $row['pilot_id']; |
|
| 549 | + } |
|
| 550 | + if (isset($row['pilot_name']) && $row['pilot_name'] != '') { |
|
| 551 | + $temp_array['pilot_name'] = $row['pilot_name']; |
|
| 552 | + } |
|
| 553 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
| 554 | + $temp_array['source_name'] = $row['source_name']; |
|
| 555 | + } |
|
| 556 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
| 557 | + $temp_array['over_country'] = $row['over_country']; |
|
| 558 | + } |
|
| 559 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 560 | + $temp_array['distance'] = $row['distance']; |
|
| 561 | + } |
|
| 484 | 562 | if (isset($row['squawk'])) { |
| 485 | 563 | $temp_array['squawk'] = $row['squawk']; |
| 486 | 564 | if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) { |
| 487 | 565 | $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']); |
| 488 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 566 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) { |
|
| 567 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 568 | + } |
|
| 489 | 569 | } elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) { |
| 490 | 570 | $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']); |
| 491 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 492 | - } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 571 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) { |
|
| 572 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 573 | + } |
|
| 574 | + } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) { |
|
| 575 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 576 | + } |
|
| 493 | 577 | } |
| 494 | 578 | |
| 495 | 579 | $temp_array['query_number_rows'] = $num_rows; |
| 496 | 580 | |
| 497 | 581 | $spotter_array[] = $temp_array; |
| 498 | 582 | } |
| 499 | - if ($num_rows == 0) return array(); |
|
| 583 | + if ($num_rows == 0) { |
|
| 584 | + return array(); |
|
| 585 | + } |
|
| 500 | 586 | $spotter_array[0]['query_number_rows'] = $num_rows; |
| 501 | 587 | return $spotter_array; |
| 502 | 588 | } |
@@ -529,7 +615,9 @@ discard block |
||
| 529 | 615 | foreach ($q_array as $q_item){ |
| 530 | 616 | $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
| 531 | 617 | $additional_query .= " AND ("; |
| 532 | - if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR "; |
|
| 618 | + if (is_int($q_item)) { |
|
| 619 | + $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR "; |
|
| 620 | + } |
|
| 533 | 621 | $additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR "; |
| 534 | 622 | $additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR "; |
| 535 | 623 | $additional_query .= "(spotter_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
@@ -550,7 +638,9 @@ discard block |
||
| 550 | 638 | $additional_query .= "(spotter_output.pilot_name like '%".$q_item."%') OR "; |
| 551 | 639 | $additional_query .= "(spotter_output.ident like '%".$q_item."%') OR "; |
| 552 | 640 | $translate = $Translation->ident2icao($q_item); |
| 553 | - if ($translate != $q_item) $additional_query .= "(spotter_output.ident like '%".$translate."%') OR "; |
|
| 641 | + if ($translate != $q_item) { |
|
| 642 | + $additional_query .= "(spotter_output.ident like '%".$translate."%') OR "; |
|
| 643 | + } |
|
| 554 | 644 | $additional_query .= "(spotter_output.highlight like '%".$q_item."%')"; |
| 555 | 645 | $additional_query .= ")"; |
| 556 | 646 | } |
@@ -777,7 +867,9 @@ discard block |
||
| 777 | 867 | date_default_timezone_set($globalTimezone); |
| 778 | 868 | $datetime = new DateTime(); |
| 779 | 869 | $offset = $datetime->format('P'); |
| 780 | - } else $offset = '+00:00'; |
|
| 870 | + } else { |
|
| 871 | + $offset = '+00:00'; |
|
| 872 | + } |
|
| 781 | 873 | |
| 782 | 874 | if ($date_array[1] != "") |
| 783 | 875 | { |
@@ -809,8 +901,12 @@ discard block |
||
| 809 | 901 | { |
| 810 | 902 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 811 | 903 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 812 | - } else $limit_query = ""; |
|
| 813 | - } else $limit_query = ""; |
|
| 904 | + } else { |
|
| 905 | + $limit_query = ""; |
|
| 906 | + } |
|
| 907 | + } else { |
|
| 908 | + $limit_query = ""; |
|
| 909 | + } |
|
| 814 | 910 | |
| 815 | 911 | |
| 816 | 912 | if ($sort != "") |
@@ -878,8 +974,12 @@ discard block |
||
| 878 | 974 | { |
| 879 | 975 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 880 | 976 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 881 | - } else $limit_query = ""; |
|
| 882 | - } else $limit_query = ""; |
|
| 977 | + } else { |
|
| 978 | + $limit_query = ""; |
|
| 979 | + } |
|
| 980 | + } else { |
|
| 981 | + $limit_query = ""; |
|
| 982 | + } |
|
| 883 | 983 | |
| 884 | 984 | if ($sort != "") |
| 885 | 985 | { |
@@ -1203,7 +1303,9 @@ discard block |
||
| 1203 | 1303 | global $global_query; |
| 1204 | 1304 | |
| 1205 | 1305 | date_default_timezone_set('UTC'); |
| 1206 | - if ($id == '') return array(); |
|
| 1306 | + if ($id == '') { |
|
| 1307 | + return array(); |
|
| 1308 | + } |
|
| 1207 | 1309 | $additional_query = "spotter_output.spotter_id = :id"; |
| 1208 | 1310 | $query_values = array(':id' => $id); |
| 1209 | 1311 | |
@@ -1940,7 +2042,9 @@ discard block |
||
| 1940 | 2042 | { |
| 1941 | 2043 | $highlight = $row['highlight']; |
| 1942 | 2044 | } |
| 1943 | - if (isset($highlight)) return $highlight; |
|
| 2045 | + if (isset($highlight)) { |
|
| 2046 | + return $highlight; |
|
| 2047 | + } |
|
| 1944 | 2048 | } |
| 1945 | 2049 | |
| 1946 | 2050 | |
@@ -1968,7 +2072,9 @@ discard block |
||
| 1968 | 2072 | $sth->closeCursor(); |
| 1969 | 2073 | if (count($row) > 0) { |
| 1970 | 2074 | return $row['usage']; |
| 1971 | - } else return ''; |
|
| 2075 | + } else { |
|
| 2076 | + return ''; |
|
| 2077 | + } |
|
| 1972 | 2078 | } |
| 1973 | 2079 | |
| 1974 | 2080 | /** |
@@ -1993,7 +2099,9 @@ discard block |
||
| 1993 | 2099 | $sth->closeCursor(); |
| 1994 | 2100 | if (count($row) > 0) { |
| 1995 | 2101 | return $row['icao']; |
| 1996 | - } else return ''; |
|
| 2102 | + } else { |
|
| 2103 | + return ''; |
|
| 2104 | + } |
|
| 1997 | 2105 | } |
| 1998 | 2106 | |
| 1999 | 2107 | /** |
@@ -2021,7 +2129,9 @@ discard block |
||
| 2021 | 2129 | $airport_longitude = $row['longitude']; |
| 2022 | 2130 | $Common = new Common(); |
| 2023 | 2131 | return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude); |
| 2024 | - } else return ''; |
|
| 2132 | + } else { |
|
| 2133 | + return ''; |
|
| 2134 | + } |
|
| 2025 | 2135 | } |
| 2026 | 2136 | |
| 2027 | 2137 | /** |
@@ -2133,7 +2243,9 @@ discard block |
||
| 2133 | 2243 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2134 | 2244 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2135 | 2245 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2136 | - } else return array(); |
|
| 2246 | + } else { |
|
| 2247 | + return array(); |
|
| 2248 | + } |
|
| 2137 | 2249 | if ($globalDBdriver == 'mysql') { |
| 2138 | 2250 | $query = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'"; |
| 2139 | 2251 | } else { |
@@ -2168,7 +2280,9 @@ discard block |
||
| 2168 | 2280 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2169 | 2281 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2170 | 2282 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2171 | - } else return array(); |
|
| 2283 | + } else { |
|
| 2284 | + return array(); |
|
| 2285 | + } |
|
| 2172 | 2286 | //$query = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong; |
| 2173 | 2287 | $query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")"; |
| 2174 | 2288 | //$query = "SELECT waypoints.* FROM waypoints"; |
@@ -2203,7 +2317,9 @@ discard block |
||
| 2203 | 2317 | public function getAllAirlineInfo($airline_icao, $fromsource = NULL) |
| 2204 | 2318 | { |
| 2205 | 2319 | global $globalUseRealAirlines; |
| 2206 | - if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL; |
|
| 2320 | + if (isset($globalUseRealAirlines) && $globalUseRealAirlines) { |
|
| 2321 | + $fromsource = NULL; |
|
| 2322 | + } |
|
| 2207 | 2323 | $airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING)); |
| 2208 | 2324 | if ($airline_icao == 'NA') { |
| 2209 | 2325 | $airline_array = array(); |
@@ -2272,7 +2388,9 @@ discard block |
||
| 2272 | 2388 | public function getAllAirlineInfoByName($airline_name, $fromsource = NULL) |
| 2273 | 2389 | { |
| 2274 | 2390 | global $globalUseRealAirlines; |
| 2275 | - if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL; |
|
| 2391 | + if (isset($globalUseRealAirlines) && $globalUseRealAirlines) { |
|
| 2392 | + $fromsource = NULL; |
|
| 2393 | + } |
|
| 2276 | 2394 | $airline_name = strtolower(filter_var($airline_name,FILTER_SANITIZE_STRING)); |
| 2277 | 2395 | $query = "SELECT airlines.name, airlines.iata, airlines.icao, airlines.callsign, airlines.country, airlines.type FROM airlines WHERE lower(airlines.name) = :airline_name AND airlines.active = 'Y' AND airlines.forsource IS NULL LIMIT 1"; |
| 2278 | 2396 | $sth = $this->db->prepare($query); |
@@ -2288,7 +2406,9 @@ discard block |
||
| 2288 | 2406 | $sth->execute(array(':fromsource' => $fromsource)); |
| 2289 | 2407 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 2290 | 2408 | $sth->closeCursor(); |
| 2291 | - if ($row['nb'] == 0) $result = $this->getAllAirlineInfoByName($airline_name); |
|
| 2409 | + if ($row['nb'] == 0) { |
|
| 2410 | + $result = $this->getAllAirlineInfoByName($airline_name); |
|
| 2411 | + } |
|
| 2292 | 2412 | } |
| 2293 | 2413 | return $result; |
| 2294 | 2414 | } |
@@ -2351,15 +2471,20 @@ discard block |
||
| 2351 | 2471 | 'A320-211' => 'A320', |
| 2352 | 2472 | '747-8i' => 'B748', |
| 2353 | 2473 | 'A380' => 'A388'); |
| 2354 | - if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type]; |
|
| 2474 | + if (isset($all_aircraft[$aircraft_type])) { |
|
| 2475 | + return $all_aircraft[$aircraft_type]; |
|
| 2476 | + } |
|
| 2355 | 2477 | |
| 2356 | 2478 | $query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1"; |
| 2357 | 2479 | $aircraft_type = strtoupper($aircraft_type); |
| 2358 | 2480 | $sth = $this->db->prepare($query); |
| 2359 | 2481 | $sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,)); |
| 2360 | 2482 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 2361 | - if (isset($result[0]['icao'])) return $result[0]['icao']; |
|
| 2362 | - else return ''; |
|
| 2483 | + if (isset($result[0]['icao'])) { |
|
| 2484 | + return $result[0]['icao']; |
|
| 2485 | + } else { |
|
| 2486 | + return ''; |
|
| 2487 | + } |
|
| 2363 | 2488 | } |
| 2364 | 2489 | |
| 2365 | 2490 | /** |
@@ -2382,9 +2507,13 @@ discard block |
||
| 2382 | 2507 | $sth->closeCursor(); |
| 2383 | 2508 | if (isset($row['icaotypecode'])) { |
| 2384 | 2509 | $icao = $row['icaotypecode']; |
| 2385 | - if (isset($this->aircraft_correct_icaotype[$icao])) $icao = $this->aircraft_correct_icaotype[$icao]; |
|
| 2510 | + if (isset($this->aircraft_correct_icaotype[$icao])) { |
|
| 2511 | + $icao = $this->aircraft_correct_icaotype[$icao]; |
|
| 2512 | + } |
|
| 2386 | 2513 | return $icao; |
| 2387 | - } else return ''; |
|
| 2514 | + } else { |
|
| 2515 | + return ''; |
|
| 2516 | + } |
|
| 2388 | 2517 | } |
| 2389 | 2518 | |
| 2390 | 2519 | /** |
@@ -2407,7 +2536,9 @@ discard block |
||
| 2407 | 2536 | $sth->closeCursor(); |
| 2408 | 2537 | if (isset($row['icaotypecode'])) { |
| 2409 | 2538 | return $row['icaotypecode']; |
| 2410 | - } else return ''; |
|
| 2539 | + } else { |
|
| 2540 | + return ''; |
|
| 2541 | + } |
|
| 2411 | 2542 | } |
| 2412 | 2543 | |
| 2413 | 2544 | /** |
@@ -2453,7 +2584,9 @@ discard block |
||
| 2453 | 2584 | $sth->closeCursor(); |
| 2454 | 2585 | if (isset($row['operator_correct'])) { |
| 2455 | 2586 | return $row['operator_correct']; |
| 2456 | - } else return $operator; |
|
| 2587 | + } else { |
|
| 2588 | + return $operator; |
|
| 2589 | + } |
|
| 2457 | 2590 | } |
| 2458 | 2591 | |
| 2459 | 2592 | /** |
@@ -2466,7 +2599,9 @@ discard block |
||
| 2466 | 2599 | public function getRouteInfo($callsign) |
| 2467 | 2600 | { |
| 2468 | 2601 | $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
| 2469 | - if ($callsign == '') return array(); |
|
| 2602 | + if ($callsign == '') { |
|
| 2603 | + return array(); |
|
| 2604 | + } |
|
| 2470 | 2605 | $query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1"; |
| 2471 | 2606 | |
| 2472 | 2607 | $sth = $this->db->prepare($query); |
@@ -2476,7 +2611,9 @@ discard block |
||
| 2476 | 2611 | $sth->closeCursor(); |
| 2477 | 2612 | if (count($row) > 0) { |
| 2478 | 2613 | return $row; |
| 2479 | - } else return array(); |
|
| 2614 | + } else { |
|
| 2615 | + return array(); |
|
| 2616 | + } |
|
| 2480 | 2617 | } |
| 2481 | 2618 | |
| 2482 | 2619 | /** |
@@ -2529,7 +2666,9 @@ discard block |
||
| 2529 | 2666 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 2530 | 2667 | $sth->closeCursor(); |
| 2531 | 2668 | return $result; |
| 2532 | - } else return array(); |
|
| 2669 | + } else { |
|
| 2670 | + return array(); |
|
| 2671 | + } |
|
| 2533 | 2672 | } |
| 2534 | 2673 | |
| 2535 | 2674 | |
@@ -2688,8 +2827,11 @@ discard block |
||
| 2688 | 2827 | $query .= " ORDER BY spotter_output.source_name ASC"; |
| 2689 | 2828 | |
| 2690 | 2829 | $sth = $this->db->prepare($query); |
| 2691 | - if (!empty($query_values)) $sth->execute($query_values); |
|
| 2692 | - else $sth->execute(); |
|
| 2830 | + if (!empty($query_values)) { |
|
| 2831 | + $sth->execute($query_values); |
|
| 2832 | + } else { |
|
| 2833 | + $sth->execute(); |
|
| 2834 | + } |
|
| 2693 | 2835 | |
| 2694 | 2836 | $source_array = array(); |
| 2695 | 2837 | $temp_array = array(); |
@@ -2722,9 +2864,13 @@ discard block |
||
| 2722 | 2864 | WHERE spotter_output.airline_icao <> '' |
| 2723 | 2865 | ORDER BY spotter_output.airline_name ASC"; |
| 2724 | 2866 | */ |
| 2725 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource; |
|
| 2726 | - elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim'; |
|
| 2727 | - elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao'; |
|
| 2867 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 2868 | + $forsource = $globalAirlinesSource; |
|
| 2869 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 2870 | + $forsource = 'vatsim'; |
|
| 2871 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 2872 | + $forsource = 'ivao'; |
|
| 2873 | + } |
|
| 2728 | 2874 | if ($forsource === NULL) { |
| 2729 | 2875 | $query = "SELECT DISTINCT icao AS airline_icao, name AS airline_name, type AS airline_type FROM airlines WHERE forsource IS NULL ORDER BY name ASC"; |
| 2730 | 2876 | $query_data = array(); |
@@ -2767,9 +2913,13 @@ discard block |
||
| 2767 | 2913 | { |
| 2768 | 2914 | global $globalAirlinesSource,$globalVATSIM, $globalIVAO; |
| 2769 | 2915 | $filter_query = $this->getFilter($filters,true,true); |
| 2770 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource; |
|
| 2771 | - elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim'; |
|
| 2772 | - elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao'; |
|
| 2916 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 2917 | + $forsource = $globalAirlinesSource; |
|
| 2918 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 2919 | + $forsource = 'vatsim'; |
|
| 2920 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 2921 | + $forsource = 'ivao'; |
|
| 2922 | + } |
|
| 2773 | 2923 | if ($forsource === NULL) { |
| 2774 | 2924 | $query = "SELECT DISTINCT alliance FROM airlines WHERE alliance IS NOT NULL AND forsource IS NULL ORDER BY alliance ASC"; |
| 2775 | 2925 | $query_data = array(); |
@@ -3080,7 +3230,9 @@ discard block |
||
| 3080 | 3230 | date_default_timezone_set($globalTimezone); |
| 3081 | 3231 | $datetime = new DateTime(); |
| 3082 | 3232 | $offset = $datetime->format('P'); |
| 3083 | - } else $offset = '+00:00'; |
|
| 3233 | + } else { |
|
| 3234 | + $offset = '+00:00'; |
|
| 3235 | + } |
|
| 3084 | 3236 | if ($airport_icao == '') { |
| 3085 | 3237 | if ($globalDBdriver == 'mysql') { |
| 3086 | 3238 | $query = "SELECT COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' AND departure_airport_icao <> '' GROUP BY departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC"; |
@@ -3112,7 +3264,9 @@ discard block |
||
| 3112 | 3264 | date_default_timezone_set($globalTimezone); |
| 3113 | 3265 | $datetime = new DateTime(); |
| 3114 | 3266 | $offset = $datetime->format('P'); |
| 3115 | - } else $offset = '+00:00'; |
|
| 3267 | + } else { |
|
| 3268 | + $offset = '+00:00'; |
|
| 3269 | + } |
|
| 3116 | 3270 | if ($airport_icao == '') { |
| 3117 | 3271 | if ($globalDBdriver == 'mysql') { |
| 3118 | 3272 | $query = "SELECT spotter_output.airline_icao, COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' AND departure_airport_icao <> '' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC"; |
@@ -3145,7 +3299,9 @@ discard block |
||
| 3145 | 3299 | date_default_timezone_set($globalTimezone); |
| 3146 | 3300 | $datetime = new DateTime(); |
| 3147 | 3301 | $offset = $datetime->format('P'); |
| 3148 | - } else $offset = '+00:00'; |
|
| 3302 | + } else { |
|
| 3303 | + $offset = '+00:00'; |
|
| 3304 | + } |
|
| 3149 | 3305 | if ($airport_icao == '') { |
| 3150 | 3306 | if ($globalDBdriver == 'mysql') { |
| 3151 | 3307 | $query = "SELECT COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date |
@@ -3184,7 +3340,9 @@ discard block |
||
| 3184 | 3340 | date_default_timezone_set($globalTimezone); |
| 3185 | 3341 | $datetime = new DateTime(); |
| 3186 | 3342 | $offset = $datetime->format('P'); |
| 3187 | - } else $offset = '+00:00'; |
|
| 3343 | + } else { |
|
| 3344 | + $offset = '+00:00'; |
|
| 3345 | + } |
|
| 3188 | 3346 | if ($airport_icao == '') { |
| 3189 | 3347 | if ($globalDBdriver == 'mysql') { |
| 3190 | 3348 | $query = "SELECT spotter_output.airline_icao, COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date |
@@ -3229,7 +3387,9 @@ discard block |
||
| 3229 | 3387 | date_default_timezone_set($globalTimezone); |
| 3230 | 3388 | $datetime = new DateTime(); |
| 3231 | 3389 | $offset = $datetime->format('P'); |
| 3232 | - } else $offset = '+00:00'; |
|
| 3390 | + } else { |
|
| 3391 | + $offset = '+00:00'; |
|
| 3392 | + } |
|
| 3233 | 3393 | if ($airport_icao == '') { |
| 3234 | 3394 | if ($globalDBdriver == 'mysql') { |
| 3235 | 3395 | $query = "SELECT COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' AND arrival_airport_icao <> '' GROUP BY arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC"; |
@@ -3264,7 +3424,9 @@ discard block |
||
| 3264 | 3424 | date_default_timezone_set($globalTimezone); |
| 3265 | 3425 | $datetime = new DateTime(); |
| 3266 | 3426 | $offset = $datetime->format('P'); |
| 3267 | - } else $offset = '+00:00'; |
|
| 3427 | + } else { |
|
| 3428 | + $offset = '+00:00'; |
|
| 3429 | + } |
|
| 3268 | 3430 | if ($airport_icao == '') { |
| 3269 | 3431 | if ($globalDBdriver == 'mysql') { |
| 3270 | 3432 | $query = "SELECT COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date |
@@ -3306,7 +3468,9 @@ discard block |
||
| 3306 | 3468 | date_default_timezone_set($globalTimezone); |
| 3307 | 3469 | $datetime = new DateTime(); |
| 3308 | 3470 | $offset = $datetime->format('P'); |
| 3309 | - } else $offset = '+00:00'; |
|
| 3471 | + } else { |
|
| 3472 | + $offset = '+00:00'; |
|
| 3473 | + } |
|
| 3310 | 3474 | if ($airport_icao == '') { |
| 3311 | 3475 | if ($globalDBdriver == 'mysql') { |
| 3312 | 3476 | $query = "SELECT spotter_output.airline_icao, COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' AND arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC"; |
@@ -3340,7 +3504,9 @@ discard block |
||
| 3340 | 3504 | date_default_timezone_set($globalTimezone); |
| 3341 | 3505 | $datetime = new DateTime(); |
| 3342 | 3506 | $offset = $datetime->format('P'); |
| 3343 | - } else $offset = '+00:00'; |
|
| 3507 | + } else { |
|
| 3508 | + $offset = '+00:00'; |
|
| 3509 | + } |
|
| 3344 | 3510 | if ($airport_icao == '') { |
| 3345 | 3511 | if ($globalDBdriver == 'mysql') { |
| 3346 | 3512 | $query = "SELECT spotter_output.airline_icao, COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date |
@@ -3388,7 +3554,9 @@ discard block |
||
| 3388 | 3554 | date_default_timezone_set($globalTimezone); |
| 3389 | 3555 | $datetime = new DateTime(); |
| 3390 | 3556 | $offset = $datetime->format('P'); |
| 3391 | - } else $offset = '+00:00'; |
|
| 3557 | + } else { |
|
| 3558 | + $offset = '+00:00'; |
|
| 3559 | + } |
|
| 3392 | 3560 | |
| 3393 | 3561 | if ($globalDBdriver == 'mysql') { |
| 3394 | 3562 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date |
@@ -3508,7 +3676,9 @@ discard block |
||
| 3508 | 3676 | */ |
| 3509 | 3677 | public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '') |
| 3510 | 3678 | { |
| 3511 | - if ($groundspeed == '') $groundspeed = NULL; |
|
| 3679 | + if ($groundspeed == '') { |
|
| 3680 | + $groundspeed = NULL; |
|
| 3681 | + } |
|
| 3512 | 3682 | $query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id'; |
| 3513 | 3683 | $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident); |
| 3514 | 3684 | |
@@ -3558,10 +3728,18 @@ discard block |
||
| 3558 | 3728 | $Image = new Image($this->db); |
| 3559 | 3729 | $Common = new Common(); |
| 3560 | 3730 | |
| 3561 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
| 3562 | - if (!isset($globalVATSIM)) $globalVATSIM = FALSE; |
|
| 3563 | - if (!isset($globalphpVMS)) $globalphpVMS = FALSE; |
|
| 3564 | - if (!isset($globalVAM)) $globalVAM = FALSE; |
|
| 3731 | + if (!isset($globalIVAO)) { |
|
| 3732 | + $globalIVAO = FALSE; |
|
| 3733 | + } |
|
| 3734 | + if (!isset($globalVATSIM)) { |
|
| 3735 | + $globalVATSIM = FALSE; |
|
| 3736 | + } |
|
| 3737 | + if (!isset($globalphpVMS)) { |
|
| 3738 | + $globalphpVMS = FALSE; |
|
| 3739 | + } |
|
| 3740 | + if (!isset($globalVAM)) { |
|
| 3741 | + $globalVAM = FALSE; |
|
| 3742 | + } |
|
| 3565 | 3743 | date_default_timezone_set('UTC'); |
| 3566 | 3744 | |
| 3567 | 3745 | //getting the registration |
@@ -3574,23 +3752,33 @@ discard block |
||
| 3574 | 3752 | if ($ModeS != '') { |
| 3575 | 3753 | $timeelapsed = microtime(true); |
| 3576 | 3754 | $registration = $this->getAircraftRegistrationBymodeS($ModeS); |
| 3577 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3755 | + if ($globalDebugTimeElapsed) { |
|
| 3756 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3757 | + } |
|
| 3578 | 3758 | } else { |
| 3579 | 3759 | $myhex = explode('-',$flightaware_id); |
| 3580 | 3760 | if (count($myhex) > 0) { |
| 3581 | 3761 | $timeelapsed = microtime(true); |
| 3582 | 3762 | $registration = $this->getAircraftRegistrationBymodeS($myhex[0]); |
| 3583 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3763 | + if ($globalDebugTimeElapsed) { |
|
| 3764 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3765 | + } |
|
| 3584 | 3766 | } |
| 3585 | 3767 | } |
| 3586 | 3768 | } |
| 3587 | 3769 | } |
| 3588 | 3770 | $fromsource = NULL; |
| 3589 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 3590 | - elseif ($format_source == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 3591 | - elseif ($format_source == 'whazzup') $fromsource = 'ivao'; |
|
| 3592 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 3593 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 3771 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 3772 | + $fromsource = $globalAirlinesSource; |
|
| 3773 | + } elseif ($format_source == 'vatsimtxt') { |
|
| 3774 | + $fromsource = 'vatsim'; |
|
| 3775 | + } elseif ($format_source == 'whazzup') { |
|
| 3776 | + $fromsource = 'ivao'; |
|
| 3777 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 3778 | + $fromsource = 'vatsim'; |
|
| 3779 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 3780 | + $fromsource = 'ivao'; |
|
| 3781 | + } |
|
| 3594 | 3782 | //getting the airline information |
| 3595 | 3783 | if ($ident != "") |
| 3596 | 3784 | { |
@@ -3614,15 +3802,21 @@ discard block |
||
| 3614 | 3802 | if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){ |
| 3615 | 3803 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3616 | 3804 | } |
| 3617 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3805 | + if ($globalDebugTimeElapsed) { |
|
| 3806 | + echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3807 | + } |
|
| 3618 | 3808 | |
| 3619 | 3809 | } else { |
| 3620 | 3810 | $timeelapsed = microtime(true); |
| 3621 | 3811 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 3622 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3812 | + if ($globalDebugTimeElapsed) { |
|
| 3813 | + echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3814 | + } |
|
| 3623 | 3815 | } |
| 3624 | 3816 | } |
| 3625 | - } else $airline_array = array(); |
|
| 3817 | + } else { |
|
| 3818 | + $airline_array = array(); |
|
| 3819 | + } |
|
| 3626 | 3820 | |
| 3627 | 3821 | //getting the aircraft information |
| 3628 | 3822 | $aircraft_array = array(); |
@@ -3636,27 +3830,37 @@ discard block |
||
| 3636 | 3830 | { |
| 3637 | 3831 | $timeelapsed = microtime(true); |
| 3638 | 3832 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 3639 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3833 | + if ($globalDebugTimeElapsed) { |
|
| 3834 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3835 | + } |
|
| 3640 | 3836 | } else { |
| 3641 | 3837 | $timeelapsed = microtime(true); |
| 3642 | 3838 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 3643 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3839 | + if ($globalDebugTimeElapsed) { |
|
| 3840 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3841 | + } |
|
| 3644 | 3842 | } |
| 3645 | 3843 | } |
| 3646 | 3844 | } else { |
| 3647 | 3845 | if ($ModeS != '') { |
| 3648 | 3846 | $timeelapsed = microtime(true); |
| 3649 | 3847 | $aircraft_icao = $this->getAllAircraftType($ModeS); |
| 3650 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3848 | + if ($globalDebugTimeElapsed) { |
|
| 3849 | + echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3850 | + } |
|
| 3651 | 3851 | if ($aircraft_icao == "" || $aircraft_icao == "XXXX") |
| 3652 | 3852 | { |
| 3653 | 3853 | $timeelapsed = microtime(true); |
| 3654 | 3854 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 3655 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3855 | + if ($globalDebugTimeElapsed) { |
|
| 3856 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3857 | + } |
|
| 3656 | 3858 | } else { |
| 3657 | 3859 | $timeelapsed = microtime(true); |
| 3658 | 3860 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 3659 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3861 | + if ($globalDebugTimeElapsed) { |
|
| 3862 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3863 | + } |
|
| 3660 | 3864 | } |
| 3661 | 3865 | } |
| 3662 | 3866 | } |
@@ -3672,7 +3876,9 @@ discard block |
||
| 3672 | 3876 | } else { |
| 3673 | 3877 | $timeelapsed = microtime(true); |
| 3674 | 3878 | $departure_airport_array = $this->getAllAirportInfo($departure_airport_icao); |
| 3675 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3879 | + if ($globalDebugTimeElapsed) { |
|
| 3880 | + echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3881 | + } |
|
| 3676 | 3882 | } |
| 3677 | 3883 | } |
| 3678 | 3884 | |
@@ -3687,7 +3893,9 @@ discard block |
||
| 3687 | 3893 | } else { |
| 3688 | 3894 | $timeelapsed = microtime(true); |
| 3689 | 3895 | $arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao); |
| 3690 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3896 | + if ($globalDebugTimeElapsed) { |
|
| 3897 | + echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3898 | + } |
|
| 3691 | 3899 | } |
| 3692 | 3900 | } |
| 3693 | 3901 | |
@@ -3721,7 +3929,9 @@ discard block |
||
| 3721 | 3929 | { |
| 3722 | 3930 | return false; |
| 3723 | 3931 | } |
| 3724 | - } else $altitude = 0; |
|
| 3932 | + } else { |
|
| 3933 | + $altitude = 0; |
|
| 3934 | + } |
|
| 3725 | 3935 | |
| 3726 | 3936 | if ($heading != "") |
| 3727 | 3937 | { |
@@ -3750,7 +3960,9 @@ discard block |
||
| 3750 | 3960 | { |
| 3751 | 3961 | $timeelapsed = microtime(true); |
| 3752 | 3962 | $image_array = $Image->getSpotterImage($registration); |
| 3753 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3963 | + if ($globalDebugTimeElapsed) { |
|
| 3964 | + echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3965 | + } |
|
| 3754 | 3966 | if (!isset($image_array[0]['registration'])) |
| 3755 | 3967 | { |
| 3756 | 3968 | //echo "Add image !!!! \n"; |
@@ -3758,14 +3970,21 @@ discard block |
||
| 3758 | 3970 | } |
| 3759 | 3971 | $timeelapsed = microtime(true); |
| 3760 | 3972 | $owner_info = $this->getAircraftOwnerByRegistration($registration); |
| 3761 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3762 | - if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner'])); |
|
| 3973 | + if ($globalDebugTimeElapsed) { |
|
| 3974 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3975 | + } |
|
| 3976 | + if ($owner_info['owner'] != '') { |
|
| 3977 | + $aircraft_owner = ucwords(strtolower($owner_info['owner'])); |
|
| 3978 | + } |
|
| 3763 | 3979 | } |
| 3764 | 3980 | |
| 3765 | 3981 | if ($globalIVAO && $aircraft_icao != '') |
| 3766 | 3982 | { |
| 3767 | - if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao']; |
|
| 3768 | - else $airline_icao = ''; |
|
| 3983 | + if (isset($airline_array[0]['icao'])) { |
|
| 3984 | + $airline_icao = $airline_array[0]['icao']; |
|
| 3985 | + } else { |
|
| 3986 | + $airline_icao = ''; |
|
| 3987 | + } |
|
| 3769 | 3988 | $image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao); |
| 3770 | 3989 | if (!isset($image_array[0]['registration'])) |
| 3771 | 3990 | { |
@@ -3810,16 +4029,28 @@ discard block |
||
| 3810 | 4029 | { |
| 3811 | 4030 | $arrival_airport_array = $this->getAllAirportInfo('NA'); |
| 3812 | 4031 | } |
| 3813 | - if ($registration == '') $registration = 'NA'; |
|
| 4032 | + if ($registration == '') { |
|
| 4033 | + $registration = 'NA'; |
|
| 4034 | + } |
|
| 3814 | 4035 | if ($latitude == '' && $longitude == '') { |
| 3815 | 4036 | $latitude = 0; |
| 3816 | 4037 | $longitude = 0; |
| 3817 | 4038 | } |
| 3818 | - if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 3819 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 3820 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 3821 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 3822 | - if (!isset($aircraft_owner)) $aircraft_owner = NULL; |
|
| 4039 | + if ($squawk == '' || $Common->isInteger($squawk) === false) { |
|
| 4040 | + $squawk = NULL; |
|
| 4041 | + } |
|
| 4042 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) { |
|
| 4043 | + $verticalrate = NULL; |
|
| 4044 | + } |
|
| 4045 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
| 4046 | + $heading = 0; |
|
| 4047 | + } |
|
| 4048 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
| 4049 | + $groundspeed = 0; |
|
| 4050 | + } |
|
| 4051 | + if (!isset($aircraft_owner)) { |
|
| 4052 | + $aircraft_owner = NULL; |
|
| 4053 | + } |
|
| 3823 | 4054 | $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) |
| 3824 | 4055 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)"; |
| 3825 | 4056 | |
@@ -3830,9 +4061,13 @@ discard block |
||
| 3830 | 4061 | if ($airline_type == '') { |
| 3831 | 4062 | $timeelapsed = microtime(true); |
| 3832 | 4063 | $airline_type = $this->getAircraftTypeBymodeS($ModeS); |
| 3833 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 4064 | + if ($globalDebugTimeElapsed) { |
|
| 4065 | + echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 4066 | + } |
|
| 4067 | + } |
|
| 4068 | + if ($airline_type == null) { |
|
| 4069 | + $airline_type = ''; |
|
| 3834 | 4070 | } |
| 3835 | - if ($airline_type == null) $airline_type = ''; |
|
| 3836 | 4071 | $aircraft_type = $aircraft_array[0]['type']; |
| 3837 | 4072 | $aircraft_manufacturer = $aircraft_array[0]['manufacturer']; |
| 3838 | 4073 | $departure_airport_name = $departure_airport_array[0]['name']; |
@@ -3996,7 +4231,9 @@ discard block |
||
| 3996 | 4231 | } |
| 3997 | 4232 | } |
| 3998 | 4233 | $query .= " GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC"; |
| 3999 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 4234 | + if ($limit) { |
|
| 4235 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 4236 | + } |
|
| 4000 | 4237 | |
| 4001 | 4238 | $sth = $this->db->prepare($query); |
| 4002 | 4239 | $sth->execute($query_values); |
@@ -4069,7 +4306,9 @@ discard block |
||
| 4069 | 4306 | } |
| 4070 | 4307 | |
| 4071 | 4308 | $query .= " GROUP BY spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC"; |
| 4072 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 4309 | + if ($limit) { |
|
| 4310 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 4311 | + } |
|
| 4073 | 4312 | |
| 4074 | 4313 | |
| 4075 | 4314 | $sth = $this->db->prepare($query); |
@@ -4113,7 +4352,9 @@ discard block |
||
| 4113 | 4352 | } |
| 4114 | 4353 | } |
| 4115 | 4354 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC"; |
| 4116 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 4355 | + if ($limit) { |
|
| 4356 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 4357 | + } |
|
| 4117 | 4358 | |
| 4118 | 4359 | |
| 4119 | 4360 | $sth = $this->db->prepare($query); |
@@ -4189,7 +4430,9 @@ discard block |
||
| 4189 | 4430 | } |
| 4190 | 4431 | } |
| 4191 | 4432 | $query .= " GROUP BY spotter_output.owner_name ORDER BY owner_count DESC"; |
| 4192 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 4433 | + if ($limit) { |
|
| 4434 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 4435 | + } |
|
| 4193 | 4436 | |
| 4194 | 4437 | $sth = $this->db->prepare($query); |
| 4195 | 4438 | $sth->execute($query_values); |
@@ -4231,7 +4474,9 @@ discard block |
||
| 4231 | 4474 | } |
| 4232 | 4475 | } |
| 4233 | 4476 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.owner_name ORDER BY owner_count DESC"; |
| 4234 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 4477 | + if ($limit) { |
|
| 4478 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 4479 | + } |
|
| 4235 | 4480 | |
| 4236 | 4481 | |
| 4237 | 4482 | $sth = $this->db->prepare($query); |
@@ -4474,7 +4719,9 @@ discard block |
||
| 4474 | 4719 | date_default_timezone_set($globalTimezone); |
| 4475 | 4720 | $datetime = new DateTime($date); |
| 4476 | 4721 | $offset = $datetime->format('P'); |
| 4477 | - } else $offset = '+00:00'; |
|
| 4722 | + } else { |
|
| 4723 | + $offset = '+00:00'; |
|
| 4724 | + } |
|
| 4478 | 4725 | |
| 4479 | 4726 | if ($globalDBdriver == 'mysql') { |
| 4480 | 4727 | $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
@@ -4522,7 +4769,9 @@ discard block |
||
| 4522 | 4769 | date_default_timezone_set($globalTimezone); |
| 4523 | 4770 | $datetime = new DateTime($date); |
| 4524 | 4771 | $offset = $datetime->format('P'); |
| 4525 | - } else $offset = '+00:00'; |
|
| 4772 | + } else { |
|
| 4773 | + $offset = '+00:00'; |
|
| 4774 | + } |
|
| 4526 | 4775 | |
| 4527 | 4776 | if ($globalDBdriver == 'mysql') { |
| 4528 | 4777 | $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
@@ -4611,8 +4860,11 @@ discard block |
||
| 4611 | 4860 | $sth = $this->db->prepare($query); |
| 4612 | 4861 | $sth->execute(array(':owner' => $owner)); |
| 4613 | 4862 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 4614 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 4615 | - else return $result[0]['duration']; |
|
| 4863 | + if (is_int($result[0]['duration'])) { |
|
| 4864 | + return gmdate('H:i:s',$result[0]['duration']); |
|
| 4865 | + } else { |
|
| 4866 | + return $result[0]['duration']; |
|
| 4867 | + } |
|
| 4616 | 4868 | } |
| 4617 | 4869 | |
| 4618 | 4870 | /** |
@@ -4630,8 +4882,11 @@ discard block |
||
| 4630 | 4882 | $sth = $this->db->prepare($query); |
| 4631 | 4883 | $sth->execute(array(':pilot' => $pilot)); |
| 4632 | 4884 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 4633 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 4634 | - else return $result[0]['duration']; |
|
| 4885 | + if (is_int($result[0]['duration'])) { |
|
| 4886 | + return gmdate('H:i:s',$result[0]['duration']); |
|
| 4887 | + } else { |
|
| 4888 | + return $result[0]['duration']; |
|
| 4889 | + } |
|
| 4635 | 4890 | } |
| 4636 | 4891 | |
| 4637 | 4892 | /** |
@@ -4836,7 +5091,9 @@ discard block |
||
| 4836 | 5091 | } |
| 4837 | 5092 | $query .= " GROUP BY spotter_output.airline_country |
| 4838 | 5093 | ORDER BY airline_country_count DESC"; |
| 4839 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 5094 | + if ($limit) { |
|
| 5095 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 5096 | + } |
|
| 4840 | 5097 | |
| 4841 | 5098 | $sth = $this->db->prepare($query); |
| 4842 | 5099 | $sth->execute($query_values); |
@@ -4864,7 +5121,9 @@ discard block |
||
| 4864 | 5121 | global $globalDBdriver; |
| 4865 | 5122 | //$filter_query = $this->getFilter($filters,true,true); |
| 4866 | 5123 | $Connection= new Connection($this->db); |
| 4867 | - if (!$Connection->tableExists('countries')) return array(); |
|
| 5124 | + if (!$Connection->tableExists('countries')) { |
|
| 5125 | + return array(); |
|
| 5126 | + } |
|
| 4868 | 5127 | /* |
| 4869 | 5128 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 4870 | 5129 | FROM countries c, spotter_output s |
@@ -4896,7 +5155,9 @@ discard block |
||
| 4896 | 5155 | } |
| 4897 | 5156 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT flightaware_id,over_country FROM spotter_live".$filter_query.") l ON c.iso2 = l.over_country "; |
| 4898 | 5157 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
| 4899 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 5158 | + if ($limit) { |
|
| 5159 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 5160 | + } |
|
| 4900 | 5161 | |
| 4901 | 5162 | |
| 4902 | 5163 | $sth = $this->db->prepare($query); |
@@ -4973,7 +5234,9 @@ discard block |
||
| 4973 | 5234 | } |
| 4974 | 5235 | |
| 4975 | 5236 | $query .= " GROUP BY spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC"; |
| 4976 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 5237 | + if ($limit) { |
|
| 5238 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 5239 | + } |
|
| 4977 | 5240 | |
| 4978 | 5241 | $sth = $this->db->prepare($query); |
| 4979 | 5242 | $sth->execute($query_values); |
@@ -5047,7 +5310,9 @@ discard block |
||
| 5047 | 5310 | } |
| 5048 | 5311 | |
| 5049 | 5312 | $query .= " GROUP BY spotter_output.airline_icao, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC"; |
| 5050 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 5313 | + if ($limit) { |
|
| 5314 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 5315 | + } |
|
| 5051 | 5316 | |
| 5052 | 5317 | $sth = $this->db->prepare($query); |
| 5053 | 5318 | $sth->execute($query_values); |
@@ -5094,7 +5359,9 @@ discard block |
||
| 5094 | 5359 | } |
| 5095 | 5360 | |
| 5096 | 5361 | $query .= "GROUP BY EXTRACT(month from spotter_output.date), EXTRACT(year from spotter_output.date), spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC"; |
| 5097 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 5362 | + if ($limit) { |
|
| 5363 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 5364 | + } |
|
| 5098 | 5365 | |
| 5099 | 5366 | $sth = $this->db->prepare($query); |
| 5100 | 5367 | $sth->execute(); |
@@ -5147,7 +5414,9 @@ discard block |
||
| 5147 | 5414 | if($row['registration'] != "") |
| 5148 | 5415 | { |
| 5149 | 5416 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5150 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5417 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 5418 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5419 | + } |
|
| 5151 | 5420 | } |
| 5152 | 5421 | $temp_array['registration_count'] = $row['registration_count']; |
| 5153 | 5422 | |
@@ -5222,7 +5491,9 @@ discard block |
||
| 5222 | 5491 | if($row['registration'] != "") |
| 5223 | 5492 | { |
| 5224 | 5493 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5225 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5494 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 5495 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5496 | + } |
|
| 5226 | 5497 | } |
| 5227 | 5498 | $temp_array['registration_count'] = $row['registration_count']; |
| 5228 | 5499 | |
@@ -5329,7 +5600,9 @@ discard block |
||
| 5329 | 5600 | if($row['registration'] != "") |
| 5330 | 5601 | { |
| 5331 | 5602 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5332 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5603 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 5604 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5605 | + } |
|
| 5333 | 5606 | } |
| 5334 | 5607 | $temp_array['registration_count'] = $row['registration_count']; |
| 5335 | 5608 | $aircraft_array[] = $temp_array; |
@@ -5454,7 +5727,9 @@ discard block |
||
| 5454 | 5727 | date_default_timezone_set($globalTimezone); |
| 5455 | 5728 | $datetime = new DateTime($date); |
| 5456 | 5729 | $offset = $datetime->format('P'); |
| 5457 | - } else $offset = '+00:00'; |
|
| 5730 | + } else { |
|
| 5731 | + $offset = '+00:00'; |
|
| 5732 | + } |
|
| 5458 | 5733 | |
| 5459 | 5734 | if ($globalDBdriver == 'mysql') { |
| 5460 | 5735 | $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
@@ -5501,7 +5776,9 @@ discard block |
||
| 5501 | 5776 | date_default_timezone_set($globalTimezone); |
| 5502 | 5777 | $datetime = new DateTime($date); |
| 5503 | 5778 | $offset = $datetime->format('P'); |
| 5504 | - } else $offset = '+00:00'; |
|
| 5779 | + } else { |
|
| 5780 | + $offset = '+00:00'; |
|
| 5781 | + } |
|
| 5505 | 5782 | |
| 5506 | 5783 | if ($globalDBdriver == 'mysql') { |
| 5507 | 5784 | $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
@@ -5530,7 +5807,9 @@ discard block |
||
| 5530 | 5807 | if($row['registration'] != "") |
| 5531 | 5808 | { |
| 5532 | 5809 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5533 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5810 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 5811 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5812 | + } |
|
| 5534 | 5813 | } |
| 5535 | 5814 | $temp_array['registration_count'] = $row['registration_count']; |
| 5536 | 5815 | |
@@ -5555,7 +5834,9 @@ discard block |
||
| 5555 | 5834 | date_default_timezone_set($globalTimezone); |
| 5556 | 5835 | $datetime = new DateTime($date); |
| 5557 | 5836 | $offset = $datetime->format('P'); |
| 5558 | - } else $offset = '+00:00'; |
|
| 5837 | + } else { |
|
| 5838 | + $offset = '+00:00'; |
|
| 5839 | + } |
|
| 5559 | 5840 | |
| 5560 | 5841 | if ($globalDBdriver == 'mysql') { |
| 5561 | 5842 | $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
@@ -5692,8 +5973,11 @@ discard block |
||
| 5692 | 5973 | if($row['registration'] != "") |
| 5693 | 5974 | { |
| 5694 | 5975 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5695 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5696 | - else $temp_array['image_thumbnail'] = ''; |
|
| 5976 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 5977 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5978 | + } else { |
|
| 5979 | + $temp_array['image_thumbnail'] = ''; |
|
| 5980 | + } |
|
| 5697 | 5981 | } |
| 5698 | 5982 | $temp_array['registration_count'] = $row['registration_count']; |
| 5699 | 5983 | $aircraft_array[] = $temp_array; |
@@ -5736,8 +6020,11 @@ discard block |
||
| 5736 | 6020 | if($row['registration'] != "") |
| 5737 | 6021 | { |
| 5738 | 6022 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5739 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5740 | - else $temp_array['image_thumbnail'] = ''; |
|
| 6023 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6024 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6025 | + } else { |
|
| 6026 | + $temp_array['image_thumbnail'] = ''; |
|
| 6027 | + } |
|
| 5741 | 6028 | } |
| 5742 | 6029 | $temp_array['registration_count'] = $row['registration_count']; |
| 5743 | 6030 | $aircraft_array[] = $temp_array; |
@@ -5780,8 +6067,11 @@ discard block |
||
| 5780 | 6067 | if($row['registration'] != "") |
| 5781 | 6068 | { |
| 5782 | 6069 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5783 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 5784 | - else $temp_array['image_thumbnail'] = ''; |
|
| 6070 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6071 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6072 | + } else { |
|
| 6073 | + $temp_array['image_thumbnail'] = ''; |
|
| 6074 | + } |
|
| 5785 | 6075 | } |
| 5786 | 6076 | $temp_array['registration_count'] = $row['registration_count']; |
| 5787 | 6077 | $aircraft_array[] = $temp_array; |
@@ -5930,7 +6220,9 @@ discard block |
||
| 5930 | 6220 | if($row['registration'] != "") |
| 5931 | 6221 | { |
| 5932 | 6222 | $image_array = $Image->getSpotterImage($row['registration']); |
| 5933 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6223 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6224 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6225 | + } |
|
| 5934 | 6226 | } |
| 5935 | 6227 | $temp_array['registration_count'] = $row['registration_count']; |
| 5936 | 6228 | |
@@ -6047,7 +6339,9 @@ discard block |
||
| 6047 | 6339 | if($row['registration'] != "") |
| 6048 | 6340 | { |
| 6049 | 6341 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6050 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6342 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6343 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6344 | + } |
|
| 6051 | 6345 | } |
| 6052 | 6346 | $temp_array['registration_count'] = $row['registration_count']; |
| 6053 | 6347 | |
@@ -6213,7 +6507,9 @@ discard block |
||
| 6213 | 6507 | } |
| 6214 | 6508 | } |
| 6215 | 6509 | $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC"; |
| 6216 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6510 | + if ($limit) { |
|
| 6511 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6512 | + } |
|
| 6217 | 6513 | |
| 6218 | 6514 | $sth = $this->db->prepare($query); |
| 6219 | 6515 | $sth->execute($query_values); |
@@ -6232,7 +6528,9 @@ discard block |
||
| 6232 | 6528 | if($row['registration'] != "") |
| 6233 | 6529 | { |
| 6234 | 6530 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6235 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6531 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6532 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6533 | + } |
|
| 6236 | 6534 | } |
| 6237 | 6535 | |
| 6238 | 6536 | $aircraft_array[] = $temp_array; |
@@ -6273,7 +6571,9 @@ discard block |
||
| 6273 | 6571 | // if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 6274 | 6572 | //if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
| 6275 | 6573 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC"; |
| 6276 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6574 | + if ($limit) { |
|
| 6575 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6576 | + } |
|
| 6277 | 6577 | |
| 6278 | 6578 | $sth = $this->db->prepare($query); |
| 6279 | 6579 | $sth->execute(); |
@@ -6293,7 +6593,9 @@ discard block |
||
| 6293 | 6593 | if($row['registration'] != "") |
| 6294 | 6594 | { |
| 6295 | 6595 | $image_array = $Image->getSpotterImage($row['registration']); |
| 6296 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6596 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 6597 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 6598 | + } |
|
| 6297 | 6599 | } |
| 6298 | 6600 | |
| 6299 | 6601 | $aircraft_array[] = $temp_array; |
@@ -6359,7 +6661,9 @@ discard block |
||
| 6359 | 6661 | } |
| 6360 | 6662 | $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6361 | 6663 | ORDER BY airport_departure_icao_count DESC"; |
| 6362 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6664 | + if ($limit) { |
|
| 6665 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6666 | + } |
|
| 6363 | 6667 | |
| 6364 | 6668 | $sth = $this->db->prepare($query); |
| 6365 | 6669 | $sth->execute($query_values); |
@@ -6410,7 +6714,9 @@ discard block |
||
| 6410 | 6714 | //if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
| 6411 | 6715 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
| 6412 | 6716 | ORDER BY airport_departure_icao_count DESC"; |
| 6413 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6717 | + if ($limit) { |
|
| 6718 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6719 | + } |
|
| 6414 | 6720 | |
| 6415 | 6721 | $sth = $this->db->prepare($query); |
| 6416 | 6722 | $sth->execute(); |
@@ -6488,7 +6794,9 @@ discard block |
||
| 6488 | 6794 | } |
| 6489 | 6795 | $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country |
| 6490 | 6796 | ORDER BY airport_departure_icao_count DESC"; |
| 6491 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6797 | + if ($limit) { |
|
| 6798 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6799 | + } |
|
| 6492 | 6800 | //echo $query; |
| 6493 | 6801 | $sth = $this->db->prepare($query); |
| 6494 | 6802 | $sth->execute($query_values); |
@@ -6540,7 +6848,9 @@ discard block |
||
| 6540 | 6848 | //if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
| 6541 | 6849 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country |
| 6542 | 6850 | ORDER BY airport_departure_icao_count DESC"; |
| 6543 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 6851 | + if ($limit) { |
|
| 6852 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 6853 | + } |
|
| 6544 | 6854 | |
| 6545 | 6855 | $sth = $this->db->prepare($query); |
| 6546 | 6856 | $sth->execute(); |
@@ -6935,7 +7245,9 @@ discard block |
||
| 6935 | 7245 | date_default_timezone_set($globalTimezone); |
| 6936 | 7246 | $datetime = new DateTime($date); |
| 6937 | 7247 | $offset = $datetime->format('P'); |
| 6938 | - } else $offset = '+00:00'; |
|
| 7248 | + } else { |
|
| 7249 | + $offset = '+00:00'; |
|
| 7250 | + } |
|
| 6939 | 7251 | |
| 6940 | 7252 | if ($globalDBdriver == 'mysql') { |
| 6941 | 7253 | $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
@@ -6985,7 +7297,9 @@ discard block |
||
| 6985 | 7297 | date_default_timezone_set($globalTimezone); |
| 6986 | 7298 | $datetime = new DateTime($date); |
| 6987 | 7299 | $offset = $datetime->format('P'); |
| 6988 | - } else $offset = '+00:00'; |
|
| 7300 | + } else { |
|
| 7301 | + $offset = '+00:00'; |
|
| 7302 | + } |
|
| 6989 | 7303 | |
| 6990 | 7304 | if ($globalDBdriver == 'mysql') { |
| 6991 | 7305 | $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
@@ -7334,7 +7648,9 @@ discard block |
||
| 7334 | 7648 | } |
| 7335 | 7649 | $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7336 | 7650 | ORDER BY airport_arrival_icao_count DESC"; |
| 7337 | - if ($limit) $query .= " LIMIT 10"; |
|
| 7651 | + if ($limit) { |
|
| 7652 | + $query .= " LIMIT 10"; |
|
| 7653 | + } |
|
| 7338 | 7654 | |
| 7339 | 7655 | |
| 7340 | 7656 | $sth = $this->db->prepare($query); |
@@ -7354,7 +7670,9 @@ discard block |
||
| 7354 | 7670 | if ($icaoaskey) { |
| 7355 | 7671 | $icao = $row['arrival_airport_icao']; |
| 7356 | 7672 | $airport_array[$icao] = $temp_array; |
| 7357 | - } else $airport_array[] = $temp_array; |
|
| 7673 | + } else { |
|
| 7674 | + $airport_array[] = $temp_array; |
|
| 7675 | + } |
|
| 7358 | 7676 | } |
| 7359 | 7677 | |
| 7360 | 7678 | return $airport_array; |
@@ -7391,7 +7709,9 @@ discard block |
||
| 7391 | 7709 | //if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
| 7392 | 7710 | $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
| 7393 | 7711 | ORDER BY airport_arrival_icao_count DESC"; |
| 7394 | - if ($limit) $query .= " LIMIT 10"; |
|
| 7712 | + if ($limit) { |
|
| 7713 | + $query .= " LIMIT 10"; |
|
| 7714 | + } |
|
| 7395 | 7715 | |
| 7396 | 7716 | |
| 7397 | 7717 | $sth = $this->db->prepare($query); |
@@ -7412,7 +7732,9 @@ discard block |
||
| 7412 | 7732 | if ($icaoaskey) { |
| 7413 | 7733 | $icao = $row['arrival_airport_icao']; |
| 7414 | 7734 | $airport_array[$icao] = $temp_array; |
| 7415 | - } else $airport_array[] = $temp_array; |
|
| 7735 | + } else { |
|
| 7736 | + $airport_array[] = $temp_array; |
|
| 7737 | + } |
|
| 7416 | 7738 | } |
| 7417 | 7739 | |
| 7418 | 7740 | return $airport_array; |
@@ -7475,7 +7797,9 @@ discard block |
||
| 7475 | 7797 | } |
| 7476 | 7798 | $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country |
| 7477 | 7799 | ORDER BY airport_arrival_icao_count DESC"; |
| 7478 | - if ($limit) $query .= " LIMIT 10"; |
|
| 7800 | + if ($limit) { |
|
| 7801 | + $query .= " LIMIT 10"; |
|
| 7802 | + } |
|
| 7479 | 7803 | |
| 7480 | 7804 | |
| 7481 | 7805 | $sth = $this->db->prepare($query); |
@@ -7494,7 +7818,9 @@ discard block |
||
| 7494 | 7818 | if ($icaoaskey) { |
| 7495 | 7819 | $icao = $row['arrival_airport_icao']; |
| 7496 | 7820 | $airport_array[$icao] = $temp_array; |
| 7497 | - } else $airport_array[] = $temp_array; |
|
| 7821 | + } else { |
|
| 7822 | + $airport_array[] = $temp_array; |
|
| 7823 | + } |
|
| 7498 | 7824 | } |
| 7499 | 7825 | |
| 7500 | 7826 | return $airport_array; |
@@ -7531,7 +7857,9 @@ discard block |
||
| 7531 | 7857 | //if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
| 7532 | 7858 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country |
| 7533 | 7859 | ORDER BY airport_arrival_icao_count DESC"; |
| 7534 | - if ($limit) $query .= " LIMIT 10"; |
|
| 7860 | + if ($limit) { |
|
| 7861 | + $query .= " LIMIT 10"; |
|
| 7862 | + } |
|
| 7535 | 7863 | |
| 7536 | 7864 | |
| 7537 | 7865 | $sth = $this->db->prepare($query); |
@@ -7552,7 +7880,9 @@ discard block |
||
| 7552 | 7880 | if ($icaoaskey) { |
| 7553 | 7881 | $icao = $row['arrival_airport_icao']; |
| 7554 | 7882 | $airport_array[$icao] = $temp_array; |
| 7555 | - } else $airport_array[] = $temp_array; |
|
| 7883 | + } else { |
|
| 7884 | + $airport_array[] = $temp_array; |
|
| 7885 | + } |
|
| 7556 | 7886 | } |
| 7557 | 7887 | |
| 7558 | 7888 | return $airport_array; |
@@ -7933,7 +8263,9 @@ discard block |
||
| 7933 | 8263 | date_default_timezone_set($globalTimezone); |
| 7934 | 8264 | $datetime = new DateTime($date); |
| 7935 | 8265 | $offset = $datetime->format('P'); |
| 7936 | - } else $offset = '+00:00'; |
|
| 8266 | + } else { |
|
| 8267 | + $offset = '+00:00'; |
|
| 8268 | + } |
|
| 7937 | 8269 | |
| 7938 | 8270 | if ($globalDBdriver == 'mysql') { |
| 7939 | 8271 | $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
@@ -7983,7 +8315,9 @@ discard block |
||
| 7983 | 8315 | date_default_timezone_set($globalTimezone); |
| 7984 | 8316 | $datetime = new DateTime($date); |
| 7985 | 8317 | $offset = $datetime->format('P'); |
| 7986 | - } else $offset = '+00:00'; |
|
| 8318 | + } else { |
|
| 8319 | + $offset = '+00:00'; |
|
| 8320 | + } |
|
| 7987 | 8321 | |
| 7988 | 8322 | if ($globalDBdriver == 'mysql') { |
| 7989 | 8323 | $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
@@ -8374,7 +8708,9 @@ discard block |
||
| 8374 | 8708 | } |
| 8375 | 8709 | $query .= " GROUP BY spotter_output.arrival_airport_country |
| 8376 | 8710 | ORDER BY airport_arrival_country_count DESC"; |
| 8377 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 8711 | + if ($limit) { |
|
| 8712 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 8713 | + } |
|
| 8378 | 8714 | |
| 8379 | 8715 | |
| 8380 | 8716 | $sth = $this->db->prepare($query); |
@@ -8661,7 +8997,9 @@ discard block |
||
| 8661 | 8997 | date_default_timezone_set($globalTimezone); |
| 8662 | 8998 | $datetime = new DateTime($date); |
| 8663 | 8999 | $offset = $datetime->format('P'); |
| 8664 | - } else $offset = '+00:00'; |
|
| 9000 | + } else { |
|
| 9001 | + $offset = '+00:00'; |
|
| 9002 | + } |
|
| 8665 | 9003 | |
| 8666 | 9004 | if ($globalDBdriver == 'mysql') { |
| 8667 | 9005 | $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
@@ -8917,12 +9255,18 @@ discard block |
||
| 8917 | 9255 | $query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao |
| 8918 | 9256 | FROM spotter_output".$filter_query." spotter_output.ident <> ''"; |
| 8919 | 9257 | if ($olderthanmonths > 0) { |
| 8920 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 8921 | - else $query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 9258 | + if ($globalDBdriver == 'mysql') { |
|
| 9259 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 9260 | + } else { |
|
| 9261 | + $query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 9262 | + } |
|
| 8922 | 9263 | } |
| 8923 | 9264 | if ($sincedate != '') { |
| 8924 | - if ($globalDBdriver == 'mysql') $query .= " AND spotter_output.date > '".$sincedate."'"; |
|
| 8925 | - else $query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 9265 | + if ($globalDBdriver == 'mysql') { |
|
| 9266 | + $query .= " AND spotter_output.date > '".$sincedate."'"; |
|
| 9267 | + } else { |
|
| 9268 | + $query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 9269 | + } |
|
| 8926 | 9270 | } |
| 8927 | 9271 | $query_values = array(); |
| 8928 | 9272 | if ($year != '') { |
@@ -8953,7 +9297,9 @@ discard block |
||
| 8953 | 9297 | } |
| 8954 | 9298 | } |
| 8955 | 9299 | $query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC"; |
| 8956 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 9300 | + if ($limit) { |
|
| 9301 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 9302 | + } |
|
| 8957 | 9303 | |
| 8958 | 9304 | $sth = $this->db->prepare($query); |
| 8959 | 9305 | $sth->execute($query_values); |
@@ -8987,15 +9333,23 @@ discard block |
||
| 8987 | 9333 | $query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name |
| 8988 | 9334 | FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao <> '' "; |
| 8989 | 9335 | if ($olderthanmonths > 0) { |
| 8990 | - if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 8991 | - else $query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' "; |
|
| 9336 | + if ($globalDBdriver == 'mysql') { |
|
| 9337 | + $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 9338 | + } else { |
|
| 9339 | + $query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' "; |
|
| 9340 | + } |
|
| 8992 | 9341 | } |
| 8993 | 9342 | if ($sincedate != '') { |
| 8994 | - if ($globalDBdriver == 'mysql') $query .= "AND spotter_output.date > '".$sincedate."' "; |
|
| 8995 | - else $query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) "; |
|
| 9343 | + if ($globalDBdriver == 'mysql') { |
|
| 9344 | + $query .= "AND spotter_output.date > '".$sincedate."' "; |
|
| 9345 | + } else { |
|
| 9346 | + $query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) "; |
|
| 9347 | + } |
|
| 8996 | 9348 | } |
| 8997 | 9349 | $query .= "GROUP BY spotter_output.airline_icao, spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC"; |
| 8998 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 9350 | + if ($limit) { |
|
| 9351 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 9352 | + } |
|
| 8999 | 9353 | |
| 9000 | 9354 | $sth = $this->db->prepare($query); |
| 9001 | 9355 | $sth->execute(); |
@@ -9032,7 +9386,9 @@ discard block |
||
| 9032 | 9386 | date_default_timezone_set($globalTimezone); |
| 9033 | 9387 | $datetime = new DateTime(); |
| 9034 | 9388 | $offset = $datetime->format('P'); |
| 9035 | - } else $offset = '+00:00'; |
|
| 9389 | + } else { |
|
| 9390 | + $offset = '+00:00'; |
|
| 9391 | + } |
|
| 9036 | 9392 | |
| 9037 | 9393 | if ($globalDBdriver == 'mysql') { |
| 9038 | 9394 | $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -9081,7 +9437,9 @@ discard block |
||
| 9081 | 9437 | date_default_timezone_set($globalTimezone); |
| 9082 | 9438 | $datetime = new DateTime(); |
| 9083 | 9439 | $offset = $datetime->format('P'); |
| 9084 | - } else $offset = '+00:00'; |
|
| 9440 | + } else { |
|
| 9441 | + $offset = '+00:00'; |
|
| 9442 | + } |
|
| 9085 | 9443 | $filter_query = $this->getFilter($filters,true,true); |
| 9086 | 9444 | if ($globalDBdriver == 'mysql') { |
| 9087 | 9445 | $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -9130,7 +9488,9 @@ discard block |
||
| 9130 | 9488 | date_default_timezone_set($globalTimezone); |
| 9131 | 9489 | $datetime = new DateTime(); |
| 9132 | 9490 | $offset = $datetime->format('P'); |
| 9133 | - } else $offset = '+00:00'; |
|
| 9491 | + } else { |
|
| 9492 | + $offset = '+00:00'; |
|
| 9493 | + } |
|
| 9134 | 9494 | $filter_query = $this->getFilter($filters,true,true); |
| 9135 | 9495 | if ($globalDBdriver == 'mysql') { |
| 9136 | 9496 | $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -9176,7 +9536,9 @@ discard block |
||
| 9176 | 9536 | date_default_timezone_set($globalTimezone); |
| 9177 | 9537 | $datetime = new DateTime(); |
| 9178 | 9538 | $offset = $datetime->format('P'); |
| 9179 | - } else $offset = '+00:00'; |
|
| 9539 | + } else { |
|
| 9540 | + $offset = '+00:00'; |
|
| 9541 | + } |
|
| 9180 | 9542 | $filter_query = $this->getFilter($filters,true,true); |
| 9181 | 9543 | if ($globalDBdriver == 'mysql') { |
| 9182 | 9544 | $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -9224,7 +9586,9 @@ discard block |
||
| 9224 | 9586 | date_default_timezone_set($globalTimezone); |
| 9225 | 9587 | $datetime = new DateTime(); |
| 9226 | 9588 | $offset = $datetime->format('P'); |
| 9227 | - } else $offset = '+00:00'; |
|
| 9589 | + } else { |
|
| 9590 | + $offset = '+00:00'; |
|
| 9591 | + } |
|
| 9228 | 9592 | |
| 9229 | 9593 | if ($globalDBdriver == 'mysql') { |
| 9230 | 9594 | $query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -9272,7 +9636,9 @@ discard block |
||
| 9272 | 9636 | date_default_timezone_set($globalTimezone); |
| 9273 | 9637 | $datetime = new DateTime(); |
| 9274 | 9638 | $offset = $datetime->format('P'); |
| 9275 | - } else $offset = '+00:00'; |
|
| 9639 | + } else { |
|
| 9640 | + $offset = '+00:00'; |
|
| 9641 | + } |
|
| 9276 | 9642 | |
| 9277 | 9643 | if ($globalDBdriver == 'mysql') { |
| 9278 | 9644 | $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -9319,7 +9685,9 @@ discard block |
||
| 9319 | 9685 | date_default_timezone_set($globalTimezone); |
| 9320 | 9686 | $datetime = new DateTime(); |
| 9321 | 9687 | $offset = $datetime->format('P'); |
| 9322 | - } else $offset = '+00:00'; |
|
| 9688 | + } else { |
|
| 9689 | + $offset = '+00:00'; |
|
| 9690 | + } |
|
| 9323 | 9691 | |
| 9324 | 9692 | if ($globalDBdriver == 'mysql') { |
| 9325 | 9693 | $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -9367,7 +9735,9 @@ discard block |
||
| 9367 | 9735 | date_default_timezone_set($globalTimezone); |
| 9368 | 9736 | $datetime = new DateTime(); |
| 9369 | 9737 | $offset = $datetime->format('P'); |
| 9370 | - } else $offset = '+00:00'; |
|
| 9738 | + } else { |
|
| 9739 | + $offset = '+00:00'; |
|
| 9740 | + } |
|
| 9371 | 9741 | $filter_query = $this->getFilter($filters,true,true); |
| 9372 | 9742 | if ($globalDBdriver == 'mysql') { |
| 9373 | 9743 | $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -9412,7 +9782,9 @@ discard block |
||
| 9412 | 9782 | date_default_timezone_set($globalTimezone); |
| 9413 | 9783 | $datetime = new DateTime(); |
| 9414 | 9784 | $offset = $datetime->format('P'); |
| 9415 | - } else $offset = '+00:00'; |
|
| 9785 | + } else { |
|
| 9786 | + $offset = '+00:00'; |
|
| 9787 | + } |
|
| 9416 | 9788 | $filter_query = $this->getFilter($filters,true,true); |
| 9417 | 9789 | |
| 9418 | 9790 | if ($globalDBdriver == 'mysql') { |
@@ -9459,7 +9831,9 @@ discard block |
||
| 9459 | 9831 | date_default_timezone_set($globalTimezone); |
| 9460 | 9832 | $datetime = new DateTime(); |
| 9461 | 9833 | $offset = $datetime->format('P'); |
| 9462 | - } else $offset = '+00:00'; |
|
| 9834 | + } else { |
|
| 9835 | + $offset = '+00:00'; |
|
| 9836 | + } |
|
| 9463 | 9837 | |
| 9464 | 9838 | if ($globalDBdriver == 'mysql') { |
| 9465 | 9839 | $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
@@ -9505,7 +9879,9 @@ discard block |
||
| 9505 | 9879 | date_default_timezone_set($globalTimezone); |
| 9506 | 9880 | $datetime = new DateTime(); |
| 9507 | 9881 | $offset = $datetime->format('P'); |
| 9508 | - } else $offset = '+00:00'; |
|
| 9882 | + } else { |
|
| 9883 | + $offset = '+00:00'; |
|
| 9884 | + } |
|
| 9509 | 9885 | $filter_query = $this->getFilter($filters,true,true); |
| 9510 | 9886 | |
| 9511 | 9887 | if ($globalDBdriver == 'mysql') { |
@@ -9552,7 +9928,9 @@ discard block |
||
| 9552 | 9928 | date_default_timezone_set($globalTimezone); |
| 9553 | 9929 | $datetime = new DateTime(); |
| 9554 | 9930 | $offset = $datetime->format('P'); |
| 9555 | - } else $offset = '+00:00'; |
|
| 9931 | + } else { |
|
| 9932 | + $offset = '+00:00'; |
|
| 9933 | + } |
|
| 9556 | 9934 | |
| 9557 | 9935 | if ($globalDBdriver == 'mysql') { |
| 9558 | 9936 | $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
@@ -9599,7 +9977,9 @@ discard block |
||
| 9599 | 9977 | date_default_timezone_set($globalTimezone); |
| 9600 | 9978 | $datetime = new DateTime(); |
| 9601 | 9979 | $offset = $datetime->format('P'); |
| 9602 | - } else $offset = '+00:00'; |
|
| 9980 | + } else { |
|
| 9981 | + $offset = '+00:00'; |
|
| 9982 | + } |
|
| 9603 | 9983 | |
| 9604 | 9984 | if ($globalDBdriver == 'mysql') { |
| 9605 | 9985 | $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count |
@@ -9644,7 +10024,9 @@ discard block |
||
| 9644 | 10024 | date_default_timezone_set($globalTimezone); |
| 9645 | 10025 | $datetime = new DateTime(); |
| 9646 | 10026 | $offset = $datetime->format('P'); |
| 9647 | - } else $offset = '+00:00'; |
|
| 10027 | + } else { |
|
| 10028 | + $offset = '+00:00'; |
|
| 10029 | + } |
|
| 9648 | 10030 | $filter_query = $this->getFilter($filters,true,true); |
| 9649 | 10031 | |
| 9650 | 10032 | if ($globalDBdriver == 'mysql') { |
@@ -9692,7 +10074,9 @@ discard block |
||
| 9692 | 10074 | date_default_timezone_set($globalTimezone); |
| 9693 | 10075 | $datetime = new DateTime(); |
| 9694 | 10076 | $offset = $datetime->format('P'); |
| 9695 | - } else $offset = '+00:00'; |
|
| 10077 | + } else { |
|
| 10078 | + $offset = '+00:00'; |
|
| 10079 | + } |
|
| 9696 | 10080 | |
| 9697 | 10081 | if ($globalDBdriver == 'mysql') { |
| 9698 | 10082 | $query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
@@ -9738,7 +10122,9 @@ discard block |
||
| 9738 | 10122 | date_default_timezone_set($globalTimezone); |
| 9739 | 10123 | $datetime = new DateTime(); |
| 9740 | 10124 | $offset = $datetime->format('P'); |
| 9741 | - } else $offset = '+00:00'; |
|
| 10125 | + } else { |
|
| 10126 | + $offset = '+00:00'; |
|
| 10127 | + } |
|
| 9742 | 10128 | $filter_query = $this->getFilter($filters,true,true); |
| 9743 | 10129 | |
| 9744 | 10130 | if ($globalDBdriver == 'mysql') { |
@@ -9786,7 +10172,9 @@ discard block |
||
| 9786 | 10172 | date_default_timezone_set($globalTimezone); |
| 9787 | 10173 | $datetime = new DateTime(); |
| 9788 | 10174 | $offset = $datetime->format('P'); |
| 9789 | - } else $offset = '+00:00'; |
|
| 10175 | + } else { |
|
| 10176 | + $offset = '+00:00'; |
|
| 10177 | + } |
|
| 9790 | 10178 | |
| 9791 | 10179 | if ($globalDBdriver == 'mysql') { |
| 9792 | 10180 | $query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
@@ -9833,7 +10221,9 @@ discard block |
||
| 9833 | 10221 | date_default_timezone_set($globalTimezone); |
| 9834 | 10222 | $datetime = new DateTime(); |
| 9835 | 10223 | $offset = $datetime->format('P'); |
| 9836 | - } else $offset = '+00:00'; |
|
| 10224 | + } else { |
|
| 10225 | + $offset = '+00:00'; |
|
| 10226 | + } |
|
| 9837 | 10227 | $filter_query = $this->getFilter($filters,true,true); |
| 9838 | 10228 | if ($globalDBdriver == 'mysql') { |
| 9839 | 10229 | $query = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -9882,7 +10272,9 @@ discard block |
||
| 9882 | 10272 | date_default_timezone_set($globalTimezone); |
| 9883 | 10273 | $datetime = new DateTime(); |
| 9884 | 10274 | $offset = $datetime->format('P'); |
| 9885 | - } else $offset = '+00:00'; |
|
| 10275 | + } else { |
|
| 10276 | + $offset = '+00:00'; |
|
| 10277 | + } |
|
| 9886 | 10278 | |
| 9887 | 10279 | $orderby_sql = ''; |
| 9888 | 10280 | if ($orderby == "hour") |
@@ -9948,7 +10340,9 @@ discard block |
||
| 9948 | 10340 | date_default_timezone_set($globalTimezone); |
| 9949 | 10341 | $datetime = new DateTime(); |
| 9950 | 10342 | $offset = $datetime->format('P'); |
| 9951 | - } else $offset = '+00:00'; |
|
| 10343 | + } else { |
|
| 10344 | + $offset = '+00:00'; |
|
| 10345 | + } |
|
| 9952 | 10346 | |
| 9953 | 10347 | $orderby_sql = ''; |
| 9954 | 10348 | if ($orderby == "hour") |
@@ -10015,7 +10409,9 @@ discard block |
||
| 10015 | 10409 | date_default_timezone_set($globalTimezone); |
| 10016 | 10410 | $datetime = new DateTime(); |
| 10017 | 10411 | $offset = $datetime->format('P'); |
| 10018 | - } else $offset = '+00:00'; |
|
| 10412 | + } else { |
|
| 10413 | + $offset = '+00:00'; |
|
| 10414 | + } |
|
| 10019 | 10415 | |
| 10020 | 10416 | $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
| 10021 | 10417 | |
@@ -10066,7 +10462,9 @@ discard block |
||
| 10066 | 10462 | date_default_timezone_set($globalTimezone); |
| 10067 | 10463 | $datetime = new DateTime(); |
| 10068 | 10464 | $offset = $datetime->format('P'); |
| 10069 | - } else $offset = '+00:00'; |
|
| 10465 | + } else { |
|
| 10466 | + $offset = '+00:00'; |
|
| 10467 | + } |
|
| 10070 | 10468 | |
| 10071 | 10469 | if ($globalDBdriver == 'mysql') { |
| 10072 | 10470 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10113,7 +10511,9 @@ discard block |
||
| 10113 | 10511 | date_default_timezone_set($globalTimezone); |
| 10114 | 10512 | $datetime = new DateTime(); |
| 10115 | 10513 | $offset = $datetime->format('P'); |
| 10116 | - } else $offset = '+00:00'; |
|
| 10514 | + } else { |
|
| 10515 | + $offset = '+00:00'; |
|
| 10516 | + } |
|
| 10117 | 10517 | |
| 10118 | 10518 | if ($globalDBdriver == 'mysql') { |
| 10119 | 10519 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10160,7 +10560,9 @@ discard block |
||
| 10160 | 10560 | date_default_timezone_set($globalTimezone); |
| 10161 | 10561 | $datetime = new DateTime(); |
| 10162 | 10562 | $offset = $datetime->format('P'); |
| 10163 | - } else $offset = '+00:00'; |
|
| 10563 | + } else { |
|
| 10564 | + $offset = '+00:00'; |
|
| 10565 | + } |
|
| 10164 | 10566 | |
| 10165 | 10567 | if ($globalDBdriver == 'mysql') { |
| 10166 | 10568 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10208,7 +10610,9 @@ discard block |
||
| 10208 | 10610 | date_default_timezone_set($globalTimezone); |
| 10209 | 10611 | $datetime = new DateTime(); |
| 10210 | 10612 | $offset = $datetime->format('P'); |
| 10211 | - } else $offset = '+00:00'; |
|
| 10613 | + } else { |
|
| 10614 | + $offset = '+00:00'; |
|
| 10615 | + } |
|
| 10212 | 10616 | |
| 10213 | 10617 | if ($globalDBdriver == 'mysql') { |
| 10214 | 10618 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10256,7 +10660,9 @@ discard block |
||
| 10256 | 10660 | date_default_timezone_set($globalTimezone); |
| 10257 | 10661 | $datetime = new DateTime($date); |
| 10258 | 10662 | $offset = $datetime->format('P'); |
| 10259 | - } else $offset = '+00:00'; |
|
| 10663 | + } else { |
|
| 10664 | + $offset = '+00:00'; |
|
| 10665 | + } |
|
| 10260 | 10666 | |
| 10261 | 10667 | if ($globalDBdriver == 'mysql') { |
| 10262 | 10668 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10304,7 +10710,9 @@ discard block |
||
| 10304 | 10710 | date_default_timezone_set($globalTimezone); |
| 10305 | 10711 | $datetime = new DateTime(); |
| 10306 | 10712 | $offset = $datetime->format('P'); |
| 10307 | - } else $offset = '+00:00'; |
|
| 10713 | + } else { |
|
| 10714 | + $offset = '+00:00'; |
|
| 10715 | + } |
|
| 10308 | 10716 | |
| 10309 | 10717 | if ($globalDBdriver == 'mysql') { |
| 10310 | 10718 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10351,7 +10759,9 @@ discard block |
||
| 10351 | 10759 | date_default_timezone_set($globalTimezone); |
| 10352 | 10760 | $datetime = new DateTime(); |
| 10353 | 10761 | $offset = $datetime->format('P'); |
| 10354 | - } else $offset = '+00:00'; |
|
| 10762 | + } else { |
|
| 10763 | + $offset = '+00:00'; |
|
| 10764 | + } |
|
| 10355 | 10765 | |
| 10356 | 10766 | if ($globalDBdriver == 'mysql') { |
| 10357 | 10767 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10398,7 +10808,9 @@ discard block |
||
| 10398 | 10808 | date_default_timezone_set($globalTimezone); |
| 10399 | 10809 | $datetime = new DateTime(); |
| 10400 | 10810 | $offset = $datetime->format('P'); |
| 10401 | - } else $offset = '+00:00'; |
|
| 10811 | + } else { |
|
| 10812 | + $offset = '+00:00'; |
|
| 10813 | + } |
|
| 10402 | 10814 | |
| 10403 | 10815 | if ($globalDBdriver == 'mysql') { |
| 10404 | 10816 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10448,7 +10860,9 @@ discard block |
||
| 10448 | 10860 | date_default_timezone_set($globalTimezone); |
| 10449 | 10861 | $datetime = new DateTime(); |
| 10450 | 10862 | $offset = $datetime->format('P'); |
| 10451 | - } else $offset = '+00:00'; |
|
| 10863 | + } else { |
|
| 10864 | + $offset = '+00:00'; |
|
| 10865 | + } |
|
| 10452 | 10866 | |
| 10453 | 10867 | if ($globalDBdriver == 'mysql') { |
| 10454 | 10868 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10495,7 +10909,9 @@ discard block |
||
| 10495 | 10909 | date_default_timezone_set($globalTimezone); |
| 10496 | 10910 | $datetime = new DateTime(); |
| 10497 | 10911 | $offset = $datetime->format('P'); |
| 10498 | - } else $offset = '+00:00'; |
|
| 10912 | + } else { |
|
| 10913 | + $offset = '+00:00'; |
|
| 10914 | + } |
|
| 10499 | 10915 | |
| 10500 | 10916 | if ($globalDBdriver == 'mysql') { |
| 10501 | 10917 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10706,8 +11122,11 @@ discard block |
||
| 10706 | 11122 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 10707 | 11123 | } |
| 10708 | 11124 | } |
| 10709 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 10710 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 11125 | + if (empty($query_values)) { |
|
| 11126 | + $queryi .= $this->getFilter($filters); |
|
| 11127 | + } else { |
|
| 11128 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 11129 | + } |
|
| 10711 | 11130 | |
| 10712 | 11131 | //echo $query; |
| 10713 | 11132 | $sth = $this->db->prepare($queryi); |
@@ -10786,8 +11205,11 @@ discard block |
||
| 10786 | 11205 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 10787 | 11206 | } |
| 10788 | 11207 | } |
| 10789 | - if ($query == '') $queryi .= $this->getFilter($filters); |
|
| 10790 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 11208 | + if ($query == '') { |
|
| 11209 | + $queryi .= $this->getFilter($filters); |
|
| 11210 | + } else { |
|
| 11211 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 11212 | + } |
|
| 10791 | 11213 | |
| 10792 | 11214 | |
| 10793 | 11215 | $sth = $this->db->prepare($queryi); |
@@ -10810,7 +11232,9 @@ discard block |
||
| 10810 | 11232 | date_default_timezone_set($globalTimezone); |
| 10811 | 11233 | $datetime = new DateTime(); |
| 10812 | 11234 | $offset = $datetime->format('P'); |
| 10813 | - } else $offset = '+00:00'; |
|
| 11235 | + } else { |
|
| 11236 | + $offset = '+00:00'; |
|
| 11237 | + } |
|
| 10814 | 11238 | |
| 10815 | 11239 | if ($globalDBdriver == 'mysql') { |
| 10816 | 11240 | $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -10996,7 +11420,9 @@ discard block |
||
| 10996 | 11420 | */ |
| 10997 | 11421 | public function parseDirection($direction = 0) |
| 10998 | 11422 | { |
| 10999 | - if ($direction == '') $direction = 0; |
|
| 11423 | + if ($direction == '') { |
|
| 11424 | + $direction = 0; |
|
| 11425 | + } |
|
| 11000 | 11426 | $direction_array = array(); |
| 11001 | 11427 | $temp_array = array(); |
| 11002 | 11428 | |
@@ -11097,7 +11523,9 @@ discard block |
||
| 11097 | 11523 | if (isset($result->AirlineFlightInfoResult)) |
| 11098 | 11524 | { |
| 11099 | 11525 | $registration = $result->AirlineFlightInfoResult->tailnumber; |
| 11100 | - } else return ''; |
|
| 11526 | + } else { |
|
| 11527 | + return ''; |
|
| 11528 | + } |
|
| 11101 | 11529 | |
| 11102 | 11530 | $registration = $this->convertAircraftRegistration($registration); |
| 11103 | 11531 | |
@@ -11126,7 +11554,9 @@ discard block |
||
| 11126 | 11554 | if (count($row) > 0) { |
| 11127 | 11555 | //return $row['Registration']; |
| 11128 | 11556 | return $row['registration']; |
| 11129 | - } else return ''; |
|
| 11557 | + } else { |
|
| 11558 | + return ''; |
|
| 11559 | + } |
|
| 11130 | 11560 | |
| 11131 | 11561 | } |
| 11132 | 11562 | |
@@ -11149,9 +11579,14 @@ discard block |
||
| 11149 | 11579 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 11150 | 11580 | $sth->closeCursor(); |
| 11151 | 11581 | if (count($row) > 0) { |
| 11152 | - if ($row['type_flight'] == null) return ''; |
|
| 11153 | - else return $row['type_flight']; |
|
| 11154 | - } else return ''; |
|
| 11582 | + if ($row['type_flight'] == null) { |
|
| 11583 | + return ''; |
|
| 11584 | + } else { |
|
| 11585 | + return $row['type_flight']; |
|
| 11586 | + } |
|
| 11587 | + } else { |
|
| 11588 | + return ''; |
|
| 11589 | + } |
|
| 11155 | 11590 | |
| 11156 | 11591 | } |
| 11157 | 11592 | |
@@ -11169,7 +11604,9 @@ discard block |
||
| 11169 | 11604 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 11170 | 11605 | |
| 11171 | 11606 | $Connection = new Connection($this->db); |
| 11172 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 11607 | + if (!$Connection->tableExists('countries')) { |
|
| 11608 | + return ''; |
|
| 11609 | + } |
|
| 11173 | 11610 | |
| 11174 | 11611 | try { |
| 11175 | 11612 | /* |
@@ -11189,9 +11626,13 @@ discard block |
||
| 11189 | 11626 | $sth->closeCursor(); |
| 11190 | 11627 | if (count($row) > 0) { |
| 11191 | 11628 | return $row; |
| 11192 | - } else return ''; |
|
| 11629 | + } else { |
|
| 11630 | + return ''; |
|
| 11631 | + } |
|
| 11193 | 11632 | } catch (PDOException $e) { |
| 11194 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 11633 | + if (isset($globalDebug) && $globalDebug) { |
|
| 11634 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 11635 | + } |
|
| 11195 | 11636 | return ''; |
| 11196 | 11637 | } |
| 11197 | 11638 | |
@@ -11209,7 +11650,9 @@ discard block |
||
| 11209 | 11650 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
| 11210 | 11651 | |
| 11211 | 11652 | $Connection = new Connection($this->db); |
| 11212 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 11653 | + if (!$Connection->tableExists('countries')) { |
|
| 11654 | + return ''; |
|
| 11655 | + } |
|
| 11213 | 11656 | |
| 11214 | 11657 | try { |
| 11215 | 11658 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -11221,9 +11664,13 @@ discard block |
||
| 11221 | 11664 | $sth->closeCursor(); |
| 11222 | 11665 | if (count($row) > 0) { |
| 11223 | 11666 | return $row; |
| 11224 | - } else return ''; |
|
| 11667 | + } else { |
|
| 11668 | + return ''; |
|
| 11669 | + } |
|
| 11225 | 11670 | } catch (PDOException $e) { |
| 11226 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 11671 | + if (isset($globalDebug) && $globalDebug) { |
|
| 11672 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 11673 | + } |
|
| 11227 | 11674 | return ''; |
| 11228 | 11675 | } |
| 11229 | 11676 | |
@@ -11473,7 +11920,9 @@ discard block |
||
| 11473 | 11920 | { |
| 11474 | 11921 | global $globalBitlyAccessToken; |
| 11475 | 11922 | |
| 11476 | - if ($globalBitlyAccessToken == '') return $url; |
|
| 11923 | + if ($globalBitlyAccessToken == '') { |
|
| 11924 | + return $url; |
|
| 11925 | + } |
|
| 11477 | 11926 | |
| 11478 | 11927 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
| 11479 | 11928 | |
@@ -11622,7 +12071,9 @@ discard block |
||
| 11622 | 12071 | |
| 11623 | 12072 | |
| 11624 | 12073 | // routes |
| 11625 | - if ($globalDebug) print "Routes...\n"; |
|
| 12074 | + if ($globalDebug) { |
|
| 12075 | + print "Routes...\n"; |
|
| 12076 | + } |
|
| 11626 | 12077 | if ($globalDBdriver == 'mysql') { |
| 11627 | 12078 | $query = "SELECT spotter_output.spotter_id, routes.FromAirport_ICAO, routes.ToAirport_ICAO FROM spotter_output, routes WHERE spotter_output.ident = routes.CallSign AND ( spotter_output.departure_airport_icao != routes.FromAirport_ICAO OR spotter_output.arrival_airport_icao != routes.ToAirport_ICAO) AND routes.FromAirport_ICAO != '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)"; |
| 11628 | 12079 | } else { |
@@ -11641,7 +12092,9 @@ discard block |
||
| 11641 | 12092 | } |
| 11642 | 12093 | } |
| 11643 | 12094 | |
| 11644 | - if ($globalDebug) print "Airlines...\n"; |
|
| 12095 | + if ($globalDebug) { |
|
| 12096 | + print "Airlines...\n"; |
|
| 12097 | + } |
|
| 11645 | 12098 | //airlines |
| 11646 | 12099 | if ($globalDBdriver == 'mysql') { |
| 11647 | 12100 | $query = "SELECT spotter_output.spotter_id, spotter_output.ident FROM spotter_output WHERE (spotter_output.airline_name = '' OR spotter_output.airline_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)"; |
@@ -11655,10 +12108,15 @@ discard block |
||
| 11655 | 12108 | if (is_numeric(substr($row['ident'], -1, 1))) |
| 11656 | 12109 | { |
| 11657 | 12110 | $fromsource = NULL; |
| 11658 | - if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 11659 | - elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 11660 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 11661 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 12111 | + if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') { |
|
| 12112 | + $fromsource = 'vatsim'; |
|
| 12113 | + } elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') { |
|
| 12114 | + $fromsource = 'ivao'; |
|
| 12115 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 12116 | + $fromsource = 'vatsim'; |
|
| 12117 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 12118 | + $fromsource = 'ivao'; |
|
| 12119 | + } |
|
| 11662 | 12120 | $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource); |
| 11663 | 12121 | if (isset($airline_array[0]['name'])) { |
| 11664 | 12122 | $update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id"; |
@@ -11668,13 +12126,17 @@ discard block |
||
| 11668 | 12126 | } |
| 11669 | 12127 | } |
| 11670 | 12128 | |
| 11671 | - if ($globalDebug) print "Remove Duplicate in aircraft_modes...\n"; |
|
| 12129 | + if ($globalDebug) { |
|
| 12130 | + print "Remove Duplicate in aircraft_modes...\n"; |
|
| 12131 | + } |
|
| 11672 | 12132 | //duplicate modes |
| 11673 | 12133 | $query = "DELETE aircraft_modes FROM aircraft_modes LEFT OUTER JOIN (SELECT max(`AircraftID`) as `AircraftID`,`ModeS` FROM `aircraft_modes` group by ModeS) as KeepRows ON aircraft_modes.AircraftID = KeepRows.AircraftID WHERE KeepRows.AircraftID IS NULL"; |
| 11674 | 12134 | $sth = $this->db->prepare($query); |
| 11675 | 12135 | $sth->execute(); |
| 11676 | 12136 | |
| 11677 | - if ($globalDebug) print "Aircraft...\n"; |
|
| 12137 | + if ($globalDebug) { |
|
| 12138 | + print "Aircraft...\n"; |
|
| 12139 | + } |
|
| 11678 | 12140 | //aircraft |
| 11679 | 12141 | if ($globalDBdriver == 'mysql') { |
| 11680 | 12142 | $query = "SELECT spotter_output.spotter_id, spotter_output.aircraft_icao, spotter_output.registration FROM spotter_output WHERE (spotter_output.aircraft_name = '' OR spotter_output.aircraft_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -11717,26 +12179,38 @@ discard block |
||
| 11717 | 12179 | if (isset($closestAirports[0])) { |
| 11718 | 12180 | if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) { |
| 11719 | 12181 | $airport_icao = $closestAirports[0]['icao']; |
| 11720 | - if ($globalDebug) echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 12182 | + if ($globalDebug) { |
|
| 12183 | + echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 12184 | + } |
|
| 11721 | 12185 | } elseif (count($closestAirports > 1) && $row['arrival_airport_icao'] != '' && $row['arrival_airport_icao'] != 'NA') { |
| 11722 | 12186 | foreach ($closestAirports as $airport) { |
| 11723 | 12187 | if ($row['arrival_airport_icao'] == $airport['icao']) { |
| 11724 | 12188 | $airport_icao = $airport['icao']; |
| 11725 | - if ($globalDebug) echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 12189 | + if ($globalDebug) { |
|
| 12190 | + echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 12191 | + } |
|
| 11726 | 12192 | break; |
| 11727 | 12193 | } |
| 11728 | 12194 | } |
| 11729 | 12195 | } elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) { |
| 11730 | 12196 | $airport_icao = $closestAirports[0]['icao']; |
| 11731 | - if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." ! Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
|
| 12197 | + if ($globalDebug) { |
|
| 12198 | + echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." ! Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
|
| 12199 | + } |
|
| 11732 | 12200 | } else { |
| 11733 | - if ($globalDebug) echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
|
| 12201 | + if ($globalDebug) { |
|
| 12202 | + echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
|
| 12203 | + } |
|
| 11734 | 12204 | } |
| 11735 | 12205 | } else { |
| 11736 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 12206 | + if ($globalDebug) { |
|
| 12207 | + echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 12208 | + } |
|
| 11737 | 12209 | } |
| 11738 | 12210 | if ($row['real_arrival_airport_icao'] != $airport_icao) { |
| 11739 | - if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n"; |
|
| 12211 | + if ($globalDebug) { |
|
| 12212 | + echo "Updating airport to ".$airport_icao."...\n"; |
|
| 12213 | + } |
|
| 11740 | 12214 | $update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id"; |
| 11741 | 12215 | $sthu = $this->db->prepare($update_query); |
| 11742 | 12216 | $sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id'])); |
@@ -53,8 +53,12 @@ discard block |
||
| 53 | 53 | { |
| 54 | 54 | $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']); |
| 55 | 55 | $ident = $spotter_array[0]['ident']; |
| 56 | - if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
|
| 57 | - if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
|
| 56 | + if (isset($spotter_array[0]['latitude'])) { |
|
| 57 | + $latitude = $spotter_array[0]['latitude']; |
|
| 58 | + } |
|
| 59 | + if (isset($spotter_array[0]['longitude'])) { |
|
| 60 | + $longitude = $spotter_array[0]['longitude']; |
|
| 61 | + } |
|
| 58 | 62 | require_once('header.php'); |
| 59 | 63 | /* |
| 60 | 64 | if (isset($globalArchive) && $globalArchive) { |
@@ -107,7 +111,9 @@ discard block |
||
| 107 | 111 | */ |
| 108 | 112 | print '<div class="info column">'; |
| 109 | 113 | print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>'; |
| 110 | - if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>'; |
|
| 114 | + if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') { |
|
| 115 | + print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>'; |
|
| 116 | + } |
|
| 111 | 117 | $Stats = new Stats(); |
| 112 | 118 | $flights = $Stats->getStatsPilot($pilot); |
| 113 | 119 | print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>'; |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | require_once(dirname(__FILE__).'/require/class.Common.php'); |
| 6 | 6 | $Common = new Common(); |
| 7 | -$showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop'); |
|
| 8 | -$showDuration = $Common->multiKeyExists($spotter_array,'duration'); |
|
| 7 | +$showRouteStop = $Common->multiKeyExists($spotter_array, 'route_stop'); |
|
| 8 | +$showDuration = $Common->multiKeyExists($spotter_array, 'duration'); |
|
| 9 | 9 | |
| 10 | 10 | if (!isset($_GET['sort'])) |
| 11 | 11 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | print '<th class="more"></th>'; |
| 101 | 101 | print '</thead>'; |
| 102 | -} else if (strtolower($current_page) == "upcoming"){ |
|
| 102 | +} else if (strtolower($current_page) == "upcoming") { |
|
| 103 | 103 | print '<thead>'; |
| 104 | 104 | if ($_GET['sort'] == "airline_name_asc") |
| 105 | 105 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | */ |
| 151 | 151 | print '</thead>'; |
| 152 | -} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){ |
|
| 152 | +} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
|
| 153 | 153 | print '<thead>'; |
| 154 | 154 | print '<th class="aircraft_thumbnail"></th>'; |
| 155 | 155 | print '<th class="logo">'._("Airline").'</th>'; |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | print '</thead>'; |
| 187 | 187 | } else { |
| 188 | 188 | |
| 189 | - if ($hide_th_links === true){ |
|
| 189 | + if ($hide_th_links === true) { |
|
| 190 | 190 | print '<thead>'; |
| 191 | 191 | print '<th class="aircraft_thumbnail"></th>'; |
| 192 | 192 | if ($_GET['sort'] == "airline_name_asc") |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | print '<tbody>'."\n"; |
| 380 | -foreach($spotter_array as $spotter_item) |
|
| 380 | +foreach ($spotter_array as $spotter_item) |
|
| 381 | 381 | { |
| 382 | 382 | if (isset($globalTimezone)) |
| 383 | 383 | { |
@@ -408,13 +408,13 @@ discard block |
||
| 408 | 408 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 409 | 409 | } |
| 410 | 410 | if (isset($spotter_item['airline_name'])) { |
| 411 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 411 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 412 | 412 | } else { |
| 413 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 413 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 414 | 414 | } |
| 415 | 415 | } else { |
| 416 | 416 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 417 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 417 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 418 | 418 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 419 | 419 | if (isset($spotter_item['airline_name'])) { |
| 420 | 420 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | print '<img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" />'."\n"; |
| 429 | 429 | print '</td>'."\n"; |
| 430 | 430 | } |
| 431 | - } elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){ |
|
| 431 | + } elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed") { |
|
| 432 | 432 | if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) { |
| 433 | 433 | $spotter_item['squawk'] = '-'; |
| 434 | 434 | } |
@@ -444,17 +444,17 @@ discard block |
||
| 444 | 444 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 445 | 445 | } |
| 446 | 446 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 447 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 447 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 448 | 448 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
| 449 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 449 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 450 | 450 | } elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) { |
| 451 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 451 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 452 | 452 | } else { |
| 453 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 453 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 454 | 454 | } |
| 455 | 455 | } else { |
| 456 | 456 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 457 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 457 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 458 | 458 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 459 | 459 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 460 | 460 | print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | } |
| 518 | 518 | print '</td>'."\n"; |
| 519 | 519 | // Aircraft type |
| 520 | - if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){ |
|
| 520 | + if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") { |
|
| 521 | 521 | print '<td class="type">'."\n"; |
| 522 | 522 | if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) { |
| 523 | 523 | print '<span class="nomobile">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</span>'."\n"; |
@@ -541,22 +541,22 @@ discard block |
||
| 541 | 541 | } |
| 542 | 542 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
| 543 | 543 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 544 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 545 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 544 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 545 | + } else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 546 | 546 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 547 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 547 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 548 | 548 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 549 | 549 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
| 550 | 550 | } elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') { |
| 551 | 551 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 552 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 552 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 553 | 553 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 554 | 554 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
| 555 | 555 | } elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
| 556 | 556 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 557 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 557 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 558 | 558 | } else { |
| 559 | - $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 559 | + $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 560 | 560 | } |
| 561 | 561 | print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n"; |
| 562 | 562 | } |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | $latitude = $spotter_item['latitude']; |
| 572 | 572 | $longitude = $spotter_item['longitude']; |
| 573 | 573 | } |
| 574 | - $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
|
| 574 | + $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude); |
|
| 575 | 575 | } else $distance = ''; |
| 576 | 576 | if ($distance != '') { |
| 577 | 577 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -612,20 +612,20 @@ discard block |
||
| 612 | 612 | } |
| 613 | 613 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
| 614 | 614 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 615 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 615 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 616 | 616 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 617 | 617 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 618 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 618 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 619 | 619 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 620 | 620 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
| 621 | 621 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
| 622 | 622 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 623 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 623 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 624 | 624 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 625 | 625 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
| 626 | 626 | } elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
| 627 | 627 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 628 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 628 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 629 | 629 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 630 | 630 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
| 631 | 631 | } |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $latitude = $spotter_item['latitude']; |
| 639 | 639 | $longitude = $spotter_item['longitude']; |
| 640 | 640 | } |
| 641 | - $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
|
| 641 | + $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude); |
|
| 642 | 642 | } else $distance = ''; |
| 643 | 643 | if ($distance != '') { |
| 644 | 644 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -659,21 +659,21 @@ discard block |
||
| 659 | 659 | } else { |
| 660 | 660 | //if (!isset($globalUnitDistance) || $globalUnitDistance == 'km') { |
| 661 | 661 | if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
| 662 | - print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n"; |
|
| 663 | - print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n"; |
|
| 662 | + print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n"; |
|
| 663 | + print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n"; |
|
| 664 | 664 | //} elseif ($globalUnitDistance == 'mi') { |
| 665 | 665 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 666 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n"; |
|
| 667 | - print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n"; |
|
| 666 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n"; |
|
| 667 | + print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n"; |
|
| 668 | 668 | //} elseif ($globalUnitDistance == 'nm') { |
| 669 | 669 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 670 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n"; |
|
| 671 | - print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n"; |
|
| 670 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n"; |
|
| 671 | + print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n"; |
|
| 672 | 672 | } |
| 673 | 673 | } |
| 674 | 674 | print '</td>'."\n"; |
| 675 | 675 | } |
| 676 | - if(strtolower($current_page) != "upcoming"){ |
|
| 676 | + if (strtolower($current_page) != "upcoming") { |
|
| 677 | 677 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 678 | 678 | print '<td class="pilot">'."\n"; |
| 679 | 679 | if ((!isset($spotter_item['pilot_id']) || $spotter_item['pilot_id'] == '') && (!isset($spotter_item['pilot_name']) || $spotter_item['pilot_name'] == '')) { |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | //if ((isset($globalIvAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalVAM) && $globalVAM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 709 | 709 | if ($showRouteStop) { |
| 710 | 710 | // Route stop |
| 711 | - if(strtolower($current_page) != "upcoming"){ |
|
| 711 | + if (strtolower($current_page) != "upcoming") { |
|
| 712 | 712 | print '<td class="route_stop">'."\n"; |
| 713 | 713 | if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') { |
| 714 | 714 | print '<span class="nomobile">-</span>'."\n"; |
@@ -727,11 +727,11 @@ discard block |
||
| 727 | 727 | } |
| 728 | 728 | if ($showDuration) { |
| 729 | 729 | // Duration |
| 730 | - if(strtolower($current_page) != "upcoming"){ |
|
| 730 | + if (strtolower($current_page) != "upcoming") { |
|
| 731 | 731 | print '<td class="duration">'."\n"; |
| 732 | 732 | if (isset($spotter_item['duration'])) { |
| 733 | - print '<span class="nomobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 734 | - print '<span class="mobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 733 | + print '<span class="nomobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 734 | + print '<span class="mobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 735 | 735 | } else { |
| 736 | 736 | print '<span class="nomobile">-</span>'."\n"; |
| 737 | 737 | print '<span class="mobile">-</span>'."\n"; |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
| 745 | 745 | if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') { |
| 746 | 746 | print '<td class="message"><p>'."\n"; |
| 747 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 747 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 748 | 748 | print '</p><p class="decode">'; |
| 749 | 749 | $decode_array = json_decode($spotter_item['decode']); |
| 750 | 750 | foreach ($decode_array as $key => $value) { |
@@ -754,7 +754,7 @@ discard block |
||
| 754 | 754 | print '</td>'."\n"; |
| 755 | 755 | } else { |
| 756 | 756 | print '<td class="message">'."\n"; |
| 757 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 757 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 758 | 758 | print '</td>'."\n"; |
| 759 | 759 | } |
| 760 | 760 | } |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | } |
| 780 | 780 | print '</td>'."\n"; |
| 781 | 781 | print '<td class="message">'."\n"; |
| 782 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 782 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 783 | 783 | print '</td>'."\n"; |
| 784 | 784 | } |
| 785 | 785 | if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") { |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | print '</td>'."\n"; |
| 806 | 806 | */ |
| 807 | 807 | print '<td class="message">'."\n"; |
| 808 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 808 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 809 | 809 | print '</td>'."\n"; |
| 810 | 810 | } |
| 811 | 811 | |
@@ -7,12 +7,12 @@ discard block |
||
| 7 | 7 | require_once('header.php'); |
| 8 | 8 | |
| 9 | 9 | //calculuation for the pagination |
| 10 | -if(!isset($_GET['limit'])) |
|
| 10 | +if (!isset($_GET['limit'])) |
|
| 11 | 11 | { |
| 12 | 12 | $limit_start = 0; |
| 13 | 13 | $limit_end = 25; |
| 14 | 14 | $absolute_difference = 25; |
| 15 | -} else { |
|
| 15 | +} else { |
|
| 16 | 16 | $limit_explode = explode(",", $_GET['limit']); |
| 17 | 17 | $limit_start = $limit_explode[0]; |
| 18 | 18 | $limit_end = $limit_explode[1]; |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | print '<div class="table column">'; |
| 35 | 35 | print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>'; |
| 36 | 36 | |
| 37 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 37 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 38 | 38 | $sql_begin = microtime(true); |
| 39 | 39 | $spotter_array = $Spotter->getLatestSpotterData($limit_start.",".$absolute_difference, $sort); |
| 40 | -$sql_time = microtime(true)-$sql_begin; |
|
| 40 | +$sql_time = microtime(true) - $sql_begin; |
|
| 41 | 41 | $page_begin = microtime(true); |
| 42 | 42 | if (!empty($spotter_array)) |
| 43 | 43 | { |
@@ -54,6 +54,6 @@ discard block |
||
| 54 | 54 | print '</div>'; |
| 55 | 55 | print '</div>'; |
| 56 | 56 | } |
| 57 | -$page_time = microtime(true)-$page_begin; |
|
| 57 | +$page_time = microtime(true) - $page_begin; |
|
| 58 | 58 | require_once('footer.php'); |
| 59 | 59 | ?> |
| 60 | 60 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING); |
|
| 2 | +$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING); |
|
| 3 | 3 | if ($id == "") |
| 4 | 4 | { |
| 5 | 5 | header('Location: /'); |
@@ -16,30 +16,30 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | if (!empty($spotter_array)) |
| 18 | 18 | { |
| 19 | - if(isset($spotter_array[0]['flightaware_id'])) { |
|
| 19 | + if (isset($spotter_array[0]['flightaware_id'])) { |
|
| 20 | 20 | $flightaware_id = $spotter_array[0]['flightaware_id']; |
| 21 | 21 | } |
| 22 | - if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') { |
|
| 22 | + if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') { |
|
| 23 | 23 | $latitude = $spotter_array[0]['last_latitude']; |
| 24 | - } elseif(isset($spotter_array[0]['latitude'])) { |
|
| 24 | + } elseif (isset($spotter_array[0]['latitude'])) { |
|
| 25 | 25 | $latitude = $spotter_array[0]['latitude']; |
| 26 | 26 | } |
| 27 | - if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') { |
|
| 27 | + if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') { |
|
| 28 | 28 | $longitude = $spotter_array[0]['last_longitude']; |
| 29 | - } elseif(isset($spotter_array[0]['longitude'])) { |
|
| 29 | + } elseif (isset($spotter_array[0]['longitude'])) { |
|
| 30 | 30 | $longitude = $spotter_array[0]['longitude']; |
| 31 | 31 | } |
| 32 | 32 | $title = ''; |
| 33 | - if(isset($spotter_array[0]['ident'])) { |
|
| 33 | + if (isset($spotter_array[0]['ident'])) { |
|
| 34 | 34 | $title .= $spotter_array[0]['ident']; |
| 35 | 35 | } |
| 36 | - if(isset($spotter_array[0]['airline_name'])) { |
|
| 36 | + if (isset($spotter_array[0]['airline_name'])) { |
|
| 37 | 37 | $title .= ' - '.$spotter_array[0]['airline_name']; |
| 38 | 38 | } |
| 39 | - if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 39 | + if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 40 | 40 | $title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')'; |
| 41 | 41 | } |
| 42 | - if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') { |
|
| 42 | + if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') { |
|
| 43 | 43 | $title .= ' - '.$spotter_array[0]['registration']; |
| 44 | 44 | } |
| 45 | 45 | //$facebook_meta_image = $spotter_array[0]['image']; |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | var data = google.visualization.arrayToDataTable([ |
| 65 | 65 | ["Hour","Altitude","Speed"], '; |
| 66 | 66 | $altitude_data = ''; |
| 67 | - foreach($all_data as $data) |
|
| 67 | + foreach ($all_data as $data) |
|
| 68 | 68 | { |
| 69 | - $altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],'; |
|
| 69 | + $altitude_data .= '[ "'.date("G:i", strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],'; |
|
| 70 | 70 | } |
| 71 | 71 | $altitude_data = substr($altitude_data, 0, -1); |
| 72 | 72 | print $altitude_data.']); |
@@ -108,16 +108,16 @@ discard block |
||
| 108 | 108 | print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> '; |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | - if(isset($spotter_array[0]['ident'])) { |
|
| 111 | + if (isset($spotter_array[0]['ident'])) { |
|
| 112 | 112 | print $spotter_array[0]['ident']; |
| 113 | 113 | } |
| 114 | - if(isset($spotter_array[0]['airline_name'])) { |
|
| 114 | + if (isset($spotter_array[0]['airline_name'])) { |
|
| 115 | 115 | print ' - '.$spotter_array[0]['airline_name']; |
| 116 | 116 | } |
| 117 | - if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 117 | + if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 118 | 118 | print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')'; |
| 119 | 119 | } |
| 120 | - if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') { |
|
| 120 | + if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') { |
|
| 121 | 121 | print ' - '.$spotter_array[0]['registration']; |
| 122 | 122 | } |
| 123 | 123 | print '</h1>'; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | print '</div>'; |
| 272 | 272 | */ |
| 273 | 273 | |
| 274 | - foreach($spotter_array as $spotter_item) |
|
| 274 | + foreach ($spotter_array as $spotter_item) |
|
| 275 | 275 | { |
| 276 | 276 | print '<div class="details">'; |
| 277 | 277 | print '<h3>'._("Flight Information").'</h3>'; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') { |
| 372 | 372 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 373 | 373 | print '<div class="time">'; |
| 374 | - print 'at '.date('H:m',$spotter_item['departure_airport_time']); |
|
| 374 | + print 'at '.date('H:m', $spotter_item['departure_airport_time']); |
|
| 375 | 375 | print '</div>'; |
| 376 | 376 | } else { |
| 377 | 377 | print '<div class="time">'; |
@@ -520,19 +520,19 @@ discard block |
||
| 520 | 520 | $departure_airport_info = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
| 521 | 521 | if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') { |
| 522 | 522 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 523 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm'; |
|
| 523 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 524 | 524 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 525 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi'; |
|
| 525 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 526 | 526 | } else { |
| 527 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km'; |
|
| 527 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km'; |
|
| 528 | 528 | } |
| 529 | 529 | } else { |
| 530 | 530 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 531 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm'; |
|
| 531 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 532 | 532 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 533 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi'; |
|
| 533 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 534 | 534 | } else { |
| 535 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km'; |
|
| 535 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km'; |
|
| 536 | 536 | } |
| 537 | 537 | } |
| 538 | 538 | print '</div>'; |
@@ -546,19 +546,19 @@ discard block |
||
| 546 | 546 | $arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
| 547 | 547 | if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') { |
| 548 | 548 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 549 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm'; |
|
| 549 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 550 | 550 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 551 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi'; |
|
| 551 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 552 | 552 | } else { |
| 553 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km'; |
|
| 553 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km'; |
|
| 554 | 554 | } |
| 555 | 555 | } else { |
| 556 | 556 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 557 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm'; |
|
| 557 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 558 | 558 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 559 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi'; |
|
| 559 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 560 | 560 | } else { |
| 561 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km'; |
|
| 561 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km'; |
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | print '</div>'; |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | print '<div class="last-flights">'; |
| 578 | 578 | print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$spotter_array[0]['registration'].')</h3>'; |
| 579 | 579 | $hide_th_links = true; |
| 580 | - $spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'],"0,5", ""); |
|
| 580 | + $spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'], "0,5", ""); |
|
| 581 | 581 | include('table-output.php'); |
| 582 | 582 | print '<div class="more">'; |
| 583 | 583 | print '<a href="'.$globalURL.'/registration/'.$spotter_array[0]['registration'].'" class="btn btn-default btn" role="button">See all Flights»</a>'; |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | //require_once('require/class.SpotterLive.php'); |
| 8 | 8 | require_once('require/class.SpotterArchive.php'); |
| 9 | 9 | |
| 10 | -if (!isset($_GET['owner'])){ |
|
| 10 | +if (!isset($_GET['owner'])) { |
|
| 11 | 11 | header('Location: '.$globalURL.''); |
| 12 | 12 | } else { |
| 13 | 13 | $Spotter = new Spotter(); |
| 14 | 14 | $SpotterArchive = new SpotterArchive(); |
| 15 | 15 | //$Translation = new Translation(); |
| 16 | 16 | //calculuation for the pagination |
| 17 | - if(!isset($_GET['limit'])) |
|
| 17 | + if (!isset($_GET['limit'])) |
|
| 18 | 18 | { |
| 19 | 19 | $limit_start = 0; |
| 20 | 20 | $limit_end = 25; |
@@ -35,24 +35,24 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | $page_url = $globalURL.'/owner/'.$_GET['owner']; |
| 37 | 37 | |
| 38 | - $owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING); |
|
| 39 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 38 | + $owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 39 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 40 | 40 | if ($sort != '') |
| 41 | 41 | { |
| 42 | - $spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort); |
|
| 42 | + $spotter_array = $Spotter->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, $sort); |
|
| 43 | 43 | if (empty($spotter_array)) { |
| 44 | - $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort); |
|
| 44 | + $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, $sort); |
|
| 45 | 45 | } |
| 46 | 46 | } else { |
| 47 | - $spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference); |
|
| 47 | + $spotter_array = $Spotter->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference); |
|
| 48 | 48 | if (empty($spotter_array)) { |
| 49 | - $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference); |
|
| 49 | + $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if (!empty($spotter_array)) |
| 54 | 54 | { |
| 55 | - $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']); |
|
| 55 | + $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['aircraft_owner']); |
|
| 56 | 56 | //$ident = $spotter_array[0]['ident']; |
| 57 | 57 | if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
| 58 | 58 | if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | include('owner-sub-menu.php'); |
| 128 | 128 | print '<div class="table column">'; |
| 129 | - print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the owner <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>'; |
|
| 129 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the owner <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>'; |
|
| 130 | 130 | |
| 131 | 131 | include('table-output.php'); |
| 132 | 132 | print '<div class="pagination">'; |
