Ysurac /
FlightAirMap
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
| 17 | 17 | $Connection = new Connection($dbc); |
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | public function addLastStatsUpdate($type,$stats_date) { |
| 22 | - $query = "DELETE FROM config WHERE name = :type; |
|
| 22 | + $query = "DELETE FROM config WHERE name = :type; |
|
| 23 | 23 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 24 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | - try { |
|
| 26 | - $sth = $this->db->prepare($query); |
|
| 27 | - $sth->execute($query_values); |
|
| 28 | - } catch(PDOException $e) { |
|
| 29 | - return "error : ".$e->getMessage(); |
|
| 30 | - } |
|
| 31 | - } |
|
| 24 | + $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | + try { |
|
| 26 | + $sth = $this->db->prepare($query); |
|
| 27 | + $sth->execute($query_values); |
|
| 28 | + } catch(PDOException $e) { |
|
| 29 | + return "error : ".$e->getMessage(); |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | 33 | public function getLastStatsUpdate($type = 'last_update_stats') { |
| 34 | - $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | - try { |
|
| 36 | - $sth = $this->db->prepare($query); |
|
| 37 | - $sth->execute(array(':type' => $type)); |
|
| 38 | - } catch(PDOException $e) { |
|
| 39 | - echo "error : ".$e->getMessage(); |
|
| 40 | - } |
|
| 41 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | - return $all; |
|
| 43 | - } |
|
| 44 | - public function deleteStats($filter_name = '') { |
|
| 45 | - /* |
|
| 34 | + $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | + try { |
|
| 36 | + $sth = $this->db->prepare($query); |
|
| 37 | + $sth->execute(array(':type' => $type)); |
|
| 38 | + } catch(PDOException $e) { |
|
| 39 | + echo "error : ".$e->getMessage(); |
|
| 40 | + } |
|
| 41 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | + return $all; |
|
| 43 | + } |
|
| 44 | + public function deleteStats($filter_name = '') { |
|
| 45 | + /* |
|
| 46 | 46 | $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
| 47 | 47 | try { |
| 48 | 48 | $sth = $this->db->prepare($query); |
@@ -51,109 +51,109 @@ discard block |
||
| 51 | 51 | return "error : ".$e->getMessage(); |
| 52 | 52 | } |
| 53 | 53 | */ |
| 54 | - $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | - try { |
|
| 56 | - $sth = $this->db->prepare($query); |
|
| 57 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | - } catch(PDOException $e) { |
|
| 59 | - return "error : ".$e->getMessage(); |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - public function deleteOldStats($filter_name = '') { |
|
| 63 | - if ($filter_name == '') { |
|
| 64 | - $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | - } else { |
|
| 66 | - $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | - } |
|
| 68 | - try { |
|
| 69 | - $sth = $this->db->prepare($query); |
|
| 70 | - $sth->execute(); |
|
| 71 | - } catch(PDOException $e) { |
|
| 72 | - return "error : ".$e->getMessage(); |
|
| 73 | - } |
|
| 54 | + $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | + try { |
|
| 56 | + $sth = $this->db->prepare($query); |
|
| 57 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | + } catch(PDOException $e) { |
|
| 59 | + return "error : ".$e->getMessage(); |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + public function deleteOldStats($filter_name = '') { |
|
| 63 | + if ($filter_name == '') { |
|
| 64 | + $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | + } else { |
|
| 66 | + $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | + } |
|
| 68 | + try { |
|
| 69 | + $sth = $this->db->prepare($query); |
|
| 70 | + $sth->execute(); |
|
| 71 | + } catch(PDOException $e) { |
|
| 72 | + return "error : ".$e->getMessage(); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | - try { |
|
| 77 | - $sth = $this->db->prepare($query); |
|
| 78 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error : ".$e->getMessage(); |
|
| 81 | - } |
|
| 82 | - } |
|
| 75 | + $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | + try { |
|
| 77 | + $sth = $this->db->prepare($query); |
|
| 78 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error : ".$e->getMessage(); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | public function getAllAirlineNames($filter_name = '') { |
| 84 | 84 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 85 | - $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | - try { |
|
| 87 | - $sth = $this->db->prepare($query); |
|
| 88 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | - } catch(PDOException $e) { |
|
| 90 | - echo "error : ".$e->getMessage(); |
|
| 91 | - } |
|
| 92 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | - return $all; |
|
| 94 | - } |
|
| 85 | + $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | + try { |
|
| 87 | + $sth = $this->db->prepare($query); |
|
| 88 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | + } catch(PDOException $e) { |
|
| 90 | + echo "error : ".$e->getMessage(); |
|
| 91 | + } |
|
| 92 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | + return $all; |
|
| 94 | + } |
|
| 95 | 95 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 96 | 96 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 97 | - $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | - try { |
|
| 99 | - $sth = $this->db->prepare($query); |
|
| 100 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | - } catch(PDOException $e) { |
|
| 102 | - echo "error : ".$e->getMessage(); |
|
| 103 | - } |
|
| 104 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | - return $all; |
|
| 106 | - } |
|
| 97 | + $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | + try { |
|
| 99 | + $sth = $this->db->prepare($query); |
|
| 100 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | + } catch(PDOException $e) { |
|
| 102 | + echo "error : ".$e->getMessage(); |
|
| 103 | + } |
|
| 104 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | + return $all; |
|
| 106 | + } |
|
| 107 | 107 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 108 | 108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 109 | - $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"; |
|
| 110 | - try { |
|
| 111 | - $sth = $this->db->prepare($query); |
|
| 112 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | - } catch(PDOException $e) { |
|
| 114 | - echo "error : ".$e->getMessage(); |
|
| 115 | - } |
|
| 116 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | - return $all; |
|
| 118 | - } |
|
| 109 | + $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"; |
|
| 110 | + try { |
|
| 111 | + $sth = $this->db->prepare($query); |
|
| 112 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | + } catch(PDOException $e) { |
|
| 114 | + echo "error : ".$e->getMessage(); |
|
| 115 | + } |
|
| 116 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | + return $all; |
|
| 118 | + } |
|
| 119 | 119 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 120 | 120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 121 | - $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"; |
|
| 122 | - try { |
|
| 123 | - $sth = $this->db->prepare($query); |
|
| 124 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | - } catch(PDOException $e) { |
|
| 126 | - echo "error : ".$e->getMessage(); |
|
| 127 | - } |
|
| 128 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | - return $all; |
|
| 130 | - } |
|
| 121 | + $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"; |
|
| 122 | + try { |
|
| 123 | + $sth = $this->db->prepare($query); |
|
| 124 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | + } catch(PDOException $e) { |
|
| 126 | + echo "error : ".$e->getMessage(); |
|
| 127 | + } |
|
| 128 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | + return $all; |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | 132 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | - $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | - try { |
|
| 136 | - $sth = $this->db->prepare($query); |
|
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 139 | - echo "error : ".$e->getMessage(); |
|
| 140 | - } |
|
| 141 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | - return $all; |
|
| 143 | - } |
|
| 134 | + $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | + try { |
|
| 136 | + $sth = $this->db->prepare($query); |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | + } catch(PDOException $e) { |
|
| 139 | + echo "error : ".$e->getMessage(); |
|
| 140 | + } |
|
| 141 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | + return $all; |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | 145 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | - $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | - try { |
|
| 149 | - $sth = $this->db->prepare($query); |
|
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 152 | - echo "error : ".$e->getMessage(); |
|
| 153 | - } |
|
| 154 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | - return $all; |
|
| 156 | - } |
|
| 147 | + $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | + try { |
|
| 149 | + $sth = $this->db->prepare($query); |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | + } catch(PDOException $e) { |
|
| 152 | + echo "error : ".$e->getMessage(); |
|
| 153 | + } |
|
| 154 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | + return $all; |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
@@ -170,16 +170,16 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | 172 | } else $all = array(); |
| 173 | - if (empty($all)) { |
|
| 174 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | - if ($filter_name != '') { |
|
| 176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | - } |
|
| 178 | - $Spotter = new Spotter($this->db); |
|
| 179 | - //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | - } |
|
| 182 | - return $all; |
|
| 173 | + if (empty($all)) { |
|
| 174 | + $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | + if ($filter_name != '') { |
|
| 176 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | + } |
|
| 178 | + $Spotter = new Spotter($this->db); |
|
| 179 | + //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | + $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | + } |
|
| 182 | + return $all; |
|
| 183 | 183 | } |
| 184 | 184 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 185 | 185 | global $globalStatsFilters; |
@@ -195,17 +195,17 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 197 | 197 | } else $all = array(); |
| 198 | - if (empty($all)) { |
|
| 199 | - $Spotter = new Spotter($this->db); |
|
| 200 | - $filters = array(); |
|
| 201 | - $filters = array('year' => $year,'month' => $month); |
|
| 202 | - if ($filter_name != '') { |
|
| 203 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | - } |
|
| 205 | - //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | - } |
|
| 208 | - return $all; |
|
| 198 | + if (empty($all)) { |
|
| 199 | + $Spotter = new Spotter($this->db); |
|
| 200 | + $filters = array(); |
|
| 201 | + $filters = array('year' => $year,'month' => $month); |
|
| 202 | + if ($filter_name != '') { |
|
| 203 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | + } |
|
| 205 | + //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | + $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | + } |
|
| 208 | + return $all; |
|
| 209 | 209 | } |
| 210 | 210 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 211 | 211 | global $globalStatsFilters; |
@@ -247,39 +247,39 @@ discard block |
||
| 247 | 247 | } |
| 248 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | 249 | } else $all = array(); |
| 250 | - if (empty($all)) { |
|
| 250 | + if (empty($all)) { |
|
| 251 | 251 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 252 | 252 | if ($filter_name != '') { |
| 253 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 253 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 254 | 254 | } |
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 257 | 257 | $all = $Spotter->countAllArrivalCountries($limit,$filters); |
| 258 | - } |
|
| 259 | - return $all; |
|
| 258 | + } |
|
| 259 | + return $all; |
|
| 260 | 260 | } |
| 261 | 261 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 262 | 262 | global $globalStatsFilters; |
| 263 | 263 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 264 | 264 | 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"; |
| 265 | 265 | 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"; |
| 266 | - try { |
|
| 267 | - $sth = $this->db->prepare($query); |
|
| 268 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | - } catch(PDOException $e) { |
|
| 270 | - echo "error : ".$e->getMessage(); |
|
| 271 | - } |
|
| 272 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | - if (empty($all)) { |
|
| 266 | + try { |
|
| 267 | + $sth = $this->db->prepare($query); |
|
| 268 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | + } catch(PDOException $e) { |
|
| 270 | + echo "error : ".$e->getMessage(); |
|
| 271 | + } |
|
| 272 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + if (empty($all)) { |
|
| 274 | 274 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 275 | 275 | if ($filter_name != '') { |
| 276 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 276 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 277 | 277 | } |
| 278 | 278 | $Spotter = new Spotter($this->db); |
| 279 | 279 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
| 280 | 280 | $all = $Spotter->countAllDepartureCountries($filters); |
| 281 | - } |
|
| 282 | - return $all; |
|
| 281 | + } |
|
| 282 | + return $all; |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
@@ -305,17 +305,17 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 307 | 307 | } else $all = array(); |
| 308 | - if (empty($all)) { |
|
| 309 | - $Spotter = new Spotter($this->db); |
|
| 310 | - $filters = array(); |
|
| 308 | + if (empty($all)) { |
|
| 309 | + $Spotter = new Spotter($this->db); |
|
| 310 | + $filters = array(); |
|
| 311 | 311 | $filters = array('year' => $year,'month' => $month); |
| 312 | - if ($filter_name != '') { |
|
| 313 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 312 | + if ($filter_name != '') { |
|
| 313 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 314 | 314 | } |
| 315 | 315 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 316 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | - } |
|
| 318 | - return $all; |
|
| 316 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | + } |
|
| 318 | + return $all; |
|
| 319 | 319 | } |
| 320 | 320 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 321 | 321 | global $globalStatsFilters; |
@@ -331,16 +331,16 @@ discard block |
||
| 331 | 331 | } |
| 332 | 332 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | 333 | } else $all = array(); |
| 334 | - if (empty($all)) { |
|
| 334 | + if (empty($all)) { |
|
| 335 | 335 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 336 | 336 | if ($filter_name != '') { |
| 337 | 337 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 338 | 338 | } |
| 339 | - $Spotter = new Spotter($this->db); |
|
| 340 | - //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | - } |
|
| 343 | - return $all; |
|
| 339 | + $Spotter = new Spotter($this->db); |
|
| 340 | + //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | + $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | + } |
|
| 343 | + return $all; |
|
| 344 | 344 | } |
| 345 | 345 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 346 | 346 | global $globalStatsFilters; |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | echo "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 384 | - /* |
|
| 384 | + /* |
|
| 385 | 385 | if (empty($all)) { |
| 386 | 386 | $Spotter = new Spotter($this->db); |
| 387 | 387 | $all = $Spotter->countAllFlightOverCountries($limit); |
@@ -433,16 +433,16 @@ discard block |
||
| 433 | 433 | } |
| 434 | 434 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | 435 | } else $all = array(); |
| 436 | - if (empty($all)) { |
|
| 436 | + if (empty($all)) { |
|
| 437 | 437 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 438 | 438 | if ($filter_name != '') { |
| 439 | 439 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 440 | 440 | } |
| 441 | - $Spotter = new Spotter($this->db); |
|
| 442 | - //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | - } |
|
| 445 | - return $all; |
|
| 441 | + $Spotter = new Spotter($this->db); |
|
| 442 | + //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | + $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | + } |
|
| 445 | + return $all; |
|
| 446 | 446 | } |
| 447 | 447 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 448 | 448 | global $globalStatsFilters; |
@@ -458,35 +458,35 @@ discard block |
||
| 458 | 458 | } |
| 459 | 459 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | 460 | } else $all = array(); |
| 461 | - if (empty($all)) { |
|
| 461 | + if (empty($all)) { |
|
| 462 | 462 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 463 | - if ($filter_name != '') { |
|
| 464 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 463 | + if ($filter_name != '') { |
|
| 464 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 465 | 465 | } |
| 466 | - $Spotter = new Spotter($this->db); |
|
| 466 | + $Spotter = new Spotter($this->db); |
|
| 467 | 467 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 468 | 468 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 469 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | - $all = array(); |
|
| 472 | - foreach ($pall as $value) { |
|
| 473 | - $icao = $value['airport_departure_icao']; |
|
| 474 | - $all[$icao] = $value; |
|
| 475 | - } |
|
| 469 | + $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | + $all = array(); |
|
| 472 | + foreach ($pall as $value) { |
|
| 473 | + $icao = $value['airport_departure_icao']; |
|
| 474 | + $all[$icao] = $value; |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - foreach ($dall as $value) { |
|
| 478 | - $icao = $value['airport_departure_icao']; |
|
| 479 | - if (isset($all[$icao])) { |
|
| 480 | - $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | - } else $all[$icao] = $value; |
|
| 482 | - } |
|
| 483 | - $count = array(); |
|
| 484 | - foreach ($all as $key => $row) { |
|
| 485 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | - } |
|
| 487 | - array_multisort($count,SORT_DESC,$all); |
|
| 488 | - } |
|
| 489 | - return $all; |
|
| 477 | + foreach ($dall as $value) { |
|
| 478 | + $icao = $value['airport_departure_icao']; |
|
| 479 | + if (isset($all[$icao])) { |
|
| 480 | + $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | + } else $all[$icao] = $value; |
|
| 482 | + } |
|
| 483 | + $count = array(); |
|
| 484 | + foreach ($all as $key => $row) { |
|
| 485 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | + } |
|
| 487 | + array_multisort($count,SORT_DESC,$all); |
|
| 488 | + } |
|
| 489 | + return $all; |
|
| 490 | 490 | } |
| 491 | 491 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 492 | 492 | global $globalStatsFilters; |
@@ -512,26 +512,26 @@ discard block |
||
| 512 | 512 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 513 | 513 | $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
| 514 | 514 | $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
| 515 | - $all = array(); |
|
| 516 | - foreach ($pall as $value) { |
|
| 517 | - $icao = $value['airport_arrival_icao']; |
|
| 518 | - $all[$icao] = $value; |
|
| 519 | - } |
|
| 515 | + $all = array(); |
|
| 516 | + foreach ($pall as $value) { |
|
| 517 | + $icao = $value['airport_arrival_icao']; |
|
| 518 | + $all[$icao] = $value; |
|
| 519 | + } |
|
| 520 | 520 | |
| 521 | - foreach ($dall as $value) { |
|
| 522 | - $icao = $value['airport_arrival_icao']; |
|
| 523 | - if (isset($all[$icao])) { |
|
| 524 | - $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | - } else $all[$icao] = $value; |
|
| 526 | - } |
|
| 527 | - $count = array(); |
|
| 528 | - foreach ($all as $key => $row) { |
|
| 529 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | - } |
|
| 531 | - array_multisort($count,SORT_DESC,$all); |
|
| 532 | - } |
|
| 521 | + foreach ($dall as $value) { |
|
| 522 | + $icao = $value['airport_arrival_icao']; |
|
| 523 | + if (isset($all[$icao])) { |
|
| 524 | + $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | + } else $all[$icao] = $value; |
|
| 526 | + } |
|
| 527 | + $count = array(); |
|
| 528 | + foreach ($all as $key => $row) { |
|
| 529 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | + } |
|
| 531 | + array_multisort($count,SORT_DESC,$all); |
|
| 532 | + } |
|
| 533 | 533 | |
| 534 | - return $all; |
|
| 534 | + return $all; |
|
| 535 | 535 | } |
| 536 | 536 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 537 | 537 | global $globalDBdriver, $globalStatsFilters; |
@@ -544,23 +544,23 @@ discard block |
||
| 544 | 544 | 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"; |
| 545 | 545 | } |
| 546 | 546 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 547 | - try { |
|
| 548 | - $sth = $this->db->prepare($query); |
|
| 549 | - $sth->execute($query_data); |
|
| 550 | - } catch(PDOException $e) { |
|
| 551 | - echo "error : ".$e->getMessage(); |
|
| 552 | - } |
|
| 553 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | - if (empty($all)) { |
|
| 547 | + try { |
|
| 548 | + $sth = $this->db->prepare($query); |
|
| 549 | + $sth->execute($query_data); |
|
| 550 | + } catch(PDOException $e) { |
|
| 551 | + echo "error : ".$e->getMessage(); |
|
| 552 | + } |
|
| 553 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | + if (empty($all)) { |
|
| 555 | 555 | $filters = array('airlines' => array($stats_airline)); |
| 556 | 556 | if ($filter_name != '') { |
| 557 | 557 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 558 | 558 | } |
| 559 | - $Spotter = new Spotter($this->db); |
|
| 560 | - $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | - } |
|
| 559 | + $Spotter = new Spotter($this->db); |
|
| 560 | + $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | + } |
|
| 562 | 562 | |
| 563 | - return $all; |
|
| 563 | + return $all; |
|
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
@@ -568,22 +568,22 @@ discard block |
||
| 568 | 568 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 569 | 569 | $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"; |
| 570 | 570 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 571 | - try { |
|
| 572 | - $sth = $this->db->prepare($query); |
|
| 573 | - $sth->execute($query_data); |
|
| 574 | - } catch(PDOException $e) { |
|
| 575 | - echo "error : ".$e->getMessage(); |
|
| 576 | - } |
|
| 577 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | - if (empty($all)) { |
|
| 571 | + try { |
|
| 572 | + $sth = $this->db->prepare($query); |
|
| 573 | + $sth->execute($query_data); |
|
| 574 | + } catch(PDOException $e) { |
|
| 575 | + echo "error : ".$e->getMessage(); |
|
| 576 | + } |
|
| 577 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | + if (empty($all)) { |
|
| 579 | 579 | $filters = array('airlines' => array($stats_airline)); |
| 580 | 580 | if ($filter_name != '') { |
| 581 | 581 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 582 | 582 | } |
| 583 | - $Spotter = new Spotter($this->db); |
|
| 584 | - $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | - } |
|
| 586 | - return $all; |
|
| 583 | + $Spotter = new Spotter($this->db); |
|
| 584 | + $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | + } |
|
| 586 | + return $all; |
|
| 587 | 587 | } |
| 588 | 588 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 589 | 589 | global $globalDBdriver, $globalStatsFilters; |
@@ -594,66 +594,66 @@ discard block |
||
| 594 | 594 | $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"; |
| 595 | 595 | } |
| 596 | 596 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 597 | - try { |
|
| 598 | - $sth = $this->db->prepare($query); |
|
| 599 | - $sth->execute($query_data); |
|
| 600 | - } catch(PDOException $e) { |
|
| 601 | - echo "error : ".$e->getMessage(); |
|
| 602 | - } |
|
| 603 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | - if (empty($all)) { |
|
| 597 | + try { |
|
| 598 | + $sth = $this->db->prepare($query); |
|
| 599 | + $sth->execute($query_data); |
|
| 600 | + } catch(PDOException $e) { |
|
| 601 | + echo "error : ".$e->getMessage(); |
|
| 602 | + } |
|
| 603 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | + if (empty($all)) { |
|
| 605 | 605 | $filters = array('airlines' => array($stats_airline)); |
| 606 | 606 | if ($filter_name != '') { |
| 607 | 607 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 608 | 608 | } |
| 609 | - $Spotter = new Spotter($this->db); |
|
| 610 | - $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | - } |
|
| 612 | - return $all; |
|
| 609 | + $Spotter = new Spotter($this->db); |
|
| 610 | + $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | + } |
|
| 612 | + return $all; |
|
| 613 | 613 | } |
| 614 | 614 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 615 | 615 | global $globalStatsFilters; |
| 616 | 616 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 617 | 617 | $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"; |
| 618 | 618 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 619 | - try { |
|
| 620 | - $sth = $this->db->prepare($query); |
|
| 621 | - $sth->execute($query_data); |
|
| 622 | - } catch(PDOException $e) { |
|
| 623 | - echo "error : ".$e->getMessage(); |
|
| 624 | - } |
|
| 625 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | - if (empty($all)) { |
|
| 619 | + try { |
|
| 620 | + $sth = $this->db->prepare($query); |
|
| 621 | + $sth->execute($query_data); |
|
| 622 | + } catch(PDOException $e) { |
|
| 623 | + echo "error : ".$e->getMessage(); |
|
| 624 | + } |
|
| 625 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | + if (empty($all)) { |
|
| 627 | 627 | $filters = array('airlines' => array($stats_airline)); |
| 628 | 628 | if ($filter_name != '') { |
| 629 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 629 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 630 | 630 | } |
| 631 | - $Spotter = new Spotter($this->db); |
|
| 632 | - $all = $Spotter->countAllDates($filters); |
|
| 633 | - } |
|
| 634 | - return $all; |
|
| 631 | + $Spotter = new Spotter($this->db); |
|
| 632 | + $all = $Spotter->countAllDates($filters); |
|
| 633 | + } |
|
| 634 | + return $all; |
|
| 635 | 635 | } |
| 636 | 636 | public function countAllDatesByAirlines($filter_name = '') { |
| 637 | 637 | global $globalStatsFilters; |
| 638 | 638 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 639 | 639 | $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"; |
| 640 | 640 | $query_data = array('filter_name' => $filter_name); |
| 641 | - try { |
|
| 642 | - $sth = $this->db->prepare($query); |
|
| 643 | - $sth->execute($query_data); |
|
| 644 | - } catch(PDOException $e) { |
|
| 645 | - echo "error : ".$e->getMessage(); |
|
| 646 | - } |
|
| 647 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | - if (empty($all)) { |
|
| 649 | - $filters = array(); |
|
| 650 | - if ($filter_name != '') { |
|
| 651 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 641 | + try { |
|
| 642 | + $sth = $this->db->prepare($query); |
|
| 643 | + $sth->execute($query_data); |
|
| 644 | + } catch(PDOException $e) { |
|
| 645 | + echo "error : ".$e->getMessage(); |
|
| 646 | + } |
|
| 647 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | + if (empty($all)) { |
|
| 649 | + $filters = array(); |
|
| 650 | + if ($filter_name != '') { |
|
| 651 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 652 | 652 | } |
| 653 | - $Spotter = new Spotter($this->db); |
|
| 654 | - $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | - } |
|
| 656 | - return $all; |
|
| 653 | + $Spotter = new Spotter($this->db); |
|
| 654 | + $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | + } |
|
| 656 | + return $all; |
|
| 657 | 657 | } |
| 658 | 658 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 659 | 659 | global $globalStatsFilters, $globalDBdriver; |
@@ -663,24 +663,24 @@ discard block |
||
| 663 | 663 | } else { |
| 664 | 664 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM 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"; |
| 665 | 665 | } |
| 666 | - try { |
|
| 667 | - $sth = $this->db->prepare($query); |
|
| 668 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | - } catch(PDOException $e) { |
|
| 670 | - echo "error : ".$e->getMessage(); |
|
| 671 | - } |
|
| 672 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 666 | + try { |
|
| 667 | + $sth = $this->db->prepare($query); |
|
| 668 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | + } catch(PDOException $e) { |
|
| 670 | + echo "error : ".$e->getMessage(); |
|
| 671 | + } |
|
| 672 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 673 | 673 | |
| 674 | - if (empty($all)) { |
|
| 674 | + if (empty($all)) { |
|
| 675 | 675 | $filters = array('airlines' => array($stats_airline)); |
| 676 | 676 | if ($filter_name != '') { |
| 677 | 677 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 678 | 678 | } |
| 679 | - $Spotter = new Spotter($this->db); |
|
| 680 | - $all = $Spotter->countAllMonths($filters); |
|
| 681 | - } |
|
| 679 | + $Spotter = new Spotter($this->db); |
|
| 680 | + $all = $Spotter->countAllMonths($filters); |
|
| 681 | + } |
|
| 682 | 682 | |
| 683 | - return $all; |
|
| 683 | + return $all; |
|
| 684 | 684 | } |
| 685 | 685 | public function countFatalitiesLast12Months() { |
| 686 | 686 | global $globalStatsFilters, $globalDBdriver; |
@@ -689,19 +689,19 @@ discard block |
||
| 689 | 689 | } else { |
| 690 | 690 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date"; |
| 691 | 691 | } |
| 692 | - try { |
|
| 693 | - $sth = $this->db->prepare($query); |
|
| 694 | - $sth->execute(); |
|
| 695 | - } catch(PDOException $e) { |
|
| 696 | - echo "error : ".$e->getMessage(); |
|
| 697 | - } |
|
| 698 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 692 | + try { |
|
| 693 | + $sth = $this->db->prepare($query); |
|
| 694 | + $sth->execute(); |
|
| 695 | + } catch(PDOException $e) { |
|
| 696 | + echo "error : ".$e->getMessage(); |
|
| 697 | + } |
|
| 698 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 699 | 699 | |
| 700 | - if (empty($all)) { |
|
| 701 | - $Accident = new Accident($this->db); |
|
| 702 | - $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | - } |
|
| 704 | - return $all; |
|
| 700 | + if (empty($all)) { |
|
| 701 | + $Accident = new Accident($this->db); |
|
| 702 | + $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | + } |
|
| 704 | + return $all; |
|
| 705 | 705 | } |
| 706 | 706 | public function countFatalitiesByYear() { |
| 707 | 707 | global $globalStatsFilters, $globalDBdriver; |
@@ -710,40 +710,40 @@ discard block |
||
| 710 | 710 | } else { |
| 711 | 711 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date"; |
| 712 | 712 | } |
| 713 | - try { |
|
| 714 | - $sth = $this->db->prepare($query); |
|
| 715 | - $sth->execute(); |
|
| 716 | - } catch(PDOException $e) { |
|
| 717 | - echo "error : ".$e->getMessage(); |
|
| 718 | - } |
|
| 719 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 713 | + try { |
|
| 714 | + $sth = $this->db->prepare($query); |
|
| 715 | + $sth->execute(); |
|
| 716 | + } catch(PDOException $e) { |
|
| 717 | + echo "error : ".$e->getMessage(); |
|
| 718 | + } |
|
| 719 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 720 | 720 | |
| 721 | - if (empty($all)) { |
|
| 722 | - $Accident = new Accident($this->db); |
|
| 723 | - $all = $Accident->countFatalitiesByYear(); |
|
| 724 | - } |
|
| 725 | - return $all; |
|
| 721 | + if (empty($all)) { |
|
| 722 | + $Accident = new Accident($this->db); |
|
| 723 | + $all = $Accident->countFatalitiesByYear(); |
|
| 724 | + } |
|
| 725 | + return $all; |
|
| 726 | 726 | } |
| 727 | 727 | public function countAllMilitaryMonths($filter_name = '') { |
| 728 | 728 | global $globalStatsFilters; |
| 729 | 729 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 730 | - $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"; |
|
| 731 | - try { |
|
| 732 | - $sth = $this->db->prepare($query); |
|
| 733 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | - } catch(PDOException $e) { |
|
| 735 | - echo "error : ".$e->getMessage(); |
|
| 736 | - } |
|
| 737 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | - if (empty($all)) { |
|
| 739 | - $filters = array(); |
|
| 740 | - if ($filter_name != '') { |
|
| 741 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 730 | + $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"; |
|
| 731 | + try { |
|
| 732 | + $sth = $this->db->prepare($query); |
|
| 733 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | + } catch(PDOException $e) { |
|
| 735 | + echo "error : ".$e->getMessage(); |
|
| 736 | + } |
|
| 737 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | + if (empty($all)) { |
|
| 739 | + $filters = array(); |
|
| 740 | + if ($filter_name != '') { |
|
| 741 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 742 | 742 | } |
| 743 | - $Spotter = new Spotter($this->db); |
|
| 744 | - $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | - } |
|
| 746 | - return $all; |
|
| 743 | + $Spotter = new Spotter($this->db); |
|
| 744 | + $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | + } |
|
| 746 | + return $all; |
|
| 747 | 747 | } |
| 748 | 748 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 749 | 749 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
@@ -759,22 +759,22 @@ discard block |
||
| 759 | 759 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 760 | 760 | } |
| 761 | 761 | if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
| 762 | - try { |
|
| 763 | - $sth = $this->db->prepare($query); |
|
| 764 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | - } catch(PDOException $e) { |
|
| 766 | - echo "error : ".$e->getMessage(); |
|
| 767 | - } |
|
| 768 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | - if (empty($all)) { |
|
| 762 | + try { |
|
| 763 | + $sth = $this->db->prepare($query); |
|
| 764 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | + } catch(PDOException $e) { |
|
| 766 | + echo "error : ".$e->getMessage(); |
|
| 767 | + } |
|
| 768 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | + if (empty($all)) { |
|
| 770 | 770 | $filters = array('airlines' => array($stats_airline)); |
| 771 | 771 | if ($filter_name != '') { |
| 772 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 772 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 773 | 773 | } |
| 774 | - $Spotter = new Spotter($this->db); |
|
| 775 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | - } |
|
| 777 | - return $all; |
|
| 774 | + $Spotter = new Spotter($this->db); |
|
| 775 | + $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | + } |
|
| 777 | + return $all; |
|
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
@@ -799,10 +799,10 @@ discard block |
||
| 799 | 799 | if ($year == '') $year = date('Y'); |
| 800 | 800 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 801 | 801 | if (empty($all)) { |
| 802 | - $filters = array(); |
|
| 802 | + $filters = array(); |
|
| 803 | 803 | $filters = array('year' => $year,'month' => $month); |
| 804 | - if ($filter_name != '') { |
|
| 805 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 804 | + if ($filter_name != '') { |
|
| 805 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 806 | 806 | } |
| 807 | 807 | $Spotter = new Spotter($this->db); |
| 808 | 808 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -866,10 +866,10 @@ discard block |
||
| 866 | 866 | $all = $result[0]['nb_airline']; |
| 867 | 867 | } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
| 868 | 868 | if (empty($all)) { |
| 869 | - $filters = array(); |
|
| 869 | + $filters = array(); |
|
| 870 | 870 | $filters = array('year' => $year,'month' => $month); |
| 871 | - if ($filter_name != '') { |
|
| 872 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 871 | + if ($filter_name != '') { |
|
| 872 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 873 | 873 | } |
| 874 | 874 | $Spotter = new Spotter($this->db); |
| 875 | 875 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -939,46 +939,46 @@ discard block |
||
| 939 | 939 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 940 | 940 | $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"; |
| 941 | 941 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 942 | - try { |
|
| 943 | - $sth = $this->db->prepare($query); |
|
| 944 | - $sth->execute($query_values); |
|
| 945 | - } catch(PDOException $e) { |
|
| 946 | - echo "error : ".$e->getMessage(); |
|
| 947 | - } |
|
| 948 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | - return $all; |
|
| 942 | + try { |
|
| 943 | + $sth = $this->db->prepare($query); |
|
| 944 | + $sth->execute($query_values); |
|
| 945 | + } catch(PDOException $e) { |
|
| 946 | + echo "error : ".$e->getMessage(); |
|
| 947 | + } |
|
| 948 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | + return $all; |
|
| 950 | 950 | } |
| 951 | 951 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 952 | 952 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 953 | - $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | - try { |
|
| 956 | - $sth = $this->db->prepare($query); |
|
| 957 | - $sth->execute($query_values); |
|
| 958 | - } catch(PDOException $e) { |
|
| 959 | - echo "error : ".$e->getMessage(); |
|
| 960 | - } |
|
| 961 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | - return $all; |
|
| 963 | - } |
|
| 953 | + $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | + try { |
|
| 956 | + $sth = $this->db->prepare($query); |
|
| 957 | + $sth->execute($query_values); |
|
| 958 | + } catch(PDOException $e) { |
|
| 959 | + echo "error : ".$e->getMessage(); |
|
| 960 | + } |
|
| 961 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | + return $all; |
|
| 963 | + } |
|
| 964 | 964 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 965 | 965 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | - $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | - try { |
|
| 969 | - $sth = $this->db->prepare($query); |
|
| 970 | - $sth->execute($query_values); |
|
| 971 | - } catch(PDOException $e) { |
|
| 972 | - echo "error : ".$e->getMessage(); |
|
| 973 | - } |
|
| 974 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 975 | - return $all; |
|
| 976 | - } |
|
| 966 | + $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | + try { |
|
| 969 | + $sth = $this->db->prepare($query); |
|
| 970 | + $sth->execute($query_values); |
|
| 971 | + } catch(PDOException $e) { |
|
| 972 | + echo "error : ".$e->getMessage(); |
|
| 973 | + } |
|
| 974 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 975 | + return $all; |
|
| 976 | + } |
|
| 977 | 977 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 978 | 978 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 979 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 980 | - if ($globalDBdriver == 'mysql') { |
|
| 981 | - if ($month == '') { |
|
| 979 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 980 | + if ($globalDBdriver == 'mysql') { |
|
| 981 | + if ($month == '') { |
|
| 982 | 982 | $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"; |
| 983 | 983 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 984 | 984 | } else { |
@@ -993,165 +993,165 @@ discard block |
||
| 993 | 993 | $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"; |
| 994 | 994 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
| 995 | 995 | } |
| 996 | - } |
|
| 997 | - try { |
|
| 998 | - $sth = $this->db->prepare($query); |
|
| 999 | - $sth->execute($query_values); |
|
| 1000 | - } catch(PDOException $e) { |
|
| 1001 | - echo "error : ".$e->getMessage(); |
|
| 1002 | - } |
|
| 1003 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1004 | - return $all[0]['total']; |
|
| 1005 | - } |
|
| 996 | + } |
|
| 997 | + try { |
|
| 998 | + $sth = $this->db->prepare($query); |
|
| 999 | + $sth->execute($query_values); |
|
| 1000 | + } catch(PDOException $e) { |
|
| 1001 | + echo "error : ".$e->getMessage(); |
|
| 1002 | + } |
|
| 1003 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1004 | + return $all[0]['total']; |
|
| 1005 | + } |
|
| 1006 | 1006 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1007 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1007 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1008 | 1008 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1009 | - if ($globalDBdriver == 'mysql') { |
|
| 1009 | + if ($globalDBdriver == 'mysql') { |
|
| 1010 | 1010 | $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"; |
| 1011 | 1011 | } else { |
| 1012 | 1012 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1013 | - } |
|
| 1014 | - $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1015 | - try { |
|
| 1016 | - $sth = $this->db->prepare($query); |
|
| 1017 | - $sth->execute($query_values); |
|
| 1018 | - } catch(PDOException $e) { |
|
| 1019 | - echo "error : ".$e->getMessage(); |
|
| 1020 | - } |
|
| 1021 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1022 | - return $all[0]['total']; |
|
| 1023 | - } |
|
| 1013 | + } |
|
| 1014 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1015 | + try { |
|
| 1016 | + $sth = $this->db->prepare($query); |
|
| 1017 | + $sth->execute($query_values); |
|
| 1018 | + } catch(PDOException $e) { |
|
| 1019 | + echo "error : ".$e->getMessage(); |
|
| 1020 | + } |
|
| 1021 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1022 | + return $all[0]['total']; |
|
| 1023 | + } |
|
| 1024 | 1024 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1025 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1025 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1026 | 1026 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1027 | - if ($globalDBdriver == 'mysql') { |
|
| 1027 | + if ($globalDBdriver == 'mysql') { |
|
| 1028 | 1028 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1029 | - } else { |
|
| 1029 | + } else { |
|
| 1030 | 1030 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1031 | - } |
|
| 1032 | - try { |
|
| 1033 | - $sth = $this->db->prepare($query); |
|
| 1034 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1035 | - } catch(PDOException $e) { |
|
| 1036 | - echo "error : ".$e->getMessage(); |
|
| 1037 | - } |
|
| 1038 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1039 | - return $all[0]['total']; |
|
| 1040 | - } |
|
| 1031 | + } |
|
| 1032 | + try { |
|
| 1033 | + $sth = $this->db->prepare($query); |
|
| 1034 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1035 | + } catch(PDOException $e) { |
|
| 1036 | + echo "error : ".$e->getMessage(); |
|
| 1037 | + } |
|
| 1038 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1039 | + return $all[0]['total']; |
|
| 1040 | + } |
|
| 1041 | 1041 | public function getStatsAirlineTotal($filter_name = '') { |
| 1042 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1042 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1043 | 1043 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1044 | - if ($globalDBdriver == 'mysql') { |
|
| 1044 | + if ($globalDBdriver == 'mysql') { |
|
| 1045 | 1045 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1046 | - } else { |
|
| 1046 | + } else { |
|
| 1047 | 1047 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1048 | - } |
|
| 1049 | - try { |
|
| 1050 | - $sth = $this->db->prepare($query); |
|
| 1051 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1052 | - } catch(PDOException $e) { |
|
| 1053 | - echo "error : ".$e->getMessage(); |
|
| 1054 | - } |
|
| 1055 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1056 | - return $all[0]['total']; |
|
| 1057 | - } |
|
| 1048 | + } |
|
| 1049 | + try { |
|
| 1050 | + $sth = $this->db->prepare($query); |
|
| 1051 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1052 | + } catch(PDOException $e) { |
|
| 1053 | + echo "error : ".$e->getMessage(); |
|
| 1054 | + } |
|
| 1055 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1056 | + return $all[0]['total']; |
|
| 1057 | + } |
|
| 1058 | 1058 | public function getStatsOwnerTotal($filter_name = '') { |
| 1059 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1059 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1060 | 1060 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1061 | - if ($globalDBdriver == 'mysql') { |
|
| 1061 | + if ($globalDBdriver == 'mysql') { |
|
| 1062 | 1062 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1063 | 1063 | } else { |
| 1064 | 1064 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1065 | - } |
|
| 1066 | - try { |
|
| 1067 | - $sth = $this->db->prepare($query); |
|
| 1068 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1069 | - } catch(PDOException $e) { |
|
| 1070 | - echo "error : ".$e->getMessage(); |
|
| 1071 | - } |
|
| 1072 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1073 | - return $all[0]['total']; |
|
| 1074 | - } |
|
| 1065 | + } |
|
| 1066 | + try { |
|
| 1067 | + $sth = $this->db->prepare($query); |
|
| 1068 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1069 | + } catch(PDOException $e) { |
|
| 1070 | + echo "error : ".$e->getMessage(); |
|
| 1071 | + } |
|
| 1072 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1073 | + return $all[0]['total']; |
|
| 1074 | + } |
|
| 1075 | 1075 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1076 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1076 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1077 | 1077 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1078 | 1078 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1079 | - try { |
|
| 1080 | - $sth = $this->db->prepare($query); |
|
| 1081 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1082 | - } catch(PDOException $e) { |
|
| 1083 | - echo "error : ".$e->getMessage(); |
|
| 1084 | - } |
|
| 1085 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1086 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1087 | - else return 0; |
|
| 1088 | - } |
|
| 1079 | + try { |
|
| 1080 | + $sth = $this->db->prepare($query); |
|
| 1081 | + $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1082 | + } catch(PDOException $e) { |
|
| 1083 | + echo "error : ".$e->getMessage(); |
|
| 1084 | + } |
|
| 1085 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1086 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1087 | + else return 0; |
|
| 1088 | + } |
|
| 1089 | 1089 | public function getStatsPilotTotal($filter_name = '') { |
| 1090 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1090 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1091 | 1091 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1092 | - if ($globalDBdriver == 'mysql') { |
|
| 1093 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | - } else { |
|
| 1095 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1096 | - } |
|
| 1097 | - try { |
|
| 1098 | - $sth = $this->db->prepare($query); |
|
| 1099 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1100 | - } catch(PDOException $e) { |
|
| 1101 | - echo "error : ".$e->getMessage(); |
|
| 1102 | - } |
|
| 1103 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1104 | - return $all[0]['total']; |
|
| 1105 | - } |
|
| 1092 | + if ($globalDBdriver == 'mysql') { |
|
| 1093 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | + } else { |
|
| 1095 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1096 | + } |
|
| 1097 | + try { |
|
| 1098 | + $sth = $this->db->prepare($query); |
|
| 1099 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1100 | + } catch(PDOException $e) { |
|
| 1101 | + echo "error : ".$e->getMessage(); |
|
| 1102 | + } |
|
| 1103 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1104 | + return $all[0]['total']; |
|
| 1105 | + } |
|
| 1106 | 1106 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1107 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1107 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1108 | 1108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1109 | 1109 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1110 | - try { |
|
| 1111 | - $sth = $this->db->prepare($query); |
|
| 1112 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1113 | - } catch(PDOException $e) { |
|
| 1114 | - echo "error : ".$e->getMessage(); |
|
| 1115 | - } |
|
| 1116 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1117 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1118 | - else return 0; |
|
| 1119 | - } |
|
| 1110 | + try { |
|
| 1111 | + $sth = $this->db->prepare($query); |
|
| 1112 | + $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1113 | + } catch(PDOException $e) { |
|
| 1114 | + echo "error : ".$e->getMessage(); |
|
| 1115 | + } |
|
| 1116 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1117 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1118 | + else return 0; |
|
| 1119 | + } |
|
| 1120 | 1120 | |
| 1121 | 1121 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1122 | 1122 | global $globalDBdriver; |
| 1123 | 1123 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1124 | 1124 | if ($globalDBdriver == 'mysql') { |
| 1125 | 1125 | $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"; |
| 1126 | - } else { |
|
| 1126 | + } else { |
|
| 1127 | 1127 | $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);"; |
| 1128 | 1128 | } |
| 1129 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1130 | - try { |
|
| 1131 | - $sth = $this->db->prepare($query); |
|
| 1132 | - $sth->execute($query_values); |
|
| 1133 | - } catch(PDOException $e) { |
|
| 1134 | - return "error : ".$e->getMessage(); |
|
| 1135 | - } |
|
| 1136 | - } |
|
| 1129 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1130 | + try { |
|
| 1131 | + $sth = $this->db->prepare($query); |
|
| 1132 | + $sth->execute($query_values); |
|
| 1133 | + } catch(PDOException $e) { |
|
| 1134 | + return "error : ".$e->getMessage(); |
|
| 1135 | + } |
|
| 1136 | + } |
|
| 1137 | 1137 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1138 | 1138 | global $globalDBdriver; |
| 1139 | 1139 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1140 | 1140 | if ($globalDBdriver == 'mysql') { |
| 1141 | 1141 | $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"; |
| 1142 | 1142 | } else { |
| 1143 | - //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1143 | + //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1144 | 1144 | $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);"; |
| 1145 | - } |
|
| 1146 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1147 | - try { |
|
| 1148 | - $sth = $this->db->prepare($query); |
|
| 1149 | - $sth->execute($query_values); |
|
| 1150 | - } catch(PDOException $e) { |
|
| 1151 | - return "error : ".$e->getMessage(); |
|
| 1152 | - } |
|
| 1153 | - } |
|
| 1154 | - /* |
|
| 1145 | + } |
|
| 1146 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1147 | + try { |
|
| 1148 | + $sth = $this->db->prepare($query); |
|
| 1149 | + $sth->execute($query_values); |
|
| 1150 | + } catch(PDOException $e) { |
|
| 1151 | + return "error : ".$e->getMessage(); |
|
| 1152 | + } |
|
| 1153 | + } |
|
| 1154 | + /* |
|
| 1155 | 1155 | public function getStatsSource($date,$stats_type = '') { |
| 1156 | 1156 | if ($stats_type == '') { |
| 1157 | 1157 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -1220,25 +1220,25 @@ discard block |
||
| 1220 | 1220 | $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"; |
| 1221 | 1221 | } else { |
| 1222 | 1222 | $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);"; |
| 1223 | - } |
|
| 1224 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1225 | - try { |
|
| 1226 | - $sth = $this->db->prepare($query); |
|
| 1227 | - $sth->execute($query_values); |
|
| 1228 | - } catch(PDOException $e) { |
|
| 1229 | - return "error : ".$e->getMessage(); |
|
| 1230 | - } |
|
| 1231 | - } |
|
| 1232 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1233 | - $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1234 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1235 | - try { |
|
| 1236 | - $sth = $this->db->prepare($query); |
|
| 1237 | - $sth->execute($query_values); |
|
| 1238 | - } catch(PDOException $e) { |
|
| 1239 | - return "error : ".$e->getMessage(); |
|
| 1240 | - } |
|
| 1241 | - } |
|
| 1223 | + } |
|
| 1224 | + $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1225 | + try { |
|
| 1226 | + $sth = $this->db->prepare($query); |
|
| 1227 | + $sth->execute($query_values); |
|
| 1228 | + } catch(PDOException $e) { |
|
| 1229 | + return "error : ".$e->getMessage(); |
|
| 1230 | + } |
|
| 1231 | + } |
|
| 1232 | + public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1233 | + $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1234 | + $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1235 | + try { |
|
| 1236 | + $sth = $this->db->prepare($query); |
|
| 1237 | + $sth->execute($query_values); |
|
| 1238 | + } catch(PDOException $e) { |
|
| 1239 | + return "error : ".$e->getMessage(); |
|
| 1240 | + } |
|
| 1241 | + } |
|
| 1242 | 1242 | public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
| 1243 | 1243 | global $globalDBdriver; |
| 1244 | 1244 | if ($globalDBdriver == 'mysql') { |
@@ -1254,14 +1254,14 @@ discard block |
||
| 1254 | 1254 | $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);"; |
| 1255 | 1255 | } |
| 1256 | 1256 | } |
| 1257 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1258 | - try { |
|
| 1259 | - $sth = $this->db->prepare($query); |
|
| 1260 | - $sth->execute($query_values); |
|
| 1261 | - } catch(PDOException $e) { |
|
| 1262 | - return "error : ".$e->getMessage(); |
|
| 1263 | - } |
|
| 1264 | - } |
|
| 1257 | + $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1258 | + try { |
|
| 1259 | + $sth = $this->db->prepare($query); |
|
| 1260 | + $sth->execute($query_values); |
|
| 1261 | + } catch(PDOException $e) { |
|
| 1262 | + return "error : ".$e->getMessage(); |
|
| 1263 | + } |
|
| 1264 | + } |
|
| 1265 | 1265 | public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
| 1266 | 1266 | global $globalDBdriver; |
| 1267 | 1267 | if ($globalDBdriver == 'mysql') { |
@@ -1277,14 +1277,14 @@ discard block |
||
| 1277 | 1277 | $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);"; |
| 1278 | 1278 | } |
| 1279 | 1279 | } |
| 1280 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1281 | - try { |
|
| 1282 | - $sth = $this->db->prepare($query); |
|
| 1283 | - $sth->execute($query_values); |
|
| 1284 | - } catch(PDOException $e) { |
|
| 1285 | - return "error : ".$e->getMessage(); |
|
| 1286 | - } |
|
| 1287 | - } |
|
| 1280 | + $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1281 | + try { |
|
| 1282 | + $sth = $this->db->prepare($query); |
|
| 1283 | + $sth->execute($query_values); |
|
| 1284 | + } catch(PDOException $e) { |
|
| 1285 | + return "error : ".$e->getMessage(); |
|
| 1286 | + } |
|
| 1287 | + } |
|
| 1288 | 1288 | public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1289 | 1289 | global $globalDBdriver; |
| 1290 | 1290 | if ($globalDBdriver == 'mysql') { |
@@ -1300,14 +1300,14 @@ discard block |
||
| 1300 | 1300 | $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);"; |
| 1301 | 1301 | } |
| 1302 | 1302 | } |
| 1303 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1304 | - try { |
|
| 1305 | - $sth = $this->db->prepare($query); |
|
| 1306 | - $sth->execute($query_values); |
|
| 1307 | - } catch(PDOException $e) { |
|
| 1308 | - return "error : ".$e->getMessage(); |
|
| 1309 | - } |
|
| 1310 | - } |
|
| 1303 | + $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1304 | + try { |
|
| 1305 | + $sth = $this->db->prepare($query); |
|
| 1306 | + $sth->execute($query_values); |
|
| 1307 | + } catch(PDOException $e) { |
|
| 1308 | + return "error : ".$e->getMessage(); |
|
| 1309 | + } |
|
| 1310 | + } |
|
| 1311 | 1311 | public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
| 1312 | 1312 | global $globalDBdriver; |
| 1313 | 1313 | if ($globalDBdriver == 'mysql') { |
@@ -1323,14 +1323,14 @@ discard block |
||
| 1323 | 1323 | $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);"; |
| 1324 | 1324 | } |
| 1325 | 1325 | } |
| 1326 | - $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); |
|
| 1327 | - try { |
|
| 1328 | - $sth = $this->db->prepare($query); |
|
| 1329 | - $sth->execute($query_values); |
|
| 1330 | - } catch(PDOException $e) { |
|
| 1331 | - return "error : ".$e->getMessage(); |
|
| 1332 | - } |
|
| 1333 | - } |
|
| 1326 | + $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); |
|
| 1327 | + try { |
|
| 1328 | + $sth = $this->db->prepare($query); |
|
| 1329 | + $sth->execute($query_values); |
|
| 1330 | + } catch(PDOException $e) { |
|
| 1331 | + return "error : ".$e->getMessage(); |
|
| 1332 | + } |
|
| 1333 | + } |
|
| 1334 | 1334 | public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
| 1335 | 1335 | global $globalDBdriver; |
| 1336 | 1336 | if ($globalDBdriver == 'mysql') { |
@@ -1346,14 +1346,14 @@ discard block |
||
| 1346 | 1346 | $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);"; |
| 1347 | 1347 | } |
| 1348 | 1348 | } |
| 1349 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1350 | - try { |
|
| 1351 | - $sth = $this->db->prepare($query); |
|
| 1352 | - $sth->execute($query_values); |
|
| 1353 | - } catch(PDOException $e) { |
|
| 1354 | - return "error : ".$e->getMessage(); |
|
| 1355 | - } |
|
| 1356 | - } |
|
| 1349 | + $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1350 | + try { |
|
| 1351 | + $sth = $this->db->prepare($query); |
|
| 1352 | + $sth->execute($query_values); |
|
| 1353 | + } catch(PDOException $e) { |
|
| 1354 | + return "error : ".$e->getMessage(); |
|
| 1355 | + } |
|
| 1356 | + } |
|
| 1357 | 1357 | public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
| 1358 | 1358 | global $globalDBdriver; |
| 1359 | 1359 | if ($globalDBdriver == 'mysql') { |
@@ -1369,14 +1369,14 @@ discard block |
||
| 1369 | 1369 | $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);"; |
| 1370 | 1370 | } |
| 1371 | 1371 | } |
| 1372 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1373 | - try { |
|
| 1374 | - $sth = $this->db->prepare($query); |
|
| 1375 | - $sth->execute($query_values); |
|
| 1376 | - } catch(PDOException $e) { |
|
| 1377 | - return "error : ".$e->getMessage(); |
|
| 1378 | - } |
|
| 1379 | - } |
|
| 1372 | + $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1373 | + try { |
|
| 1374 | + $sth = $this->db->prepare($query); |
|
| 1375 | + $sth->execute($query_values); |
|
| 1376 | + } catch(PDOException $e) { |
|
| 1377 | + return "error : ".$e->getMessage(); |
|
| 1378 | + } |
|
| 1379 | + } |
|
| 1380 | 1380 | public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
| 1381 | 1381 | global $globalDBdriver; |
| 1382 | 1382 | if ($globalDBdriver == 'mysql') { |
@@ -1392,14 +1392,14 @@ discard block |
||
| 1392 | 1392 | $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);"; |
| 1393 | 1393 | } |
| 1394 | 1394 | } |
| 1395 | - $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); |
|
| 1396 | - try { |
|
| 1397 | - $sth = $this->db->prepare($query); |
|
| 1398 | - $sth->execute($query_values); |
|
| 1399 | - } catch(PDOException $e) { |
|
| 1400 | - return "error : ".$e->getMessage(); |
|
| 1401 | - } |
|
| 1402 | - } |
|
| 1395 | + $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); |
|
| 1396 | + try { |
|
| 1397 | + $sth = $this->db->prepare($query); |
|
| 1398 | + $sth->execute($query_values); |
|
| 1399 | + } catch(PDOException $e) { |
|
| 1400 | + return "error : ".$e->getMessage(); |
|
| 1401 | + } |
|
| 1402 | + } |
|
| 1403 | 1403 | public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1404 | 1404 | global $globalDBdriver; |
| 1405 | 1405 | if ($airport_icao != '') { |
@@ -1423,8 +1423,8 @@ discard block |
||
| 1423 | 1423 | } catch(PDOException $e) { |
| 1424 | 1424 | return "error : ".$e->getMessage(); |
| 1425 | 1425 | } |
| 1426 | - } |
|
| 1427 | - } |
|
| 1426 | + } |
|
| 1427 | + } |
|
| 1428 | 1428 | public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
| 1429 | 1429 | global $globalDBdriver; |
| 1430 | 1430 | if ($airport_icao != '') { |
@@ -1440,8 +1440,8 @@ discard block |
||
| 1440 | 1440 | } catch(PDOException $e) { |
| 1441 | 1441 | return "error : ".$e->getMessage(); |
| 1442 | 1442 | } |
| 1443 | - } |
|
| 1444 | - } |
|
| 1443 | + } |
|
| 1444 | + } |
|
| 1445 | 1445 | public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1446 | 1446 | global $globalDBdriver; |
| 1447 | 1447 | if ($airport_icao != '') { |
@@ -1458,15 +1458,15 @@ discard block |
||
| 1458 | 1458 | $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);"; |
| 1459 | 1459 | } |
| 1460 | 1460 | } |
| 1461 | - $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); |
|
| 1461 | + $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); |
|
| 1462 | 1462 | try { |
| 1463 | - $sth = $this->db->prepare($query); |
|
| 1464 | - $sth->execute($query_values); |
|
| 1465 | - } catch(PDOException $e) { |
|
| 1466 | - return "error : ".$e->getMessage(); |
|
| 1467 | - } |
|
| 1468 | - } |
|
| 1469 | - } |
|
| 1463 | + $sth = $this->db->prepare($query); |
|
| 1464 | + $sth->execute($query_values); |
|
| 1465 | + } catch(PDOException $e) { |
|
| 1466 | + return "error : ".$e->getMessage(); |
|
| 1467 | + } |
|
| 1468 | + } |
|
| 1469 | + } |
|
| 1470 | 1470 | public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
| 1471 | 1471 | global $globalDBdriver; |
| 1472 | 1472 | if ($airport_icao != '') { |
@@ -1482,46 +1482,46 @@ discard block |
||
| 1482 | 1482 | } catch(PDOException $e) { |
| 1483 | 1483 | return "error : ".$e->getMessage(); |
| 1484 | 1484 | } |
| 1485 | - } |
|
| 1486 | - } |
|
| 1485 | + } |
|
| 1486 | + } |
|
| 1487 | 1487 | |
| 1488 | 1488 | public function deleteStat($id) { |
| 1489 | - $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1490 | - $query_values = array(':id' => $id); |
|
| 1491 | - try { |
|
| 1492 | - $sth = $this->db->prepare($query); |
|
| 1493 | - $sth->execute($query_values); |
|
| 1494 | - } catch(PDOException $e) { |
|
| 1495 | - return "error : ".$e->getMessage(); |
|
| 1496 | - } |
|
| 1497 | - } |
|
| 1489 | + $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1490 | + $query_values = array(':id' => $id); |
|
| 1491 | + try { |
|
| 1492 | + $sth = $this->db->prepare($query); |
|
| 1493 | + $sth->execute($query_values); |
|
| 1494 | + } catch(PDOException $e) { |
|
| 1495 | + return "error : ".$e->getMessage(); |
|
| 1496 | + } |
|
| 1497 | + } |
|
| 1498 | 1498 | public function deleteStatFlight($type) { |
| 1499 | - $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1500 | - $query_values = array(':type' => $type); |
|
| 1501 | - try { |
|
| 1502 | - $sth = $this->db->prepare($query); |
|
| 1503 | - $sth->execute($query_values); |
|
| 1504 | - } catch(PDOException $e) { |
|
| 1505 | - return "error : ".$e->getMessage(); |
|
| 1506 | - } |
|
| 1507 | - } |
|
| 1499 | + $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1500 | + $query_values = array(':type' => $type); |
|
| 1501 | + try { |
|
| 1502 | + $sth = $this->db->prepare($query); |
|
| 1503 | + $sth->execute($query_values); |
|
| 1504 | + } catch(PDOException $e) { |
|
| 1505 | + return "error : ".$e->getMessage(); |
|
| 1506 | + } |
|
| 1507 | + } |
|
| 1508 | 1508 | public function deleteStatAirport($type) { |
| 1509 | - $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1510 | - $query_values = array(':type' => $type); |
|
| 1511 | - try { |
|
| 1512 | - $sth = $this->db->prepare($query); |
|
| 1513 | - $sth->execute($query_values); |
|
| 1514 | - } catch(PDOException $e) { |
|
| 1515 | - return "error : ".$e->getMessage(); |
|
| 1516 | - } |
|
| 1517 | - } |
|
| 1509 | + $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1510 | + $query_values = array(':type' => $type); |
|
| 1511 | + try { |
|
| 1512 | + $sth = $this->db->prepare($query); |
|
| 1513 | + $sth->execute($query_values); |
|
| 1514 | + } catch(PDOException $e) { |
|
| 1515 | + return "error : ".$e->getMessage(); |
|
| 1516 | + } |
|
| 1517 | + } |
|
| 1518 | 1518 | |
| 1519 | - public function addOldStats() { |
|
| 1520 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1521 | - $Common = new Common(); |
|
| 1522 | - $Connection = new Connection(); |
|
| 1523 | - date_default_timezone_set('UTC'); |
|
| 1524 | - $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1519 | + public function addOldStats() { |
|
| 1520 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1521 | + $Common = new Common(); |
|
| 1522 | + $Connection = new Connection(); |
|
| 1523 | + date_default_timezone_set('UTC'); |
|
| 1524 | + $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1525 | 1525 | if ($globalDebug) echo 'Update stats !'."\n"; |
| 1526 | 1526 | if (isset($last_update[0]['value'])) { |
| 1527 | 1527 | $last_update_day = $last_update[0]['value']; |
@@ -1568,24 +1568,24 @@ discard block |
||
| 1568 | 1568 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1569 | 1569 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1570 | 1570 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1571 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1571 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1572 | 1572 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1573 | - $alldata = array(); |
|
| 1573 | + $alldata = array(); |
|
| 1574 | 1574 | |
| 1575 | - foreach ($pall as $value) { |
|
| 1576 | - $icao = $value['airport_departure_icao']; |
|
| 1577 | - $alldata[$icao] = $value; |
|
| 1578 | - } |
|
| 1579 | - foreach ($dall as $value) { |
|
| 1580 | - $icao = $value['airport_departure_icao']; |
|
| 1581 | - if (isset($alldata[$icao])) { |
|
| 1582 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1583 | - } else $alldata[$icao] = $value; |
|
| 1584 | - } |
|
| 1585 | - $count = array(); |
|
| 1586 | - foreach ($alldata as $key => $row) { |
|
| 1587 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 1588 | - } |
|
| 1575 | + foreach ($pall as $value) { |
|
| 1576 | + $icao = $value['airport_departure_icao']; |
|
| 1577 | + $alldata[$icao] = $value; |
|
| 1578 | + } |
|
| 1579 | + foreach ($dall as $value) { |
|
| 1580 | + $icao = $value['airport_departure_icao']; |
|
| 1581 | + if (isset($alldata[$icao])) { |
|
| 1582 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1583 | + } else $alldata[$icao] = $value; |
|
| 1584 | + } |
|
| 1585 | + $count = array(); |
|
| 1586 | + foreach ($alldata as $key => $row) { |
|
| 1587 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 1588 | + } |
|
| 1589 | 1589 | array_multisort($count,SORT_DESC,$alldata); |
| 1590 | 1590 | foreach ($alldata as $number) { |
| 1591 | 1591 | 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); |
@@ -1593,25 +1593,25 @@ discard block |
||
| 1593 | 1593 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1594 | 1594 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1595 | 1595 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1596 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1596 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1597 | 1597 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1598 | - $alldata = array(); |
|
| 1599 | - foreach ($pall as $value) { |
|
| 1600 | - $icao = $value['airport_arrival_icao']; |
|
| 1601 | - $alldata[$icao] = $value; |
|
| 1602 | - } |
|
| 1603 | - foreach ($dall as $value) { |
|
| 1604 | - $icao = $value['airport_arrival_icao']; |
|
| 1605 | - if (isset($alldata[$icao])) { |
|
| 1606 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1607 | - } else $alldata[$icao] = $value; |
|
| 1608 | - } |
|
| 1609 | - $count = array(); |
|
| 1610 | - foreach ($alldata as $key => $row) { |
|
| 1611 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1612 | - } |
|
| 1613 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1614 | - foreach ($alldata as $number) { |
|
| 1598 | + $alldata = array(); |
|
| 1599 | + foreach ($pall as $value) { |
|
| 1600 | + $icao = $value['airport_arrival_icao']; |
|
| 1601 | + $alldata[$icao] = $value; |
|
| 1602 | + } |
|
| 1603 | + foreach ($dall as $value) { |
|
| 1604 | + $icao = $value['airport_arrival_icao']; |
|
| 1605 | + if (isset($alldata[$icao])) { |
|
| 1606 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1607 | + } else $alldata[$icao] = $value; |
|
| 1608 | + } |
|
| 1609 | + $count = array(); |
|
| 1610 | + foreach ($alldata as $key => $row) { |
|
| 1611 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1612 | + } |
|
| 1613 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 1614 | + foreach ($alldata as $number) { |
|
| 1615 | 1615 | 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); |
| 1616 | 1616 | } |
| 1617 | 1617 | if ($Connection->tableExists('countries')) { |
@@ -1684,8 +1684,8 @@ discard block |
||
| 1684 | 1684 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1685 | 1685 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
| 1686 | 1686 | $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1687 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1688 | - /* |
|
| 1687 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1688 | + /* |
|
| 1689 | 1689 | $alldata = array(); |
| 1690 | 1690 | foreach ($pall as $value) { |
| 1691 | 1691 | $icao = $value['departure_airport_icao']; |
@@ -1704,29 +1704,29 @@ discard block |
||
| 1704 | 1704 | } |
| 1705 | 1705 | array_multisort($count,SORT_DESC,$alldata); |
| 1706 | 1706 | */ |
| 1707 | - foreach ($dall as $value) { |
|
| 1708 | - $icao = $value['departure_airport_icao']; |
|
| 1709 | - $ddate = $value['date']; |
|
| 1710 | - $find = false; |
|
| 1711 | - foreach ($pall as $pvalue) { |
|
| 1712 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1713 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1714 | - $find = true; |
|
| 1715 | - break; |
|
| 1716 | - } |
|
| 1717 | - } |
|
| 1718 | - if ($find === false) { |
|
| 1719 | - $pall[] = $value; |
|
| 1720 | - } |
|
| 1721 | - } |
|
| 1722 | - $alldata = $pall; |
|
| 1707 | + foreach ($dall as $value) { |
|
| 1708 | + $icao = $value['departure_airport_icao']; |
|
| 1709 | + $ddate = $value['date']; |
|
| 1710 | + $find = false; |
|
| 1711 | + foreach ($pall as $pvalue) { |
|
| 1712 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1713 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1714 | + $find = true; |
|
| 1715 | + break; |
|
| 1716 | + } |
|
| 1717 | + } |
|
| 1718 | + if ($find === false) { |
|
| 1719 | + $pall[] = $value; |
|
| 1720 | + } |
|
| 1721 | + } |
|
| 1722 | + $alldata = $pall; |
|
| 1723 | 1723 | foreach ($alldata as $number) { |
| 1724 | 1724 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
| 1725 | 1725 | } |
| 1726 | 1726 | echo '...Arrival'."\n"; |
| 1727 | 1727 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
| 1728 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1729 | - /* |
|
| 1728 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1729 | + /* |
|
| 1730 | 1730 | $alldata = array(); |
| 1731 | 1731 | foreach ($pall as $value) { |
| 1732 | 1732 | $icao = $value['arrival_airport_icao']; |
@@ -1746,22 +1746,22 @@ discard block |
||
| 1746 | 1746 | */ |
| 1747 | 1747 | |
| 1748 | 1748 | |
| 1749 | - foreach ($dall as $value) { |
|
| 1750 | - $icao = $value['arrival_airport_icao']; |
|
| 1751 | - $ddate = $value['date']; |
|
| 1752 | - $find = false; |
|
| 1753 | - foreach ($pall as $pvalue) { |
|
| 1754 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1755 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1756 | - $find = true; |
|
| 1757 | - break; |
|
| 1758 | - } |
|
| 1759 | - } |
|
| 1760 | - if ($find === false) { |
|
| 1761 | - $pall[] = $value; |
|
| 1762 | - } |
|
| 1763 | - } |
|
| 1764 | - $alldata = $pall; |
|
| 1749 | + foreach ($dall as $value) { |
|
| 1750 | + $icao = $value['arrival_airport_icao']; |
|
| 1751 | + $ddate = $value['date']; |
|
| 1752 | + $find = false; |
|
| 1753 | + foreach ($pall as $pvalue) { |
|
| 1754 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1755 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1756 | + $find = true; |
|
| 1757 | + break; |
|
| 1758 | + } |
|
| 1759 | + } |
|
| 1760 | + if ($find === false) { |
|
| 1761 | + $pall[] = $value; |
|
| 1762 | + } |
|
| 1763 | + } |
|
| 1764 | + $alldata = $pall; |
|
| 1765 | 1765 | foreach ($alldata as $number) { |
| 1766 | 1766 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
| 1767 | 1767 | } |
@@ -1836,51 +1836,51 @@ discard block |
||
| 1836 | 1836 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1837 | 1837 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1838 | 1838 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1839 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1839 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1840 | 1840 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1841 | - //$alldata = array(); |
|
| 1842 | - foreach ($dall as $value) { |
|
| 1843 | - $icao = $value['airport_departure_icao']; |
|
| 1844 | - $dicao = $value['airline_icao']; |
|
| 1845 | - $find = false; |
|
| 1846 | - foreach ($pall as $pvalue) { |
|
| 1847 | - if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1848 | - $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1849 | - $find = true; |
|
| 1850 | - break; |
|
| 1851 | - } |
|
| 1852 | - } |
|
| 1853 | - if ($find === false) { |
|
| 1854 | - $pall[] = $value; |
|
| 1855 | - } |
|
| 1856 | - } |
|
| 1857 | - $alldata = $pall; |
|
| 1841 | + //$alldata = array(); |
|
| 1842 | + foreach ($dall as $value) { |
|
| 1843 | + $icao = $value['airport_departure_icao']; |
|
| 1844 | + $dicao = $value['airline_icao']; |
|
| 1845 | + $find = false; |
|
| 1846 | + foreach ($pall as $pvalue) { |
|
| 1847 | + if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1848 | + $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1849 | + $find = true; |
|
| 1850 | + break; |
|
| 1851 | + } |
|
| 1852 | + } |
|
| 1853 | + if ($find === false) { |
|
| 1854 | + $pall[] = $value; |
|
| 1855 | + } |
|
| 1856 | + } |
|
| 1857 | + $alldata = $pall; |
|
| 1858 | 1858 | foreach ($alldata as $number) { |
| 1859 | 1859 | 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); |
| 1860 | 1860 | } |
| 1861 | 1861 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1862 | 1862 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1863 | 1863 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1864 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1864 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1865 | 1865 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1866 | - //$alldata = array(); |
|
| 1867 | - foreach ($dall as $value) { |
|
| 1868 | - $icao = $value['airport_arrival_icao']; |
|
| 1869 | - $dicao = $value['airline_icao']; |
|
| 1870 | - $find = false; |
|
| 1871 | - foreach ($pall as $pvalue) { |
|
| 1872 | - if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1873 | - $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1874 | - $find = true; |
|
| 1875 | - break; |
|
| 1876 | - } |
|
| 1877 | - } |
|
| 1878 | - if ($find === false) { |
|
| 1879 | - $pall[] = $value; |
|
| 1880 | - } |
|
| 1881 | - } |
|
| 1882 | - $alldata = $pall; |
|
| 1883 | - foreach ($alldata as $number) { |
|
| 1866 | + //$alldata = array(); |
|
| 1867 | + foreach ($dall as $value) { |
|
| 1868 | + $icao = $value['airport_arrival_icao']; |
|
| 1869 | + $dicao = $value['airline_icao']; |
|
| 1870 | + $find = false; |
|
| 1871 | + foreach ($pall as $pvalue) { |
|
| 1872 | + if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1873 | + $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1874 | + $find = true; |
|
| 1875 | + break; |
|
| 1876 | + } |
|
| 1877 | + } |
|
| 1878 | + if ($find === false) { |
|
| 1879 | + $pall[] = $value; |
|
| 1880 | + } |
|
| 1881 | + } |
|
| 1882 | + $alldata = $pall; |
|
| 1883 | + foreach ($alldata as $number) { |
|
| 1884 | 1884 | 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); |
| 1885 | 1885 | } |
| 1886 | 1886 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
@@ -1913,47 +1913,47 @@ discard block |
||
| 1913 | 1913 | } |
| 1914 | 1914 | if ($globalDebug) echo '...Departure'."\n"; |
| 1915 | 1915 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1916 | - $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1917 | - foreach ($dall as $value) { |
|
| 1918 | - $icao = $value['departure_airport_icao']; |
|
| 1919 | - $airline = $value['airline_icao']; |
|
| 1920 | - $ddate = $value['date']; |
|
| 1921 | - $find = false; |
|
| 1922 | - foreach ($pall as $pvalue) { |
|
| 1923 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1924 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1925 | - $find = true; |
|
| 1926 | - break; |
|
| 1927 | - } |
|
| 1928 | - } |
|
| 1929 | - if ($find === false) { |
|
| 1930 | - $pall[] = $value; |
|
| 1931 | - } |
|
| 1932 | - } |
|
| 1933 | - $alldata = $pall; |
|
| 1916 | + $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1917 | + foreach ($dall as $value) { |
|
| 1918 | + $icao = $value['departure_airport_icao']; |
|
| 1919 | + $airline = $value['airline_icao']; |
|
| 1920 | + $ddate = $value['date']; |
|
| 1921 | + $find = false; |
|
| 1922 | + foreach ($pall as $pvalue) { |
|
| 1923 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1924 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1925 | + $find = true; |
|
| 1926 | + break; |
|
| 1927 | + } |
|
| 1928 | + } |
|
| 1929 | + if ($find === false) { |
|
| 1930 | + $pall[] = $value; |
|
| 1931 | + } |
|
| 1932 | + } |
|
| 1933 | + $alldata = $pall; |
|
| 1934 | 1934 | foreach ($alldata as $number) { |
| 1935 | 1935 | $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']); |
| 1936 | 1936 | } |
| 1937 | 1937 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1938 | 1938 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1939 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1940 | - foreach ($dall as $value) { |
|
| 1941 | - $icao = $value['arrival_airport_icao']; |
|
| 1942 | - $airline = $value['airline_icao']; |
|
| 1943 | - $ddate = $value['date']; |
|
| 1944 | - $find = false; |
|
| 1945 | - foreach ($pall as $pvalue) { |
|
| 1946 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1947 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1948 | - $find = true; |
|
| 1949 | - break; |
|
| 1950 | - } |
|
| 1951 | - } |
|
| 1952 | - if ($find === false) { |
|
| 1953 | - $pall[] = $value; |
|
| 1954 | - } |
|
| 1955 | - } |
|
| 1956 | - $alldata = $pall; |
|
| 1939 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1940 | + foreach ($dall as $value) { |
|
| 1941 | + $icao = $value['arrival_airport_icao']; |
|
| 1942 | + $airline = $value['airline_icao']; |
|
| 1943 | + $ddate = $value['date']; |
|
| 1944 | + $find = false; |
|
| 1945 | + foreach ($pall as $pvalue) { |
|
| 1946 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1947 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1948 | + $find = true; |
|
| 1949 | + break; |
|
| 1950 | + } |
|
| 1951 | + } |
|
| 1952 | + if ($find === false) { |
|
| 1953 | + $pall[] = $value; |
|
| 1954 | + } |
|
| 1955 | + } |
|
| 1956 | + $alldata = $pall; |
|
| 1957 | 1957 | foreach ($alldata as $number) { |
| 1958 | 1958 | $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']); |
| 1959 | 1959 | } |
@@ -2038,44 +2038,44 @@ discard block |
||
| 2038 | 2038 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2039 | 2039 | } |
| 2040 | 2040 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2041 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2042 | - $alldata = array(); |
|
| 2043 | - foreach ($pall as $value) { |
|
| 2044 | - $icao = $value['airport_departure_icao']; |
|
| 2045 | - $alldata[$icao] = $value; |
|
| 2046 | - } |
|
| 2047 | - foreach ($dall as $value) { |
|
| 2048 | - $icao = $value['airport_departure_icao']; |
|
| 2049 | - if (isset($alldata[$icao])) { |
|
| 2050 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2051 | - } else $alldata[$icao] = $value; |
|
| 2052 | - } |
|
| 2053 | - $count = array(); |
|
| 2054 | - foreach ($alldata as $key => $row) { |
|
| 2055 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 2056 | - } |
|
| 2041 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2042 | + $alldata = array(); |
|
| 2043 | + foreach ($pall as $value) { |
|
| 2044 | + $icao = $value['airport_departure_icao']; |
|
| 2045 | + $alldata[$icao] = $value; |
|
| 2046 | + } |
|
| 2047 | + foreach ($dall as $value) { |
|
| 2048 | + $icao = $value['airport_departure_icao']; |
|
| 2049 | + if (isset($alldata[$icao])) { |
|
| 2050 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2051 | + } else $alldata[$icao] = $value; |
|
| 2052 | + } |
|
| 2053 | + $count = array(); |
|
| 2054 | + foreach ($alldata as $key => $row) { |
|
| 2055 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 2056 | + } |
|
| 2057 | 2057 | array_multisort($count,SORT_DESC,$alldata); |
| 2058 | 2058 | foreach ($alldata as $number) { |
| 2059 | - 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); |
|
| 2059 | + 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); |
|
| 2060 | 2060 | } |
| 2061 | 2061 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2062 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2062 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2063 | 2063 | $alldata = array(); |
| 2064 | - foreach ($pall as $value) { |
|
| 2065 | - $icao = $value['airport_arrival_icao']; |
|
| 2066 | - $alldata[$icao] = $value; |
|
| 2067 | - } |
|
| 2068 | - foreach ($dall as $value) { |
|
| 2069 | - $icao = $value['airport_arrival_icao']; |
|
| 2070 | - if (isset($alldata[$icao])) { |
|
| 2071 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2072 | - } else $alldata[$icao] = $value; |
|
| 2073 | - } |
|
| 2074 | - $count = array(); |
|
| 2075 | - foreach ($alldata as $key => $row) { |
|
| 2076 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2077 | - } |
|
| 2078 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2064 | + foreach ($pall as $value) { |
|
| 2065 | + $icao = $value['airport_arrival_icao']; |
|
| 2066 | + $alldata[$icao] = $value; |
|
| 2067 | + } |
|
| 2068 | + foreach ($dall as $value) { |
|
| 2069 | + $icao = $value['airport_arrival_icao']; |
|
| 2070 | + if (isset($alldata[$icao])) { |
|
| 2071 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2072 | + } else $alldata[$icao] = $value; |
|
| 2073 | + } |
|
| 2074 | + $count = array(); |
|
| 2075 | + foreach ($alldata as $key => $row) { |
|
| 2076 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2077 | + } |
|
| 2078 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 2079 | 2079 | foreach ($alldata as $number) { |
| 2080 | 2080 | 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); |
| 2081 | 2081 | } |
@@ -2108,45 +2108,45 @@ discard block |
||
| 2108 | 2108 | } |
| 2109 | 2109 | echo '...Departure'."\n"; |
| 2110 | 2110 | $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
| 2111 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2111 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2112 | 2112 | foreach ($dall as $value) { |
| 2113 | - $icao = $value['departure_airport_icao']; |
|
| 2114 | - $ddate = $value['date']; |
|
| 2115 | - $find = false; |
|
| 2116 | - foreach ($pall as $pvalue) { |
|
| 2117 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2118 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2119 | - $find = true; |
|
| 2120 | - break; |
|
| 2121 | - } |
|
| 2122 | - } |
|
| 2123 | - if ($find === false) { |
|
| 2124 | - $pall[] = $value; |
|
| 2125 | - } |
|
| 2126 | - } |
|
| 2127 | - $alldata = $pall; |
|
| 2113 | + $icao = $value['departure_airport_icao']; |
|
| 2114 | + $ddate = $value['date']; |
|
| 2115 | + $find = false; |
|
| 2116 | + foreach ($pall as $pvalue) { |
|
| 2117 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2118 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2119 | + $find = true; |
|
| 2120 | + break; |
|
| 2121 | + } |
|
| 2122 | + } |
|
| 2123 | + if ($find === false) { |
|
| 2124 | + $pall[] = $value; |
|
| 2125 | + } |
|
| 2126 | + } |
|
| 2127 | + $alldata = $pall; |
|
| 2128 | 2128 | foreach ($alldata as $number) { |
| 2129 | 2129 | $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); |
| 2130 | 2130 | } |
| 2131 | 2131 | echo '...Arrival'."\n"; |
| 2132 | 2132 | $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
| 2133 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2133 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2134 | 2134 | foreach ($dall as $value) { |
| 2135 | 2135 | $icao = $value['arrival_airport_icao']; |
| 2136 | 2136 | $ddate = $value['date']; |
| 2137 | - $find = false; |
|
| 2137 | + $find = false; |
|
| 2138 | 2138 | foreach ($pall as $pvalue) { |
| 2139 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2140 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2141 | - $find = true; |
|
| 2142 | - break; |
|
| 2143 | - } |
|
| 2144 | - } |
|
| 2145 | - if ($find === false) { |
|
| 2146 | - $pall[] = $value; |
|
| 2147 | - } |
|
| 2148 | - } |
|
| 2149 | - $alldata = $pall; |
|
| 2139 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2140 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2141 | + $find = true; |
|
| 2142 | + break; |
|
| 2143 | + } |
|
| 2144 | + } |
|
| 2145 | + if ($find === false) { |
|
| 2146 | + $pall[] = $value; |
|
| 2147 | + } |
|
| 2148 | + } |
|
| 2149 | + $alldata = $pall; |
|
| 2150 | 2150 | foreach ($alldata as $number) { |
| 2151 | 2151 | $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); |
| 2152 | 2152 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 47 | 47 | print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
| 48 | 48 | } |
| 49 | - ?> |
|
| 49 | + ?> |
|
| 50 | 50 | </div> |
| 51 | 51 | <?php include('statistics-sub-menu.php'); ?> |
| 52 | 52 | <p class="global-stats"> |
@@ -55,23 +55,23 @@ discard block |
||
| 55 | 55 | <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
| 56 | 56 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 57 | 57 | <?php |
| 58 | - if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 58 | + if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 59 | 59 | ?> |
| 60 | 60 | <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
| 61 | 61 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 62 | 62 | <?php |
| 63 | - } else { |
|
| 64 | - ?> |
|
| 63 | + } else { |
|
| 64 | + ?> |
|
| 65 | 65 | <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
| 66 | 66 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 67 | 67 | <?php |
| 68 | - } |
|
| 69 | - ?> |
|
| 68 | + } |
|
| 69 | + ?> |
|
| 70 | 70 | <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
| 71 | 71 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 72 | 72 | <?php |
| 73 | - if ($airline_icao == '') { |
|
| 74 | - ?> |
|
| 73 | + if ($airline_icao == '') { |
|
| 74 | + ?> |
|
| 75 | 75 | <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
| 76 | 76 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 77 | 77 | <?php |
@@ -94,25 +94,25 @@ discard block |
||
| 94 | 94 | <div class="col-md-6"> |
| 95 | 95 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 96 | 96 | <?php |
| 97 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 98 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
| 99 | - else { |
|
| 97 | + $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 98 | + if (count($aircraft_array) == 0) print _("No data available"); |
|
| 99 | + else { |
|
| 100 | 100 | |
| 101 | - print '<div id="chart1" class="chart" width="100%"></div> |
|
| 101 | + print '<div id="chart1" class="chart" width="100%"></div> |
|
| 102 | 102 | <script> |
| 103 | 103 | google.load("visualization", "1", {packages:["corechart"]}); |
| 104 | 104 | google.setOnLoadCallback(drawChart1); |
| 105 | 105 | function drawChart1() { |
| 106 | 106 | var data = google.visualization.arrayToDataTable([ |
| 107 | 107 | ["'._("Aircraft").'", "'._("# of times").'"], '; |
| 108 | - $aircraft_data = ''; |
|
| 109 | - foreach($aircraft_array as $aircraft_item) |
|
| 110 | - { |
|
| 111 | - $aircraft_data .= '[ "'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 112 | - } |
|
| 113 | - $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 114 | - print $aircraft_data; |
|
| 115 | - print ']); |
|
| 108 | + $aircraft_data = ''; |
|
| 109 | + foreach($aircraft_array as $aircraft_item) |
|
| 110 | + { |
|
| 111 | + $aircraft_data .= '[ "'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 112 | + } |
|
| 113 | + $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 114 | + print $aircraft_data; |
|
| 115 | + print ']); |
|
| 116 | 116 | |
| 117 | 117 | var options = { |
| 118 | 118 | chartArea: {"width": "80%", "height": "60%"}, |
@@ -127,45 +127,45 @@ discard block |
||
| 127 | 127 | drawChart1(); |
| 128 | 128 | }); |
| 129 | 129 | </script>'; |
| 130 | - } |
|
| 131 | - ?> |
|
| 130 | + } |
|
| 131 | + ?> |
|
| 132 | 132 | <div class="more"> |
| 133 | 133 | <?php |
| 134 | - if ($year != '' && $month != '') { |
|
| 135 | - ?> |
|
| 134 | + if ($year != '' && $month != '') { |
|
| 135 | + ?> |
|
| 136 | 136 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 137 | 137 | <?php |
| 138 | - } else { |
|
| 139 | - ?> |
|
| 138 | + } else { |
|
| 139 | + ?> |
|
| 140 | 140 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 141 | 141 | <?php |
| 142 | - } |
|
| 143 | - ?> |
|
| 142 | + } |
|
| 143 | + ?> |
|
| 144 | 144 | </div> |
| 145 | 145 | </div> |
| 146 | 146 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 147 | 147 | <?php |
| 148 | 148 | // echo $airline_icao; |
| 149 | - if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 149 | + if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 150 | 150 | $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
| 151 | 151 | if (count($airline_array) > 0) { |
| 152 | - print '<div class="col-md-6">'; |
|
| 153 | - print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 154 | - print '<div id="chart2" class="chart" width="100%"></div> |
|
| 152 | + print '<div class="col-md-6">'; |
|
| 153 | + print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 154 | + print '<div id="chart2" class="chart" width="100%"></div> |
|
| 155 | 155 | <script> |
| 156 | 156 | google.load("visualization", "1", {packages:["corechart"]}); |
| 157 | 157 | google.setOnLoadCallback(drawChart2); |
| 158 | 158 | function drawChart2() { |
| 159 | 159 | var data = google.visualization.arrayToDataTable([ |
| 160 | 160 | ["'._("Airline").'", "'._("# of times").'"], '; |
| 161 | - $airline_data = ''; |
|
| 162 | - foreach($airline_array as $airline_item) |
|
| 163 | - { |
|
| 161 | + $airline_data = ''; |
|
| 162 | + foreach($airline_array as $airline_item) |
|
| 163 | + { |
|
| 164 | 164 | $airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 165 | - } |
|
| 166 | - $airline_data = substr($airline_data, 0, -1); |
|
| 167 | - print $airline_data; |
|
| 168 | - print ']); |
|
| 165 | + } |
|
| 166 | + $airline_data = substr($airline_data, 0, -1); |
|
| 167 | + print $airline_data; |
|
| 168 | + print ']); |
|
| 169 | 169 | |
| 170 | 170 | var options = { |
| 171 | 171 | chartArea: {"width": "80%", "height": "60%"}, |
@@ -180,31 +180,31 @@ discard block |
||
| 180 | 180 | drawChart2(); |
| 181 | 181 | }); |
| 182 | 182 | </script>'; |
| 183 | - if ($year != '' && $month != '') { |
|
| 183 | + if ($year != '' && $month != '') { |
|
| 184 | 184 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 185 | 185 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 186 | 186 | print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 187 | - } else { |
|
| 187 | + } else { |
|
| 188 | 188 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 189 | 189 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 190 | 190 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 191 | - } |
|
| 192 | - print '</div>'; |
|
| 191 | + } |
|
| 192 | + print '</div>'; |
|
| 193 | 193 | } |
| 194 | 194 | ?> |
| 195 | 195 | </div> |
| 196 | 196 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 197 | 197 | <?php |
| 198 | - } |
|
| 198 | + } |
|
| 199 | 199 | ?> |
| 200 | 200 | <div class="row column"> |
| 201 | 201 | <?php |
| 202 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 203 | - if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 202 | + $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 203 | + if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 204 | 204 | if (empty($flightover_array)) { |
| 205 | - print '<div class="col-md-12">'; |
|
| 205 | + print '<div class="col-md-12">'; |
|
| 206 | 206 | } else { |
| 207 | - print '<div class="col-md-6">'; |
|
| 207 | + print '<div class="col-md-6">'; |
|
| 208 | 208 | } |
| 209 | 209 | ?> |
| 210 | 210 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
@@ -212,21 +212,21 @@ discard block |
||
| 212 | 212 | $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
| 213 | 213 | if (count($pilot_array) == 0) print _("No data available"); |
| 214 | 214 | else { |
| 215 | - print '<div id="chart7" class="chart" width="100%"></div> |
|
| 215 | + print '<div id="chart7" class="chart" width="100%"></div> |
|
| 216 | 216 | <script> |
| 217 | 217 | google.load("visualization", "1", {packages:["corechart"]}); |
| 218 | 218 | google.setOnLoadCallback(drawChart7); |
| 219 | 219 | function drawChart7() { |
| 220 | 220 | var data = google.visualization.arrayToDataTable([ |
| 221 | 221 | ["'._("Pilots").'", "'._("# of times").'"], '; |
| 222 | - $pilot_data = ''; |
|
| 223 | - foreach($pilot_array as $pilot_item) |
|
| 224 | - { |
|
| 222 | + $pilot_data = ''; |
|
| 223 | + foreach($pilot_array as $pilot_item) |
|
| 224 | + { |
|
| 225 | 225 | $pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 226 | - } |
|
| 227 | - $pilot_data = substr($pilot_data, 0, -1); |
|
| 228 | - print $pilot_data; |
|
| 229 | - print ']); |
|
| 226 | + } |
|
| 227 | + $pilot_data = substr($pilot_data, 0, -1); |
|
| 228 | + print $pilot_data; |
|
| 229 | + print ']); |
|
| 230 | 230 | |
| 231 | 231 | var options = { |
| 232 | 232 | chartArea: {"width": "80%", "height": "60%"}, |
@@ -241,8 +241,8 @@ discard block |
||
| 241 | 241 | drawChart7(); |
| 242 | 242 | }); |
| 243 | 243 | </script>'; |
| 244 | - } |
|
| 245 | - print '<div class="more">'; |
|
| 244 | + } |
|
| 245 | + print '<div class="more">'; |
|
| 246 | 246 | print '<a href="'.$globalURL.'/statistics/pilot'; |
| 247 | 247 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 248 | 248 | print'" class="btn btn-default btn" role="button">'._("See full statistic").'»</a>'; |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 254 | 254 | <?php |
| 255 | - } else { |
|
| 255 | + } else { |
|
| 256 | 256 | ?> |
| 257 | 257 | <div class="col-md-6"> |
| 258 | 258 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
@@ -260,21 +260,21 @@ discard block |
||
| 260 | 260 | $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
| 261 | 261 | if (count($owner_array) == 0) print _("No data available"); |
| 262 | 262 | else { |
| 263 | - print '<div id="chart7" class="chart" width="100%"></div> |
|
| 263 | + print '<div id="chart7" class="chart" width="100%"></div> |
|
| 264 | 264 | <script> |
| 265 | 265 | google.load("visualization", "1", {packages:["corechart"]}); |
| 266 | 266 | google.setOnLoadCallback(drawChart7); |
| 267 | 267 | function drawChart7() { |
| 268 | 268 | var data = google.visualization.arrayToDataTable([ |
| 269 | 269 | ["'._("Owner").'", "'._("# of times").'"], '; |
| 270 | - $owner_data = ''; |
|
| 271 | - foreach($owner_array as $owner_item) |
|
| 272 | - { |
|
| 270 | + $owner_data = ''; |
|
| 271 | + foreach($owner_array as $owner_item) |
|
| 272 | + { |
|
| 273 | 273 | $owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 274 | - } |
|
| 275 | - $owner_data = substr($owner_data, 0, -1); |
|
| 276 | - print $owner_data; |
|
| 277 | - print ']); |
|
| 274 | + } |
|
| 275 | + $owner_data = substr($owner_data, 0, -1); |
|
| 276 | + print $owner_data; |
|
| 277 | + print ']); |
|
| 278 | 278 | |
| 279 | 279 | var options = { |
| 280 | 280 | chartArea: {"width": "80%", "height": "60%"}, |
@@ -298,8 +298,8 @@ discard block |
||
| 298 | 298 | |
| 299 | 299 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 300 | 300 | <?php |
| 301 | - } |
|
| 302 | - if (!empty($flightover_array)) { |
|
| 301 | + } |
|
| 302 | + if (!empty($flightover_array)) { |
|
| 303 | 303 | ?> |
| 304 | 304 | <div class="col-md-6"> |
| 305 | 305 | <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2> |
@@ -307,21 +307,21 @@ discard block |
||
| 307 | 307 | //$flightover_array = $Stats->countAllFlightOverCountries(); |
| 308 | 308 | if (count($flightover_array) == 0) print _("No data available"); |
| 309 | 309 | else { |
| 310 | - print '<div id="chart10" class="chart" width="100%"></div> |
|
| 310 | + print '<div id="chart10" class="chart" width="100%"></div> |
|
| 311 | 311 | <script> |
| 312 | 312 | google.load("visualization", "1", {packages:["corechart"]}); |
| 313 | 313 | google.setOnLoadCallback(drawChart10); |
| 314 | 314 | function drawChart10() { |
| 315 | 315 | var data = google.visualization.arrayToDataTable([ |
| 316 | 316 | ["'._("Country").'", "'._("# of times").'"], '; |
| 317 | - $flightover_data = ''; |
|
| 318 | - foreach($flightover_array as $flightover_item) |
|
| 319 | - { |
|
| 317 | + $flightover_data = ''; |
|
| 318 | + foreach($flightover_array as $flightover_item) |
|
| 319 | + { |
|
| 320 | 320 | $flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],'; |
| 321 | - } |
|
| 322 | - $flightover_data = substr($flightover_data, 0, -1); |
|
| 323 | - print $flightover_data; |
|
| 324 | - print ']); |
|
| 321 | + } |
|
| 322 | + $flightover_data = substr($flightover_data, 0, -1); |
|
| 323 | + print $flightover_data; |
|
| 324 | + print ']); |
|
| 325 | 325 | |
| 326 | 326 | var options = { |
| 327 | 327 | chartArea: {"width": "80%", "height": "60%"}, |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | </div> |
| 346 | 346 | </div> |
| 347 | 347 | <?php |
| 348 | - } |
|
| 348 | + } |
|
| 349 | 349 | ?> |
| 350 | 350 | </div> |
| 351 | 351 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | <div class="row column"> |
| 356 | 356 | <div class="col-md-6"> |
| 357 | 357 | <?php |
| 358 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 359 | - if (count($airport_airport_array) > 0) { |
|
| 358 | + $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 359 | + if (count($airport_airport_array) > 0) { |
|
| 360 | 360 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 361 | 361 | print '<div id="chart3" class="chart" width="100%"></div> |
| 362 | 362 | <script> |
@@ -369,13 +369,13 @@ discard block |
||
| 369 | 369 | |
| 370 | 370 | var data = google.visualization.arrayToDataTable([ |
| 371 | 371 | ["'._("Airport").'", "'._("# of times").'"],'; |
| 372 | - $airport_data = ''; |
|
| 372 | + $airport_data = ''; |
|
| 373 | 373 | foreach($airport_airport_array as $airport_item) |
| 374 | 374 | { |
| 375 | - $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')'; |
|
| 376 | - $name = str_replace("'", "", $name); |
|
| 377 | - $name = str_replace('"', "", $name); |
|
| 378 | - $airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],'; |
|
| 375 | + $name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')'; |
|
| 376 | + $name = str_replace("'", "", $name); |
|
| 377 | + $name = str_replace('"', "", $name); |
|
| 378 | + $airport_data .= '[ "'.$name.'",'.$airport_item['airport_departure_icao_count'].'],'; |
|
| 379 | 379 | } |
| 380 | 380 | $airport_data = substr($airport_data, 0, -1); |
| 381 | 381 | print $airport_data; |
@@ -396,15 +396,15 @@ discard block |
||
| 396 | 396 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; |
| 397 | 397 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 398 | 398 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 399 | - } |
|
| 399 | + } |
|
| 400 | 400 | ?> |
| 401 | 401 | </div> |
| 402 | 402 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 403 | 403 | |
| 404 | 404 | <div class="col-md-6"> |
| 405 | 405 | <?php |
| 406 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 407 | - if (count($airport_airport_array2) > 0) { |
|
| 406 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 407 | + if (count($airport_airport_array2) > 0) { |
|
| 408 | 408 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 409 | 409 | print '<div id="chart4" class="chart" width="100%"></div> |
| 410 | 410 | <script> |
@@ -420,9 +420,9 @@ discard block |
||
| 420 | 420 | $airport_data2 = ''; |
| 421 | 421 | foreach($airport_airport_array2 as $airport_item2) |
| 422 | 422 | { |
| 423 | - $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')'; |
|
| 424 | - $name2 = str_replace(array("'",'"'), '', $name2); |
|
| 425 | - $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],'; |
|
| 423 | + $name2 = $airport_item2['airport_arrival_city'].', '.$airport_item2['airport_arrival_country'].' ('.$airport_item2['airport_arrival_icao'].')'; |
|
| 424 | + $name2 = str_replace(array("'",'"'), '', $name2); |
|
| 425 | + $airport_data2 .= '[ "'.$name2.'",'.$airport_item2['airport_arrival_icao_count'].'],'; |
|
| 426 | 426 | } |
| 427 | 427 | $airport_data2 = substr($airport_data2, 0, -1); |
| 428 | 428 | print $airport_data2; |
@@ -443,36 +443,36 @@ discard block |
||
| 443 | 443 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival'; |
| 444 | 444 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 445 | 445 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 446 | - } |
|
| 446 | + } |
|
| 447 | 447 | ?> |
| 448 | 448 | </div> |
| 449 | 449 | </div> |
| 450 | 450 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 451 | 451 | <?php |
| 452 | - if ($year == '' && $month == '') { |
|
| 452 | + if ($year == '' && $month == '') { |
|
| 453 | 453 | ?> |
| 454 | 454 | <div class="row column"> |
| 455 | 455 | <div class="col-md-6"> |
| 456 | 456 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 457 | 457 | <?php |
| 458 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 459 | - if (count($year_array) == 0) print _("No data available"); |
|
| 460 | - else { |
|
| 461 | - print '<div id="chart8" class="chart" width="100%"></div> |
|
| 458 | + $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 459 | + if (count($year_array) == 0) print _("No data available"); |
|
| 460 | + else { |
|
| 461 | + print '<div id="chart8" class="chart" width="100%"></div> |
|
| 462 | 462 | <script> |
| 463 | 463 | google.load("visualization", "1", {packages:["corechart"]}); |
| 464 | 464 | google.setOnLoadCallback(drawChart8); |
| 465 | 465 | function drawChart8() { |
| 466 | 466 | var data = google.visualization.arrayToDataTable([ |
| 467 | 467 | ["'._("Month").'", "'._("# of Flights").'"], '; |
| 468 | - $year_data = ''; |
|
| 469 | - foreach($year_array as $year_item) |
|
| 470 | - { |
|
| 471 | - $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],'; |
|
| 472 | - } |
|
| 473 | - $year_data = substr($year_data, 0, -1); |
|
| 474 | - print $year_data; |
|
| 475 | - print ']); |
|
| 468 | + $year_data = ''; |
|
| 469 | + foreach($year_array as $year_item) |
|
| 470 | + { |
|
| 471 | + $year_data .= '[ "'.date('F, Y',strtotime($year_item['year_name'].'-'.$year_item['month_name'].'-01')).'",'.$year_item['date_count'].'],'; |
|
| 472 | + } |
|
| 473 | + $year_data = substr($year_data, 0, -1); |
|
| 474 | + print $year_data; |
|
| 475 | + print ']); |
|
| 476 | 476 | |
| 477 | 477 | var options = { |
| 478 | 478 | legend: {position: "none"}, |
@@ -490,8 +490,8 @@ discard block |
||
| 490 | 490 | drawChart8(); |
| 491 | 491 | }); |
| 492 | 492 | </script>'; |
| 493 | - } |
|
| 494 | - ?> |
|
| 493 | + } |
|
| 494 | + ?> |
|
| 495 | 495 | <div class="more"> |
| 496 | 496 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 497 | 497 | </div> |
@@ -500,24 +500,24 @@ discard block |
||
| 500 | 500 | <div class="col-md-6"> |
| 501 | 501 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 502 | 502 | <?php |
| 503 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 504 | - if (count($month_array) == 0) print _("No data available"); |
|
| 505 | - else { |
|
| 506 | - print '<div id="chart9" class="chart" width="100%"></div> |
|
| 503 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 504 | + if (count($month_array) == 0) print _("No data available"); |
|
| 505 | + else { |
|
| 506 | + print '<div id="chart9" class="chart" width="100%"></div> |
|
| 507 | 507 | <script> |
| 508 | 508 | google.load("visualization", "1", {packages:["corechart"]}); |
| 509 | 509 | google.setOnLoadCallback(drawChart9); |
| 510 | 510 | function drawChart9() { |
| 511 | 511 | var data = google.visualization.arrayToDataTable([ |
| 512 | 512 | ["'._("Day").'", "'._("# of Flights").'"], '; |
| 513 | - $month_data = ''; |
|
| 514 | - foreach($month_array as $month_item) |
|
| 515 | - { |
|
| 516 | - $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],'; |
|
| 517 | - } |
|
| 518 | - $month_data = substr($month_data, 0, -1); |
|
| 519 | - print $month_data; |
|
| 520 | - print ']); |
|
| 513 | + $month_data = ''; |
|
| 514 | + foreach($month_array as $month_item) |
|
| 515 | + { |
|
| 516 | + $month_data .= '[ "'.date('F j, Y',strtotime($month_item['date_name'])).'",'.$month_item['date_count'].'],'; |
|
| 517 | + } |
|
| 518 | + $month_data = substr($month_data, 0, -1); |
|
| 519 | + print $month_data; |
|
| 520 | + print ']); |
|
| 521 | 521 | |
| 522 | 522 | var options = { |
| 523 | 523 | legend: {position: "none"}, |
@@ -535,8 +535,8 @@ discard block |
||
| 535 | 535 | drawChart9(); |
| 536 | 536 | }); |
| 537 | 537 | </script>'; |
| 538 | - } |
|
| 539 | - ?> |
|
| 538 | + } |
|
| 539 | + ?> |
|
| 540 | 540 | <div class="more"> |
| 541 | 541 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 542 | 542 | </div> |
@@ -546,25 +546,25 @@ discard block |
||
| 546 | 546 | <div class="col-md-6"> |
| 547 | 547 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 548 | 548 | <?php |
| 549 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 550 | - if (empty($date_array)) print _("No data available"); |
|
| 551 | - else { |
|
| 552 | - print '<div id="chart5" class="chart" width="100%"></div> |
|
| 549 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 550 | + if (empty($date_array)) print _("No data available"); |
|
| 551 | + else { |
|
| 552 | + print '<div id="chart5" class="chart" width="100%"></div> |
|
| 553 | 553 | <script> |
| 554 | 554 | google.load("visualization", "1", {packages:["corechart"]}); |
| 555 | 555 | google.setOnLoadCallback(drawChart5); |
| 556 | 556 | function drawChart5() { |
| 557 | 557 | var data = google.visualization.arrayToDataTable([ |
| 558 | 558 | ["'._("Date").'", "'._("# of Flights").'"], '; |
| 559 | - $date_data = ''; |
|
| 559 | + $date_data = ''; |
|
| 560 | 560 | |
| 561 | - foreach($date_array as $date_item) |
|
| 562 | - { |
|
| 563 | - $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],'; |
|
| 564 | - } |
|
| 565 | - $date_data = substr($date_data, 0, -1); |
|
| 566 | - print $date_data; |
|
| 567 | - print ']); |
|
| 561 | + foreach($date_array as $date_item) |
|
| 562 | + { |
|
| 563 | + $date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],'; |
|
| 564 | + } |
|
| 565 | + $date_data = substr($date_data, 0, -1); |
|
| 566 | + print $date_data; |
|
| 567 | + print ']); |
|
| 568 | 568 | |
| 569 | 569 | var options = { |
| 570 | 570 | legend: {position: "none"}, |
@@ -582,8 +582,8 @@ discard block |
||
| 582 | 582 | drawChart5(); |
| 583 | 583 | }); |
| 584 | 584 | </script>'; |
| 585 | - } |
|
| 586 | - ?> |
|
| 585 | + } |
|
| 586 | + ?> |
|
| 587 | 587 | <div class="more"> |
| 588 | 588 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 589 | 589 | </div> |
@@ -592,25 +592,25 @@ discard block |
||
| 592 | 592 | <div class="col-md-6"> |
| 593 | 593 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 594 | 594 | <?php |
| 595 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 596 | - if (empty($hour_array)) print _("No data available"); |
|
| 597 | - else { |
|
| 595 | + $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 596 | + if (empty($hour_array)) print _("No data available"); |
|
| 597 | + else { |
|
| 598 | 598 | |
| 599 | - print '<div id="chart6" class="chart" width="100%"></div> |
|
| 599 | + print '<div id="chart6" class="chart" width="100%"></div> |
|
| 600 | 600 | <script> |
| 601 | 601 | google.load("visualization", "1", {packages:["corechart"]}); |
| 602 | 602 | google.setOnLoadCallback(drawChart6); |
| 603 | 603 | function drawChart6() { |
| 604 | 604 | var data = google.visualization.arrayToDataTable([ |
| 605 | 605 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
| 606 | - $hour_data = ''; |
|
| 607 | - foreach($hour_array as $hour_item) |
|
| 608 | - { |
|
| 609 | - $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],'; |
|
| 610 | - } |
|
| 611 | - $hour_data = substr($hour_data, 0, -1); |
|
| 612 | - print $hour_data; |
|
| 613 | - print ']); |
|
| 606 | + $hour_data = ''; |
|
| 607 | + foreach($hour_array as $hour_item) |
|
| 608 | + { |
|
| 609 | + $hour_data .= '[ "'.$hour_item['hour_name'].':00",'.$hour_item['hour_count'].'],'; |
|
| 610 | + } |
|
| 611 | + $hour_data = substr($hour_data, 0, -1); |
|
| 612 | + print $hour_data; |
|
| 613 | + print ']); |
|
| 614 | 614 | |
| 615 | 615 | var options = { |
| 616 | 616 | legend: {position: "none"}, |
@@ -628,8 +628,8 @@ discard block |
||
| 628 | 628 | drawChart6(); |
| 629 | 629 | }); |
| 630 | 630 | </script>'; |
| 631 | - } |
|
| 632 | - ?> |
|
| 631 | + } |
|
| 632 | + ?> |
|
| 633 | 633 | <div class="more"> |
| 634 | 634 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 635 | 635 | </div> |
@@ -637,34 +637,34 @@ discard block |
||
| 637 | 637 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 638 | 638 | </div> |
| 639 | 639 | <?php |
| 640 | - } |
|
| 640 | + } |
|
| 641 | 641 | ?> |
| 642 | 642 | |
| 643 | 643 | <?php |
| 644 | - if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 644 | + if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 645 | 645 | ?> |
| 646 | 646 | <div class="row column"> |
| 647 | 647 | <div class="col-md-6"> |
| 648 | 648 | <h2><?php echo _("Fatalities by Years"); ?></h2> |
| 649 | 649 | <?php |
| 650 | - $year_array = $Stats->countFatalitiesByYear(); |
|
| 651 | - if (count($year_array) == 0) print _("No data available"); |
|
| 652 | - else { |
|
| 653 | - print '<div id="chart32" class="chart" width="100%"></div> |
|
| 650 | + $year_array = $Stats->countFatalitiesByYear(); |
|
| 651 | + if (count($year_array) == 0) print _("No data available"); |
|
| 652 | + else { |
|
| 653 | + print '<div id="chart32" class="chart" width="100%"></div> |
|
| 654 | 654 | <script> |
| 655 | 655 | google.load("visualization", "1", {packages:["corechart"]}); |
| 656 | 656 | google.setOnLoadCallback(drawChart32); |
| 657 | 657 | function drawChart32() { |
| 658 | 658 | var data = google.visualization.arrayToDataTable([ |
| 659 | 659 | ["'._("Year").'", "'._("# of Fatalities").'"], '; |
| 660 | - $year_data = ''; |
|
| 661 | - foreach($year_array as $year_item) |
|
| 662 | - { |
|
| 663 | - $year_data .= '[ "'.$year_item['year'].'",'.$year_item['count'].'],'; |
|
| 664 | - } |
|
| 665 | - $year_data = substr($year_data, 0, -1); |
|
| 666 | - print $year_data; |
|
| 667 | - print ']); |
|
| 660 | + $year_data = ''; |
|
| 661 | + foreach($year_array as $year_item) |
|
| 662 | + { |
|
| 663 | + $year_data .= '[ "'.$year_item['year'].'",'.$year_item['count'].'],'; |
|
| 664 | + } |
|
| 665 | + $year_data = substr($year_data, 0, -1); |
|
| 666 | + print $year_data; |
|
| 667 | + print ']); |
|
| 668 | 668 | |
| 669 | 669 | var options = { |
| 670 | 670 | legend: {position: "none"}, |
@@ -682,8 +682,8 @@ discard block |
||
| 682 | 682 | drawChart32(); |
| 683 | 683 | }); |
| 684 | 684 | </script>'; |
| 685 | - } |
|
| 686 | - ?> |
|
| 685 | + } |
|
| 686 | + ?> |
|
| 687 | 687 | <div class="more"> |
| 688 | 688 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 689 | 689 | </div> |
@@ -694,24 +694,24 @@ discard block |
||
| 694 | 694 | <div class="col-md-6"> |
| 695 | 695 | <h2><?php echo _("Fatalities last 12 Months"); ?></h2> |
| 696 | 696 | <?php |
| 697 | - $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 698 | - if (count($year_array) == 0) print _("No data available"); |
|
| 699 | - else { |
|
| 700 | - print '<div id="chart33" class="chart" width="100%"></div> |
|
| 697 | + $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 698 | + if (count($year_array) == 0) print _("No data available"); |
|
| 699 | + else { |
|
| 700 | + print '<div id="chart33" class="chart" width="100%"></div> |
|
| 701 | 701 | <script> |
| 702 | 702 | google.load("visualization", "1", {packages:["corechart"]}); |
| 703 | 703 | google.setOnLoadCallback(drawChart33); |
| 704 | 704 | function drawChart33() { |
| 705 | 705 | var data = google.visualization.arrayToDataTable([ |
| 706 | 706 | ["'._("Month").'", "'._("# of Fatalities").'"], '; |
| 707 | - $year_data = ''; |
|
| 708 | - foreach($year_array as $year_item) |
|
| 709 | - { |
|
| 710 | - $year_data .= '[ "'.date('F, Y',strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],'; |
|
| 711 | - } |
|
| 712 | - $year_data = substr($year_data, 0, -1); |
|
| 713 | - print $year_data; |
|
| 714 | - print ']); |
|
| 707 | + $year_data = ''; |
|
| 708 | + foreach($year_array as $year_item) |
|
| 709 | + { |
|
| 710 | + $year_data .= '[ "'.date('F, Y',strtotime($year_item['year'].'-'.$year_item['month'].'-01')).'",'.$year_item['count'].'],'; |
|
| 711 | + } |
|
| 712 | + $year_data = substr($year_data, 0, -1); |
|
| 713 | + print $year_data; |
|
| 714 | + print ']); |
|
| 715 | 715 | |
| 716 | 716 | var options = { |
| 717 | 717 | legend: {position: "none"}, |
@@ -729,8 +729,8 @@ discard block |
||
| 729 | 729 | drawChart33(); |
| 730 | 730 | }); |
| 731 | 731 | </script>'; |
| 732 | - } |
|
| 733 | - ?> |
|
| 732 | + } |
|
| 733 | + ?> |
|
| 734 | 734 | <div class="more"> |
| 735 | 735 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 736 | 736 | </div> |
@@ -738,30 +738,30 @@ discard block |
||
| 738 | 738 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 739 | 739 | <br/> |
| 740 | 740 | <?php |
| 741 | - } |
|
| 741 | + } |
|
| 742 | 742 | ?> |
| 743 | 743 | |
| 744 | 744 | <?php |
| 745 | - if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 745 | + if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 746 | 746 | ?> |
| 747 | 747 | <div class="row column"> |
| 748 | 748 | <?php |
| 749 | - //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 750 | - if ($year == '' && $month == '') { |
|
| 751 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 752 | - } else { |
|
| 753 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 754 | - } |
|
| 755 | - if (!empty($polar)) { |
|
| 756 | - print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 757 | - foreach ($polar as $eachpolar) { |
|
| 758 | - unset($polar_data); |
|
| 759 | - $Spotter = new Spotter(); |
|
| 760 | - $data = json_decode($eachpolar['source_data']); |
|
| 761 | - foreach($data as $value => $key) { |
|
| 762 | - $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 763 | - $distance = $key; |
|
| 764 | - $unit = 'km'; |
|
| 749 | + //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 750 | + if ($year == '' && $month == '') { |
|
| 751 | + $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 752 | + } else { |
|
| 753 | + $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 754 | + } |
|
| 755 | + if (!empty($polar)) { |
|
| 756 | + print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 757 | + foreach ($polar as $eachpolar) { |
|
| 758 | + unset($polar_data); |
|
| 759 | + $Spotter = new Spotter(); |
|
| 760 | + $data = json_decode($eachpolar['source_data']); |
|
| 761 | + foreach($data as $value => $key) { |
|
| 762 | + $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 763 | + $distance = $key; |
|
| 764 | + $unit = 'km'; |
|
| 765 | 765 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 766 | 766 | $distance = round($distance*0.539957); |
| 767 | 767 | $unit = 'nm'; |
@@ -772,10 +772,10 @@ discard block |
||
| 772 | 772 | $distance = $distance; |
| 773 | 773 | $unit = 'km'; |
| 774 | 774 | } |
| 775 | - if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 776 | - else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 777 | - } |
|
| 778 | - ?> |
|
| 775 | + if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 776 | + else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 777 | + } |
|
| 778 | + ?> |
|
| 779 | 779 | <div class="col-md-6"> |
| 780 | 780 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 781 | 781 | <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
@@ -807,27 +807,27 @@ discard block |
||
| 807 | 807 | </script> |
| 808 | 808 | </div> |
| 809 | 809 | <?php |
| 810 | - } |
|
| 811 | - } |
|
| 812 | - ?> |
|
| 810 | + } |
|
| 811 | + } |
|
| 812 | + ?> |
|
| 813 | 813 | </div> |
| 814 | 814 | <div class="row column"> |
| 815 | 815 | <div class="col-md-6"> |
| 816 | 816 | <?php |
| 817 | - //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 818 | - if ($year == '' && $month == '') { |
|
| 819 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 820 | - } else { |
|
| 821 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 822 | - } |
|
| 823 | - if (!empty($msg)) { |
|
| 824 | - print '<h2>'._("Messages received").'</h2>'; |
|
| 825 | - foreach ($msg as $eachmsg) { |
|
| 826 | - //$eachmsg = $msg[0]; |
|
| 827 | - $data = $eachmsg['source_data']; |
|
| 828 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 829 | - else $max = 500; |
|
| 830 | - ?> |
|
| 817 | + //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 818 | + if ($year == '' && $month == '') { |
|
| 819 | + $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 820 | + } else { |
|
| 821 | + $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 822 | + } |
|
| 823 | + if (!empty($msg)) { |
|
| 824 | + print '<h2>'._("Messages received").'</h2>'; |
|
| 825 | + foreach ($msg as $eachmsg) { |
|
| 826 | + //$eachmsg = $msg[0]; |
|
| 827 | + $data = $eachmsg['source_data']; |
|
| 828 | + if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 829 | + else $max = 500; |
|
| 830 | + ?> |
|
| 831 | 831 | <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
| 832 | 832 | <script> |
| 833 | 833 | var g = new JustGage({ |
@@ -843,9 +843,9 @@ discard block |
||
| 843 | 843 | }); |
| 844 | 844 | </script> |
| 845 | 845 | <?php |
| 846 | - } |
|
| 847 | - } |
|
| 848 | - ?> |
|
| 846 | + } |
|
| 847 | + } |
|
| 848 | + ?> |
|
| 849 | 849 | </div> |
| 850 | 850 | </div> |
| 851 | 851 | <div class="row column"> |
@@ -877,19 +877,19 @@ discard block |
||
| 877 | 877 | $hist_data .= '[ "'.$distance.'",'.$nb.'],'; |
| 878 | 878 | } |
| 879 | 879 | $hist_data = substr($hist_data, 0, -1); |
| 880 | - ?> |
|
| 880 | + ?> |
|
| 881 | 881 | <div class="col-md-6"> |
| 882 | 882 | <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
| 883 | 883 | <?php |
| 884 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div> |
|
| 884 | + print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div> |
|
| 885 | 885 | <script> |
| 886 | 886 | google.load("visualization", "1", {packages:["corechart"]}); |
| 887 | 887 | google.setOnLoadCallback(drawCharthist_'.str_replace(' ','_',strtolower($source)).'); |
| 888 | 888 | function drawCharthist_'.str_replace(' ','_',strtolower($source)).'() { |
| 889 | 889 | var data = google.visualization.arrayToDataTable([ |
| 890 | 890 | ["'._("Distance").'", "'._("# of Flights").'"], '; |
| 891 | - print $hist_data; |
|
| 892 | - print ']); |
|
| 891 | + print $hist_data; |
|
| 892 | + print ']); |
|
| 893 | 893 | |
| 894 | 894 | var options = { |
| 895 | 895 | legend: {position: "none"}, |
@@ -907,15 +907,15 @@ discard block |
||
| 907 | 907 | drawCharthist_'.str_replace(' ','_',strtolower($source)).'(); |
| 908 | 908 | }); |
| 909 | 909 | </script>'; |
| 910 | - ?> |
|
| 910 | + ?> |
|
| 911 | 911 | </div> |
| 912 | 912 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 913 | 913 | <?php |
| 914 | - } |
|
| 915 | - ?> |
|
| 914 | + } |
|
| 915 | + ?> |
|
| 916 | 916 | </div> |
| 917 | 917 | <?php |
| 918 | - } |
|
| 918 | + } |
|
| 919 | 919 | ?> |
| 920 | 920 | </div> |
| 921 | 921 | </div> |
@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | $this->db = $Connection->db; |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * Get SQL query part for filter used |
|
| 13 | - * @param Array $filter the filter |
|
| 14 | - * @return Array the SQL part |
|
| 15 | - */ |
|
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 11 | + /** |
|
| 12 | + * Get SQL query part for filter used |
|
| 13 | + * @param Array $filter the filter |
|
| 14 | + * @return Array the SQL part |
|
| 15 | + */ |
|
| 16 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -30,88 +30,88 @@ discard block |
||
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | foreach($filters as $flt) { |
| 33 | - if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 33 | + if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | - if (isset($flt['source'])) { |
|
| 35 | + if (isset($flt['source'])) { |
|
| 36 | 36 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 37 | - } else { |
|
| 37 | + } else { |
|
| 38 | 38 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 39 | - } |
|
| 39 | + } |
|
| 40 | + } |
|
| 40 | 41 | } |
| 41 | - } |
|
| 42 | - if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 42 | + if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | - } |
|
| 49 | - if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 48 | + } |
|
| 49 | + if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | - } |
|
| 56 | - if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 56 | + if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + } |
|
| 61 | 62 | } |
| 62 | - } |
|
| 63 | - if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
|
| 63 | + if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
|
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | - } |
|
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | - if ($filter['airlines'][0] != '') { |
|
| 70 | + if ($filter['airlines'][0] != '') { |
|
| 71 | 71 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 76 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | - $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 85 | + $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | 88 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | - $filter_query_date = ''; |
|
| 91 | + $filter_query_date = ''; |
|
| 92 | 92 | |
| 93 | - if (isset($filter['year']) && $filter['year'] != '') { |
|
| 93 | + if (isset($filter['year']) && $filter['year'] != '') { |
|
| 94 | 94 | if ($globalDBdriver == 'mysql') { |
| 95 | - $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 95 | + $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 96 | 96 | } else { |
| 97 | - $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 97 | + $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 98 | + } |
|
| 98 | 99 | } |
| 99 | - } |
|
| 100 | - if (isset($filter['month']) && $filter['month'] != '') { |
|
| 100 | + if (isset($filter['month']) && $filter['month'] != '') { |
|
| 101 | 101 | if ($globalDBdriver == 'mysql') { |
| 102 | - $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 102 | + $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 103 | 103 | } else { |
| 104 | - $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 104 | + $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 105 | 105 | } |
| 106 | - } |
|
| 107 | - if (isset($filter['day']) && $filter['day'] != '') { |
|
| 106 | + } |
|
| 107 | + if (isset($filter['day']) && $filter['day'] != '') { |
|
| 108 | 108 | if ($globalDBdriver == 'mysql') { |
| 109 | - $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 109 | + $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 110 | 110 | } else { |
| 111 | - $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 111 | + $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 112 | + } |
|
| 112 | 113 | } |
| 113 | - } |
|
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | 126 | public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
@@ -151,44 +151,44 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Gets all the spotter information based on a particular callsign |
|
| 156 | - * |
|
| 157 | - * @return Array the spotter information |
|
| 158 | - * |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | - { |
|
| 154 | + /** |
|
| 155 | + * Gets all the spotter information based on a particular callsign |
|
| 156 | + * |
|
| 157 | + * @return Array the spotter information |
|
| 158 | + * |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | + { |
|
| 162 | 162 | $Spotter = new Spotter($this->db); |
| 163 | - date_default_timezone_set('UTC'); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | 164 | |
| 165 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 165 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | - return $spotter_array; |
|
| 172 | - } |
|
| 171 | + return $spotter_array; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Gets last the spotter information based on a particular id |
|
| 177 | - * |
|
| 178 | - * @return Array the spotter information |
|
| 179 | - * |
|
| 180 | - */ |
|
| 181 | - public function getLastArchiveSpotterDataById($id) |
|
| 182 | - { |
|
| 183 | - $Spotter = new Spotter($this->db); |
|
| 184 | - date_default_timezone_set('UTC'); |
|
| 185 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 175 | + /** |
|
| 176 | + * Gets last the spotter information based on a particular id |
|
| 177 | + * |
|
| 178 | + * @return Array the spotter information |
|
| 179 | + * |
|
| 180 | + */ |
|
| 181 | + public function getLastArchiveSpotterDataById($id) |
|
| 182 | + { |
|
| 183 | + $Spotter = new Spotter($this->db); |
|
| 184 | + date_default_timezone_set('UTC'); |
|
| 185 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | - /* |
|
| 191 | + /* |
|
| 192 | 192 | try { |
| 193 | 193 | $Connection = new Connection(); |
| 194 | 194 | $sth = Connection->$db->prepare($query); |
@@ -198,232 +198,232 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | - |
|
| 203 | - return $spotter_array; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Gets all the spotter information based on a particular id |
|
| 208 | - * |
|
| 209 | - * @return Array the spotter information |
|
| 210 | - * |
|
| 211 | - */ |
|
| 212 | - public function getAllArchiveSpotterDataById($id) |
|
| 213 | - { |
|
| 214 | - date_default_timezone_set('UTC'); |
|
| 215 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + |
|
| 203 | + return $spotter_array; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Gets all the spotter information based on a particular id |
|
| 208 | + * |
|
| 209 | + * @return Array the spotter information |
|
| 210 | + * |
|
| 211 | + */ |
|
| 212 | + public function getAllArchiveSpotterDataById($id) |
|
| 213 | + { |
|
| 214 | + date_default_timezone_set('UTC'); |
|
| 215 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | - try { |
|
| 221 | - $sth = $this->db->prepare($query); |
|
| 222 | - $sth->execute(array(':id' => $id)); |
|
| 223 | - } catch(PDOException $e) { |
|
| 224 | - echo $e->getMessage(); |
|
| 225 | - die; |
|
| 226 | - } |
|
| 227 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | - |
|
| 229 | - return $spotter_array; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * Gets coordinate & time spotter information based on a particular id |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 238 | - public function getCoordArchiveSpotterDataById($id) |
|
| 239 | - { |
|
| 240 | - date_default_timezone_set('UTC'); |
|
| 241 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 220 | + try { |
|
| 221 | + $sth = $this->db->prepare($query); |
|
| 222 | + $sth->execute(array(':id' => $id)); |
|
| 223 | + } catch(PDOException $e) { |
|
| 224 | + echo $e->getMessage(); |
|
| 225 | + die; |
|
| 226 | + } |
|
| 227 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + |
|
| 229 | + return $spotter_array; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * Gets coordinate & time spotter information based on a particular id |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | + public function getCoordArchiveSpotterDataById($id) |
|
| 239 | + { |
|
| 240 | + date_default_timezone_set('UTC'); |
|
| 241 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':id' => $id)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo $e->getMessage(); |
|
| 251 | - die; |
|
| 252 | - } |
|
| 253 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':id' => $id)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo $e->getMessage(); |
|
| 251 | + die; |
|
| 252 | + } |
|
| 253 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | 254 | |
| 255 | - return $spotter_array; |
|
| 256 | - } |
|
| 255 | + return $spotter_array; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets altitude information based on a particular callsign |
|
| 261 | - * |
|
| 262 | - * @return Array the spotter information |
|
| 263 | - * |
|
| 264 | - */ |
|
| 265 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | - { |
|
| 259 | + /** |
|
| 260 | + * Gets altitude information based on a particular callsign |
|
| 261 | + * |
|
| 262 | + * @return Array the spotter information |
|
| 263 | + * |
|
| 264 | + */ |
|
| 265 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | + { |
|
| 267 | 267 | |
| 268 | - date_default_timezone_set('UTC'); |
|
| 268 | + date_default_timezone_set('UTC'); |
|
| 269 | 269 | |
| 270 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 270 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | 272 | |
| 273 | - try { |
|
| 274 | - $sth = $this->db->prepare($query); |
|
| 275 | - $sth->execute(array(':ident' => $ident)); |
|
| 276 | - } catch(PDOException $e) { |
|
| 277 | - echo $e->getMessage(); |
|
| 278 | - die; |
|
| 279 | - } |
|
| 280 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + try { |
|
| 274 | + $sth = $this->db->prepare($query); |
|
| 275 | + $sth->execute(array(':ident' => $ident)); |
|
| 276 | + } catch(PDOException $e) { |
|
| 277 | + echo $e->getMessage(); |
|
| 278 | + die; |
|
| 279 | + } |
|
| 280 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 281 | 281 | |
| 282 | - return $spotter_array; |
|
| 283 | - } |
|
| 282 | + return $spotter_array; |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - /** |
|
| 286 | - * Gets altitude information based on a particular id |
|
| 287 | - * |
|
| 288 | - * @return Array the spotter information |
|
| 289 | - * |
|
| 290 | - */ |
|
| 291 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | - { |
|
| 285 | + /** |
|
| 286 | + * Gets altitude information based on a particular id |
|
| 287 | + * |
|
| 288 | + * @return Array the spotter information |
|
| 289 | + * |
|
| 290 | + */ |
|
| 291 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | + { |
|
| 293 | 293 | |
| 294 | - date_default_timezone_set('UTC'); |
|
| 294 | + date_default_timezone_set('UTC'); |
|
| 295 | 295 | |
| 296 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 296 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | 298 | |
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute(array(':id' => $id)); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - echo $e->getMessage(); |
|
| 304 | - die; |
|
| 305 | - } |
|
| 306 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute(array(':id' => $id)); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + echo $e->getMessage(); |
|
| 304 | + die; |
|
| 305 | + } |
|
| 306 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 307 | 307 | |
| 308 | - return $spotter_array; |
|
| 309 | - } |
|
| 308 | + return $spotter_array; |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets altitude & speed information based on a particular id |
|
| 313 | - * |
|
| 314 | - * @return Array the spotter information |
|
| 315 | - * |
|
| 316 | - */ |
|
| 317 | - public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 318 | - { |
|
| 311 | + /** |
|
| 312 | + * Gets altitude & speed information based on a particular id |
|
| 313 | + * |
|
| 314 | + * @return Array the spotter information |
|
| 315 | + * |
|
| 316 | + */ |
|
| 317 | + public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 318 | + { |
|
| 319 | 319 | |
| 320 | - date_default_timezone_set('UTC'); |
|
| 320 | + date_default_timezone_set('UTC'); |
|
| 321 | 321 | |
| 322 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 323 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 322 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 323 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | 324 | |
| 325 | - try { |
|
| 326 | - $sth = $this->db->prepare($query); |
|
| 327 | - $sth->execute(array(':id' => $id)); |
|
| 328 | - } catch(PDOException $e) { |
|
| 329 | - echo $e->getMessage(); |
|
| 330 | - die; |
|
| 331 | - } |
|
| 332 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 325 | + try { |
|
| 326 | + $sth = $this->db->prepare($query); |
|
| 327 | + $sth->execute(array(':id' => $id)); |
|
| 328 | + } catch(PDOException $e) { |
|
| 329 | + echo $e->getMessage(); |
|
| 330 | + die; |
|
| 331 | + } |
|
| 332 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 333 | 333 | |
| 334 | - return $spotter_array; |
|
| 335 | - } |
|
| 334 | + return $spotter_array; |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | 337 | |
| 338 | - /** |
|
| 339 | - * Gets altitude information based on a particular callsign |
|
| 340 | - * |
|
| 341 | - * @return Array the spotter information |
|
| 342 | - * |
|
| 343 | - */ |
|
| 344 | - public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 345 | - { |
|
| 338 | + /** |
|
| 339 | + * Gets altitude information based on a particular callsign |
|
| 340 | + * |
|
| 341 | + * @return Array the spotter information |
|
| 342 | + * |
|
| 343 | + */ |
|
| 344 | + public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 345 | + { |
|
| 346 | 346 | |
| 347 | - date_default_timezone_set('UTC'); |
|
| 347 | + date_default_timezone_set('UTC'); |
|
| 348 | 348 | |
| 349 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 350 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 349 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 350 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 351 | 351 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 352 | 352 | |
| 353 | - try { |
|
| 354 | - $sth = $this->db->prepare($query); |
|
| 355 | - $sth->execute(array(':ident' => $ident)); |
|
| 356 | - } catch(PDOException $e) { |
|
| 357 | - echo $e->getMessage(); |
|
| 358 | - die; |
|
| 359 | - } |
|
| 360 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 353 | + try { |
|
| 354 | + $sth = $this->db->prepare($query); |
|
| 355 | + $sth->execute(array(':ident' => $ident)); |
|
| 356 | + } catch(PDOException $e) { |
|
| 357 | + echo $e->getMessage(); |
|
| 358 | + die; |
|
| 359 | + } |
|
| 360 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 361 | 361 | |
| 362 | - return $spotter_array; |
|
| 363 | - } |
|
| 362 | + return $spotter_array; |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | 365 | |
| 366 | 366 | |
| 367 | - /** |
|
| 368 | - * Gets all the archive spotter information |
|
| 369 | - * |
|
| 370 | - * @return Array the spotter information |
|
| 371 | - * |
|
| 372 | - */ |
|
| 373 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | - { |
|
| 375 | - $Spotter = new Spotter($this->db); |
|
| 376 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 377 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 367 | + /** |
|
| 368 | + * Gets all the archive spotter information |
|
| 369 | + * |
|
| 370 | + * @return Array the spotter information |
|
| 371 | + * |
|
| 372 | + */ |
|
| 373 | + public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | + { |
|
| 375 | + $Spotter = new Spotter($this->db); |
|
| 376 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 377 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | 378 | |
| 379 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 379 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | 380 | |
| 381 | - return $spotter_array; |
|
| 382 | - } |
|
| 381 | + return $spotter_array; |
|
| 382 | + } |
|
| 383 | 383 | |
| 384 | - public function deleteSpotterArchiveTrackData() |
|
| 385 | - { |
|
| 384 | + public function deleteSpotterArchiveTrackData() |
|
| 385 | + { |
|
| 386 | 386 | global $globalArchiveKeepTrackMonths; |
| 387 | - date_default_timezone_set('UTC'); |
|
| 387 | + date_default_timezone_set('UTC'); |
|
| 388 | 388 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 389 | - try { |
|
| 390 | - $sth = $this->db->prepare($query); |
|
| 391 | - $sth->execute(); |
|
| 392 | - } catch(PDOException $e) { |
|
| 393 | - echo $e->getMessage(); |
|
| 394 | - die; |
|
| 395 | - } |
|
| 389 | + try { |
|
| 390 | + $sth = $this->db->prepare($query); |
|
| 391 | + $sth->execute(); |
|
| 392 | + } catch(PDOException $e) { |
|
| 393 | + echo $e->getMessage(); |
|
| 394 | + die; |
|
| 395 | + } |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
| 399 | - * Gets Minimal Live Spotter data |
|
| 400 | - * |
|
| 401 | - * @return Array the spotter information |
|
| 402 | - * |
|
| 403 | - */ |
|
| 404 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | - { |
|
| 406 | - global $globalDBdriver, $globalLiveInterval; |
|
| 407 | - date_default_timezone_set('UTC'); |
|
| 408 | - |
|
| 409 | - $filter_query = ''; |
|
| 410 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 411 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | - } |
|
| 413 | - // Use spotter_output also ? |
|
| 414 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 415 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 416 | - } |
|
| 417 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 418 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 419 | - } |
|
| 420 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 421 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | - } |
|
| 423 | - |
|
| 424 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 425 | - if ($globalDBdriver == 'mysql') { |
|
| 426 | - /* |
|
| 399 | + * Gets Minimal Live Spotter data |
|
| 400 | + * |
|
| 401 | + * @return Array the spotter information |
|
| 402 | + * |
|
| 403 | + */ |
|
| 404 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | + { |
|
| 406 | + global $globalDBdriver, $globalLiveInterval; |
|
| 407 | + date_default_timezone_set('UTC'); |
|
| 408 | + |
|
| 409 | + $filter_query = ''; |
|
| 410 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 411 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | + } |
|
| 413 | + // Use spotter_output also ? |
|
| 414 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 415 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 416 | + } |
|
| 417 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 418 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 419 | + } |
|
| 420 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 421 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | + } |
|
| 423 | + |
|
| 424 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 425 | + if ($globalDBdriver == 'mysql') { |
|
| 426 | + /* |
|
| 427 | 427 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 428 | 428 | FROM spotter_archive |
| 429 | 429 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -442,56 +442,56 @@ discard block |
||
| 442 | 442 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 443 | 443 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 444 | 444 | '.$filter_query.' ORDER BY flightaware_id'; |
| 445 | - } else { |
|
| 446 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 447 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 445 | + } else { |
|
| 446 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 447 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 448 | 448 | FROM spotter_archive |
| 449 | 449 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 450 | 450 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 451 | 451 | '.$filter_query.' ORDER BY flightaware_id'; |
| 452 | - } |
|
| 453 | - //echo $query; |
|
| 454 | - try { |
|
| 455 | - $sth = $this->db->prepare($query); |
|
| 456 | - $sth->execute(); |
|
| 457 | - } catch(PDOException $e) { |
|
| 458 | - echo $e->getMessage(); |
|
| 459 | - die; |
|
| 460 | - } |
|
| 461 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 462 | - |
|
| 463 | - return $spotter_array; |
|
| 464 | - } |
|
| 452 | + } |
|
| 453 | + //echo $query; |
|
| 454 | + try { |
|
| 455 | + $sth = $this->db->prepare($query); |
|
| 456 | + $sth->execute(); |
|
| 457 | + } catch(PDOException $e) { |
|
| 458 | + echo $e->getMessage(); |
|
| 459 | + die; |
|
| 460 | + } |
|
| 461 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 462 | + |
|
| 463 | + return $spotter_array; |
|
| 464 | + } |
|
| 465 | 465 | |
| 466 | 466 | /** |
| 467 | - * Gets Minimal Live Spotter data |
|
| 468 | - * |
|
| 469 | - * @return Array the spotter information |
|
| 470 | - * |
|
| 471 | - */ |
|
| 472 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | - { |
|
| 474 | - global $globalDBdriver, $globalLiveInterval; |
|
| 475 | - date_default_timezone_set('UTC'); |
|
| 476 | - |
|
| 477 | - $filter_query = ''; |
|
| 478 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 479 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | - } |
|
| 481 | - // Should use spotter_output also ? |
|
| 482 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 483 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 484 | - } |
|
| 485 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 486 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 487 | - } |
|
| 488 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 489 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | - } |
|
| 491 | - |
|
| 492 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 493 | - if ($globalDBdriver == 'mysql') { |
|
| 494 | - /* |
|
| 467 | + * Gets Minimal Live Spotter data |
|
| 468 | + * |
|
| 469 | + * @return Array the spotter information |
|
| 470 | + * |
|
| 471 | + */ |
|
| 472 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | + { |
|
| 474 | + global $globalDBdriver, $globalLiveInterval; |
|
| 475 | + date_default_timezone_set('UTC'); |
|
| 476 | + |
|
| 477 | + $filter_query = ''; |
|
| 478 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 479 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | + } |
|
| 481 | + // Should use spotter_output also ? |
|
| 482 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 483 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 484 | + } |
|
| 485 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 486 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 487 | + } |
|
| 488 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 489 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | + } |
|
| 491 | + |
|
| 492 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 493 | + if ($globalDBdriver == 'mysql') { |
|
| 494 | + /* |
|
| 495 | 495 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 496 | 496 | FROM spotter_archive |
| 497 | 497 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -502,95 +502,95 @@ discard block |
||
| 502 | 502 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 503 | 503 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 504 | 504 | |
| 505 | - } else { |
|
| 506 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 507 | - /* |
|
| 505 | + } else { |
|
| 506 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 507 | + /* |
|
| 508 | 508 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 509 | 509 | FROM spotter_archive_output |
| 510 | 510 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 511 | 511 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 512 | 512 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 513 | 513 | */ |
| 514 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 514 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 515 | 515 | FROM spotter_archive_output |
| 516 | 516 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 517 | 517 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 518 | 518 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 519 | 519 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 520 | 520 | |
| 521 | - } |
|
| 522 | - //echo $query; |
|
| 523 | - try { |
|
| 524 | - $sth = $this->db->prepare($query); |
|
| 525 | - $sth->execute(); |
|
| 526 | - } catch(PDOException $e) { |
|
| 527 | - echo $e->getMessage(); |
|
| 528 | - die; |
|
| 529 | - } |
|
| 530 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 531 | - |
|
| 532 | - return $spotter_array; |
|
| 533 | - } |
|
| 521 | + } |
|
| 522 | + //echo $query; |
|
| 523 | + try { |
|
| 524 | + $sth = $this->db->prepare($query); |
|
| 525 | + $sth->execute(); |
|
| 526 | + } catch(PDOException $e) { |
|
| 527 | + echo $e->getMessage(); |
|
| 528 | + die; |
|
| 529 | + } |
|
| 530 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 531 | + |
|
| 532 | + return $spotter_array; |
|
| 533 | + } |
|
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | - * Gets count Live Spotter data |
|
| 537 | - * |
|
| 538 | - * @return Array the spotter information |
|
| 539 | - * |
|
| 540 | - */ |
|
| 541 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | - { |
|
| 543 | - global $globalDBdriver, $globalLiveInterval; |
|
| 544 | - date_default_timezone_set('UTC'); |
|
| 545 | - |
|
| 546 | - $filter_query = ''; |
|
| 547 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 548 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | - } |
|
| 550 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 551 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 552 | - } |
|
| 553 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 554 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 555 | - } |
|
| 556 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 557 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | - } |
|
| 559 | - |
|
| 560 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 561 | - if ($globalDBdriver == 'mysql') { |
|
| 536 | + * Gets count Live Spotter data |
|
| 537 | + * |
|
| 538 | + * @return Array the spotter information |
|
| 539 | + * |
|
| 540 | + */ |
|
| 541 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | + { |
|
| 543 | + global $globalDBdriver, $globalLiveInterval; |
|
| 544 | + date_default_timezone_set('UTC'); |
|
| 545 | + |
|
| 546 | + $filter_query = ''; |
|
| 547 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 548 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | + } |
|
| 550 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 551 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 552 | + } |
|
| 553 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 554 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 555 | + } |
|
| 556 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 557 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | + } |
|
| 559 | + |
|
| 560 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 561 | + if ($globalDBdriver == 'mysql') { |
|
| 562 | 562 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 563 | 563 | FROM spotter_archive l |
| 564 | 564 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 565 | - } else { |
|
| 565 | + } else { |
|
| 566 | 566 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 567 | - } |
|
| 568 | - //echo $query; |
|
| 569 | - try { |
|
| 570 | - $sth = $this->db->prepare($query); |
|
| 571 | - $sth->execute(); |
|
| 572 | - } catch(PDOException $e) { |
|
| 573 | - echo $e->getMessage(); |
|
| 574 | - die; |
|
| 575 | - } |
|
| 567 | + } |
|
| 568 | + //echo $query; |
|
| 569 | + try { |
|
| 570 | + $sth = $this->db->prepare($query); |
|
| 571 | + $sth->execute(); |
|
| 572 | + } catch(PDOException $e) { |
|
| 573 | + echo $e->getMessage(); |
|
| 574 | + die; |
|
| 575 | + } |
|
| 576 | 576 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 577 | 577 | $sth->closeCursor(); |
| 578 | - return $result['nb']; |
|
| 578 | + return $result['nb']; |
|
| 579 | 579 | |
| 580 | - } |
|
| 580 | + } |
|
| 581 | 581 | |
| 582 | 582 | |
| 583 | 583 | |
| 584 | 584 | // Spotter_Archive_output |
| 585 | 585 | |
| 586 | - /** |
|
| 587 | - * Gets all the spotter information |
|
| 588 | - * |
|
| 589 | - * @return Array the spotter information |
|
| 590 | - * |
|
| 591 | - */ |
|
| 592 | - 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()) |
|
| 593 | - { |
|
| 586 | + /** |
|
| 587 | + * Gets all the spotter information |
|
| 588 | + * |
|
| 589 | + * @return Array the spotter information |
|
| 590 | + * |
|
| 591 | + */ |
|
| 592 | + 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()) |
|
| 593 | + { |
|
| 594 | 594 | global $globalTimezone, $globalDBdriver; |
| 595 | 595 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 596 | 596 | $Translation = new Translation(); |
@@ -604,159 +604,159 @@ discard block |
||
| 604 | 604 | $filter_query = $this->getFilter($filters); |
| 605 | 605 | if ($q != "") |
| 606 | 606 | { |
| 607 | - if (!is_string($q)) |
|
| 608 | - { |
|
| 607 | + if (!is_string($q)) |
|
| 608 | + { |
|
| 609 | 609 | return false; |
| 610 | - } else { |
|
| 610 | + } else { |
|
| 611 | 611 | |
| 612 | 612 | $q_array = explode(" ", $q); |
| 613 | 613 | |
| 614 | 614 | foreach ($q_array as $q_item){ |
| 615 | - $additional_query .= " AND ("; |
|
| 616 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 617 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 628 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 629 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 631 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 632 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 633 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 634 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 635 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 636 | - $translate = $Translation->ident2icao($q_item); |
|
| 637 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 638 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 639 | - $additional_query .= ")"; |
|
| 640 | - } |
|
| 641 | - } |
|
| 615 | + $additional_query .= " AND ("; |
|
| 616 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 617 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 628 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 629 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 631 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 632 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 633 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 634 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 635 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 636 | + $translate = $Translation->ident2icao($q_item); |
|
| 637 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 638 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 639 | + $additional_query .= ")"; |
|
| 640 | + } |
|
| 641 | + } |
|
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | if ($registration != "") |
| 645 | 645 | { |
| 646 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | - if (!is_string($registration)) |
|
| 648 | - { |
|
| 646 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | + if (!is_string($registration)) |
|
| 648 | + { |
|
| 649 | 649 | return false; |
| 650 | - } else { |
|
| 650 | + } else { |
|
| 651 | 651 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 652 | - } |
|
| 652 | + } |
|
| 653 | 653 | } |
| 654 | 654 | |
| 655 | 655 | if ($aircraft_icao != "") |
| 656 | 656 | { |
| 657 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | - if (!is_string($aircraft_icao)) |
|
| 659 | - { |
|
| 657 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | + if (!is_string($aircraft_icao)) |
|
| 659 | + { |
|
| 660 | 660 | return false; |
| 661 | - } else { |
|
| 661 | + } else { |
|
| 662 | 662 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 663 | - } |
|
| 663 | + } |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | if ($aircraft_manufacturer != "") |
| 667 | 667 | { |
| 668 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | - if (!is_string($aircraft_manufacturer)) |
|
| 670 | - { |
|
| 668 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | + if (!is_string($aircraft_manufacturer)) |
|
| 670 | + { |
|
| 671 | 671 | return false; |
| 672 | - } else { |
|
| 672 | + } else { |
|
| 673 | 673 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 674 | - } |
|
| 674 | + } |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | if ($highlights == "true") |
| 678 | 678 | { |
| 679 | - if (!is_string($highlights)) |
|
| 680 | - { |
|
| 679 | + if (!is_string($highlights)) |
|
| 680 | + { |
|
| 681 | 681 | return false; |
| 682 | - } else { |
|
| 682 | + } else { |
|
| 683 | 683 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 684 | - } |
|
| 684 | + } |
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | if ($airline_icao != "") |
| 688 | 688 | { |
| 689 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | - if (!is_string($airline_icao)) |
|
| 691 | - { |
|
| 689 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | + if (!is_string($airline_icao)) |
|
| 691 | + { |
|
| 692 | 692 | return false; |
| 693 | - } else { |
|
| 693 | + } else { |
|
| 694 | 694 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 695 | - } |
|
| 695 | + } |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | if ($airline_country != "") |
| 699 | 699 | { |
| 700 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | - if (!is_string($airline_country)) |
|
| 702 | - { |
|
| 700 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | + if (!is_string($airline_country)) |
|
| 702 | + { |
|
| 703 | 703 | return false; |
| 704 | - } else { |
|
| 704 | + } else { |
|
| 705 | 705 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 706 | - } |
|
| 706 | + } |
|
| 707 | 707 | } |
| 708 | 708 | |
| 709 | 709 | if ($airline_type != "") |
| 710 | 710 | { |
| 711 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | - if (!is_string($airline_type)) |
|
| 713 | - { |
|
| 711 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | + if (!is_string($airline_type)) |
|
| 713 | + { |
|
| 714 | 714 | return false; |
| 715 | - } else { |
|
| 715 | + } else { |
|
| 716 | 716 | if ($airline_type == "passenger") |
| 717 | 717 | { |
| 718 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 718 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 719 | 719 | } |
| 720 | 720 | if ($airline_type == "cargo") |
| 721 | 721 | { |
| 722 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 722 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 723 | 723 | } |
| 724 | 724 | if ($airline_type == "military") |
| 725 | 725 | { |
| 726 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 726 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 727 | + } |
|
| 727 | 728 | } |
| 728 | - } |
|
| 729 | 729 | } |
| 730 | 730 | |
| 731 | 731 | if ($airport != "") |
| 732 | 732 | { |
| 733 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | - if (!is_string($airport)) |
|
| 735 | - { |
|
| 733 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | + if (!is_string($airport)) |
|
| 735 | + { |
|
| 736 | 736 | return false; |
| 737 | - } else { |
|
| 737 | + } else { |
|
| 738 | 738 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 739 | - } |
|
| 739 | + } |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | if ($airport_country != "") |
| 743 | 743 | { |
| 744 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | - if (!is_string($airport_country)) |
|
| 746 | - { |
|
| 744 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | + if (!is_string($airport_country)) |
|
| 746 | + { |
|
| 747 | 747 | return false; |
| 748 | - } else { |
|
| 748 | + } else { |
|
| 749 | 749 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 750 | - } |
|
| 750 | + } |
|
| 751 | 751 | } |
| 752 | 752 | |
| 753 | 753 | if ($callsign != "") |
| 754 | 754 | { |
| 755 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | - if (!is_string($callsign)) |
|
| 757 | - { |
|
| 755 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | + if (!is_string($callsign)) |
|
| 757 | + { |
|
| 758 | 758 | return false; |
| 759 | - } else { |
|
| 759 | + } else { |
|
| 760 | 760 | $translate = $Translation->ident2icao($callsign); |
| 761 | 761 | if ($translate != $callsign) { |
| 762 | 762 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -764,99 +764,99 @@ discard block |
||
| 764 | 764 | } else { |
| 765 | 765 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 766 | 766 | } |
| 767 | - } |
|
| 767 | + } |
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | if ($owner != "") |
| 771 | 771 | { |
| 772 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | - if (!is_string($owner)) |
|
| 774 | - { |
|
| 772 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | + if (!is_string($owner)) |
|
| 774 | + { |
|
| 775 | 775 | return false; |
| 776 | - } else { |
|
| 776 | + } else { |
|
| 777 | 777 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 778 | - } |
|
| 778 | + } |
|
| 779 | 779 | } |
| 780 | 780 | |
| 781 | 781 | if ($pilot_name != "") |
| 782 | 782 | { |
| 783 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | - if (!is_string($pilot_name)) |
|
| 785 | - { |
|
| 783 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | + if (!is_string($pilot_name)) |
|
| 785 | + { |
|
| 786 | 786 | return false; |
| 787 | - } else { |
|
| 787 | + } else { |
|
| 788 | 788 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 789 | - } |
|
| 789 | + } |
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | 792 | if ($pilot_id != "") |
| 793 | 793 | { |
| 794 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | - if (!is_string($pilot_id)) |
|
| 796 | - { |
|
| 794 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | + if (!is_string($pilot_id)) |
|
| 796 | + { |
|
| 797 | 797 | return false; |
| 798 | - } else { |
|
| 798 | + } else { |
|
| 799 | 799 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 800 | - } |
|
| 800 | + } |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | if ($departure_airport_route != "") |
| 804 | 804 | { |
| 805 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | - if (!is_string($departure_airport_route)) |
|
| 807 | - { |
|
| 805 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | + if (!is_string($departure_airport_route)) |
|
| 807 | + { |
|
| 808 | 808 | return false; |
| 809 | - } else { |
|
| 809 | + } else { |
|
| 810 | 810 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 811 | - } |
|
| 811 | + } |
|
| 812 | 812 | } |
| 813 | 813 | |
| 814 | 814 | if ($arrival_airport_route != "") |
| 815 | 815 | { |
| 816 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | - if (!is_string($arrival_airport_route)) |
|
| 818 | - { |
|
| 816 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | + if (!is_string($arrival_airport_route)) |
|
| 818 | + { |
|
| 819 | 819 | return false; |
| 820 | - } else { |
|
| 820 | + } else { |
|
| 821 | 821 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 822 | - } |
|
| 822 | + } |
|
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | if ($altitude != "") |
| 826 | 826 | { |
| 827 | - $altitude_array = explode(",", $altitude); |
|
| 827 | + $altitude_array = explode(",", $altitude); |
|
| 828 | 828 | |
| 829 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 829 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | 831 | |
| 832 | 832 | |
| 833 | - if ($altitude_array[1] != "") |
|
| 834 | - { |
|
| 833 | + if ($altitude_array[1] != "") |
|
| 834 | + { |
|
| 835 | 835 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 836 | 836 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 837 | 837 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 838 | - } else { |
|
| 838 | + } else { |
|
| 839 | 839 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 840 | 840 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 841 | - } |
|
| 841 | + } |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | if ($date_posted != "") |
| 845 | 845 | { |
| 846 | - $date_array = explode(",", $date_posted); |
|
| 846 | + $date_array = explode(",", $date_posted); |
|
| 847 | 847 | |
| 848 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 849 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 848 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 850 | 850 | |
| 851 | - if ($globalTimezone != '') { |
|
| 851 | + if ($globalTimezone != '') { |
|
| 852 | 852 | date_default_timezone_set($globalTimezone); |
| 853 | 853 | $datetime = new DateTime(); |
| 854 | 854 | $offset = $datetime->format('P'); |
| 855 | - } else $offset = '+00:00'; |
|
| 855 | + } else $offset = '+00:00'; |
|
| 856 | 856 | |
| 857 | 857 | |
| 858 | - if ($date_array[1] != "") |
|
| 859 | - { |
|
| 858 | + if ($date_array[1] != "") |
|
| 859 | + { |
|
| 860 | 860 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 861 | 861 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 862 | 862 | if ($globalDBdriver == 'mysql') { |
@@ -864,28 +864,28 @@ discard block |
||
| 864 | 864 | } else { |
| 865 | 865 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 866 | 866 | } |
| 867 | - } else { |
|
| 867 | + } else { |
|
| 868 | 868 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 869 | - if ($globalDBdriver == 'mysql') { |
|
| 869 | + if ($globalDBdriver == 'mysql') { |
|
| 870 | 870 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 871 | 871 | } else { |
| 872 | 872 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 873 | 873 | } |
| 874 | - } |
|
| 874 | + } |
|
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | if ($limit != "") |
| 878 | 878 | { |
| 879 | - $limit_array = explode(",", $limit); |
|
| 879 | + $limit_array = explode(",", $limit); |
|
| 880 | 880 | |
| 881 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 881 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | 883 | |
| 884 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 885 | - { |
|
| 884 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 885 | + { |
|
| 886 | 886 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 887 | 887 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 888 | - } |
|
| 888 | + } |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | |
@@ -916,33 +916,33 @@ discard block |
||
| 916 | 916 | $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
| 917 | 917 | |
| 918 | 918 | return $spotter_array; |
| 919 | - } |
|
| 919 | + } |
|
| 920 | 920 | |
| 921 | - public function deleteSpotterArchiveData() |
|
| 922 | - { |
|
| 921 | + public function deleteSpotterArchiveData() |
|
| 922 | + { |
|
| 923 | 923 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 924 | - date_default_timezone_set('UTC'); |
|
| 925 | - if ($globalDBdriver == 'mysql') { |
|
| 924 | + date_default_timezone_set('UTC'); |
|
| 925 | + if ($globalDBdriver == 'mysql') { |
|
| 926 | 926 | $query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 927 | 927 | } else { |
| 928 | 928 | $query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 929 | 929 | } |
| 930 | - try { |
|
| 931 | - $sth = $this->db->prepare($query); |
|
| 932 | - $sth->execute(); |
|
| 933 | - } catch(PDOException $e) { |
|
| 934 | - return "error"; |
|
| 935 | - } |
|
| 930 | + try { |
|
| 931 | + $sth = $this->db->prepare($query); |
|
| 932 | + $sth->execute(); |
|
| 933 | + } catch(PDOException $e) { |
|
| 934 | + return "error"; |
|
| 935 | + } |
|
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - /** |
|
| 939 | - * Gets all the spotter information based on the callsign |
|
| 940 | - * |
|
| 941 | - * @return Array the spotter information |
|
| 942 | - * |
|
| 943 | - */ |
|
| 944 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 945 | - { |
|
| 938 | + /** |
|
| 939 | + * Gets all the spotter information based on the callsign |
|
| 940 | + * |
|
| 941 | + * @return Array the spotter information |
|
| 942 | + * |
|
| 943 | + */ |
|
| 944 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 945 | + { |
|
| 946 | 946 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 947 | 947 | |
| 948 | 948 | date_default_timezone_set('UTC'); |
@@ -954,35 +954,35 @@ discard block |
||
| 954 | 954 | |
| 955 | 955 | if ($ident != "") |
| 956 | 956 | { |
| 957 | - if (!is_string($ident)) |
|
| 958 | - { |
|
| 957 | + if (!is_string($ident)) |
|
| 958 | + { |
|
| 959 | 959 | return false; |
| 960 | - } else { |
|
| 960 | + } else { |
|
| 961 | 961 | $additional_query = " AND (spotter_archive_output.ident = :ident)"; |
| 962 | 962 | $query_values = array(':ident' => $ident); |
| 963 | - } |
|
| 963 | + } |
|
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | if ($limit != "") |
| 967 | 967 | { |
| 968 | - $limit_array = explode(",", $limit); |
|
| 968 | + $limit_array = explode(",", $limit); |
|
| 969 | 969 | |
| 970 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 970 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | 972 | |
| 973 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 974 | - { |
|
| 973 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 974 | + { |
|
| 975 | 975 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 976 | 976 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 977 | - } |
|
| 977 | + } |
|
| 978 | 978 | } |
| 979 | 979 | |
| 980 | 980 | if ($sort != "") |
| 981 | 981 | { |
| 982 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 983 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 982 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 983 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 984 | 984 | } else { |
| 985 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 985 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -990,17 +990,17 @@ discard block |
||
| 990 | 990 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 991 | 991 | |
| 992 | 992 | return $spotter_array; |
| 993 | - } |
|
| 993 | + } |
|
| 994 | 994 | |
| 995 | 995 | |
| 996 | - /** |
|
| 997 | - * Gets all the spotter information based on the owner |
|
| 998 | - * |
|
| 999 | - * @return Array the spotter information |
|
| 1000 | - * |
|
| 1001 | - */ |
|
| 1002 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1003 | - { |
|
| 996 | + /** |
|
| 997 | + * Gets all the spotter information based on the owner |
|
| 998 | + * |
|
| 999 | + * @return Array the spotter information |
|
| 1000 | + * |
|
| 1001 | + */ |
|
| 1002 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1003 | + { |
|
| 1004 | 1004 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1005 | 1005 | |
| 1006 | 1006 | date_default_timezone_set('UTC'); |
@@ -1013,35 +1013,35 @@ discard block |
||
| 1013 | 1013 | |
| 1014 | 1014 | if ($owner != "") |
| 1015 | 1015 | { |
| 1016 | - if (!is_string($owner)) |
|
| 1017 | - { |
|
| 1016 | + if (!is_string($owner)) |
|
| 1017 | + { |
|
| 1018 | 1018 | return false; |
| 1019 | - } else { |
|
| 1019 | + } else { |
|
| 1020 | 1020 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1021 | 1021 | $query_values = array(':owner' => $owner); |
| 1022 | - } |
|
| 1022 | + } |
|
| 1023 | 1023 | } |
| 1024 | 1024 | |
| 1025 | 1025 | if ($limit != "") |
| 1026 | 1026 | { |
| 1027 | - $limit_array = explode(",", $limit); |
|
| 1027 | + $limit_array = explode(",", $limit); |
|
| 1028 | 1028 | |
| 1029 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | 1031 | |
| 1032 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1033 | - { |
|
| 1032 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1033 | + { |
|
| 1034 | 1034 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1035 | 1035 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1036 | - } |
|
| 1036 | + } |
|
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | 1039 | if ($sort != "") |
| 1040 | 1040 | { |
| 1041 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1042 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1041 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1042 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1043 | 1043 | } else { |
| 1044 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1044 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1049,16 +1049,16 @@ discard block |
||
| 1049 | 1049 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1050 | 1050 | |
| 1051 | 1051 | return $spotter_array; |
| 1052 | - } |
|
| 1053 | - |
|
| 1054 | - /** |
|
| 1055 | - * Gets all the spotter information based on the pilot |
|
| 1056 | - * |
|
| 1057 | - * @return Array the spotter information |
|
| 1058 | - * |
|
| 1059 | - */ |
|
| 1060 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1061 | - { |
|
| 1052 | + } |
|
| 1053 | + |
|
| 1054 | + /** |
|
| 1055 | + * Gets all the spotter information based on the pilot |
|
| 1056 | + * |
|
| 1057 | + * @return Array the spotter information |
|
| 1058 | + * |
|
| 1059 | + */ |
|
| 1060 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1061 | + { |
|
| 1062 | 1062 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1063 | 1063 | |
| 1064 | 1064 | date_default_timezone_set('UTC'); |
@@ -1077,24 +1077,24 @@ discard block |
||
| 1077 | 1077 | |
| 1078 | 1078 | if ($limit != "") |
| 1079 | 1079 | { |
| 1080 | - $limit_array = explode(",", $limit); |
|
| 1080 | + $limit_array = explode(",", $limit); |
|
| 1081 | 1081 | |
| 1082 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | 1084 | |
| 1085 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1086 | - { |
|
| 1085 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1086 | + { |
|
| 1087 | 1087 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1088 | 1088 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1089 | - } |
|
| 1089 | + } |
|
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | 1092 | if ($sort != "") |
| 1093 | 1093 | { |
| 1094 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1095 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1094 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1095 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1096 | 1096 | } else { |
| 1097 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1097 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1098 | 1098 | } |
| 1099 | 1099 | |
| 1100 | 1100 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1102,16 +1102,16 @@ discard block |
||
| 1102 | 1102 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1103 | 1103 | |
| 1104 | 1104 | return $spotter_array; |
| 1105 | - } |
|
| 1106 | - |
|
| 1107 | - /** |
|
| 1108 | - * Gets all number of flight over countries |
|
| 1109 | - * |
|
| 1110 | - * @return Array the airline country list |
|
| 1111 | - * |
|
| 1112 | - */ |
|
| 1113 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | - { |
|
| 1105 | + } |
|
| 1106 | + |
|
| 1107 | + /** |
|
| 1108 | + * Gets all number of flight over countries |
|
| 1109 | + * |
|
| 1110 | + * @return Array the airline country list |
|
| 1111 | + * |
|
| 1112 | + */ |
|
| 1113 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | + { |
|
| 1115 | 1115 | global $globalDBdriver; |
| 1116 | 1116 | /* |
| 1117 | 1117 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1121,14 +1121,14 @@ discard block |
||
| 1121 | 1121 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1122 | 1122 | FROM countries c, spotter_archive s |
| 1123 | 1123 | WHERE c.iso2 = s.over_country "; |
| 1124 | - if ($olderthanmonths > 0) { |
|
| 1125 | - if ($globalDBdriver == 'mysql') { |
|
| 1124 | + if ($olderthanmonths > 0) { |
|
| 1125 | + if ($globalDBdriver == 'mysql') { |
|
| 1126 | 1126 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1127 | 1127 | } else { |
| 1128 | 1128 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1129 | 1129 | } |
| 1130 | 1130 | } |
| 1131 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1131 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1132 | 1132 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1133 | 1133 | if ($limit) $query .= " LIMIT 0,10"; |
| 1134 | 1134 | |
@@ -1141,23 +1141,23 @@ discard block |
||
| 1141 | 1141 | |
| 1142 | 1142 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1143 | 1143 | { |
| 1144 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1145 | - $temp_array['flight_country'] = $row['name']; |
|
| 1146 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1147 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1148 | - $flight_array[] = $temp_array; |
|
| 1144 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1145 | + $temp_array['flight_country'] = $row['name']; |
|
| 1146 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1147 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1148 | + $flight_array[] = $temp_array; |
|
| 1149 | 1149 | } |
| 1150 | 1150 | return $flight_array; |
| 1151 | - } |
|
| 1152 | - |
|
| 1153 | - /** |
|
| 1154 | - * Gets all number of flight over countries |
|
| 1155 | - * |
|
| 1156 | - * @return Array the airline country list |
|
| 1157 | - * |
|
| 1158 | - */ |
|
| 1159 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | - { |
|
| 1151 | + } |
|
| 1152 | + |
|
| 1153 | + /** |
|
| 1154 | + * Gets all number of flight over countries |
|
| 1155 | + * |
|
| 1156 | + * @return Array the airline country list |
|
| 1157 | + * |
|
| 1158 | + */ |
|
| 1159 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | + { |
|
| 1161 | 1161 | global $globalDBdriver; |
| 1162 | 1162 | /* |
| 1163 | 1163 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1167,14 +1167,14 @@ discard block |
||
| 1167 | 1167 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1168 | 1168 | FROM countries c, spotter_archive s, spotter_output o |
| 1169 | 1169 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1170 | - if ($olderthanmonths > 0) { |
|
| 1171 | - if ($globalDBdriver == 'mysql') { |
|
| 1170 | + if ($olderthanmonths > 0) { |
|
| 1171 | + if ($globalDBdriver == 'mysql') { |
|
| 1172 | 1172 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1173 | 1173 | } else { |
| 1174 | 1174 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1175 | 1175 | } |
| 1176 | 1176 | } |
| 1177 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1177 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1178 | 1178 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1179 | 1179 | if ($limit) $query .= " LIMIT 0,10"; |
| 1180 | 1180 | |
@@ -1187,24 +1187,24 @@ discard block |
||
| 1187 | 1187 | |
| 1188 | 1188 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1189 | 1189 | { |
| 1190 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1191 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1192 | - $temp_array['flight_country'] = $row['name']; |
|
| 1193 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1194 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1195 | - $flight_array[] = $temp_array; |
|
| 1190 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1191 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1192 | + $temp_array['flight_country'] = $row['name']; |
|
| 1193 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1194 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1195 | + $flight_array[] = $temp_array; |
|
| 1196 | 1196 | } |
| 1197 | 1197 | return $flight_array; |
| 1198 | - } |
|
| 1199 | - |
|
| 1200 | - /** |
|
| 1201 | - * Gets last spotter information based on a particular callsign |
|
| 1202 | - * |
|
| 1203 | - * @return Array the spotter information |
|
| 1204 | - * |
|
| 1205 | - */ |
|
| 1206 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | - { |
|
| 1198 | + } |
|
| 1199 | + |
|
| 1200 | + /** |
|
| 1201 | + * Gets last spotter information based on a particular callsign |
|
| 1202 | + * |
|
| 1203 | + * @return Array the spotter information |
|
| 1204 | + * |
|
| 1205 | + */ |
|
| 1206 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | + { |
|
| 1208 | 1208 | $Spotter = new Spotter($this->db); |
| 1209 | 1209 | date_default_timezone_set('UTC'); |
| 1210 | 1210 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1212,16 +1212,16 @@ discard block |
||
| 1212 | 1212 | $date = date('c',$date); |
| 1213 | 1213 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1214 | 1214 | return $spotter_array; |
| 1215 | - } |
|
| 1216 | - |
|
| 1217 | - /** |
|
| 1218 | - * Gets all the spotter information based on a particular callsign |
|
| 1219 | - * |
|
| 1220 | - * @return Array the spotter information |
|
| 1221 | - * |
|
| 1222 | - */ |
|
| 1223 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | - { |
|
| 1215 | + } |
|
| 1216 | + |
|
| 1217 | + /** |
|
| 1218 | + * Gets all the spotter information based on a particular callsign |
|
| 1219 | + * |
|
| 1220 | + * @return Array the spotter information |
|
| 1221 | + * |
|
| 1222 | + */ |
|
| 1223 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | + { |
|
| 1225 | 1225 | $Spotter = new Spotter($this->db); |
| 1226 | 1226 | date_default_timezone_set('UTC'); |
| 1227 | 1227 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1229,16 +1229,16 @@ discard block |
||
| 1229 | 1229 | $date = date('c',$date); |
| 1230 | 1230 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1231 | 1231 | return $spotter_array; |
| 1232 | - } |
|
| 1233 | - |
|
| 1234 | - /** |
|
| 1235 | - * Gets all the spotter information based on the airport |
|
| 1236 | - * |
|
| 1237 | - * @return Array the spotter information |
|
| 1238 | - * |
|
| 1239 | - */ |
|
| 1240 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | - { |
|
| 1232 | + } |
|
| 1233 | + |
|
| 1234 | + /** |
|
| 1235 | + * Gets all the spotter information based on the airport |
|
| 1236 | + * |
|
| 1237 | + * @return Array the spotter information |
|
| 1238 | + * |
|
| 1239 | + */ |
|
| 1240 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | + { |
|
| 1242 | 1242 | global $global_query; |
| 1243 | 1243 | $Spotter = new Spotter(); |
| 1244 | 1244 | date_default_timezone_set('UTC'); |
@@ -1249,35 +1249,35 @@ discard block |
||
| 1249 | 1249 | |
| 1250 | 1250 | if ($airport != "") |
| 1251 | 1251 | { |
| 1252 | - if (!is_string($airport)) |
|
| 1253 | - { |
|
| 1252 | + if (!is_string($airport)) |
|
| 1253 | + { |
|
| 1254 | 1254 | return false; |
| 1255 | - } else { |
|
| 1255 | + } else { |
|
| 1256 | 1256 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1257 | 1257 | $query_values = array(':airport' => $airport); |
| 1258 | - } |
|
| 1258 | + } |
|
| 1259 | 1259 | } |
| 1260 | 1260 | |
| 1261 | 1261 | if ($limit != "") |
| 1262 | 1262 | { |
| 1263 | - $limit_array = explode(",", $limit); |
|
| 1263 | + $limit_array = explode(",", $limit); |
|
| 1264 | 1264 | |
| 1265 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1265 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | 1267 | |
| 1268 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1269 | - { |
|
| 1268 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1269 | + { |
|
| 1270 | 1270 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1271 | 1271 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1272 | - } |
|
| 1272 | + } |
|
| 1273 | 1273 | } |
| 1274 | 1274 | |
| 1275 | 1275 | if ($sort != "") |
| 1276 | 1276 | { |
| 1277 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1278 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1277 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1278 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1279 | 1279 | } else { |
| 1280 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1280 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1281 | 1281 | } |
| 1282 | 1282 | |
| 1283 | 1283 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1285,6 +1285,6 @@ discard block |
||
| 1285 | 1285 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1286 | 1286 | |
| 1287 | 1287 | return $spotter_array; |
| 1288 | - } |
|
| 1288 | + } |
|
| 1289 | 1289 | } |
| 1290 | 1290 | ?> |
| 1291 | 1291 | \ No newline at end of file |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | class aprs { |
| 3 | - protected $symbols = array('!' => 'Police', |
|
| 3 | + protected $symbols = array('!' => 'Police', |
|
| 4 | 4 | '#' => 'DIGI', |
| 5 | 5 | '$' => 'Phone', |
| 6 | 6 | '%' => 'DX Cluster', |
@@ -84,13 +84,13 @@ discard block |
||
| 84 | 84 | 'y' => 'Yagi At QTH'); |
| 85 | 85 | |
| 86 | 86 | |
| 87 | - private function urshift($n, $s) { |
|
| 87 | + private function urshift($n, $s) { |
|
| 88 | 88 | return ($n >= 0) ? ($n >> $s) : |
| 89 | - (($n & 0x7fffffff) >> $s) | |
|
| 89 | + (($n & 0x7fffffff) >> $s) | |
|
| 90 | 90 | (0x40000000 >> ($s - 1)); |
| 91 | - } |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - public function parse($input) { |
|
| 93 | + public function parse($input) { |
|
| 94 | 94 | global $globalDebug; |
| 95 | 95 | $debug = true; |
| 96 | 96 | $result = array(); |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | /* Check that end was found and body has at least one byte. */ |
| 104 | 104 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
| 105 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 106 | - return false; |
|
| 105 | + if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 106 | + return false; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if ($debug) echo 'input : '.$input."\n"; |
@@ -117,23 +117,23 @@ discard block |
||
| 117 | 117 | /* Parse source, target and path. */ |
| 118 | 118 | //FLRDF0A52>APRS,qAS,LSTB |
| 119 | 119 | if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
| 120 | - $ident = $matches[1]; |
|
| 121 | - $all_elements = $matches[2]; |
|
| 122 | - if ($debug) echo 'ident : '.$ident."\n"; |
|
| 123 | - $result['ident'] = $ident; |
|
| 120 | + $ident = $matches[1]; |
|
| 121 | + $all_elements = $matches[2]; |
|
| 122 | + if ($debug) echo 'ident : '.$ident."\n"; |
|
| 123 | + $result['ident'] = $ident; |
|
| 124 | 124 | } else return false; |
| 125 | 125 | $elements = explode(',',$all_elements); |
| 126 | 126 | $source = end($elements); |
| 127 | 127 | $result['source'] = $source; |
| 128 | 128 | foreach ($elements as $element) { |
| 129 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 130 | - //echo "ok"; |
|
| 131 | - //if ($element == 'TCPIP*') return false; |
|
| 132 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 129 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 130 | + //echo "ok"; |
|
| 131 | + //if ($element == 'TCPIP*') return false; |
|
| 132 | + } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 133 | 133 | if ($debug) echo 'element : '.$element."\n"; |
| 134 | 134 | return false; |
| 135 | - } |
|
| 136 | - /* |
|
| 135 | + } |
|
| 136 | + /* |
|
| 137 | 137 | } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) { |
| 138 | 138 | //echo "ok"; |
| 139 | 139 | } else { |
@@ -156,49 +156,49 @@ discard block |
||
| 156 | 156 | $body_parse = substr($body,1); |
| 157 | 157 | //echo 'Body : '.$body."\n"; |
| 158 | 158 | if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
| 159 | - $body_parse = substr($body_parse,10); |
|
| 160 | - $find = true; |
|
| 161 | - //echo $body_parse."\n"; |
|
| 159 | + $body_parse = substr($body_parse,10); |
|
| 160 | + $find = true; |
|
| 161 | + //echo $body_parse."\n"; |
|
| 162 | 162 | } |
| 163 | 163 | if (preg_match('/^`(.*)\//',$body,$matches)) { |
| 164 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 165 | - $find = true; |
|
| 166 | - //echo $body_parse."\n"; |
|
| 164 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 165 | + $find = true; |
|
| 166 | + //echo $body_parse."\n"; |
|
| 167 | 167 | } |
| 168 | 168 | if (preg_match("/^'(.*)\//",$body,$matches)) { |
| 169 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 170 | - $find = true; |
|
| 171 | - //echo $body_parse."\n"; |
|
| 169 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 170 | + $find = true; |
|
| 171 | + //echo $body_parse."\n"; |
|
| 172 | 172 | } |
| 173 | 173 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
| 174 | - $find = true; |
|
| 175 | - //print_r($matches); |
|
| 176 | - $timestamp = $matches[0]; |
|
| 177 | - if ($matches[4] == 'h') { |
|
| 174 | + $find = true; |
|
| 175 | + //print_r($matches); |
|
| 176 | + $timestamp = $matches[0]; |
|
| 177 | + if ($matches[4] == 'h') { |
|
| 178 | 178 | $timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]); |
| 179 | 179 | //echo 'timestamp : '.$timestamp.' - now : '.time()."\n"; |
| 180 | 180 | /* |
| 181 | 181 | if (time() + 3900 < $timestamp) $timestamp -= 86400; |
| 182 | 182 | elseif (time() - 82500 > $timestamp) $timestamp += 86400; |
| 183 | 183 | */ |
| 184 | - } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 184 | + } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 185 | 185 | // This work or not ? |
| 186 | 186 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 187 | - } |
|
| 188 | - $body_parse = substr($body_parse,7); |
|
| 189 | - $result['timestamp'] = $timestamp; |
|
| 190 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 187 | + } |
|
| 188 | + $body_parse = substr($body_parse,7); |
|
| 189 | + $result['timestamp'] = $timestamp; |
|
| 190 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 191 | 191 | } |
| 192 | 192 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
| 193 | - $find = true; |
|
| 194 | - $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 195 | - $body_parse = substr($body_parse,8); |
|
| 196 | - $result['timestamp'] = $timestamp; |
|
| 197 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 193 | + $find = true; |
|
| 194 | + $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 195 | + $body_parse = substr($body_parse,8); |
|
| 196 | + $result['timestamp'] = $timestamp; |
|
| 197 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 198 | 198 | } |
| 199 | 199 | //if (strlen($body_parse) > 19) { |
| 200 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 201 | - $find = true; |
|
| 200 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 201 | + $find = true; |
|
| 202 | 202 | // 4658.70N/00707.78Ez |
| 203 | 203 | //print_r(str_split($body_parse)); |
| 204 | 204 | |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | $lon = intval($lon_deg); |
| 216 | 216 | if ($lat > 89 || $lon > 179) return false; |
| 217 | 217 | |
| 218 | - /* |
|
| 218 | + /* |
|
| 219 | 219 | $tmp_5b = str_replace('.','',$lat_min); |
| 220 | 220 | if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) { |
| 221 | 221 | print_r($matches); |
@@ -229,9 +229,9 @@ discard block |
||
| 229 | 229 | $result['longitude'] = $longitude; |
| 230 | 230 | $body_parse = substr($body_parse,18); |
| 231 | 231 | $body_parse_len = strlen($body_parse); |
| 232 | - } |
|
| 233 | - $body_parse_len = strlen($body_parse); |
|
| 234 | - if ($body_parse_len > 0) { |
|
| 232 | + } |
|
| 233 | + $body_parse_len = strlen($body_parse); |
|
| 234 | + if ($body_parse_len > 0) { |
|
| 235 | 235 | /* |
| 236 | 236 | if (!isset($result['timestamp']) && !isset($result['latitude'])) { |
| 237 | 237 | $body_split = str_split($body); |
@@ -260,64 +260,64 @@ discard block |
||
| 260 | 260 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
| 261 | 261 | if ($symbol_code != '_') { |
| 262 | 262 | } |
| 263 | - //$body_parse = substr($body_parse,1); |
|
| 264 | - //$body_parse = trim($body_parse); |
|
| 265 | - //$body_parse_len = strlen($body_parse); |
|
| 266 | - if ($body_parse_len >= 7) { |
|
| 263 | + //$body_parse = substr($body_parse,1); |
|
| 264 | + //$body_parse = trim($body_parse); |
|
| 265 | + //$body_parse_len = strlen($body_parse); |
|
| 266 | + if ($body_parse_len >= 7) { |
|
| 267 | 267 | |
| 268 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 269 | - $course = substr($body_parse,0,3); |
|
| 270 | - $tmp_s = intval($course); |
|
| 271 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 272 | - $speed = substr($body_parse,4,3); |
|
| 273 | - if ($speed != '...') { |
|
| 274 | - $result['speed'] = round($speed*1.852); |
|
| 275 | - } |
|
| 276 | - $body_parse = substr($body_parse,7); |
|
| 277 | - } |
|
| 278 | - // Check PHGR, PHG, RNG |
|
| 279 | - } |
|
| 280 | - /* |
|
| 268 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 269 | + $course = substr($body_parse,0,3); |
|
| 270 | + $tmp_s = intval($course); |
|
| 271 | + if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 272 | + $speed = substr($body_parse,4,3); |
|
| 273 | + if ($speed != '...') { |
|
| 274 | + $result['speed'] = round($speed*1.852); |
|
| 275 | + } |
|
| 276 | + $body_parse = substr($body_parse,7); |
|
| 277 | + } |
|
| 278 | + // Check PHGR, PHG, RNG |
|
| 279 | + } |
|
| 280 | + /* |
|
| 281 | 281 | else if ($body_parse_len > 0) { |
| 282 | 282 | $rest = $body_parse; |
| 283 | 283 | } |
| 284 | 284 | */ |
| 285 | - if (strlen($body_parse) > 0) { |
|
| 286 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 287 | - $altitude = intval($matches[1]); |
|
| 288 | - //$result['altitude'] = round($altitude*0.3048); |
|
| 289 | - $result['altitude'] = $altitude; |
|
| 290 | - //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 291 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 292 | - } |
|
| 293 | - } |
|
| 285 | + if (strlen($body_parse) > 0) { |
|
| 286 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 287 | + $altitude = intval($matches[1]); |
|
| 288 | + //$result['altitude'] = round($altitude*0.3048); |
|
| 289 | + $result['altitude'] = $altitude; |
|
| 290 | + //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 291 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 292 | + } |
|
| 293 | + } |
|
| 294 | 294 | |
| 295 | - // Telemetry |
|
| 296 | - /* |
|
| 295 | + // Telemetry |
|
| 296 | + /* |
|
| 297 | 297 | if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) { |
| 298 | 298 | // Nothing yet... |
| 299 | 299 | } |
| 300 | 300 | */ |
| 301 | - // DAO |
|
| 302 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 303 | - $dao = $matches[1]; |
|
| 304 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 301 | + // DAO |
|
| 302 | + if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 303 | + $dao = $matches[1]; |
|
| 304 | + if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 305 | 305 | $dao_split = str_split($dao); |
| 306 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 307 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 306 | + $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 307 | + $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 308 | 308 | |
| 309 | 309 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 310 | 310 | else $result['latitude'] += $lat_off; |
| 311 | 311 | if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
| 312 | 312 | else $result['longitude'] += $lon_off; |
| 313 | - } |
|
| 314 | - $body_parse = substr($body_parse,6); |
|
| 315 | - } |
|
| 313 | + } |
|
| 314 | + $body_parse = substr($body_parse,6); |
|
| 315 | + } |
|
| 316 | 316 | |
| 317 | - // OGN comment |
|
| 317 | + // OGN comment |
|
| 318 | 318 | // echo "Before OGN : ".$body_parse."\n"; |
| 319 | - //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 320 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 319 | + //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 320 | + if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 321 | 321 | $id = $matches[1]; |
| 322 | 322 | //$mode = substr($id,0,2); |
| 323 | 323 | $address = substr($id,2); |
@@ -347,51 +347,51 @@ discard block |
||
| 347 | 347 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
| 348 | 348 | $result['stealth'] = $stealth; |
| 349 | 349 | $result['address'] = $address; |
| 350 | - } |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - //Comment |
|
| 353 | - $result['comment'] = trim($body_parse); |
|
| 352 | + //Comment |
|
| 353 | + $result['comment'] = trim($body_parse); |
|
| 354 | 354 | } else { |
| 355 | - // parse weather |
|
| 356 | - //$body_parse = substr($body_parse,1); |
|
| 357 | - //$body_parse_len = strlen($body_parse); |
|
| 355 | + // parse weather |
|
| 356 | + //$body_parse = substr($body_parse,1); |
|
| 357 | + //$body_parse_len = strlen($body_parse); |
|
| 358 | 358 | |
| 359 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 360 | - $result['wind_dir'] = intval($matches[1]); |
|
| 361 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 362 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 363 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 364 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 365 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 359 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 360 | + $result['wind_dir'] = intval($matches[1]); |
|
| 361 | + $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 362 | + $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 363 | + $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 364 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 365 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 366 | 366 | $result['wind_dir'] = intval($matches[1]); |
| 367 | 367 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 368 | 368 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 369 | 369 | $result['temp'] = round(5/9*(($matches[4])-32),1); |
| 370 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 371 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 370 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 371 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 372 | 372 | $result['wind_dir'] = intval($matches[1]); |
| 373 | 373 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 374 | 374 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 375 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 376 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 375 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 376 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 377 | 377 | $result['wind_dir'] = intval($matches[1]); |
| 378 | 378 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 379 | 379 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 380 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 381 | - } |
|
| 382 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 380 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 381 | + } |
|
| 382 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 383 | 383 | $result['temp'] = round(5/9*(($matches[1])-32),1); |
| 384 | - } |
|
| 384 | + } |
|
| 385 | 385 | } |
| 386 | 386 | } else $result['comment'] = trim($body_parse); |
| 387 | 387 | |
| 388 | - } |
|
| 388 | + } |
|
| 389 | 389 | //} |
| 390 | 390 | if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
| 391 | 391 | if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
| 392 | 392 | if ($debug) print_r($result); |
| 393 | 393 | return $result; |
| 394 | - } |
|
| 394 | + } |
|
| 395 | 395 | } |
| 396 | 396 | /* |
| 397 | 397 | $aprs = new aprs(); |
