Ysurac /
FlightAirMap
@@ -7,16 +7,16 @@ discard block |
||
| 7 | 7 | header('Location: '.$globalURL.'/manufacturer'); |
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | -$aircraft_manufacturer = urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)); |
|
| 11 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 10 | +$aircraft_manufacturer = urldecode(filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)); |
|
| 11 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 12 | 12 | $Spotter = new Spotter(); |
| 13 | 13 | $manufacturer = ucwords(str_replace("-", " ", $aircraft_manufacturer)); |
| 14 | 14 | |
| 15 | -$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort); |
|
| 15 | +$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort); |
|
| 16 | 16 | |
| 17 | 17 | if (!empty($spotter_array)) |
| 18 | 18 | { |
| 19 | - $title = sprintf(_("Most Common Airlines from %s"),$manufacturer); |
|
| 19 | + $title = sprintf(_("Most Common Airlines from %s"), $manufacturer); |
|
| 20 | 20 | |
| 21 | 21 | require_once('header.php'); |
| 22 | 22 | print '<div class="select-item">'; |
@@ -25,9 +25,9 @@ discard block |
||
| 25 | 25 | $Stats = new Stats(); |
| 26 | 26 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 27 | 27 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 28 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 28 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 29 | 29 | { |
| 30 | - if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 30 | + if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 31 | 31 | { |
| 32 | 32 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 33 | 33 | } else { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | include('manufacturer-sub-menu.php'); |
| 47 | 47 | print '<div class="column">'; |
| 48 | 48 | print '<h2>'._("Most Common Airlines").'</h2>'; |
| 49 | - print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 49 | + print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 50 | 50 | $airline_array = $Spotter->countAllAirlinesByManufacturer($manufacturer); |
| 51 | 51 | if (!empty($airline_array)) |
| 52 | 52 | { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | print '</thead>'; |
| 63 | 63 | print '<tbody>'; |
| 64 | 64 | $i = 1; |
| 65 | - foreach($airline_array as $airline_item) |
|
| 65 | + foreach ($airline_array as $airline_item) |
|
| 66 | 66 | { |
| 67 | 67 | print '<tr>'; |
| 68 | 68 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | if ($this->db === null) die('Error: No DB connection. (Stats)'); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 24 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 25 | 25 | $query = "DELETE FROM config WHERE name = :type; |
| 26 | 26 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 27 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 27 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 28 | 28 | try { |
| 29 | 29 | $sth = $this->db->prepare($query); |
| 30 | 30 | $sth->execute($query_values); |
| 31 | - } catch(PDOException $e) { |
|
| 31 | + } catch (PDOException $e) { |
|
| 32 | 32 | return "error : ".$e->getMessage(); |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | try { |
| 39 | 39 | $sth = $this->db->prepare($query); |
| 40 | 40 | $sth->execute(array(':type' => $type)); |
| 41 | - } catch(PDOException $e) { |
|
| 41 | + } catch (PDOException $e) { |
|
| 42 | 42 | echo "error : ".$e->getMessage(); |
| 43 | 43 | } |
| 44 | 44 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | try { |
| 60 | 60 | $sth = $this->db->prepare($query); |
| 61 | 61 | $sth->execute(array(':filter_name' => $filter_name)); |
| 62 | - } catch(PDOException $e) { |
|
| 62 | + } catch (PDOException $e) { |
|
| 63 | 63 | return "error : ".$e->getMessage(); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -72,14 +72,14 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $sth = $this->db->prepare($query); |
| 74 | 74 | $sth->execute(); |
| 75 | - } catch(PDOException $e) { |
|
| 75 | + } catch (PDOException $e) { |
|
| 76 | 76 | return "error : ".$e->getMessage(); |
| 77 | 77 | } |
| 78 | 78 | $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;"; |
| 79 | 79 | try { |
| 80 | 80 | $sth = $this->db->prepare($query); |
| 81 | 81 | $sth->execute(array(':filter_name' => $filter_name)); |
| 82 | - } catch(PDOException $e) { |
|
| 82 | + } catch (PDOException $e) { |
|
| 83 | 83 | return "error : ".$e->getMessage(); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -91,77 +91,77 @@ discard block |
||
| 91 | 91 | try { |
| 92 | 92 | $sth = $this->db->prepare($query); |
| 93 | 93 | $sth->execute(array(':filter_name' => $filter_name)); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | echo "error : ".$e->getMessage(); |
| 96 | 96 | } |
| 97 | 97 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 98 | 98 | if (empty($all)) { |
| 99 | 99 | $filters = array(); |
| 100 | 100 | if ($filter_name != '') { |
| 101 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 101 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 102 | 102 | } |
| 103 | 103 | $Spotter = new Spotter($this->db); |
| 104 | - $all = $Spotter->getAllAirlineNames('',NULL,$filters); |
|
| 104 | + $all = $Spotter->getAllAirlineNames('', NULL, $filters); |
|
| 105 | 105 | } |
| 106 | 106 | return $all; |
| 107 | 107 | } |
| 108 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 108 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 109 | 109 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 110 | 110 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 111 | 111 | try { |
| 112 | 112 | $sth = $this->db->prepare($query); |
| 113 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 114 | - } catch(PDOException $e) { |
|
| 113 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 114 | + } catch (PDOException $e) { |
|
| 115 | 115 | echo "error : ".$e->getMessage(); |
| 116 | 116 | } |
| 117 | 117 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 118 | 118 | return $all; |
| 119 | 119 | } |
| 120 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 120 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 121 | 121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 122 | 122 | $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"; |
| 123 | 123 | try { |
| 124 | 124 | $sth = $this->db->prepare($query); |
| 125 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 126 | - } catch(PDOException $e) { |
|
| 125 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | echo "error : ".$e->getMessage(); |
| 128 | 128 | } |
| 129 | 129 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 130 | 130 | return $all; |
| 131 | 131 | } |
| 132 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 132 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | 134 | $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"; |
| 135 | 135 | try { |
| 136 | 136 | $sth = $this->db->prepare($query); |
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 138 | + } catch (PDOException $e) { |
|
| 139 | 139 | echo "error : ".$e->getMessage(); |
| 140 | 140 | } |
| 141 | 141 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 142 | 142 | return $all; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 145 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | 147 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 148 | 148 | try { |
| 149 | 149 | $sth = $this->db->prepare($query); |
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | echo "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 155 | 155 | return $all; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 158 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 159 | 159 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 160 | 160 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 161 | 161 | try { |
| 162 | 162 | $sth = $this->db->prepare($query); |
| 163 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 164 | - } catch(PDOException $e) { |
|
| 163 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 164 | + } catch (PDOException $e) { |
|
| 165 | 165 | echo "error : ".$e->getMessage(); |
| 166 | 166 | } |
| 167 | 167 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -169,23 +169,23 @@ discard block |
||
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | |
| 172 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 172 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 173 | 173 | global $globalStatsFilters; |
| 174 | 174 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 175 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 175 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 176 | 176 | $Spotter = new Spotter($this->db); |
| 177 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 177 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 178 | 178 | $alliance_airlines = array(); |
| 179 | 179 | foreach ($airlines as $airline) { |
| 180 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 180 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 181 | 181 | } |
| 182 | 182 | if ($year == '' && $month == '') { |
| 183 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 183 | + if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | + else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 185 | 185 | try { |
| 186 | 186 | $sth = $this->db->prepare($query); |
| 187 | 187 | $sth->execute(array(':filter_name' => $filter_name)); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | echo "error : ".$e->getMessage(); |
| 190 | 190 | } |
| 191 | 191 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -196,29 +196,29 @@ discard block |
||
| 196 | 196 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
| 197 | 197 | try { |
| 198 | 198 | $sth = $this->db->prepare($query); |
| 199 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 200 | - } catch(PDOException $e) { |
|
| 199 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 200 | + } catch (PDOException $e) { |
|
| 201 | 201 | echo "error : ".$e->getMessage(); |
| 202 | 202 | } |
| 203 | 203 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 204 | 204 | } else $all = array(); |
| 205 | 205 | } |
| 206 | 206 | if (empty($all)) { |
| 207 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 208 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 207 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 208 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 209 | 209 | } else { |
| 210 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 210 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 211 | 211 | } |
| 212 | 212 | if ($filter_name != '') { |
| 213 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 213 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 214 | 214 | } |
| 215 | 215 | $Spotter = new Spotter($this->db); |
| 216 | 216 | //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
| 217 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 217 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 218 | 218 | } |
| 219 | 219 | return $all; |
| 220 | 220 | } |
| 221 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 221 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 222 | 222 | global $globalStatsFilters; |
| 223 | 223 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 224 | 224 | if ($year == '' && $month == '') { |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | try { |
| 228 | 228 | $sth = $this->db->prepare($query); |
| 229 | 229 | $sth->execute(array(':filter_name' => $filter_name)); |
| 230 | - } catch(PDOException $e) { |
|
| 230 | + } catch (PDOException $e) { |
|
| 231 | 231 | echo "error : ".$e->getMessage(); |
| 232 | 232 | } |
| 233 | 233 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -235,32 +235,32 @@ discard block |
||
| 235 | 235 | if (empty($all)) { |
| 236 | 236 | $Spotter = new Spotter($this->db); |
| 237 | 237 | $filters = array(); |
| 238 | - $filters = array('year' => $year,'month' => $month); |
|
| 238 | + $filters = array('year' => $year, 'month' => $month); |
|
| 239 | 239 | if ($filter_name != '') { |
| 240 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 240 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 241 | 241 | } |
| 242 | 242 | //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
| 243 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 243 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 244 | 244 | } |
| 245 | 245 | return $all; |
| 246 | 246 | } |
| 247 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 247 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 248 | 248 | global $globalStatsFilters; |
| 249 | 249 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 250 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 250 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 251 | 251 | $Spotter = new Spotter($this->db); |
| 252 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 252 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 253 | 253 | $alliance_airlines = array(); |
| 254 | 254 | foreach ($airlines as $airline) { |
| 255 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 255 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 256 | 256 | } |
| 257 | 257 | if ($year == '' && $month == '') { |
| 258 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 258 | + if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | + else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 260 | 260 | try { |
| 261 | 261 | $sth = $this->db->prepare($query); |
| 262 | 262 | $sth->execute(array(':filter_name' => $filter_name)); |
| 263 | - } catch(PDOException $e) { |
|
| 263 | + } catch (PDOException $e) { |
|
| 264 | 264 | echo "error : ".$e->getMessage(); |
| 265 | 265 | } |
| 266 | 266 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -271,21 +271,21 @@ discard block |
||
| 271 | 271 | else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
| 272 | 272 | try { |
| 273 | 273 | $sth = $this->db->prepare($query); |
| 274 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 275 | - } catch(PDOException $e) { |
|
| 274 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 275 | + } catch (PDOException $e) { |
|
| 276 | 276 | echo "error : ".$e->getMessage(); |
| 277 | 277 | } |
| 278 | 278 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 279 | 279 | } else $all = array(); |
| 280 | 280 | } |
| 281 | 281 | if (empty($all)) { |
| 282 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 283 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 282 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 283 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 284 | 284 | } else { |
| 285 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 285 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 286 | 286 | } |
| 287 | 287 | if ($filter_name != '') { |
| 288 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 288 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 289 | 289 | } |
| 290 | 290 | $Spotter = new Spotter($this->db); |
| 291 | 291 | //$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
@@ -294,23 +294,23 @@ discard block |
||
| 294 | 294 | return $all; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 297 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 298 | 298 | global $globalStatsFilters; |
| 299 | 299 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 300 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 300 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 301 | 301 | $Spotter = new Spotter($this->db); |
| 302 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 302 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 303 | 303 | $alliance_airlines = array(); |
| 304 | 304 | foreach ($airlines as $airline) { |
| 305 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 305 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 306 | 306 | } |
| 307 | 307 | if ($year == '' && $month == '') { |
| 308 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 308 | + if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | + else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 310 | 310 | try { |
| 311 | 311 | $sth = $this->db->prepare($query); |
| 312 | 312 | $sth->execute(array(':filter_name' => $filter_name)); |
| 313 | - } catch(PDOException $e) { |
|
| 313 | + } catch (PDOException $e) { |
|
| 314 | 314 | echo "error : ".$e->getMessage(); |
| 315 | 315 | } |
| 316 | 316 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -321,61 +321,61 @@ discard block |
||
| 321 | 321 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
| 322 | 322 | try { |
| 323 | 323 | $sth = $this->db->prepare($query); |
| 324 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 325 | - } catch(PDOException $e) { |
|
| 324 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 325 | + } catch (PDOException $e) { |
|
| 326 | 326 | echo "error : ".$e->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 329 | 329 | } else $all = array(); |
| 330 | 330 | } |
| 331 | 331 | if (empty($all)) { |
| 332 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 333 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 332 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 333 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 334 | 334 | } else { |
| 335 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 335 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 336 | 336 | } |
| 337 | 337 | if ($filter_name != '') { |
| 338 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 338 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 339 | 339 | } |
| 340 | 340 | $Spotter = new Spotter($this->db); |
| 341 | 341 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 342 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 342 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 343 | 343 | } |
| 344 | 344 | return $all; |
| 345 | 345 | } |
| 346 | 346 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 347 | 347 | global $globalStatsFilters; |
| 348 | 348 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 349 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 349 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 350 | 350 | $Spotter = new Spotter($this->db); |
| 351 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 351 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 352 | 352 | $alliance_airlines = array(); |
| 353 | 353 | foreach ($airlines as $airline) { |
| 354 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 354 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 355 | 355 | } |
| 356 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 356 | + if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | + else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 358 | 358 | $query_values = array(':filter_name' => $filter_name); |
| 359 | 359 | } else { |
| 360 | 360 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
| 361 | 361 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
| 362 | - $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 362 | + $query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 363 | 363 | } |
| 364 | 364 | try { |
| 365 | 365 | $sth = $this->db->prepare($query); |
| 366 | 366 | $sth->execute($query_values); |
| 367 | - } catch(PDOException $e) { |
|
| 367 | + } catch (PDOException $e) { |
|
| 368 | 368 | echo "error : ".$e->getMessage(); |
| 369 | 369 | } |
| 370 | 370 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 371 | 371 | if (empty($all)) { |
| 372 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 373 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 372 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 373 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 374 | 374 | } else { |
| 375 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 375 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 376 | 376 | } |
| 377 | 377 | if ($filter_name != '') { |
| 378 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 378 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 379 | 379 | } |
| 380 | 380 | $Spotter = new Spotter($this->db); |
| 381 | 381 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | return $all; |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 387 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 388 | 388 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 389 | 389 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 390 | 390 | if ($year == '' && $month == '') { |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | if (isset($forsource)) { |
| 394 | 394 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 395 | 395 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
| 396 | - $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
|
| 396 | + $query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource); |
|
| 397 | 397 | } else { |
| 398 | 398 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 399 | 399 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | try { |
| 403 | 403 | $sth = $this->db->prepare($query); |
| 404 | 404 | $sth->execute($query_values); |
| 405 | - } catch(PDOException $e) { |
|
| 405 | + } catch (PDOException $e) { |
|
| 406 | 406 | echo "error : ".$e->getMessage(); |
| 407 | 407 | } |
| 408 | 408 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -410,32 +410,32 @@ discard block |
||
| 410 | 410 | if (empty($all)) { |
| 411 | 411 | $Spotter = new Spotter($this->db); |
| 412 | 412 | $filters = array(); |
| 413 | - $filters = array('year' => $year,'month' => $month); |
|
| 413 | + $filters = array('year' => $year, 'month' => $month); |
|
| 414 | 414 | if ($filter_name != '') { |
| 415 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 415 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 416 | 416 | } |
| 417 | 417 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 418 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 418 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 419 | 419 | } |
| 420 | 420 | return $all; |
| 421 | 421 | } |
| 422 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 422 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 423 | 423 | global $globalStatsFilters; |
| 424 | 424 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 425 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 425 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 426 | 426 | $Spotter = new Spotter($this->db); |
| 427 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 427 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 428 | 428 | $alliance_airlines = array(); |
| 429 | 429 | foreach ($airlines as $airline) { |
| 430 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 430 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 431 | 431 | } |
| 432 | 432 | if ($year == '' && $month == '') { |
| 433 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 433 | + if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | + else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 435 | 435 | try { |
| 436 | 436 | $sth = $this->db->prepare($query); |
| 437 | 437 | $sth->execute(array(':filter_name' => $filter_name)); |
| 438 | - } catch(PDOException $e) { |
|
| 438 | + } catch (PDOException $e) { |
|
| 439 | 439 | echo "error : ".$e->getMessage(); |
| 440 | 440 | } |
| 441 | 441 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -446,45 +446,45 @@ discard block |
||
| 446 | 446 | else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
| 447 | 447 | try { |
| 448 | 448 | $sth = $this->db->prepare($query); |
| 449 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 450 | - } catch(PDOException $e) { |
|
| 449 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 450 | + } catch (PDOException $e) { |
|
| 451 | 451 | echo "error : ".$e->getMessage(); |
| 452 | 452 | } |
| 453 | 453 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 454 | 454 | } else $all = array(); |
| 455 | 455 | } |
| 456 | 456 | if (empty($all)) { |
| 457 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 458 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 457 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 458 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 459 | 459 | } else { |
| 460 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 460 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 461 | 461 | } |
| 462 | 462 | if ($filter_name != '') { |
| 463 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 463 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 464 | 464 | } |
| 465 | 465 | $Spotter = new Spotter($this->db); |
| 466 | 466 | //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
| 467 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 467 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 468 | 468 | } |
| 469 | 469 | return $all; |
| 470 | 470 | } |
| 471 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 471 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 472 | 472 | global $globalStatsFilters; |
| 473 | 473 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 474 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 474 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 475 | 475 | $Spotter = new Spotter($this->db); |
| 476 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 476 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 477 | 477 | $alliance_airlines = array(); |
| 478 | 478 | foreach ($airlines as $airline) { |
| 479 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 479 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 480 | 480 | } |
| 481 | 481 | if ($year == '' && $month == '') { |
| 482 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 482 | + if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | + else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 484 | 484 | try { |
| 485 | 485 | $sth = $this->db->prepare($query); |
| 486 | 486 | $sth->execute(array(':filter_name' => $filter_name)); |
| 487 | - } catch(PDOException $e) { |
|
| 487 | + } catch (PDOException $e) { |
|
| 488 | 488 | echo "error : ".$e->getMessage(); |
| 489 | 489 | } |
| 490 | 490 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -495,46 +495,46 @@ discard block |
||
| 495 | 495 | else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
| 496 | 496 | try { |
| 497 | 497 | $sth = $this->db->prepare($query); |
| 498 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 499 | - } catch(PDOException $e) { |
|
| 498 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 499 | + } catch (PDOException $e) { |
|
| 500 | 500 | echo "error : ".$e->getMessage(); |
| 501 | 501 | } |
| 502 | 502 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 503 | 503 | } else $all = array(); |
| 504 | 504 | } |
| 505 | 505 | if (empty($all)) { |
| 506 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 507 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 506 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 507 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 508 | 508 | } else { |
| 509 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 509 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 510 | 510 | } |
| 511 | 511 | if ($filter_name != '') { |
| 512 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 512 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 513 | 513 | } |
| 514 | 514 | $Spotter = new Spotter($this->db); |
| 515 | 515 | //$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
| 516 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 516 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 517 | 517 | } |
| 518 | 518 | return $all; |
| 519 | 519 | } |
| 520 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 520 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 521 | 521 | $Connection = new Connection($this->db); |
| 522 | 522 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 523 | 523 | if ($Connection->tableExists('countries')) { |
| 524 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 524 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 525 | 525 | $Spotter = new Spotter($this->db); |
| 526 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 526 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 527 | 527 | if ($year == '' && $month == '') { |
| 528 | 528 | $alliance_airlines = array(); |
| 529 | 529 | foreach ($airlines as $airline) { |
| 530 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 530 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 531 | 531 | } |
| 532 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 532 | + if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | + else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 534 | 534 | try { |
| 535 | 535 | $sth = $this->db->prepare($query); |
| 536 | 536 | $sth->execute(array(':filter_name' => $filter_name)); |
| 537 | - } catch(PDOException $e) { |
|
| 537 | + } catch (PDOException $e) { |
|
| 538 | 538 | echo "error : ".$e->getMessage(); |
| 539 | 539 | } |
| 540 | 540 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -546,8 +546,8 @@ discard block |
||
| 546 | 546 | else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
| 547 | 547 | try { |
| 548 | 548 | $sth = $this->db->prepare($query); |
| 549 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 550 | - } catch(PDOException $e) { |
|
| 549 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 550 | + } catch (PDOException $e) { |
|
| 551 | 551 | echo "error : ".$e->getMessage(); |
| 552 | 552 | } |
| 553 | 553 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | return array(); |
| 565 | 565 | } |
| 566 | 566 | } |
| 567 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 567 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 568 | 568 | global $globalStatsFilters; |
| 569 | 569 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 570 | 570 | if ($year == '' && $month == '') { |
@@ -572,41 +572,41 @@ discard block |
||
| 572 | 572 | else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
| 573 | 573 | try { |
| 574 | 574 | $sth = $this->db->prepare($query); |
| 575 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 576 | - } catch(PDOException $e) { |
|
| 575 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 576 | + } catch (PDOException $e) { |
|
| 577 | 577 | echo "error : ".$e->getMessage(); |
| 578 | 578 | } |
| 579 | 579 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 580 | 580 | } else $all = array(); |
| 581 | 581 | if (empty($all)) { |
| 582 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 582 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 583 | 583 | if ($filter_name != '') { |
| 584 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 584 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 585 | 585 | } |
| 586 | 586 | $Spotter = new Spotter($this->db); |
| 587 | 587 | //$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
| 588 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 588 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 589 | 589 | } |
| 590 | 590 | return $all; |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 593 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 594 | 594 | global $globalStatsFilters; |
| 595 | 595 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 596 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 596 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 597 | 597 | $Spotter = new Spotter($this->db); |
| 598 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 598 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 599 | 599 | if ($year == '' && $month == '') { |
| 600 | 600 | $alliance_airlines = array(); |
| 601 | 601 | foreach ($airlines as $airline) { |
| 602 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 602 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 603 | 603 | } |
| 604 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 604 | + if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | + else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 606 | 606 | try { |
| 607 | 607 | $sth = $this->db->prepare($query); |
| 608 | 608 | $sth->execute(array(':filter_name' => $filter_name)); |
| 609 | - } catch(PDOException $e) { |
|
| 609 | + } catch (PDOException $e) { |
|
| 610 | 610 | echo "error : ".$e->getMessage(); |
| 611 | 611 | } |
| 612 | 612 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -617,45 +617,45 @@ discard block |
||
| 617 | 617 | else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
| 618 | 618 | try { |
| 619 | 619 | $sth = $this->db->prepare($query); |
| 620 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 621 | - } catch(PDOException $e) { |
|
| 620 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 621 | + } catch (PDOException $e) { |
|
| 622 | 622 | echo "error : ".$e->getMessage(); |
| 623 | 623 | } |
| 624 | 624 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 625 | 625 | } else $all = array(); |
| 626 | 626 | } |
| 627 | 627 | if (empty($all)) { |
| 628 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 629 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 628 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 629 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 630 | 630 | } else { |
| 631 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 631 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 632 | 632 | } |
| 633 | 633 | if ($filter_name != '') { |
| 634 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 634 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 635 | 635 | } |
| 636 | 636 | $Spotter = new Spotter($this->db); |
| 637 | 637 | //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
| 638 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 638 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 639 | 639 | } |
| 640 | 640 | return $all; |
| 641 | 641 | } |
| 642 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 642 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 643 | 643 | global $globalStatsFilters; |
| 644 | 644 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 645 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 645 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 646 | 646 | $Spotter = new Spotter($this->db); |
| 647 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 647 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 648 | 648 | if ($year == '' && $month == '') { |
| 649 | 649 | $alliance_airlines = array(); |
| 650 | 650 | foreach ($airlines as $airline) { |
| 651 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 651 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 652 | 652 | } |
| 653 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 653 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | + else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 655 | 655 | try { |
| 656 | 656 | $sth = $this->db->prepare($query); |
| 657 | 657 | $sth->execute(array(':filter_name' => $filter_name)); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | echo "error : ".$e->getMessage(); |
| 660 | 660 | } |
| 661 | 661 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -666,27 +666,27 @@ discard block |
||
| 666 | 666 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 667 | 667 | try { |
| 668 | 668 | $sth = $this->db->prepare($query); |
| 669 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 670 | - } catch(PDOException $e) { |
|
| 669 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 670 | + } catch (PDOException $e) { |
|
| 671 | 671 | echo "error : ".$e->getMessage(); |
| 672 | 672 | } |
| 673 | 673 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 674 | 674 | } else $all = array(); |
| 675 | 675 | } |
| 676 | 676 | if (empty($all)) { |
| 677 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 678 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 677 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 678 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 679 | 679 | } else { |
| 680 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 680 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 681 | 681 | } |
| 682 | 682 | if ($filter_name != '') { |
| 683 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 683 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 684 | 684 | } |
| 685 | 685 | $Spotter = new Spotter($this->db); |
| 686 | 686 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 687 | 687 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 688 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 689 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 688 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 689 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 690 | 690 | $all = array(); |
| 691 | 691 | foreach ($pall as $value) { |
| 692 | 692 | $icao = $value['airport_departure_icao']; |
@@ -702,27 +702,27 @@ discard block |
||
| 702 | 702 | foreach ($all as $key => $row) { |
| 703 | 703 | $count[$key] = $row['airport_departure_icao_count']; |
| 704 | 704 | } |
| 705 | - array_multisort($count,SORT_DESC,$all); |
|
| 705 | + array_multisort($count, SORT_DESC, $all); |
|
| 706 | 706 | } |
| 707 | 707 | return $all; |
| 708 | 708 | } |
| 709 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 709 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 710 | 710 | global $globalStatsFilters; |
| 711 | 711 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 712 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 712 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 713 | 713 | $Spotter = new Spotter($this->db); |
| 714 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 714 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 715 | 715 | if ($year == '' && $month == '') { |
| 716 | 716 | $alliance_airlines = array(); |
| 717 | 717 | foreach ($airlines as $airline) { |
| 718 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 718 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 719 | 719 | } |
| 720 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 720 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | + else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 722 | 722 | try { |
| 723 | 723 | $sth = $this->db->prepare($query); |
| 724 | 724 | $sth->execute(array(':filter_name' => $filter_name)); |
| 725 | - } catch(PDOException $e) { |
|
| 725 | + } catch (PDOException $e) { |
|
| 726 | 726 | echo "error : ".$e->getMessage(); |
| 727 | 727 | } |
| 728 | 728 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -733,27 +733,27 @@ discard block |
||
| 733 | 733 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 734 | 734 | try { |
| 735 | 735 | $sth = $this->db->prepare($query); |
| 736 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 737 | - } catch(PDOException $e) { |
|
| 736 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 737 | + } catch (PDOException $e) { |
|
| 738 | 738 | echo "error : ".$e->getMessage(); |
| 739 | 739 | } |
| 740 | 740 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 741 | 741 | } else $all = array(); |
| 742 | 742 | } |
| 743 | 743 | if (empty($all)) { |
| 744 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 745 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 744 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 745 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 746 | 746 | } else { |
| 747 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 747 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 748 | 748 | } |
| 749 | 749 | if ($filter_name != '') { |
| 750 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 750 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 751 | 751 | } |
| 752 | 752 | $Spotter = new Spotter($this->db); |
| 753 | 753 | // $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 754 | 754 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 755 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 756 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 755 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 756 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 757 | 757 | $all = array(); |
| 758 | 758 | foreach ($pall as $value) { |
| 759 | 759 | $icao = $value['airport_arrival_icao']; |
@@ -769,26 +769,26 @@ discard block |
||
| 769 | 769 | foreach ($all as $key => $row) { |
| 770 | 770 | $count[$key] = $row['airport_arrival_icao_count']; |
| 771 | 771 | } |
| 772 | - array_multisort($count,SORT_DESC,$all); |
|
| 772 | + array_multisort($count, SORT_DESC, $all); |
|
| 773 | 773 | } |
| 774 | 774 | return $all; |
| 775 | 775 | } |
| 776 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 776 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 777 | 777 | global $globalDBdriver, $globalStatsFilters; |
| 778 | 778 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 779 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 779 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 780 | 780 | $Spotter = new Spotter($this->db); |
| 781 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 781 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 782 | 782 | $alliance_airlines = array(); |
| 783 | 783 | foreach ($airlines as $airline) { |
| 784 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 784 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 785 | 785 | } |
| 786 | 786 | if ($globalDBdriver == 'mysql') { |
| 787 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 787 | + if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | + else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 789 | 789 | } else { |
| 790 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 790 | + if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | + else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 792 | 792 | } |
| 793 | 793 | $query_data = array(':filter_name' => $filter_name); |
| 794 | 794 | } else { |
@@ -799,23 +799,23 @@ discard block |
||
| 799 | 799 | if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 800 | 800 | 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"; |
| 801 | 801 | } |
| 802 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 802 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 803 | 803 | } |
| 804 | 804 | try { |
| 805 | 805 | $sth = $this->db->prepare($query); |
| 806 | 806 | $sth->execute($query_data); |
| 807 | - } catch(PDOException $e) { |
|
| 807 | + } catch (PDOException $e) { |
|
| 808 | 808 | echo "error : ".$e->getMessage(); |
| 809 | 809 | } |
| 810 | 810 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 811 | 811 | if (empty($all)) { |
| 812 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 813 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 812 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 813 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 814 | 814 | } else { |
| 815 | 815 | $filters = array('airlines' => array($stats_airline)); |
| 816 | 816 | } |
| 817 | 817 | if ($filter_name != '') { |
| 818 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 818 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 819 | 819 | } |
| 820 | 820 | $Spotter = new Spotter($this->db); |
| 821 | 821 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -823,57 +823,57 @@ discard block |
||
| 823 | 823 | return $all; |
| 824 | 824 | } |
| 825 | 825 | |
| 826 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 826 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 827 | 827 | global $globalStatsFilters; |
| 828 | 828 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 829 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 829 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 830 | 830 | $Spotter = new Spotter($this->db); |
| 831 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 831 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 832 | 832 | $alliance_airlines = array(); |
| 833 | 833 | foreach ($airlines as $airline) { |
| 834 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 834 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 835 | 835 | } |
| 836 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 836 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 837 | 837 | $query_data = array(':filter_name' => $filter_name); |
| 838 | 838 | } else { |
| 839 | 839 | $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"; |
| 840 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 840 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 841 | 841 | } |
| 842 | 842 | try { |
| 843 | 843 | $sth = $this->db->prepare($query); |
| 844 | 844 | $sth->execute($query_data); |
| 845 | - } catch(PDOException $e) { |
|
| 845 | + } catch (PDOException $e) { |
|
| 846 | 846 | echo "error : ".$e->getMessage(); |
| 847 | 847 | } |
| 848 | 848 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 849 | 849 | if (empty($all)) { |
| 850 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 851 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 850 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 851 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 852 | 852 | } else { |
| 853 | 853 | $filters = array('airlines' => array($stats_airline)); |
| 854 | 854 | } |
| 855 | 855 | if ($filter_name != '') { |
| 856 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 856 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 857 | 857 | } |
| 858 | 858 | $Spotter = new Spotter($this->db); |
| 859 | 859 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 860 | 860 | } |
| 861 | 861 | return $all; |
| 862 | 862 | } |
| 863 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 863 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 864 | 864 | global $globalDBdriver, $globalStatsFilters; |
| 865 | 865 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 866 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 866 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 867 | 867 | $Spotter = new Spotter($this->db); |
| 868 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 868 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 869 | 869 | $alliance_airlines = array(); |
| 870 | 870 | foreach ($airlines as $airline) { |
| 871 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 871 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 872 | 872 | } |
| 873 | 873 | if ($globalDBdriver == 'mysql') { |
| 874 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 874 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 875 | 875 | } else { |
| 876 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 876 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 877 | 877 | } |
| 878 | 878 | $query_data = array(':filter_name' => $filter_name); |
| 879 | 879 | } else { |
@@ -882,60 +882,60 @@ discard block |
||
| 882 | 882 | } else { |
| 883 | 883 | $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"; |
| 884 | 884 | } |
| 885 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 885 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 886 | 886 | } |
| 887 | 887 | try { |
| 888 | 888 | $sth = $this->db->prepare($query); |
| 889 | 889 | $sth->execute($query_data); |
| 890 | - } catch(PDOException $e) { |
|
| 890 | + } catch (PDOException $e) { |
|
| 891 | 891 | echo "error : ".$e->getMessage(); |
| 892 | 892 | } |
| 893 | 893 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 894 | 894 | if (empty($all)) { |
| 895 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 896 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 895 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 896 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 897 | 897 | } else { |
| 898 | 898 | $filters = array('airlines' => array($stats_airline)); |
| 899 | 899 | } |
| 900 | 900 | if ($filter_name != '') { |
| 901 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 901 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 902 | 902 | } |
| 903 | 903 | $Spotter = new Spotter($this->db); |
| 904 | 904 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 905 | 905 | } |
| 906 | 906 | return $all; |
| 907 | 907 | } |
| 908 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 908 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 909 | 909 | global $globalStatsFilters; |
| 910 | 910 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 911 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 911 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 912 | 912 | $Spotter = new Spotter($this->db); |
| 913 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 913 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 914 | 914 | $alliance_airlines = array(); |
| 915 | 915 | foreach ($airlines as $airline) { |
| 916 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 916 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 917 | 917 | } |
| 918 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 918 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 919 | 919 | $query_data = array(':filter_name' => $filter_name); |
| 920 | 920 | } else { |
| 921 | 921 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 922 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 922 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 923 | 923 | } |
| 924 | 924 | try { |
| 925 | 925 | $sth = $this->db->prepare($query); |
| 926 | 926 | $sth->execute($query_data); |
| 927 | - } catch(PDOException $e) { |
|
| 927 | + } catch (PDOException $e) { |
|
| 928 | 928 | echo "error : ".$e->getMessage(); |
| 929 | 929 | } |
| 930 | 930 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 931 | 931 | if (empty($all)) { |
| 932 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 933 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 932 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 933 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 934 | 934 | } else { |
| 935 | 935 | $filters = array('airlines' => array($stats_airline)); |
| 936 | 936 | } |
| 937 | 937 | if ($filter_name != '') { |
| 938 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 938 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 939 | 939 | } |
| 940 | 940 | $Spotter = new Spotter($this->db); |
| 941 | 941 | $all = $Spotter->countAllDates($filters); |
@@ -950,7 +950,7 @@ discard block |
||
| 950 | 950 | try { |
| 951 | 951 | $sth = $this->db->prepare($query); |
| 952 | 952 | $sth->execute($query_data); |
| 953 | - } catch(PDOException $e) { |
|
| 953 | + } catch (PDOException $e) { |
|
| 954 | 954 | echo "error : ".$e->getMessage(); |
| 955 | 955 | } |
| 956 | 956 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | try { |
| 973 | 973 | $sth = $this->db->prepare($query); |
| 974 | 974 | $sth->execute($query_data); |
| 975 | - } catch(PDOException $e) { |
|
| 975 | + } catch (PDOException $e) { |
|
| 976 | 976 | echo "error : ".$e->getMessage(); |
| 977 | 977 | } |
| 978 | 978 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -994,34 +994,34 @@ discard block |
||
| 994 | 994 | try { |
| 995 | 995 | $sth = $this->db->prepare($query); |
| 996 | 996 | $sth->execute($query_data); |
| 997 | - } catch(PDOException $e) { |
|
| 997 | + } catch (PDOException $e) { |
|
| 998 | 998 | echo "error : ".$e->getMessage(); |
| 999 | 999 | } |
| 1000 | 1000 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1001 | 1001 | if (empty($all)) { |
| 1002 | 1002 | $filters = array(); |
| 1003 | 1003 | if ($filter_name != '') { |
| 1004 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1004 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1005 | 1005 | } |
| 1006 | 1006 | $Spotter = new Spotter($this->db); |
| 1007 | 1007 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 1008 | 1008 | } |
| 1009 | 1009 | return $all; |
| 1010 | 1010 | } |
| 1011 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 1011 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 1012 | 1012 | global $globalStatsFilters, $globalDBdriver; |
| 1013 | 1013 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1014 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1014 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1015 | 1015 | $Spotter = new Spotter($this->db); |
| 1016 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1016 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1017 | 1017 | $alliance_airlines = array(); |
| 1018 | 1018 | foreach ($airlines as $airline) { |
| 1019 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1019 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1020 | 1020 | } |
| 1021 | 1021 | if ($globalDBdriver == 'mysql') { |
| 1022 | - $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1022 | + $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1023 | 1023 | } else { |
| 1024 | - $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1024 | + $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | $query_data = array(':filter_name' => $filter_name); |
| 1027 | 1027 | } else { |
@@ -1035,18 +1035,18 @@ discard block |
||
| 1035 | 1035 | try { |
| 1036 | 1036 | $sth = $this->db->prepare($query); |
| 1037 | 1037 | $sth->execute($query_data); |
| 1038 | - } catch(PDOException $e) { |
|
| 1038 | + } catch (PDOException $e) { |
|
| 1039 | 1039 | echo "error : ".$e->getMessage(); |
| 1040 | 1040 | } |
| 1041 | 1041 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1042 | 1042 | if (empty($all)) { |
| 1043 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1044 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1043 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1044 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1045 | 1045 | } else { |
| 1046 | 1046 | $filters = array('airlines' => array($stats_airline)); |
| 1047 | 1047 | } |
| 1048 | 1048 | if ($filter_name != '') { |
| 1049 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1049 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1050 | 1050 | } |
| 1051 | 1051 | $Spotter = new Spotter($this->db); |
| 1052 | 1052 | $all = $Spotter->countAllMonths($filters); |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | try { |
| 1064 | 1064 | $sth = $this->db->prepare($query); |
| 1065 | 1065 | $sth->execute(); |
| 1066 | - } catch(PDOException $e) { |
|
| 1066 | + } catch (PDOException $e) { |
|
| 1067 | 1067 | echo "error : ".$e->getMessage(); |
| 1068 | 1068 | } |
| 1069 | 1069 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1083,7 +1083,7 @@ discard block |
||
| 1083 | 1083 | try { |
| 1084 | 1084 | $sth = $this->db->prepare($query); |
| 1085 | 1085 | $sth->execute(); |
| 1086 | - } catch(PDOException $e) { |
|
| 1086 | + } catch (PDOException $e) { |
|
| 1087 | 1087 | echo "error : ".$e->getMessage(); |
| 1088 | 1088 | } |
| 1089 | 1089 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1100,32 +1100,32 @@ discard block |
||
| 1100 | 1100 | try { |
| 1101 | 1101 | $sth = $this->db->prepare($query); |
| 1102 | 1102 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1103 | - } catch(PDOException $e) { |
|
| 1103 | + } catch (PDOException $e) { |
|
| 1104 | 1104 | echo "error : ".$e->getMessage(); |
| 1105 | 1105 | } |
| 1106 | 1106 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1107 | 1107 | if (empty($all)) { |
| 1108 | 1108 | $filters = array(); |
| 1109 | 1109 | if ($filter_name != '') { |
| 1110 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1110 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1111 | 1111 | } |
| 1112 | 1112 | $Spotter = new Spotter($this->db); |
| 1113 | 1113 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 1114 | 1114 | } |
| 1115 | 1115 | return $all; |
| 1116 | 1116 | } |
| 1117 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 1117 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 1118 | 1118 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1119 | 1119 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1120 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1120 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1121 | 1121 | $Spotter = new Spotter($this->db); |
| 1122 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1122 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1123 | 1123 | $alliance_airlines = array(); |
| 1124 | 1124 | foreach ($airlines as $airline) { |
| 1125 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1125 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1126 | 1126 | } |
| 1127 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1127 | + if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | + else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1129 | 1129 | $query_data = array(':filter_name' => $filter_name); |
| 1130 | 1130 | } else { |
| 1131 | 1131 | if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1143,37 +1143,37 @@ discard block |
||
| 1143 | 1143 | try { |
| 1144 | 1144 | $sth = $this->db->prepare($query); |
| 1145 | 1145 | $sth->execute($query_data); |
| 1146 | - } catch(PDOException $e) { |
|
| 1146 | + } catch (PDOException $e) { |
|
| 1147 | 1147 | echo "error : ".$e->getMessage(); |
| 1148 | 1148 | } |
| 1149 | 1149 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1150 | 1150 | if (empty($all)) { |
| 1151 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1152 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1151 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1152 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1153 | 1153 | } else { |
| 1154 | 1154 | $filters = array('airlines' => array($stats_airline)); |
| 1155 | 1155 | } |
| 1156 | 1156 | if ($filter_name != '') { |
| 1157 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1157 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1158 | 1158 | } |
| 1159 | 1159 | $Spotter = new Spotter($this->db); |
| 1160 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 1160 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 1161 | 1161 | } |
| 1162 | 1162 | return $all; |
| 1163 | 1163 | } |
| 1164 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 1164 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1165 | 1165 | global $globalStatsFilters; |
| 1166 | 1166 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1167 | 1167 | if ($year == '') $year = date('Y'); |
| 1168 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1168 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1169 | 1169 | if (empty($all)) { |
| 1170 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1171 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1170 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1171 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1172 | 1172 | } else { |
| 1173 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1173 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1174 | 1174 | } |
| 1175 | 1175 | if ($filter_name != '') { |
| 1176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1176 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1177 | 1177 | } |
| 1178 | 1178 | $Spotter = new Spotter($this->db); |
| 1179 | 1179 | //$all = $Spotter->countOverallFlights($filters,$year,$month); |
@@ -1181,16 +1181,16 @@ discard block |
||
| 1181 | 1181 | } |
| 1182 | 1182 | return $all; |
| 1183 | 1183 | } |
| 1184 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 1184 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 1185 | 1185 | global $globalStatsFilters; |
| 1186 | 1186 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1187 | 1187 | if ($year == '') $year = date('Y'); |
| 1188 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 1188 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 1189 | 1189 | if (empty($all)) { |
| 1190 | 1190 | $filters = array(); |
| 1191 | - $filters = array('year' => $year,'month' => $month); |
|
| 1191 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1192 | 1192 | if ($filter_name != '') { |
| 1193 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1193 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1194 | 1194 | } |
| 1195 | 1195 | $Spotter = new Spotter($this->db); |
| 1196 | 1196 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -1198,19 +1198,19 @@ discard block |
||
| 1198 | 1198 | } |
| 1199 | 1199 | return $all; |
| 1200 | 1200 | } |
| 1201 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 1201 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1202 | 1202 | global $globalStatsFilters; |
| 1203 | 1203 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1204 | 1204 | if ($year == '') $year = date('Y'); |
| 1205 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1205 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1206 | 1206 | if (empty($all)) { |
| 1207 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1208 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1207 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1208 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1209 | 1209 | } else { |
| 1210 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1210 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1211 | 1211 | } |
| 1212 | 1212 | if ($filter_name != '') { |
| 1213 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1213 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1214 | 1214 | } |
| 1215 | 1215 | $Spotter = new Spotter($this->db); |
| 1216 | 1216 | //$all = $Spotter->countOverallArrival($filters,$year,$month); |
@@ -1218,48 +1218,48 @@ discard block |
||
| 1218 | 1218 | } |
| 1219 | 1219 | return $all; |
| 1220 | 1220 | } |
| 1221 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1221 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1222 | 1222 | global $globalStatsFilters; |
| 1223 | 1223 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1224 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1224 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1225 | 1225 | $Spotter = new Spotter($this->db); |
| 1226 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1226 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1227 | 1227 | if ($year == '' && $month == '') { |
| 1228 | 1228 | $alliance_airlines = array(); |
| 1229 | 1229 | foreach ($airlines as $airline) { |
| 1230 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1230 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1231 | 1231 | } |
| 1232 | - $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1232 | + $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $this->db->prepare($query); |
| 1235 | 1235 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1236 | - } catch(PDOException $e) { |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | echo "error : ".$e->getMessage(); |
| 1238 | 1238 | } |
| 1239 | 1239 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1240 | 1240 | $all = $result[0]['nb']; |
| 1241 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1241 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1242 | 1242 | } else { |
| 1243 | 1243 | if ($year == '' && $month == '') { |
| 1244 | 1244 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1245 | 1245 | try { |
| 1246 | 1246 | $sth = $this->db->prepare($query); |
| 1247 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 1248 | - } catch(PDOException $e) { |
|
| 1247 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 1248 | + } catch (PDOException $e) { |
|
| 1249 | 1249 | echo "error : ".$e->getMessage(); |
| 1250 | 1250 | } |
| 1251 | 1251 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1252 | 1252 | $all = $result[0]['nb']; |
| 1253 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1253 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1254 | 1254 | } |
| 1255 | 1255 | if (empty($all)) { |
| 1256 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1257 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1256 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1257 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1258 | 1258 | } else { |
| 1259 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1259 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1260 | 1260 | } |
| 1261 | 1261 | if ($filter_name != '') { |
| 1262 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1262 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1263 | 1263 | } |
| 1264 | 1264 | $Spotter = new Spotter($this->db); |
| 1265 | 1265 | //$all = $Spotter->countOverallAircrafts($filters,$year,$month); |
@@ -1267,7 +1267,7 @@ discard block |
||
| 1267 | 1267 | } |
| 1268 | 1268 | return $all; |
| 1269 | 1269 | } |
| 1270 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 1270 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 1271 | 1271 | global $globalStatsFilters; |
| 1272 | 1272 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1273 | 1273 | if ($year == '' && $month == '') { |
@@ -1275,17 +1275,17 @@ discard block |
||
| 1275 | 1275 | try { |
| 1276 | 1276 | $sth = $this->db->prepare($query); |
| 1277 | 1277 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1278 | - } catch(PDOException $e) { |
|
| 1278 | + } catch (PDOException $e) { |
|
| 1279 | 1279 | echo "error : ".$e->getMessage(); |
| 1280 | 1280 | } |
| 1281 | 1281 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1282 | 1282 | $all = $result[0]['nb_airline']; |
| 1283 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1283 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 1284 | 1284 | if (empty($all)) { |
| 1285 | 1285 | $filters = array(); |
| 1286 | - $filters = array('year' => $year,'month' => $month); |
|
| 1286 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1287 | 1287 | if ($filter_name != '') { |
| 1288 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1288 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1289 | 1289 | } |
| 1290 | 1290 | $Spotter = new Spotter($this->db); |
| 1291 | 1291 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -1293,29 +1293,29 @@ discard block |
||
| 1293 | 1293 | } |
| 1294 | 1294 | return $all; |
| 1295 | 1295 | } |
| 1296 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1296 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1297 | 1297 | global $globalStatsFilters; |
| 1298 | 1298 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1299 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1299 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1300 | 1300 | $Spotter = new Spotter($this->db); |
| 1301 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1301 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1302 | 1302 | if ($year == '' && $month == '') { |
| 1303 | 1303 | $alliance_airlines = array(); |
| 1304 | 1304 | foreach ($airlines as $airline) { |
| 1305 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1305 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1306 | 1306 | } |
| 1307 | - $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1307 | + $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1308 | 1308 | $query_values = array(':filter_name' => $filter_name); |
| 1309 | 1309 | try { |
| 1310 | 1310 | $sth = $this->db->prepare($query); |
| 1311 | 1311 | $sth->execute($query_values); |
| 1312 | - } catch(PDOException $e) { |
|
| 1312 | + } catch (PDOException $e) { |
|
| 1313 | 1313 | echo "error : ".$e->getMessage(); |
| 1314 | 1314 | } |
| 1315 | 1315 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1316 | 1316 | $all = $result[0]['nb']; |
| 1317 | 1317 | } else { |
| 1318 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1318 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1319 | 1319 | } |
| 1320 | 1320 | } else { |
| 1321 | 1321 | if ($year == '' && $month == '') { |
@@ -1324,23 +1324,23 @@ discard block |
||
| 1324 | 1324 | try { |
| 1325 | 1325 | $sth = $this->db->prepare($query); |
| 1326 | 1326 | $sth->execute($query_values); |
| 1327 | - } catch(PDOException $e) { |
|
| 1327 | + } catch (PDOException $e) { |
|
| 1328 | 1328 | echo "error : ".$e->getMessage(); |
| 1329 | 1329 | } |
| 1330 | 1330 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1331 | 1331 | $all = $result[0]['nb']; |
| 1332 | 1332 | } else { |
| 1333 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1333 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1334 | 1334 | } |
| 1335 | 1335 | } |
| 1336 | 1336 | if (empty($all)) { |
| 1337 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1338 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1337 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1338 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1339 | 1339 | } else { |
| 1340 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1340 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1341 | 1341 | } |
| 1342 | 1342 | if ($filter_name != '') { |
| 1343 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1343 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1344 | 1344 | } |
| 1345 | 1345 | $Spotter = new Spotter($this->db); |
| 1346 | 1346 | //$all = $Spotter->countOverallOwners($filters,$year,$month); |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | } |
| 1349 | 1349 | return $all; |
| 1350 | 1350 | } |
| 1351 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 1351 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1352 | 1352 | global $globalStatsFilters; |
| 1353 | 1353 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1354 | 1354 | //if ($year == '') $year = date('Y'); |
@@ -1358,18 +1358,18 @@ discard block |
||
| 1358 | 1358 | try { |
| 1359 | 1359 | $sth = $this->db->prepare($query); |
| 1360 | 1360 | $sth->execute($query_values); |
| 1361 | - } catch(PDOException $e) { |
|
| 1361 | + } catch (PDOException $e) { |
|
| 1362 | 1362 | echo "error : ".$e->getMessage(); |
| 1363 | 1363 | } |
| 1364 | 1364 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1365 | 1365 | $all = $result[0]['nb']; |
| 1366 | 1366 | } else { |
| 1367 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1367 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1368 | 1368 | } |
| 1369 | 1369 | if (empty($all)) { |
| 1370 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1370 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1371 | 1371 | if ($filter_name != '') { |
| 1372 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1372 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1373 | 1373 | } |
| 1374 | 1374 | $Spotter = new Spotter($this->db); |
| 1375 | 1375 | //$all = $Spotter->countOverallPilots($filters,$year,$month); |
@@ -1378,104 +1378,104 @@ discard block |
||
| 1378 | 1378 | return $all; |
| 1379 | 1379 | } |
| 1380 | 1380 | |
| 1381 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 1381 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 1382 | 1382 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1383 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1383 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1384 | 1384 | $Spotter = new Spotter($this->db); |
| 1385 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1385 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1386 | 1386 | $alliance_airlines = array(); |
| 1387 | 1387 | foreach ($airlines as $airline) { |
| 1388 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1388 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1389 | 1389 | } |
| 1390 | - $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1391 | - $query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name); |
|
| 1390 | + $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1391 | + $query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name); |
|
| 1392 | 1392 | } else { |
| 1393 | 1393 | $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"; |
| 1394 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1394 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1395 | 1395 | } |
| 1396 | 1396 | try { |
| 1397 | 1397 | $sth = $this->db->prepare($query); |
| 1398 | 1398 | $sth->execute($query_values); |
| 1399 | - } catch(PDOException $e) { |
|
| 1399 | + } catch (PDOException $e) { |
|
| 1400 | 1400 | echo "error : ".$e->getMessage(); |
| 1401 | 1401 | } |
| 1402 | 1402 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1403 | 1403 | return $all; |
| 1404 | 1404 | } |
| 1405 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 1405 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 1406 | 1406 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1407 | 1407 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1408 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1408 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1409 | 1409 | try { |
| 1410 | 1410 | $sth = $this->db->prepare($query); |
| 1411 | 1411 | $sth->execute($query_values); |
| 1412 | - } catch(PDOException $e) { |
|
| 1412 | + } catch (PDOException $e) { |
|
| 1413 | 1413 | echo "error : ".$e->getMessage(); |
| 1414 | 1414 | } |
| 1415 | 1415 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1416 | 1416 | return $all; |
| 1417 | 1417 | } |
| 1418 | - public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
|
| 1418 | + public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') { |
|
| 1419 | 1419 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1420 | 1420 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1421 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1421 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1422 | 1422 | try { |
| 1423 | 1423 | $sth = $this->db->prepare($query); |
| 1424 | 1424 | $sth->execute($query_values); |
| 1425 | - } catch(PDOException $e) { |
|
| 1425 | + } catch (PDOException $e) { |
|
| 1426 | 1426 | echo "error : ".$e->getMessage(); |
| 1427 | 1427 | } |
| 1428 | 1428 | } |
| 1429 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 1429 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 1430 | 1430 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1431 | 1431 | global $globalArchiveMonths, $globalDBdriver; |
| 1432 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1432 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1433 | 1433 | $Spotter = new Spotter($this->db); |
| 1434 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1434 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1435 | 1435 | $alliance_airlines = array(); |
| 1436 | 1436 | foreach ($airlines as $airline) { |
| 1437 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1437 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1438 | 1438 | } |
| 1439 | 1439 | if ($globalDBdriver == 'mysql') { |
| 1440 | 1440 | if ($month == '') { |
| 1441 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1441 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1442 | 1442 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1443 | 1443 | } else { |
| 1444 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1445 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1444 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1445 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1446 | 1446 | } |
| 1447 | 1447 | } else { |
| 1448 | 1448 | if ($month == '') { |
| 1449 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1449 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1450 | 1450 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1451 | 1451 | } else { |
| 1452 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1453 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1452 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1453 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1454 | 1454 | } |
| 1455 | 1455 | } |
| 1456 | 1456 | } else { |
| 1457 | 1457 | if ($globalDBdriver == 'mysql') { |
| 1458 | 1458 | if ($month == '') { |
| 1459 | 1459 | $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"; |
| 1460 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1460 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1461 | 1461 | } else { |
| 1462 | 1462 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1463 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1463 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1464 | 1464 | } |
| 1465 | 1465 | } else { |
| 1466 | 1466 | if ($month == '') { |
| 1467 | 1467 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1468 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1468 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1469 | 1469 | } else { |
| 1470 | 1470 | $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"; |
| 1471 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1471 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1472 | 1472 | } |
| 1473 | 1473 | } |
| 1474 | 1474 | } |
| 1475 | 1475 | try { |
| 1476 | 1476 | $sth = $this->db->prepare($query); |
| 1477 | 1477 | $sth->execute($query_values); |
| 1478 | - } catch(PDOException $e) { |
|
| 1478 | + } catch (PDOException $e) { |
|
| 1479 | 1479 | echo "error : ".$e->getMessage(); |
| 1480 | 1480 | } |
| 1481 | 1481 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1484,17 +1484,17 @@ discard block |
||
| 1484 | 1484 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1485 | 1485 | global $globalArchiveMonths, $globalDBdriver; |
| 1486 | 1486 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1487 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1487 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1488 | 1488 | $Spotter = new Spotter($this->db); |
| 1489 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1489 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1490 | 1490 | $alliance_airlines = array(); |
| 1491 | 1491 | foreach ($airlines as $airline) { |
| 1492 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1492 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1493 | 1493 | } |
| 1494 | 1494 | if ($globalDBdriver == 'mysql') { |
| 1495 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1495 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1496 | 1496 | } else { |
| 1497 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1497 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1498 | 1498 | } |
| 1499 | 1499 | $query_values = array(':type' => $type, ':filter_name' => $filter_name); |
| 1500 | 1500 | } else { |
@@ -1508,7 +1508,7 @@ discard block |
||
| 1508 | 1508 | try { |
| 1509 | 1509 | $sth = $this->db->prepare($query); |
| 1510 | 1510 | $sth->execute($query_values); |
| 1511 | - } catch(PDOException $e) { |
|
| 1511 | + } catch (PDOException $e) { |
|
| 1512 | 1512 | echo "error : ".$e->getMessage(); |
| 1513 | 1513 | } |
| 1514 | 1514 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1517,17 +1517,17 @@ discard block |
||
| 1517 | 1517 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1518 | 1518 | global $globalArchiveMonths, $globalDBdriver; |
| 1519 | 1519 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1520 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1520 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1521 | 1521 | $Spotter = new Spotter($this->db); |
| 1522 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1522 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1523 | 1523 | $alliance_airlines = array(); |
| 1524 | 1524 | foreach ($airlines as $airline) { |
| 1525 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1525 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1526 | 1526 | } |
| 1527 | 1527 | if ($globalDBdriver == 'mysql') { |
| 1528 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1528 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1529 | 1529 | } else { |
| 1530 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1530 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1531 | 1531 | } |
| 1532 | 1532 | } else { |
| 1533 | 1533 | if ($globalDBdriver == 'mysql') { |
@@ -1539,7 +1539,7 @@ discard block |
||
| 1539 | 1539 | try { |
| 1540 | 1540 | $sth = $this->db->prepare($query); |
| 1541 | 1541 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 1542 | - } catch(PDOException $e) { |
|
| 1542 | + } catch (PDOException $e) { |
|
| 1543 | 1543 | echo "error : ".$e->getMessage(); |
| 1544 | 1544 | } |
| 1545 | 1545 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | try { |
| 1557 | 1557 | $sth = $this->db->prepare($query); |
| 1558 | 1558 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1559 | - } catch(PDOException $e) { |
|
| 1559 | + } catch (PDOException $e) { |
|
| 1560 | 1560 | echo "error : ".$e->getMessage(); |
| 1561 | 1561 | } |
| 1562 | 1562 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1573,20 +1573,20 @@ discard block |
||
| 1573 | 1573 | try { |
| 1574 | 1574 | $sth = $this->db->prepare($query); |
| 1575 | 1575 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1576 | - } catch(PDOException $e) { |
|
| 1576 | + } catch (PDOException $e) { |
|
| 1577 | 1577 | echo "error : ".$e->getMessage(); |
| 1578 | 1578 | } |
| 1579 | 1579 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1580 | 1580 | return $all[0]['total']; |
| 1581 | 1581 | } |
| 1582 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 1582 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 1583 | 1583 | global $globalArchiveMonths, $globalDBdriver; |
| 1584 | 1584 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1585 | 1585 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1586 | 1586 | try { |
| 1587 | 1587 | $sth = $this->db->prepare($query); |
| 1588 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1589 | - } catch(PDOException $e) { |
|
| 1588 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 1589 | + } catch (PDOException $e) { |
|
| 1590 | 1590 | echo "error : ".$e->getMessage(); |
| 1591 | 1591 | } |
| 1592 | 1592 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1604,20 +1604,20 @@ discard block |
||
| 1604 | 1604 | try { |
| 1605 | 1605 | $sth = $this->db->prepare($query); |
| 1606 | 1606 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1607 | - } catch(PDOException $e) { |
|
| 1607 | + } catch (PDOException $e) { |
|
| 1608 | 1608 | echo "error : ".$e->getMessage(); |
| 1609 | 1609 | } |
| 1610 | 1610 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1611 | 1611 | return $all[0]['total']; |
| 1612 | 1612 | } |
| 1613 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1613 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1614 | 1614 | global $globalArchiveMonths, $globalDBdriver; |
| 1615 | 1615 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1616 | 1616 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1617 | 1617 | try { |
| 1618 | 1618 | $sth = $this->db->prepare($query); |
| 1619 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1620 | - } catch(PDOException $e) { |
|
| 1619 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1620 | + } catch (PDOException $e) { |
|
| 1621 | 1621 | echo "error : ".$e->getMessage(); |
| 1622 | 1622 | } |
| 1623 | 1623 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | else return 0; |
| 1626 | 1626 | } |
| 1627 | 1627 | |
| 1628 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1628 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1629 | 1629 | global $globalDBdriver; |
| 1630 | 1630 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1631 | 1631 | if ($globalDBdriver == 'mysql') { |
@@ -1633,15 +1633,15 @@ discard block |
||
| 1633 | 1633 | } else { |
| 1634 | 1634 | $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);"; |
| 1635 | 1635 | } |
| 1636 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1636 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1637 | 1637 | try { |
| 1638 | 1638 | $sth = $this->db->prepare($query); |
| 1639 | 1639 | $sth->execute($query_values); |
| 1640 | - } catch(PDOException $e) { |
|
| 1640 | + } catch (PDOException $e) { |
|
| 1641 | 1641 | return "error : ".$e->getMessage(); |
| 1642 | 1642 | } |
| 1643 | 1643 | } |
| 1644 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1644 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1645 | 1645 | global $globalDBdriver; |
| 1646 | 1646 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1647 | 1647 | if ($globalDBdriver == 'mysql') { |
@@ -1650,11 +1650,11 @@ discard block |
||
| 1650 | 1650 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1651 | 1651 | $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);"; |
| 1652 | 1652 | } |
| 1653 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1653 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1654 | 1654 | try { |
| 1655 | 1655 | $sth = $this->db->prepare($query); |
| 1656 | 1656 | $sth->execute($query_values); |
| 1657 | - } catch(PDOException $e) { |
|
| 1657 | + } catch (PDOException $e) { |
|
| 1658 | 1658 | return "error : ".$e->getMessage(); |
| 1659 | 1659 | } |
| 1660 | 1660 | } |
@@ -1678,95 +1678,95 @@ discard block |
||
| 1678 | 1678 | } |
| 1679 | 1679 | */ |
| 1680 | 1680 | |
| 1681 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1681 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1682 | 1682 | global $globalDBdriver; |
| 1683 | 1683 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1684 | 1684 | $query_values = array(); |
| 1685 | 1685 | if ($globalDBdriver == 'mysql') { |
| 1686 | 1686 | if ($year != '') { |
| 1687 | 1687 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1688 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1688 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1689 | 1689 | } |
| 1690 | 1690 | if ($month != '') { |
| 1691 | 1691 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1692 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1692 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1693 | 1693 | } |
| 1694 | 1694 | if ($day != '') { |
| 1695 | 1695 | $query .= ' AND DAY(stats_date) = :day'; |
| 1696 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1696 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1697 | 1697 | } |
| 1698 | 1698 | } else { |
| 1699 | 1699 | if ($year != '') { |
| 1700 | 1700 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1701 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1701 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1702 | 1702 | } |
| 1703 | 1703 | if ($month != '') { |
| 1704 | 1704 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1705 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1705 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1706 | 1706 | } |
| 1707 | 1707 | if ($day != '') { |
| 1708 | 1708 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1709 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1709 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1710 | 1710 | } |
| 1711 | 1711 | } |
| 1712 | 1712 | $query .= " ORDER BY source_name"; |
| 1713 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1713 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1714 | 1714 | try { |
| 1715 | 1715 | $sth = $this->db->prepare($query); |
| 1716 | 1716 | $sth->execute($query_values); |
| 1717 | - } catch(PDOException $e) { |
|
| 1717 | + } catch (PDOException $e) { |
|
| 1718 | 1718 | echo "error : ".$e->getMessage(); |
| 1719 | 1719 | } |
| 1720 | 1720 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1721 | 1721 | return $all; |
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1724 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1725 | 1725 | global $globalDBdriver; |
| 1726 | 1726 | if ($globalDBdriver == 'mysql') { |
| 1727 | 1727 | $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"; |
| 1728 | 1728 | } else { |
| 1729 | 1729 | $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);"; |
| 1730 | 1730 | } |
| 1731 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1731 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1732 | 1732 | try { |
| 1733 | 1733 | $sth = $this->db->prepare($query); |
| 1734 | 1734 | $sth->execute($query_values); |
| 1735 | - } catch(PDOException $e) { |
|
| 1735 | + } catch (PDOException $e) { |
|
| 1736 | 1736 | return "error : ".$e->getMessage(); |
| 1737 | 1737 | } |
| 1738 | 1738 | } |
| 1739 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1739 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1740 | 1740 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1741 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1741 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1742 | 1742 | try { |
| 1743 | 1743 | $sth = $this->db->prepare($query); |
| 1744 | 1744 | $sth->execute($query_values); |
| 1745 | - } catch(PDOException $e) { |
|
| 1745 | + } catch (PDOException $e) { |
|
| 1746 | 1746 | return "error : ".$e->getMessage(); |
| 1747 | 1747 | } |
| 1748 | 1748 | } |
| 1749 | - public function addStatMarine($type,$date_name,$cnt,$filter_name = '') { |
|
| 1749 | + public function addStatMarine($type, $date_name, $cnt, $filter_name = '') { |
|
| 1750 | 1750 | $query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1751 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1751 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1752 | 1752 | try { |
| 1753 | 1753 | $sth = $this->db->prepare($query); |
| 1754 | 1754 | $sth->execute($query_values); |
| 1755 | - } catch(PDOException $e) { |
|
| 1755 | + } catch (PDOException $e) { |
|
| 1756 | 1756 | return "error : ".$e->getMessage(); |
| 1757 | 1757 | } |
| 1758 | 1758 | } |
| 1759 | - public function addStatTracker($type,$date_name,$cnt,$filter_name = '') { |
|
| 1759 | + public function addStatTracker($type, $date_name, $cnt, $filter_name = '') { |
|
| 1760 | 1760 | $query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1761 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1761 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1762 | 1762 | try { |
| 1763 | 1763 | $sth = $this->db->prepare($query); |
| 1764 | 1764 | $sth->execute($query_values); |
| 1765 | - } catch(PDOException $e) { |
|
| 1765 | + } catch (PDOException $e) { |
|
| 1766 | 1766 | return "error : ".$e->getMessage(); |
| 1767 | 1767 | } |
| 1768 | 1768 | } |
| 1769 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1769 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1770 | 1770 | global $globalDBdriver; |
| 1771 | 1771 | if ($globalDBdriver == 'mysql') { |
| 1772 | 1772 | if ($reset) { |
@@ -1781,15 +1781,15 @@ discard block |
||
| 1781 | 1781 | $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);"; |
| 1782 | 1782 | } |
| 1783 | 1783 | } |
| 1784 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1784 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1785 | 1785 | try { |
| 1786 | 1786 | $sth = $this->db->prepare($query); |
| 1787 | 1787 | $sth->execute($query_values); |
| 1788 | - } catch(PDOException $e) { |
|
| 1788 | + } catch (PDOException $e) { |
|
| 1789 | 1789 | return "error : ".$e->getMessage(); |
| 1790 | 1790 | } |
| 1791 | 1791 | } |
| 1792 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1792 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1793 | 1793 | global $globalDBdriver; |
| 1794 | 1794 | if ($globalDBdriver == 'mysql') { |
| 1795 | 1795 | if ($reset) { |
@@ -1804,15 +1804,15 @@ discard block |
||
| 1804 | 1804 | $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);"; |
| 1805 | 1805 | } |
| 1806 | 1806 | } |
| 1807 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1807 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1808 | 1808 | try { |
| 1809 | 1809 | $sth = $this->db->prepare($query); |
| 1810 | 1810 | $sth->execute($query_values); |
| 1811 | - } catch(PDOException $e) { |
|
| 1811 | + } catch (PDOException $e) { |
|
| 1812 | 1812 | return "error : ".$e->getMessage(); |
| 1813 | 1813 | } |
| 1814 | 1814 | } |
| 1815 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1815 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1816 | 1816 | global $globalDBdriver; |
| 1817 | 1817 | if ($globalDBdriver == 'mysql') { |
| 1818 | 1818 | if ($reset) { |
@@ -1827,15 +1827,15 @@ discard block |
||
| 1827 | 1827 | $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);"; |
| 1828 | 1828 | } |
| 1829 | 1829 | } |
| 1830 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1830 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1831 | 1831 | try { |
| 1832 | 1832 | $sth = $this->db->prepare($query); |
| 1833 | 1833 | $sth->execute($query_values); |
| 1834 | - } catch(PDOException $e) { |
|
| 1834 | + } catch (PDOException $e) { |
|
| 1835 | 1835 | return "error : ".$e->getMessage(); |
| 1836 | 1836 | } |
| 1837 | 1837 | } |
| 1838 | - public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
|
| 1838 | + public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) { |
|
| 1839 | 1839 | global $globalDBdriver; |
| 1840 | 1840 | if ($globalDBdriver == 'mysql') { |
| 1841 | 1841 | if ($reset) { |
@@ -1850,15 +1850,15 @@ discard block |
||
| 1850 | 1850 | $query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1851 | 1851 | } |
| 1852 | 1852 | } |
| 1853 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1853 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1854 | 1854 | try { |
| 1855 | 1855 | $sth = $this->db->prepare($query); |
| 1856 | 1856 | $sth->execute($query_values); |
| 1857 | - } catch(PDOException $e) { |
|
| 1857 | + } catch (PDOException $e) { |
|
| 1858 | 1858 | return "error : ".$e->getMessage(); |
| 1859 | 1859 | } |
| 1860 | 1860 | } |
| 1861 | - public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
|
| 1861 | + public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) { |
|
| 1862 | 1862 | global $globalDBdriver; |
| 1863 | 1863 | if ($globalDBdriver == 'mysql') { |
| 1864 | 1864 | if ($reset) { |
@@ -1873,15 +1873,15 @@ discard block |
||
| 1873 | 1873 | $query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1874 | 1874 | } |
| 1875 | 1875 | } |
| 1876 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1876 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1877 | 1877 | try { |
| 1878 | 1878 | $sth = $this->db->prepare($query); |
| 1879 | 1879 | $sth->execute($query_values); |
| 1880 | - } catch(PDOException $e) { |
|
| 1880 | + } catch (PDOException $e) { |
|
| 1881 | 1881 | return "error : ".$e->getMessage(); |
| 1882 | 1882 | } |
| 1883 | 1883 | } |
| 1884 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1884 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1885 | 1885 | global $globalDBdriver; |
| 1886 | 1886 | if ($globalDBdriver == 'mysql') { |
| 1887 | 1887 | if ($reset) { |
@@ -1896,15 +1896,15 @@ discard block |
||
| 1896 | 1896 | $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);"; |
| 1897 | 1897 | } |
| 1898 | 1898 | } |
| 1899 | - $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); |
|
| 1899 | + $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); |
|
| 1900 | 1900 | try { |
| 1901 | 1901 | $sth = $this->db->prepare($query); |
| 1902 | 1902 | $sth->execute($query_values); |
| 1903 | - } catch(PDOException $e) { |
|
| 1903 | + } catch (PDOException $e) { |
|
| 1904 | 1904 | return "error : ".$e->getMessage(); |
| 1905 | 1905 | } |
| 1906 | 1906 | } |
| 1907 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1907 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1908 | 1908 | global $globalDBdriver; |
| 1909 | 1909 | if ($globalDBdriver == 'mysql') { |
| 1910 | 1910 | if ($reset) { |
@@ -1919,15 +1919,15 @@ discard block |
||
| 1919 | 1919 | $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);"; |
| 1920 | 1920 | } |
| 1921 | 1921 | } |
| 1922 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1922 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1923 | 1923 | try { |
| 1924 | 1924 | $sth = $this->db->prepare($query); |
| 1925 | 1925 | $sth->execute($query_values); |
| 1926 | - } catch(PDOException $e) { |
|
| 1926 | + } catch (PDOException $e) { |
|
| 1927 | 1927 | return "error : ".$e->getMessage(); |
| 1928 | 1928 | } |
| 1929 | 1929 | } |
| 1930 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1930 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1931 | 1931 | global $globalDBdriver; |
| 1932 | 1932 | if ($globalDBdriver == 'mysql') { |
| 1933 | 1933 | if ($reset) { |
@@ -1942,15 +1942,15 @@ discard block |
||
| 1942 | 1942 | $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);"; |
| 1943 | 1943 | } |
| 1944 | 1944 | } |
| 1945 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1945 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1946 | 1946 | try { |
| 1947 | 1947 | $sth = $this->db->prepare($query); |
| 1948 | 1948 | $sth->execute($query_values); |
| 1949 | - } catch(PDOException $e) { |
|
| 1949 | + } catch (PDOException $e) { |
|
| 1950 | 1950 | return "error : ".$e->getMessage(); |
| 1951 | 1951 | } |
| 1952 | 1952 | } |
| 1953 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1953 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1954 | 1954 | global $globalDBdriver; |
| 1955 | 1955 | if ($globalDBdriver == 'mysql') { |
| 1956 | 1956 | if ($reset) { |
@@ -1965,15 +1965,15 @@ discard block |
||
| 1965 | 1965 | $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);"; |
| 1966 | 1966 | } |
| 1967 | 1967 | } |
| 1968 | - $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); |
|
| 1968 | + $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); |
|
| 1969 | 1969 | try { |
| 1970 | 1970 | $sth = $this->db->prepare($query); |
| 1971 | 1971 | $sth->execute($query_values); |
| 1972 | - } catch(PDOException $e) { |
|
| 1972 | + } catch (PDOException $e) { |
|
| 1973 | 1973 | return "error : ".$e->getMessage(); |
| 1974 | 1974 | } |
| 1975 | 1975 | } |
| 1976 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1976 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1977 | 1977 | global $globalDBdriver; |
| 1978 | 1978 | if ($airport_icao != '') { |
| 1979 | 1979 | if ($globalDBdriver == 'mysql') { |
@@ -1989,16 +1989,16 @@ discard block |
||
| 1989 | 1989 | $query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1990 | 1990 | } |
| 1991 | 1991 | } |
| 1992 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1992 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1993 | 1993 | try { |
| 1994 | 1994 | $sth = $this->db->prepare($query); |
| 1995 | 1995 | $sth->execute($query_values); |
| 1996 | - } catch(PDOException $e) { |
|
| 1996 | + } catch (PDOException $e) { |
|
| 1997 | 1997 | return "error : ".$e->getMessage(); |
| 1998 | 1998 | } |
| 1999 | 1999 | } |
| 2000 | 2000 | } |
| 2001 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 2001 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 2002 | 2002 | global $globalDBdriver; |
| 2003 | 2003 | if ($airport_icao != '') { |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
@@ -2006,16 +2006,16 @@ discard block |
||
| 2006 | 2006 | } else { |
| 2007 | 2007 | $query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 2008 | 2008 | } |
| 2009 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 2009 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 2010 | 2010 | try { |
| 2011 | 2011 | $sth = $this->db->prepare($query); |
| 2012 | 2012 | $sth->execute($query_values); |
| 2013 | - } catch(PDOException $e) { |
|
| 2013 | + } catch (PDOException $e) { |
|
| 2014 | 2014 | return "error : ".$e->getMessage(); |
| 2015 | 2015 | } |
| 2016 | 2016 | } |
| 2017 | 2017 | } |
| 2018 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 2018 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 2019 | 2019 | global $globalDBdriver; |
| 2020 | 2020 | if ($airport_icao != '') { |
| 2021 | 2021 | if ($globalDBdriver == 'mysql') { |
@@ -2031,16 +2031,16 @@ discard block |
||
| 2031 | 2031 | $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);"; |
| 2032 | 2032 | } |
| 2033 | 2033 | } |
| 2034 | - $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); |
|
| 2034 | + $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); |
|
| 2035 | 2035 | try { |
| 2036 | 2036 | $sth = $this->db->prepare($query); |
| 2037 | 2037 | $sth->execute($query_values); |
| 2038 | - } catch(PDOException $e) { |
|
| 2038 | + } catch (PDOException $e) { |
|
| 2039 | 2039 | return "error : ".$e->getMessage(); |
| 2040 | 2040 | } |
| 2041 | 2041 | } |
| 2042 | 2042 | } |
| 2043 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 2043 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 2044 | 2044 | global $globalDBdriver; |
| 2045 | 2045 | if ($airport_icao != '') { |
| 2046 | 2046 | if ($globalDBdriver == 'mysql') { |
@@ -2048,11 +2048,11 @@ discard block |
||
| 2048 | 2048 | } else { |
| 2049 | 2049 | $query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 2050 | 2050 | } |
| 2051 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 2051 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 2052 | 2052 | try { |
| 2053 | 2053 | $sth = $this->db->prepare($query); |
| 2054 | 2054 | $sth->execute($query_values); |
| 2055 | - } catch(PDOException $e) { |
|
| 2055 | + } catch (PDOException $e) { |
|
| 2056 | 2056 | return "error : ".$e->getMessage(); |
| 2057 | 2057 | } |
| 2058 | 2058 | } |
@@ -2064,7 +2064,7 @@ discard block |
||
| 2064 | 2064 | try { |
| 2065 | 2065 | $sth = $this->db->prepare($query); |
| 2066 | 2066 | $sth->execute($query_values); |
| 2067 | - } catch(PDOException $e) { |
|
| 2067 | + } catch (PDOException $e) { |
|
| 2068 | 2068 | return "error : ".$e->getMessage(); |
| 2069 | 2069 | } |
| 2070 | 2070 | } |
@@ -2074,7 +2074,7 @@ discard block |
||
| 2074 | 2074 | try { |
| 2075 | 2075 | $sth = $this->db->prepare($query); |
| 2076 | 2076 | $sth->execute($query_values); |
| 2077 | - } catch(PDOException $e) { |
|
| 2077 | + } catch (PDOException $e) { |
|
| 2078 | 2078 | return "error : ".$e->getMessage(); |
| 2079 | 2079 | } |
| 2080 | 2080 | } |
@@ -2084,7 +2084,7 @@ discard block |
||
| 2084 | 2084 | try { |
| 2085 | 2085 | $sth = $this->db->prepare($query); |
| 2086 | 2086 | $sth->execute($query_values); |
| 2087 | - } catch(PDOException $e) { |
|
| 2087 | + } catch (PDOException $e) { |
|
| 2088 | 2088 | return "error : ".$e->getMessage(); |
| 2089 | 2089 | } |
| 2090 | 2090 | } |
@@ -2094,7 +2094,7 @@ discard block |
||
| 2094 | 2094 | try { |
| 2095 | 2095 | $sth = $this->db->prepare($query); |
| 2096 | 2096 | $sth->execute($query_values); |
| 2097 | - } catch(PDOException $e) { |
|
| 2097 | + } catch (PDOException $e) { |
|
| 2098 | 2098 | return "error : ".$e->getMessage(); |
| 2099 | 2099 | } |
| 2100 | 2100 | } |
@@ -2104,13 +2104,13 @@ discard block |
||
| 2104 | 2104 | try { |
| 2105 | 2105 | $sth = $this->db->prepare($query); |
| 2106 | 2106 | $sth->execute($query_values); |
| 2107 | - } catch(PDOException $e) { |
|
| 2107 | + } catch (PDOException $e) { |
|
| 2108 | 2108 | return "error : ".$e->getMessage(); |
| 2109 | 2109 | } |
| 2110 | 2110 | } |
| 2111 | 2111 | |
| 2112 | 2112 | public function addOldStats() { |
| 2113 | - global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents; |
|
| 2113 | + global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents; |
|
| 2114 | 2114 | $Common = new Common(); |
| 2115 | 2115 | $Connection = new Connection($this->db); |
| 2116 | 2116 | date_default_timezone_set('UTC'); |
@@ -2125,9 +2125,9 @@ discard block |
||
| 2125 | 2125 | $filtername = 'marine'; |
| 2126 | 2126 | if ($Connection->tableExists('countries')) { |
| 2127 | 2127 | if ($globalDebug) echo 'Count all vessels by countries...'."\n"; |
| 2128 | - $alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day); |
|
| 2128 | + $alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day); |
|
| 2129 | 2129 | foreach ($alldata as $number) { |
| 2130 | - $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset); |
|
| 2130 | + $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset); |
|
| 2131 | 2131 | } |
| 2132 | 2132 | } |
| 2133 | 2133 | if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
@@ -2137,38 +2137,38 @@ discard block |
||
| 2137 | 2137 | $lastyear = false; |
| 2138 | 2138 | foreach ($alldata as $number) { |
| 2139 | 2139 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2140 | - $this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2140 | + $this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2141 | 2141 | } |
| 2142 | 2142 | echo 'Marine data...'."\n"; |
| 2143 | 2143 | $this->deleteStatMarine('month'); |
| 2144 | 2144 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2145 | 2145 | $alldata = $Marine->countAllDatesLastMonth($filter_last_month); |
| 2146 | 2146 | foreach ($alldata as $number) { |
| 2147 | - $this->addStatMarine('month',$number['date_name'],$number['date_count']); |
|
| 2147 | + $this->addStatMarine('month', $number['date_name'], $number['date_count']); |
|
| 2148 | 2148 | } |
| 2149 | 2149 | echo '-> countAllDates...'."\n"; |
| 2150 | 2150 | $previousdata = $this->countAllDatesMarine(); |
| 2151 | 2151 | $this->deleteStatMarine('date'); |
| 2152 | - $alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month)); |
|
| 2152 | + $alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month)); |
|
| 2153 | 2153 | $values = array(); |
| 2154 | 2154 | foreach ($alldata as $cnt) { |
| 2155 | 2155 | $values[] = $cnt['date_count']; |
| 2156 | 2156 | } |
| 2157 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2158 | - array_splice($alldata,11); |
|
| 2157 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2158 | + array_splice($alldata, 11); |
|
| 2159 | 2159 | foreach ($alldata as $number) { |
| 2160 | - $this->addStatMarine('date',$number['date_name'],$number['date_count']); |
|
| 2160 | + $this->addStatMarine('date', $number['date_name'], $number['date_count']); |
|
| 2161 | 2161 | } |
| 2162 | 2162 | |
| 2163 | 2163 | $this->deleteStatMarine('hour'); |
| 2164 | 2164 | echo '-> countAllHours...'."\n"; |
| 2165 | - $alldata = $Marine->countAllHours('hour',$filter_last_month); |
|
| 2165 | + $alldata = $Marine->countAllHours('hour', $filter_last_month); |
|
| 2166 | 2166 | foreach ($alldata as $number) { |
| 2167 | - $this->addStatMarine('hour',$number['hour_name'],$number['hour_count']); |
|
| 2167 | + $this->addStatMarine('hour', $number['hour_name'], $number['hour_count']); |
|
| 2168 | 2168 | } |
| 2169 | 2169 | echo 'Insert last stats update date...'."\n"; |
| 2170 | 2170 | date_default_timezone_set('UTC'); |
| 2171 | - $this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s')); |
|
| 2171 | + $this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s')); |
|
| 2172 | 2172 | } |
| 2173 | 2173 | if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2174 | 2174 | $last_update = $this->getLastStatsUpdate('last_update_stats_tracker'); |
@@ -2180,9 +2180,9 @@ discard block |
||
| 2180 | 2180 | $Tracker = new Tracker($this->db); |
| 2181 | 2181 | if ($Connection->tableExists('countries')) { |
| 2182 | 2182 | if ($globalDebug) echo 'Count all trackers by countries...'."\n"; |
| 2183 | - $alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day); |
|
| 2183 | + $alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day); |
|
| 2184 | 2184 | foreach ($alldata as $number) { |
| 2185 | - $this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset); |
|
| 2185 | + $this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset); |
|
| 2186 | 2186 | } |
| 2187 | 2187 | } |
| 2188 | 2188 | if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
@@ -2192,38 +2192,38 @@ discard block |
||
| 2192 | 2192 | $lastyear = false; |
| 2193 | 2193 | foreach ($alldata as $number) { |
| 2194 | 2194 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2195 | - $this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2195 | + $this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2196 | 2196 | } |
| 2197 | 2197 | echo 'Tracker data...'."\n"; |
| 2198 | 2198 | $this->deleteStatTracker('month'); |
| 2199 | 2199 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2200 | 2200 | $alldata = $Tracker->countAllDatesLastMonth($filter_last_month); |
| 2201 | 2201 | foreach ($alldata as $number) { |
| 2202 | - $this->addStatTracker('month',$number['date_name'],$number['date_count']); |
|
| 2202 | + $this->addStatTracker('month', $number['date_name'], $number['date_count']); |
|
| 2203 | 2203 | } |
| 2204 | 2204 | echo '-> countAllDates...'."\n"; |
| 2205 | 2205 | $previousdata = $this->countAllDatesTracker(); |
| 2206 | 2206 | $this->deleteStatTracker('date'); |
| 2207 | - $alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month)); |
|
| 2207 | + $alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month)); |
|
| 2208 | 2208 | $values = array(); |
| 2209 | 2209 | foreach ($alldata as $cnt) { |
| 2210 | 2210 | $values[] = $cnt['date_count']; |
| 2211 | 2211 | } |
| 2212 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2213 | - array_splice($alldata,11); |
|
| 2212 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2213 | + array_splice($alldata, 11); |
|
| 2214 | 2214 | foreach ($alldata as $number) { |
| 2215 | - $this->addStatTracker('date',$number['date_name'],$number['date_count']); |
|
| 2215 | + $this->addStatTracker('date', $number['date_name'], $number['date_count']); |
|
| 2216 | 2216 | } |
| 2217 | 2217 | |
| 2218 | 2218 | $this->deleteStatTracker('hour'); |
| 2219 | 2219 | echo '-> countAllHours...'."\n"; |
| 2220 | - $alldata = $Tracker->countAllHours('hour',$filter_last_month); |
|
| 2220 | + $alldata = $Tracker->countAllHours('hour', $filter_last_month); |
|
| 2221 | 2221 | foreach ($alldata as $number) { |
| 2222 | - $this->addStatTracker('hour',$number['hour_name'],$number['hour_count']); |
|
| 2222 | + $this->addStatTracker('hour', $number['hour_name'], $number['hour_count']); |
|
| 2223 | 2223 | } |
| 2224 | 2224 | echo 'Insert last stats update date...'."\n"; |
| 2225 | 2225 | date_default_timezone_set('UTC'); |
| 2226 | - $this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s')); |
|
| 2226 | + $this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s')); |
|
| 2227 | 2227 | } |
| 2228 | 2228 | |
| 2229 | 2229 | if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) { |
@@ -2241,41 +2241,41 @@ discard block |
||
| 2241 | 2241 | $Spotter = new Spotter($this->db); |
| 2242 | 2242 | |
| 2243 | 2243 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 2244 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 2244 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 2245 | 2245 | foreach ($alldata as $number) { |
| 2246 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 2246 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 2247 | 2247 | } |
| 2248 | 2248 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2249 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 2249 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 2250 | 2250 | foreach ($alldata as $number) { |
| 2251 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 2251 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 2252 | 2252 | } |
| 2253 | 2253 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 2254 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 2254 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 2255 | 2255 | foreach ($alldata as $number) { |
| 2256 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 2256 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 2257 | 2257 | } |
| 2258 | 2258 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2259 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 2259 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 2260 | 2260 | foreach ($alldata as $number) { |
| 2261 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2261 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2262 | 2262 | } |
| 2263 | 2263 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2264 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 2264 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 2265 | 2265 | foreach ($alldata as $number) { |
| 2266 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 2266 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 2267 | 2267 | } |
| 2268 | 2268 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2269 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 2269 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 2270 | 2270 | foreach ($alldata as $number) { |
| 2271 | 2271 | if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
| 2272 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 2272 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 2273 | 2273 | } |
| 2274 | 2274 | |
| 2275 | 2275 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 2276 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 2276 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 2277 | 2277 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 2278 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 2278 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 2279 | 2279 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 2280 | 2280 | $alldata = array(); |
| 2281 | 2281 | foreach ($pall as $value) { |
@@ -2292,14 +2292,14 @@ discard block |
||
| 2292 | 2292 | foreach ($alldata as $key => $row) { |
| 2293 | 2293 | $count[$key] = $row['airport_departure_icao_count']; |
| 2294 | 2294 | } |
| 2295 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2295 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2296 | 2296 | foreach ($alldata as $number) { |
| 2297 | - 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); |
|
| 2297 | + 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); |
|
| 2298 | 2298 | } |
| 2299 | 2299 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2300 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 2300 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 2301 | 2301 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 2302 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 2302 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 2303 | 2303 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 2304 | 2304 | $alldata = array(); |
| 2305 | 2305 | foreach ($pall as $value) { |
@@ -2316,18 +2316,18 @@ discard block |
||
| 2316 | 2316 | foreach ($alldata as $key => $row) { |
| 2317 | 2317 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2318 | 2318 | } |
| 2319 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2319 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2320 | 2320 | foreach ($alldata as $number) { |
| 2321 | - 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); |
|
| 2321 | + 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); |
|
| 2322 | 2322 | } |
| 2323 | 2323 | if ($Connection->tableExists('countries')) { |
| 2324 | 2324 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 2325 | 2325 | //$SpotterArchive = new SpotterArchive(); |
| 2326 | 2326 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2327 | 2327 | $Spotter = new Spotter($this->db); |
| 2328 | - $alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 2328 | + $alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 2329 | 2329 | foreach ($alldata as $number) { |
| 2330 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 2330 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 2331 | 2331 | } |
| 2332 | 2332 | } |
| 2333 | 2333 | |
@@ -2337,12 +2337,12 @@ discard block |
||
| 2337 | 2337 | $this->deleteStatsByType('fatalities_byyear'); |
| 2338 | 2338 | $alldata = $Accident->countFatalitiesByYear(); |
| 2339 | 2339 | foreach ($alldata as $number) { |
| 2340 | - $this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year']))); |
|
| 2340 | + $this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year']))); |
|
| 2341 | 2341 | } |
| 2342 | 2342 | $this->deleteStatsByType('fatalities_bymonth'); |
| 2343 | 2343 | $alldata = $Accident->countFatalitiesLast12Months(); |
| 2344 | 2344 | foreach ($alldata as $number) { |
| 2345 | - $this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year']))); |
|
| 2345 | + $this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year']))); |
|
| 2346 | 2346 | } |
| 2347 | 2347 | } |
| 2348 | 2348 | |
@@ -2356,37 +2356,37 @@ discard block |
||
| 2356 | 2356 | $lastyear = false; |
| 2357 | 2357 | foreach ($alldata as $number) { |
| 2358 | 2358 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2359 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2359 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2360 | 2360 | } |
| 2361 | 2361 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 2362 | 2362 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2363 | 2363 | foreach ($alldata as $number) { |
| 2364 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2364 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2365 | 2365 | } |
| 2366 | 2366 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2367 | 2367 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2368 | 2368 | foreach ($alldata as $number) { |
| 2369 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2369 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2370 | 2370 | } |
| 2371 | 2371 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2372 | 2372 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2373 | 2373 | foreach ($alldata as $number) { |
| 2374 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2374 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2375 | 2375 | } |
| 2376 | 2376 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 2377 | 2377 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2378 | 2378 | foreach ($alldata as $number) { |
| 2379 | - $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2379 | + $this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2380 | 2380 | } |
| 2381 | 2381 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2382 | 2382 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2383 | 2383 | foreach ($alldata as $number) { |
| 2384 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2384 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2385 | 2385 | } |
| 2386 | 2386 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2387 | 2387 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2388 | 2388 | foreach ($alldata as $number) { |
| 2389 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2389 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2390 | 2390 | } |
| 2391 | 2391 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 2392 | 2392 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -2431,7 +2431,7 @@ discard block |
||
| 2431 | 2431 | } |
| 2432 | 2432 | $alldata = $pall; |
| 2433 | 2433 | foreach ($alldata as $number) { |
| 2434 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 2434 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 2435 | 2435 | } |
| 2436 | 2436 | echo '...Arrival'."\n"; |
| 2437 | 2437 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -2472,7 +2472,7 @@ discard block |
||
| 2472 | 2472 | } |
| 2473 | 2473 | $alldata = $pall; |
| 2474 | 2474 | foreach ($alldata as $number) { |
| 2475 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 2475 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 2476 | 2476 | } |
| 2477 | 2477 | |
| 2478 | 2478 | echo 'Flights data...'."\n"; |
@@ -2480,28 +2480,28 @@ discard block |
||
| 2480 | 2480 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2481 | 2481 | $alldata = $Spotter->countAllDatesLastMonth($filter_last_month); |
| 2482 | 2482 | foreach ($alldata as $number) { |
| 2483 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 2483 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 2484 | 2484 | } |
| 2485 | 2485 | echo '-> countAllDates...'."\n"; |
| 2486 | 2486 | $previousdata = $this->countAllDates(); |
| 2487 | 2487 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 2488 | 2488 | $this->deleteStatFlight('date'); |
| 2489 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month)); |
|
| 2489 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month)); |
|
| 2490 | 2490 | $values = array(); |
| 2491 | 2491 | foreach ($alldata as $cnt) { |
| 2492 | 2492 | $values[] = $cnt['date_count']; |
| 2493 | 2493 | } |
| 2494 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2495 | - array_splice($alldata,11); |
|
| 2494 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2495 | + array_splice($alldata, 11); |
|
| 2496 | 2496 | foreach ($alldata as $number) { |
| 2497 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 2497 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 2498 | 2498 | } |
| 2499 | 2499 | |
| 2500 | 2500 | $this->deleteStatFlight('hour'); |
| 2501 | 2501 | echo '-> countAllHours...'."\n"; |
| 2502 | - $alldata = $Spotter->countAllHours('hour',$filter_last_month); |
|
| 2502 | + $alldata = $Spotter->countAllHours('hour', $filter_last_month); |
|
| 2503 | 2503 | foreach ($alldata as $number) { |
| 2504 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 2504 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 2505 | 2505 | } |
| 2506 | 2506 | |
| 2507 | 2507 | // Count by airlines |
@@ -2510,42 +2510,42 @@ discard block |
||
| 2510 | 2510 | if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
| 2511 | 2511 | $SpotterArchive = new SpotterArchive($this->db); |
| 2512 | 2512 | //$Spotter = new Spotter($this->db); |
| 2513 | - $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 2513 | + $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 2514 | 2514 | //$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 2515 | 2515 | foreach ($alldata as $number) { |
| 2516 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 2516 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 2517 | 2517 | } |
| 2518 | 2518 | } |
| 2519 | 2519 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 2520 | 2520 | $Spotter = new Spotter($this->db); |
| 2521 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 2521 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 2522 | 2522 | foreach ($alldata as $number) { |
| 2523 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 2523 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 2524 | 2524 | } |
| 2525 | 2525 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 2526 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 2526 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 2527 | 2527 | foreach ($alldata as $number) { |
| 2528 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 2528 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 2531 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 2531 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 2532 | 2532 | foreach ($alldata as $number) { |
| 2533 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2533 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2534 | 2534 | } |
| 2535 | 2535 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 2536 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 2536 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 2537 | 2537 | foreach ($alldata as $number) { |
| 2538 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 2538 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 2539 | 2539 | } |
| 2540 | 2540 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 2541 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 2541 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 2542 | 2542 | foreach ($alldata as $number) { |
| 2543 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 2543 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 2544 | 2544 | } |
| 2545 | 2545 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 2546 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2546 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2547 | 2547 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 2548 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2548 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2549 | 2549 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 2550 | 2550 | //$alldata = array(); |
| 2551 | 2551 | foreach ($dall as $value) { |
@@ -2565,12 +2565,12 @@ discard block |
||
| 2565 | 2565 | } |
| 2566 | 2566 | $alldata = $pall; |
| 2567 | 2567 | foreach ($alldata as $number) { |
| 2568 | - 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); |
|
| 2568 | + 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); |
|
| 2569 | 2569 | } |
| 2570 | 2570 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 2571 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2571 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2572 | 2572 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 2573 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2573 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2574 | 2574 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 2575 | 2575 | //$alldata = array(); |
| 2576 | 2576 | foreach ($dall as $value) { |
@@ -2590,7 +2590,7 @@ discard block |
||
| 2590 | 2590 | } |
| 2591 | 2591 | $alldata = $pall; |
| 2592 | 2592 | foreach ($alldata as $number) { |
| 2593 | - 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); |
|
| 2593 | + 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); |
|
| 2594 | 2594 | } |
| 2595 | 2595 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 2596 | 2596 | $Spotter = new Spotter($this->db); |
@@ -2598,27 +2598,27 @@ discard block |
||
| 2598 | 2598 | $lastyear = false; |
| 2599 | 2599 | foreach ($alldata as $number) { |
| 2600 | 2600 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2601 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2601 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2602 | 2602 | } |
| 2603 | 2603 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 2604 | 2604 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2605 | 2605 | foreach ($alldata as $number) { |
| 2606 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2606 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2607 | 2607 | } |
| 2608 | 2608 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 2609 | 2609 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2610 | 2610 | foreach ($alldata as $number) { |
| 2611 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2611 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2612 | 2612 | } |
| 2613 | 2613 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 2614 | 2614 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2615 | 2615 | foreach ($alldata as $number) { |
| 2616 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2616 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2617 | 2617 | } |
| 2618 | 2618 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 2619 | 2619 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2620 | 2620 | foreach ($alldata as $number) { |
| 2621 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2621 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2622 | 2622 | } |
| 2623 | 2623 | if ($globalDebug) echo '...Departure'."\n"; |
| 2624 | 2624 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -2641,7 +2641,7 @@ discard block |
||
| 2641 | 2641 | } |
| 2642 | 2642 | $alldata = $pall; |
| 2643 | 2643 | foreach ($alldata as $number) { |
| 2644 | - $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']); |
|
| 2644 | + $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']); |
|
| 2645 | 2645 | } |
| 2646 | 2646 | if ($globalDebug) echo '...Arrival'."\n"; |
| 2647 | 2647 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -2664,32 +2664,32 @@ discard block |
||
| 2664 | 2664 | } |
| 2665 | 2665 | $alldata = $pall; |
| 2666 | 2666 | foreach ($alldata as $number) { |
| 2667 | - $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']); |
|
| 2667 | + $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']); |
|
| 2668 | 2668 | } |
| 2669 | 2669 | |
| 2670 | 2670 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 2671 | 2671 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 2672 | 2672 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2673 | 2673 | foreach ($alldata as $number) { |
| 2674 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 2674 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2675 | 2675 | } |
| 2676 | 2676 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 2677 | 2677 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2678 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2678 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2679 | 2679 | $values = array(); |
| 2680 | 2680 | foreach ($alldata as $cnt) { |
| 2681 | 2681 | $values[] = $cnt['date_count']; |
| 2682 | 2682 | } |
| 2683 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2684 | - array_splice($alldata,11); |
|
| 2683 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2684 | + array_splice($alldata, 11); |
|
| 2685 | 2685 | foreach ($alldata as $number) { |
| 2686 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 2686 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2687 | 2687 | } |
| 2688 | 2688 | |
| 2689 | 2689 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 2690 | - $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
|
| 2690 | + $alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month); |
|
| 2691 | 2691 | foreach ($alldata as $number) { |
| 2692 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 2692 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 2693 | 2693 | } |
| 2694 | 2694 | |
| 2695 | 2695 | // Stats by filters |
@@ -2713,7 +2713,7 @@ discard block |
||
| 2713 | 2713 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2714 | 2714 | } |
| 2715 | 2715 | } |
| 2716 | - if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2716 | + if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2717 | 2717 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2718 | 2718 | $reset = true; |
| 2719 | 2719 | } |
@@ -2721,38 +2721,38 @@ discard block |
||
| 2721 | 2721 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 2722 | 2722 | $Spotter = new Spotter($this->db); |
| 2723 | 2723 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 2724 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 2724 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 2725 | 2725 | foreach ($alldata as $number) { |
| 2726 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 2726 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 2727 | 2727 | } |
| 2728 | 2728 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2729 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 2729 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 2730 | 2730 | foreach ($alldata as $number) { |
| 2731 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 2731 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 2732 | 2732 | } |
| 2733 | 2733 | if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
| 2734 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 2734 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 2735 | 2735 | foreach ($alldata as $number) { |
| 2736 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 2736 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 2737 | 2737 | } |
| 2738 | 2738 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2739 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 2739 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 2740 | 2740 | foreach ($alldata as $number) { |
| 2741 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 2741 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 2742 | 2742 | } |
| 2743 | 2743 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2744 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 2744 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 2745 | 2745 | foreach ($alldata as $number) { |
| 2746 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 2746 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 2747 | 2747 | } |
| 2748 | 2748 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2749 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 2749 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 2750 | 2750 | foreach ($alldata as $number) { |
| 2751 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 2751 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 2752 | 2752 | } |
| 2753 | 2753 | if ($globalDebug) echo 'Count departure airports...'."\n"; |
| 2754 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2755 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2754 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2755 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2756 | 2756 | $alldata = array(); |
| 2757 | 2757 | foreach ($pall as $value) { |
| 2758 | 2758 | $icao = $value['airport_departure_icao']; |
@@ -2768,13 +2768,13 @@ discard block |
||
| 2768 | 2768 | foreach ($alldata as $key => $row) { |
| 2769 | 2769 | $count[$key] = $row['airport_departure_icao_count']; |
| 2770 | 2770 | } |
| 2771 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2771 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2772 | 2772 | foreach ($alldata as $number) { |
| 2773 | - 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); |
|
| 2773 | + 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); |
|
| 2774 | 2774 | } |
| 2775 | 2775 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2776 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2777 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2776 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2777 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2778 | 2778 | $alldata = array(); |
| 2779 | 2779 | foreach ($pall as $value) { |
| 2780 | 2780 | $icao = $value['airport_arrival_icao']; |
@@ -2790,9 +2790,9 @@ discard block |
||
| 2790 | 2790 | foreach ($alldata as $key => $row) { |
| 2791 | 2791 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2792 | 2792 | } |
| 2793 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2793 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2794 | 2794 | foreach ($alldata as $number) { |
| 2795 | - 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); |
|
| 2795 | + 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); |
|
| 2796 | 2796 | } |
| 2797 | 2797 | if ($globalDebug) echo 'Count all months...'."\n"; |
| 2798 | 2798 | $Spotter = new Spotter($this->db); |
@@ -2800,36 +2800,36 @@ discard block |
||
| 2800 | 2800 | $lastyear = false; |
| 2801 | 2801 | foreach ($alldata as $number) { |
| 2802 | 2802 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2803 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2803 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2804 | 2804 | } |
| 2805 | 2805 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2806 | 2806 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2807 | 2807 | foreach ($alldata as $number) { |
| 2808 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2808 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2809 | 2809 | } |
| 2810 | 2810 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2811 | 2811 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2812 | 2812 | foreach ($alldata as $number) { |
| 2813 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2813 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2814 | 2814 | } |
| 2815 | 2815 | if ($globalDebug) echo 'Count all military by months...'."\n"; |
| 2816 | 2816 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2817 | 2817 | foreach ($alldata as $number) { |
| 2818 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2818 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2819 | 2819 | } |
| 2820 | 2820 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2821 | 2821 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2822 | 2822 | foreach ($alldata as $number) { |
| 2823 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2823 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2824 | 2824 | } |
| 2825 | 2825 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2826 | 2826 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2827 | 2827 | foreach ($alldata as $number) { |
| 2828 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2828 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2829 | 2829 | } |
| 2830 | 2830 | echo '...Departure'."\n"; |
| 2831 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 2832 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2831 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 2832 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 2833 | 2833 | foreach ($dall as $value) { |
| 2834 | 2834 | $icao = $value['departure_airport_icao']; |
| 2835 | 2835 | $ddate = $value['date']; |
@@ -2847,11 +2847,11 @@ discard block |
||
| 2847 | 2847 | } |
| 2848 | 2848 | $alldata = $pall; |
| 2849 | 2849 | foreach ($alldata as $number) { |
| 2850 | - $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); |
|
| 2850 | + $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); |
|
| 2851 | 2851 | } |
| 2852 | 2852 | echo '...Arrival'."\n"; |
| 2853 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2854 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2853 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2854 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2855 | 2855 | foreach ($dall as $value) { |
| 2856 | 2856 | $icao = $value['arrival_airport_icao']; |
| 2857 | 2857 | $ddate = $value['date']; |
@@ -2869,39 +2869,39 @@ discard block |
||
| 2869 | 2869 | } |
| 2870 | 2870 | $alldata = $pall; |
| 2871 | 2871 | foreach ($alldata as $number) { |
| 2872 | - $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); |
|
| 2872 | + $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); |
|
| 2873 | 2873 | } |
| 2874 | 2874 | echo 'Flights data...'."\n"; |
| 2875 | 2875 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2876 | 2876 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2877 | 2877 | foreach ($alldata as $number) { |
| 2878 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2878 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2879 | 2879 | } |
| 2880 | 2880 | echo '-> countAllDates...'."\n"; |
| 2881 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2882 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2881 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2882 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2883 | 2883 | $values = array(); |
| 2884 | 2884 | foreach ($alldata as $cnt) { |
| 2885 | 2885 | $values[] = $cnt['date_count']; |
| 2886 | 2886 | } |
| 2887 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2888 | - array_splice($alldata,11); |
|
| 2887 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2888 | + array_splice($alldata, 11); |
|
| 2889 | 2889 | foreach ($alldata as $number) { |
| 2890 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2890 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2891 | 2891 | } |
| 2892 | 2892 | |
| 2893 | 2893 | echo '-> countAllHours...'."\n"; |
| 2894 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2894 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2895 | 2895 | foreach ($alldata as $number) { |
| 2896 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2896 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2897 | 2897 | } |
| 2898 | 2898 | echo 'Insert last stats update date...'."\n"; |
| 2899 | 2899 | date_default_timezone_set('UTC'); |
| 2900 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2900 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2901 | 2901 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2902 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2902 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2903 | 2903 | $this->deleteOldStats($filter_name); |
| 2904 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2904 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2905 | 2905 | } |
| 2906 | 2906 | } |
| 2907 | 2907 | } |
@@ -2914,16 +2914,16 @@ discard block |
||
| 2914 | 2914 | // SUM all previous month to put as year |
| 2915 | 2915 | $previous_year = date('Y'); |
| 2916 | 2916 | $previous_year--; |
| 2917 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2918 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2919 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2920 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2917 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2918 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2919 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2920 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2921 | 2921 | $allairlines = $this->getAllAirlineNames(); |
| 2922 | 2922 | foreach ($allairlines as $data) { |
| 2923 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2924 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2925 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2926 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2923 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2924 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2925 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2926 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2927 | 2927 | } |
| 2928 | 2928 | |
| 2929 | 2929 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2932,21 +2932,21 @@ discard block |
||
| 2932 | 2932 | try { |
| 2933 | 2933 | $sth = $this->db->prepare($query); |
| 2934 | 2934 | $sth->execute(); |
| 2935 | - } catch(PDOException $e) { |
|
| 2935 | + } catch (PDOException $e) { |
|
| 2936 | 2936 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2937 | 2937 | } |
| 2938 | 2938 | $query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2939 | 2939 | try { |
| 2940 | 2940 | $sth = $this->db->prepare($query); |
| 2941 | 2941 | $sth->execute(); |
| 2942 | - } catch(PDOException $e) { |
|
| 2942 | + } catch (PDOException $e) { |
|
| 2943 | 2943 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2944 | 2944 | } |
| 2945 | 2945 | $query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2946 | 2946 | try { |
| 2947 | 2947 | $sth = $this->db->prepare($query); |
| 2948 | 2948 | $sth->execute(); |
| 2949 | - } catch(PDOException $e) { |
|
| 2949 | + } catch (PDOException $e) { |
|
| 2950 | 2950 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2951 | 2951 | } |
| 2952 | 2952 | } |
@@ -2959,7 +2959,7 @@ discard block |
||
| 2959 | 2959 | try { |
| 2960 | 2960 | $sth = $this->db->prepare($query); |
| 2961 | 2961 | $sth->execute(); |
| 2962 | - } catch(PDOException $e) { |
|
| 2962 | + } catch (PDOException $e) { |
|
| 2963 | 2963 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2964 | 2964 | } |
| 2965 | 2965 | if ($globalDBdriver == 'mysql') { |
@@ -2970,7 +2970,7 @@ discard block |
||
| 2970 | 2970 | try { |
| 2971 | 2971 | $sth = $this->db->prepare($query); |
| 2972 | 2972 | $sth->execute(); |
| 2973 | - } catch(PDOException $e) { |
|
| 2973 | + } catch (PDOException $e) { |
|
| 2974 | 2974 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2975 | 2975 | } |
| 2976 | 2976 | if ($globalDBdriver == 'mysql') { |
@@ -2981,15 +2981,15 @@ discard block |
||
| 2981 | 2981 | try { |
| 2982 | 2982 | $sth = $this->db->prepare($query); |
| 2983 | 2983 | $sth->execute(); |
| 2984 | - } catch(PDOException $e) { |
|
| 2984 | + } catch (PDOException $e) { |
|
| 2985 | 2985 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2986 | 2986 | } |
| 2987 | 2987 | } |
| 2988 | 2988 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2989 | 2989 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2990 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2990 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2991 | 2991 | $this->deleteOldStats(); |
| 2992 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2992 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2993 | 2993 | $lastyearupdate = true; |
| 2994 | 2994 | } |
| 2995 | 2995 | } |
@@ -3011,7 +3011,7 @@ discard block |
||
| 3011 | 3011 | try { |
| 3012 | 3012 | $sth = $this->db->prepare($query); |
| 3013 | 3013 | $sth->execute(); |
| 3014 | - } catch(PDOException $e) { |
|
| 3014 | + } catch (PDOException $e) { |
|
| 3015 | 3015 | return "error : ".$e->getMessage(); |
| 3016 | 3016 | } |
| 3017 | 3017 | echo 'Archive old tracker data...'."\n"; |
@@ -3027,7 +3027,7 @@ discard block |
||
| 3027 | 3027 | try { |
| 3028 | 3028 | $sth = $this->db->prepare($query); |
| 3029 | 3029 | $sth->execute(); |
| 3030 | - } catch(PDOException $e) { |
|
| 3030 | + } catch (PDOException $e) { |
|
| 3031 | 3031 | return "error : ".$e->getMessage(); |
| 3032 | 3032 | } |
| 3033 | 3033 | echo 'Archive old marine data...'."\n"; |
@@ -3043,7 +3043,7 @@ discard block |
||
| 3043 | 3043 | try { |
| 3044 | 3044 | $sth = $this->db->prepare($query); |
| 3045 | 3045 | $sth->execute(); |
| 3046 | - } catch(PDOException $e) { |
|
| 3046 | + } catch (PDOException $e) { |
|
| 3047 | 3047 | return "error : ".$e->getMessage(); |
| 3048 | 3048 | } |
| 3049 | 3049 | } |
@@ -3056,7 +3056,7 @@ discard block |
||
| 3056 | 3056 | try { |
| 3057 | 3057 | $sth = $this->db->prepare($query); |
| 3058 | 3058 | $sth->execute(); |
| 3059 | - } catch(PDOException $e) { |
|
| 3059 | + } catch (PDOException $e) { |
|
| 3060 | 3060 | return "error : ".$e->getMessage(); |
| 3061 | 3061 | } |
| 3062 | 3062 | echo 'Deleting old tracker data...'."\n"; |
@@ -3068,7 +3068,7 @@ discard block |
||
| 3068 | 3068 | try { |
| 3069 | 3069 | $sth = $this->db->prepare($query); |
| 3070 | 3070 | $sth->execute(); |
| 3071 | - } catch(PDOException $e) { |
|
| 3071 | + } catch (PDOException $e) { |
|
| 3072 | 3072 | return "error : ".$e->getMessage(); |
| 3073 | 3073 | } |
| 3074 | 3074 | echo 'Deleting old marine data...'."\n"; |
@@ -3080,14 +3080,14 @@ discard block |
||
| 3080 | 3080 | try { |
| 3081 | 3081 | $sth = $this->db->prepare($query); |
| 3082 | 3082 | $sth->execute(); |
| 3083 | - } catch(PDOException $e) { |
|
| 3083 | + } catch (PDOException $e) { |
|
| 3084 | 3084 | return "error : ".$e->getMessage(); |
| 3085 | 3085 | } |
| 3086 | 3086 | } |
| 3087 | 3087 | if (!isset($lastyearupdate)) { |
| 3088 | 3088 | echo 'Insert last stats update date...'."\n"; |
| 3089 | 3089 | date_default_timezone_set('UTC'); |
| 3090 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 3090 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 3091 | 3091 | } |
| 3092 | 3092 | if ($globalStatsResetYear) { |
| 3093 | 3093 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -15,10 +15,14 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | public function __construct($dbc = null) { |
| 17 | 17 | global $globalFilterName; |
| 18 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 18 | + if (isset($globalFilterName)) { |
|
| 19 | + $this->filter_name = $globalFilterName; |
|
| 20 | + } |
|
| 19 | 21 | $Connection = new Connection($dbc); |
| 20 | 22 | $this->db = $Connection->db(); |
| 21 | - if ($this->db === null) die('Error: No DB connection. (Stats)'); |
|
| 23 | + if ($this->db === null) { |
|
| 24 | + die('Error: No DB connection. (Stats)'); |
|
| 25 | + } |
|
| 22 | 26 | } |
| 23 | 27 | |
| 24 | 28 | public function addLastStatsUpdate($type,$stats_date) { |
@@ -86,7 +90,9 @@ discard block |
||
| 86 | 90 | |
| 87 | 91 | public function getAllAirlineNames($filter_name = '') { |
| 88 | 92 | global $globalStatsFilters; |
| 89 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 93 | + if ($filter_name == '') { |
|
| 94 | + $filter_name = $this->filter_name; |
|
| 95 | + } |
|
| 90 | 96 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 91 | 97 | try { |
| 92 | 98 | $sth = $this->db->prepare($query); |
@@ -106,7 +112,9 @@ discard block |
||
| 106 | 112 | return $all; |
| 107 | 113 | } |
| 108 | 114 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 109 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 115 | + if ($filter_name == '') { |
|
| 116 | + $filter_name = $this->filter_name; |
|
| 117 | + } |
|
| 110 | 118 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 111 | 119 | try { |
| 112 | 120 | $sth = $this->db->prepare($query); |
@@ -118,7 +126,9 @@ discard block |
||
| 118 | 126 | return $all; |
| 119 | 127 | } |
| 120 | 128 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 121 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 129 | + if ($filter_name == '') { |
|
| 130 | + $filter_name = $this->filter_name; |
|
| 131 | + } |
|
| 122 | 132 | $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"; |
| 123 | 133 | try { |
| 124 | 134 | $sth = $this->db->prepare($query); |
@@ -130,7 +140,9 @@ discard block |
||
| 130 | 140 | return $all; |
| 131 | 141 | } |
| 132 | 142 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 133 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 143 | + if ($filter_name == '') { |
|
| 144 | + $filter_name = $this->filter_name; |
|
| 145 | + } |
|
| 134 | 146 | $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"; |
| 135 | 147 | try { |
| 136 | 148 | $sth = $this->db->prepare($query); |
@@ -143,7 +155,9 @@ discard block |
||
| 143 | 155 | } |
| 144 | 156 | |
| 145 | 157 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 146 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 158 | + if ($filter_name == '') { |
|
| 159 | + $filter_name = $this->filter_name; |
|
| 160 | + } |
|
| 147 | 161 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 148 | 162 | try { |
| 149 | 163 | $sth = $this->db->prepare($query); |
@@ -156,7 +170,9 @@ discard block |
||
| 156 | 170 | } |
| 157 | 171 | |
| 158 | 172 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 159 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 173 | + if ($filter_name == '') { |
|
| 174 | + $filter_name = $this->filter_name; |
|
| 175 | + } |
|
| 160 | 176 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 161 | 177 | try { |
| 162 | 178 | $sth = $this->db->prepare($query); |
@@ -171,7 +187,9 @@ discard block |
||
| 171 | 187 | |
| 172 | 188 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 173 | 189 | global $globalStatsFilters; |
| 174 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 190 | + if ($filter_name == '') { |
|
| 191 | + $filter_name = $this->filter_name; |
|
| 192 | + } |
|
| 175 | 193 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 176 | 194 | $Spotter = new Spotter($this->db); |
| 177 | 195 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -180,8 +198,11 @@ discard block |
||
| 180 | 198 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 181 | 199 | } |
| 182 | 200 | if ($year == '' && $month == '') { |
| 183 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 201 | + if ($limit) { |
|
| 202 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 203 | + } else { |
|
| 204 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 205 | + } |
|
| 185 | 206 | try { |
| 186 | 207 | $sth = $this->db->prepare($query); |
| 187 | 208 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -189,11 +210,16 @@ discard block |
||
| 189 | 210 | echo "error : ".$e->getMessage(); |
| 190 | 211 | } |
| 191 | 212 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 192 | - } else $all = array(); |
|
| 213 | + } else { |
|
| 214 | + $all = array(); |
|
| 215 | + } |
|
| 193 | 216 | } else { |
| 194 | 217 | if ($year == '' && $month == '') { |
| 195 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 196 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 218 | + if ($limit) { |
|
| 219 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 220 | + } else { |
|
| 221 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 222 | + } |
|
| 197 | 223 | try { |
| 198 | 224 | $sth = $this->db->prepare($query); |
| 199 | 225 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -201,7 +227,9 @@ discard block |
||
| 201 | 227 | echo "error : ".$e->getMessage(); |
| 202 | 228 | } |
| 203 | 229 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 204 | - } else $all = array(); |
|
| 230 | + } else { |
|
| 231 | + $all = array(); |
|
| 232 | + } |
|
| 205 | 233 | } |
| 206 | 234 | if (empty($all)) { |
| 207 | 235 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -220,10 +248,15 @@ discard block |
||
| 220 | 248 | } |
| 221 | 249 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 222 | 250 | global $globalStatsFilters; |
| 223 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 251 | + if ($filter_name == '') { |
|
| 252 | + $filter_name = $this->filter_name; |
|
| 253 | + } |
|
| 224 | 254 | if ($year == '' && $month == '') { |
| 225 | - if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 226 | - else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 255 | + if ($limit) { |
|
| 256 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 257 | + } else { |
|
| 258 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 259 | + } |
|
| 227 | 260 | try { |
| 228 | 261 | $sth = $this->db->prepare($query); |
| 229 | 262 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -231,7 +264,9 @@ discard block |
||
| 231 | 264 | echo "error : ".$e->getMessage(); |
| 232 | 265 | } |
| 233 | 266 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 234 | - } else $all = array(); |
|
| 267 | + } else { |
|
| 268 | + $all = array(); |
|
| 269 | + } |
|
| 235 | 270 | if (empty($all)) { |
| 236 | 271 | $Spotter = new Spotter($this->db); |
| 237 | 272 | $filters = array(); |
@@ -246,7 +281,9 @@ discard block |
||
| 246 | 281 | } |
| 247 | 282 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 248 | 283 | global $globalStatsFilters; |
| 249 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 284 | + if ($filter_name == '') { |
|
| 285 | + $filter_name = $this->filter_name; |
|
| 286 | + } |
|
| 250 | 287 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 251 | 288 | $Spotter = new Spotter($this->db); |
| 252 | 289 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -255,8 +292,11 @@ discard block |
||
| 255 | 292 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 256 | 293 | } |
| 257 | 294 | if ($year == '' && $month == '') { |
| 258 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 295 | + if ($limit) { |
|
| 296 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 297 | + } else { |
|
| 298 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 299 | + } |
|
| 260 | 300 | try { |
| 261 | 301 | $sth = $this->db->prepare($query); |
| 262 | 302 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -264,11 +304,16 @@ discard block |
||
| 264 | 304 | echo "error : ".$e->getMessage(); |
| 265 | 305 | } |
| 266 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 267 | - } else $all = array(); |
|
| 307 | + } else { |
|
| 308 | + $all = array(); |
|
| 309 | + } |
|
| 268 | 310 | } else { |
| 269 | 311 | if ($year == '' && $month == '') { |
| 270 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 271 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 312 | + if ($limit) { |
|
| 313 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 314 | + } else { |
|
| 315 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 316 | + } |
|
| 272 | 317 | try { |
| 273 | 318 | $sth = $this->db->prepare($query); |
| 274 | 319 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -276,7 +321,9 @@ discard block |
||
| 276 | 321 | echo "error : ".$e->getMessage(); |
| 277 | 322 | } |
| 278 | 323 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 279 | - } else $all = array(); |
|
| 324 | + } else { |
|
| 325 | + $all = array(); |
|
| 326 | + } |
|
| 280 | 327 | } |
| 281 | 328 | if (empty($all)) { |
| 282 | 329 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -296,7 +343,9 @@ discard block |
||
| 296 | 343 | |
| 297 | 344 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 298 | 345 | global $globalStatsFilters; |
| 299 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 346 | + if ($filter_name == '') { |
|
| 347 | + $filter_name = $this->filter_name; |
|
| 348 | + } |
|
| 300 | 349 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 301 | 350 | $Spotter = new Spotter($this->db); |
| 302 | 351 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -305,8 +354,11 @@ discard block |
||
| 305 | 354 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 306 | 355 | } |
| 307 | 356 | if ($year == '' && $month == '') { |
| 308 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 357 | + if ($limit) { |
|
| 358 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 359 | + } else { |
|
| 360 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 361 | + } |
|
| 310 | 362 | try { |
| 311 | 363 | $sth = $this->db->prepare($query); |
| 312 | 364 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -314,11 +366,16 @@ discard block |
||
| 314 | 366 | echo "error : ".$e->getMessage(); |
| 315 | 367 | } |
| 316 | 368 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 317 | - } else $all = array(); |
|
| 369 | + } else { |
|
| 370 | + $all = array(); |
|
| 371 | + } |
|
| 318 | 372 | } else { |
| 319 | 373 | if ($year == '' && $month == '') { |
| 320 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 321 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 374 | + if ($limit) { |
|
| 375 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 376 | + } else { |
|
| 377 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 378 | + } |
|
| 322 | 379 | try { |
| 323 | 380 | $sth = $this->db->prepare($query); |
| 324 | 381 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -326,7 +383,9 @@ discard block |
||
| 326 | 383 | echo "error : ".$e->getMessage(); |
| 327 | 384 | } |
| 328 | 385 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 329 | - } else $all = array(); |
|
| 386 | + } else { |
|
| 387 | + $all = array(); |
|
| 388 | + } |
|
| 330 | 389 | } |
| 331 | 390 | if (empty($all)) { |
| 332 | 391 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -345,7 +404,9 @@ discard block |
||
| 345 | 404 | } |
| 346 | 405 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 347 | 406 | global $globalStatsFilters; |
| 348 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 407 | + if ($filter_name == '') { |
|
| 408 | + $filter_name = $this->filter_name; |
|
| 409 | + } |
|
| 349 | 410 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 350 | 411 | $Spotter = new Spotter($this->db); |
| 351 | 412 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -353,12 +414,18 @@ discard block |
||
| 353 | 414 | foreach ($airlines as $airline) { |
| 354 | 415 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 355 | 416 | } |
| 356 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 417 | + if ($limit) { |
|
| 418 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 419 | + } else { |
|
| 420 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 421 | + } |
|
| 358 | 422 | $query_values = array(':filter_name' => $filter_name); |
| 359 | 423 | } else { |
| 360 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 361 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 424 | + if ($limit) { |
|
| 425 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 426 | + } else { |
|
| 427 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 428 | + } |
|
| 362 | 429 | $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 363 | 430 | } |
| 364 | 431 | try { |
@@ -386,17 +453,29 @@ discard block |
||
| 386 | 453 | |
| 387 | 454 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
| 388 | 455 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 389 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 456 | + if ($filter_name == '') { |
|
| 457 | + $filter_name = $this->filter_name; |
|
| 458 | + } |
|
| 390 | 459 | if ($year == '' && $month == '') { |
| 391 | - if ($globalVATSIM) $forsource = 'vatsim'; |
|
| 392 | - if ($globalIVAO) $forsource = 'ivao'; |
|
| 460 | + if ($globalVATSIM) { |
|
| 461 | + $forsource = 'vatsim'; |
|
| 462 | + } |
|
| 463 | + if ($globalIVAO) { |
|
| 464 | + $forsource = 'ivao'; |
|
| 465 | + } |
|
| 393 | 466 | if (isset($forsource)) { |
| 394 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 395 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 467 | + if ($limit) { |
|
| 468 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 469 | + } else { |
|
| 470 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 471 | + } |
|
| 396 | 472 | $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
| 397 | 473 | } else { |
| 398 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 399 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 474 | + if ($limit) { |
|
| 475 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 476 | + } else { |
|
| 477 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 478 | + } |
|
| 400 | 479 | $query_values = array(':filter_name' => $filter_name); |
| 401 | 480 | } |
| 402 | 481 | try { |
@@ -406,7 +485,9 @@ discard block |
||
| 406 | 485 | echo "error : ".$e->getMessage(); |
| 407 | 486 | } |
| 408 | 487 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 409 | - } else $all = array(); |
|
| 488 | + } else { |
|
| 489 | + $all = array(); |
|
| 490 | + } |
|
| 410 | 491 | if (empty($all)) { |
| 411 | 492 | $Spotter = new Spotter($this->db); |
| 412 | 493 | $filters = array(); |
@@ -421,7 +502,9 @@ discard block |
||
| 421 | 502 | } |
| 422 | 503 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 423 | 504 | global $globalStatsFilters; |
| 424 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 505 | + if ($filter_name == '') { |
|
| 506 | + $filter_name = $this->filter_name; |
|
| 507 | + } |
|
| 425 | 508 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 426 | 509 | $Spotter = new Spotter($this->db); |
| 427 | 510 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -430,8 +513,11 @@ discard block |
||
| 430 | 513 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 431 | 514 | } |
| 432 | 515 | if ($year == '' && $month == '') { |
| 433 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 516 | + if ($limit) { |
|
| 517 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 518 | + } else { |
|
| 519 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 520 | + } |
|
| 435 | 521 | try { |
| 436 | 522 | $sth = $this->db->prepare($query); |
| 437 | 523 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -439,11 +525,16 @@ discard block |
||
| 439 | 525 | echo "error : ".$e->getMessage(); |
| 440 | 526 | } |
| 441 | 527 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 442 | - } else $all = array(); |
|
| 528 | + } else { |
|
| 529 | + $all = array(); |
|
| 530 | + } |
|
| 443 | 531 | } else { |
| 444 | 532 | if ($year == '' && $month == '') { |
| 445 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 446 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 533 | + if ($limit) { |
|
| 534 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 535 | + } else { |
|
| 536 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 537 | + } |
|
| 447 | 538 | try { |
| 448 | 539 | $sth = $this->db->prepare($query); |
| 449 | 540 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -451,7 +542,9 @@ discard block |
||
| 451 | 542 | echo "error : ".$e->getMessage(); |
| 452 | 543 | } |
| 453 | 544 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 454 | - } else $all = array(); |
|
| 545 | + } else { |
|
| 546 | + $all = array(); |
|
| 547 | + } |
|
| 455 | 548 | } |
| 456 | 549 | if (empty($all)) { |
| 457 | 550 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -470,7 +563,9 @@ discard block |
||
| 470 | 563 | } |
| 471 | 564 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 472 | 565 | global $globalStatsFilters; |
| 473 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 566 | + if ($filter_name == '') { |
|
| 567 | + $filter_name = $this->filter_name; |
|
| 568 | + } |
|
| 474 | 569 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 475 | 570 | $Spotter = new Spotter($this->db); |
| 476 | 571 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -479,8 +574,11 @@ discard block |
||
| 479 | 574 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 480 | 575 | } |
| 481 | 576 | if ($year == '' && $month == '') { |
| 482 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 577 | + if ($limit) { |
|
| 578 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 579 | + } else { |
|
| 580 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 581 | + } |
|
| 484 | 582 | try { |
| 485 | 583 | $sth = $this->db->prepare($query); |
| 486 | 584 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -488,11 +586,16 @@ discard block |
||
| 488 | 586 | echo "error : ".$e->getMessage(); |
| 489 | 587 | } |
| 490 | 588 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 491 | - } else $all = array(); |
|
| 589 | + } else { |
|
| 590 | + $all = array(); |
|
| 591 | + } |
|
| 492 | 592 | } else { |
| 493 | 593 | if ($year == '' && $month == '') { |
| 494 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 495 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 594 | + if ($limit) { |
|
| 595 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 596 | + } else { |
|
| 597 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 598 | + } |
|
| 496 | 599 | try { |
| 497 | 600 | $sth = $this->db->prepare($query); |
| 498 | 601 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -500,7 +603,9 @@ discard block |
||
| 500 | 603 | echo "error : ".$e->getMessage(); |
| 501 | 604 | } |
| 502 | 605 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 503 | - } else $all = array(); |
|
| 606 | + } else { |
|
| 607 | + $all = array(); |
|
| 608 | + } |
|
| 504 | 609 | } |
| 505 | 610 | if (empty($all)) { |
| 506 | 611 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -519,7 +624,9 @@ discard block |
||
| 519 | 624 | } |
| 520 | 625 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 521 | 626 | $Connection = new Connection($this->db); |
| 522 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 627 | + if ($filter_name == '') { |
|
| 628 | + $filter_name = $this->filter_name; |
|
| 629 | + } |
|
| 523 | 630 | if ($Connection->tableExists('countries')) { |
| 524 | 631 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 525 | 632 | $Spotter = new Spotter($this->db); |
@@ -529,8 +636,11 @@ discard block |
||
| 529 | 636 | foreach ($airlines as $airline) { |
| 530 | 637 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 531 | 638 | } |
| 532 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 639 | + if ($limit) { |
|
| 640 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 641 | + } else { |
|
| 642 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 643 | + } |
|
| 534 | 644 | try { |
| 535 | 645 | $sth = $this->db->prepare($query); |
| 536 | 646 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -539,11 +649,16 @@ discard block |
||
| 539 | 649 | } |
| 540 | 650 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 541 | 651 | return $all; |
| 542 | - } else return array(); |
|
| 652 | + } else { |
|
| 653 | + return array(); |
|
| 654 | + } |
|
| 543 | 655 | } else { |
| 544 | 656 | if ($year == '' && $month == '') { |
| 545 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 546 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 657 | + if ($limit) { |
|
| 658 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 659 | + } else { |
|
| 660 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 661 | + } |
|
| 547 | 662 | try { |
| 548 | 663 | $sth = $this->db->prepare($query); |
| 549 | 664 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -552,7 +667,9 @@ discard block |
||
| 552 | 667 | } |
| 553 | 668 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 554 | 669 | return $all; |
| 555 | - } else return array(); |
|
| 670 | + } else { |
|
| 671 | + return array(); |
|
| 672 | + } |
|
| 556 | 673 | } |
| 557 | 674 | } else { |
| 558 | 675 | /* |
@@ -566,10 +683,15 @@ discard block |
||
| 566 | 683 | } |
| 567 | 684 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
| 568 | 685 | global $globalStatsFilters; |
| 569 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 686 | + if ($filter_name == '') { |
|
| 687 | + $filter_name = $this->filter_name; |
|
| 688 | + } |
|
| 570 | 689 | if ($year == '' && $month == '') { |
| 571 | - if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 572 | - else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 690 | + if ($limit) { |
|
| 691 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 692 | + } else { |
|
| 693 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 694 | + } |
|
| 573 | 695 | try { |
| 574 | 696 | $sth = $this->db->prepare($query); |
| 575 | 697 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -577,7 +699,9 @@ discard block |
||
| 577 | 699 | echo "error : ".$e->getMessage(); |
| 578 | 700 | } |
| 579 | 701 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 580 | - } else $all = array(); |
|
| 702 | + } else { |
|
| 703 | + $all = array(); |
|
| 704 | + } |
|
| 581 | 705 | if (empty($all)) { |
| 582 | 706 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 583 | 707 | if ($filter_name != '') { |
@@ -592,7 +716,9 @@ discard block |
||
| 592 | 716 | |
| 593 | 717 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 594 | 718 | global $globalStatsFilters; |
| 595 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 719 | + if ($filter_name == '') { |
|
| 720 | + $filter_name = $this->filter_name; |
|
| 721 | + } |
|
| 596 | 722 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 597 | 723 | $Spotter = new Spotter($this->db); |
| 598 | 724 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -601,8 +727,11 @@ discard block |
||
| 601 | 727 | foreach ($airlines as $airline) { |
| 602 | 728 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 603 | 729 | } |
| 604 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 730 | + if ($limit) { |
|
| 731 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 732 | + } else { |
|
| 733 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 734 | + } |
|
| 606 | 735 | try { |
| 607 | 736 | $sth = $this->db->prepare($query); |
| 608 | 737 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -610,11 +739,16 @@ discard block |
||
| 610 | 739 | echo "error : ".$e->getMessage(); |
| 611 | 740 | } |
| 612 | 741 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 613 | - } else $all = array(); |
|
| 742 | + } else { |
|
| 743 | + $all = array(); |
|
| 744 | + } |
|
| 614 | 745 | } else { |
| 615 | 746 | if ($year == '' && $month == '') { |
| 616 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 617 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 747 | + if ($limit) { |
|
| 748 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 749 | + } else { |
|
| 750 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 751 | + } |
|
| 618 | 752 | try { |
| 619 | 753 | $sth = $this->db->prepare($query); |
| 620 | 754 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -622,7 +756,9 @@ discard block |
||
| 622 | 756 | echo "error : ".$e->getMessage(); |
| 623 | 757 | } |
| 624 | 758 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 625 | - } else $all = array(); |
|
| 759 | + } else { |
|
| 760 | + $all = array(); |
|
| 761 | + } |
|
| 626 | 762 | } |
| 627 | 763 | if (empty($all)) { |
| 628 | 764 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -641,7 +777,9 @@ discard block |
||
| 641 | 777 | } |
| 642 | 778 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 643 | 779 | global $globalStatsFilters; |
| 644 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 780 | + if ($filter_name == '') { |
|
| 781 | + $filter_name = $this->filter_name; |
|
| 782 | + } |
|
| 645 | 783 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 646 | 784 | $Spotter = new Spotter($this->db); |
| 647 | 785 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -650,8 +788,11 @@ discard block |
||
| 650 | 788 | foreach ($airlines as $airline) { |
| 651 | 789 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 652 | 790 | } |
| 653 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 791 | + if ($limit) { |
|
| 792 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 793 | + } else { |
|
| 794 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 795 | + } |
|
| 655 | 796 | try { |
| 656 | 797 | $sth = $this->db->prepare($query); |
| 657 | 798 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -659,11 +800,16 @@ discard block |
||
| 659 | 800 | echo "error : ".$e->getMessage(); |
| 660 | 801 | } |
| 661 | 802 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 662 | - } else $all = array(); |
|
| 803 | + } else { |
|
| 804 | + $all = array(); |
|
| 805 | + } |
|
| 663 | 806 | } else { |
| 664 | 807 | if ($year == '' && $month == '') { |
| 665 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 666 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 808 | + if ($limit) { |
|
| 809 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 810 | + } else { |
|
| 811 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 812 | + } |
|
| 667 | 813 | try { |
| 668 | 814 | $sth = $this->db->prepare($query); |
| 669 | 815 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -671,7 +817,9 @@ discard block |
||
| 671 | 817 | echo "error : ".$e->getMessage(); |
| 672 | 818 | } |
| 673 | 819 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 674 | - } else $all = array(); |
|
| 820 | + } else { |
|
| 821 | + $all = array(); |
|
| 822 | + } |
|
| 675 | 823 | } |
| 676 | 824 | if (empty($all)) { |
| 677 | 825 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -696,7 +844,9 @@ discard block |
||
| 696 | 844 | $icao = $value['airport_departure_icao']; |
| 697 | 845 | if (isset($all[$icao])) { |
| 698 | 846 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 699 | - } else $all[$icao] = $value; |
|
| 847 | + } else { |
|
| 848 | + $all[$icao] = $value; |
|
| 849 | + } |
|
| 700 | 850 | } |
| 701 | 851 | $count = array(); |
| 702 | 852 | foreach ($all as $key => $row) { |
@@ -708,7 +858,9 @@ discard block |
||
| 708 | 858 | } |
| 709 | 859 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 710 | 860 | global $globalStatsFilters; |
| 711 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 861 | + if ($filter_name == '') { |
|
| 862 | + $filter_name = $this->filter_name; |
|
| 863 | + } |
|
| 712 | 864 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 713 | 865 | $Spotter = new Spotter($this->db); |
| 714 | 866 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -717,8 +869,11 @@ discard block |
||
| 717 | 869 | foreach ($airlines as $airline) { |
| 718 | 870 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 719 | 871 | } |
| 720 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 872 | + if ($limit) { |
|
| 873 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 874 | + } else { |
|
| 875 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 876 | + } |
|
| 722 | 877 | try { |
| 723 | 878 | $sth = $this->db->prepare($query); |
| 724 | 879 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -726,11 +881,16 @@ discard block |
||
| 726 | 881 | echo "error : ".$e->getMessage(); |
| 727 | 882 | } |
| 728 | 883 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 729 | - } else $all = array(); |
|
| 884 | + } else { |
|
| 885 | + $all = array(); |
|
| 886 | + } |
|
| 730 | 887 | } else { |
| 731 | 888 | if ($year == '' && $month == '') { |
| 732 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 733 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 889 | + if ($limit) { |
|
| 890 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 891 | + } else { |
|
| 892 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 893 | + } |
|
| 734 | 894 | try { |
| 735 | 895 | $sth = $this->db->prepare($query); |
| 736 | 896 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -738,7 +898,9 @@ discard block |
||
| 738 | 898 | echo "error : ".$e->getMessage(); |
| 739 | 899 | } |
| 740 | 900 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 741 | - } else $all = array(); |
|
| 901 | + } else { |
|
| 902 | + $all = array(); |
|
| 903 | + } |
|
| 742 | 904 | } |
| 743 | 905 | if (empty($all)) { |
| 744 | 906 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -763,7 +925,9 @@ discard block |
||
| 763 | 925 | $icao = $value['airport_arrival_icao']; |
| 764 | 926 | if (isset($all[$icao])) { |
| 765 | 927 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 766 | - } else $all[$icao] = $value; |
|
| 928 | + } else { |
|
| 929 | + $all[$icao] = $value; |
|
| 930 | + } |
|
| 767 | 931 | } |
| 768 | 932 | $count = array(); |
| 769 | 933 | foreach ($all as $key => $row) { |
@@ -775,7 +939,9 @@ discard block |
||
| 775 | 939 | } |
| 776 | 940 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 777 | 941 | global $globalDBdriver, $globalStatsFilters; |
| 778 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 942 | + if ($filter_name == '') { |
|
| 943 | + $filter_name = $this->filter_name; |
|
| 944 | + } |
|
| 779 | 945 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 780 | 946 | $Spotter = new Spotter($this->db); |
| 781 | 947 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -784,20 +950,32 @@ discard block |
||
| 784 | 950 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 785 | 951 | } |
| 786 | 952 | if ($globalDBdriver == 'mysql') { |
| 787 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 953 | + if ($limit) { |
|
| 954 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 955 | + } else { |
|
| 956 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 957 | + } |
|
| 789 | 958 | } else { |
| 790 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 959 | + if ($limit) { |
|
| 960 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 961 | + } else { |
|
| 962 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 963 | + } |
|
| 792 | 964 | } |
| 793 | 965 | $query_data = array(':filter_name' => $filter_name); |
| 794 | 966 | } else { |
| 795 | 967 | if ($globalDBdriver == 'mysql') { |
| 796 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 797 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 968 | + if ($limit) { |
|
| 969 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 970 | + } else { |
|
| 971 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 972 | + } |
|
| 798 | 973 | } else { |
| 799 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 800 | - 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"; |
|
| 974 | + if ($limit) { |
|
| 975 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 976 | + } else { |
|
| 977 | + $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"; |
|
| 978 | + } |
|
| 801 | 979 | } |
| 802 | 980 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 803 | 981 | } |
@@ -825,7 +1003,9 @@ discard block |
||
| 825 | 1003 | |
| 826 | 1004 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 827 | 1005 | global $globalStatsFilters; |
| 828 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1006 | + if ($filter_name == '') { |
|
| 1007 | + $filter_name = $this->filter_name; |
|
| 1008 | + } |
|
| 829 | 1009 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 830 | 1010 | $Spotter = new Spotter($this->db); |
| 831 | 1011 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -862,7 +1042,9 @@ discard block |
||
| 862 | 1042 | } |
| 863 | 1043 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 864 | 1044 | global $globalDBdriver, $globalStatsFilters; |
| 865 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1045 | + if ($filter_name == '') { |
|
| 1046 | + $filter_name = $this->filter_name; |
|
| 1047 | + } |
|
| 866 | 1048 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 867 | 1049 | $Spotter = new Spotter($this->db); |
| 868 | 1050 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -907,7 +1089,9 @@ discard block |
||
| 907 | 1089 | } |
| 908 | 1090 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 909 | 1091 | global $globalStatsFilters; |
| 910 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1092 | + if ($filter_name == '') { |
|
| 1093 | + $filter_name = $this->filter_name; |
|
| 1094 | + } |
|
| 911 | 1095 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 912 | 1096 | $Spotter = new Spotter($this->db); |
| 913 | 1097 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -944,7 +1128,9 @@ discard block |
||
| 944 | 1128 | } |
| 945 | 1129 | public function countAllDatesMarine($filter_name = '') { |
| 946 | 1130 | global $globalStatsFilters; |
| 947 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1131 | + if ($filter_name == '') { |
|
| 1132 | + $filter_name = $this->filter_name; |
|
| 1133 | + } |
|
| 948 | 1134 | $query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 949 | 1135 | $query_data = array(':filter_name' => $filter_name); |
| 950 | 1136 | try { |
@@ -966,7 +1152,9 @@ discard block |
||
| 966 | 1152 | } |
| 967 | 1153 | public function countAllDatesTracker($filter_name = '') { |
| 968 | 1154 | global $globalStatsFilters; |
| 969 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1155 | + if ($filter_name == '') { |
|
| 1156 | + $filter_name = $this->filter_name; |
|
| 1157 | + } |
|
| 970 | 1158 | $query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 971 | 1159 | $query_data = array(':filter_name' => $filter_name); |
| 972 | 1160 | try { |
@@ -988,7 +1176,9 @@ discard block |
||
| 988 | 1176 | } |
| 989 | 1177 | public function countAllDatesByAirlines($filter_name = '') { |
| 990 | 1178 | global $globalStatsFilters; |
| 991 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1179 | + if ($filter_name == '') { |
|
| 1180 | + $filter_name = $this->filter_name; |
|
| 1181 | + } |
|
| 992 | 1182 | $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"; |
| 993 | 1183 | $query_data = array('filter_name' => $filter_name); |
| 994 | 1184 | try { |
@@ -1010,7 +1200,9 @@ discard block |
||
| 1010 | 1200 | } |
| 1011 | 1201 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 1012 | 1202 | global $globalStatsFilters, $globalDBdriver; |
| 1013 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1203 | + if ($filter_name == '') { |
|
| 1204 | + $filter_name = $this->filter_name; |
|
| 1205 | + } |
|
| 1014 | 1206 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1015 | 1207 | $Spotter = new Spotter($this->db); |
| 1016 | 1208 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1095,7 +1287,9 @@ discard block |
||
| 1095 | 1287 | } |
| 1096 | 1288 | public function countAllMilitaryMonths($filter_name = '') { |
| 1097 | 1289 | global $globalStatsFilters; |
| 1098 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1290 | + if ($filter_name == '') { |
|
| 1291 | + $filter_name = $this->filter_name; |
|
| 1292 | + } |
|
| 1099 | 1293 | $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"; |
| 1100 | 1294 | try { |
| 1101 | 1295 | $sth = $this->db->prepare($query); |
@@ -1116,7 +1310,9 @@ discard block |
||
| 1116 | 1310 | } |
| 1117 | 1311 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 1118 | 1312 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1119 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1313 | + if ($filter_name == '') { |
|
| 1314 | + $filter_name = $this->filter_name; |
|
| 1315 | + } |
|
| 1120 | 1316 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1121 | 1317 | $Spotter = new Spotter($this->db); |
| 1122 | 1318 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1124,12 +1320,18 @@ discard block |
||
| 1124 | 1320 | foreach ($airlines as $airline) { |
| 1125 | 1321 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 1126 | 1322 | } |
| 1127 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1323 | + if ($limit) { |
|
| 1324 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1325 | + } else { |
|
| 1326 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1327 | + } |
|
| 1129 | 1328 | $query_data = array(':filter_name' => $filter_name); |
| 1130 | 1329 | } else { |
| 1131 | - if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1132 | - else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1330 | + if ($limit) { |
|
| 1331 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1332 | + } else { |
|
| 1333 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1334 | + } |
|
| 1133 | 1335 | $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 1134 | 1336 | } |
| 1135 | 1337 | if ($orderby == 'hour') { |
@@ -1139,7 +1341,9 @@ discard block |
||
| 1139 | 1341 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 1140 | 1342 | } |
| 1141 | 1343 | } |
| 1142 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 1344 | + if ($orderby == 'count') { |
|
| 1345 | + $query .= " ORDER BY hour_count DESC"; |
|
| 1346 | + } |
|
| 1143 | 1347 | try { |
| 1144 | 1348 | $sth = $this->db->prepare($query); |
| 1145 | 1349 | $sth->execute($query_data); |
@@ -1163,8 +1367,12 @@ discard block |
||
| 1163 | 1367 | } |
| 1164 | 1368 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 1165 | 1369 | global $globalStatsFilters; |
| 1166 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1167 | - if ($year == '') $year = date('Y'); |
|
| 1370 | + if ($filter_name == '') { |
|
| 1371 | + $filter_name = $this->filter_name; |
|
| 1372 | + } |
|
| 1373 | + if ($year == '') { |
|
| 1374 | + $year = date('Y'); |
|
| 1375 | + } |
|
| 1168 | 1376 | $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1169 | 1377 | if (empty($all)) { |
| 1170 | 1378 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1183,8 +1391,12 @@ discard block |
||
| 1183 | 1391 | } |
| 1184 | 1392 | public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
| 1185 | 1393 | global $globalStatsFilters; |
| 1186 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1187 | - if ($year == '') $year = date('Y'); |
|
| 1394 | + if ($filter_name == '') { |
|
| 1395 | + $filter_name = $this->filter_name; |
|
| 1396 | + } |
|
| 1397 | + if ($year == '') { |
|
| 1398 | + $year = date('Y'); |
|
| 1399 | + } |
|
| 1188 | 1400 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 1189 | 1401 | if (empty($all)) { |
| 1190 | 1402 | $filters = array(); |
@@ -1200,8 +1412,12 @@ discard block |
||
| 1200 | 1412 | } |
| 1201 | 1413 | public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
| 1202 | 1414 | global $globalStatsFilters; |
| 1203 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1204 | - if ($year == '') $year = date('Y'); |
|
| 1415 | + if ($filter_name == '') { |
|
| 1416 | + $filter_name = $this->filter_name; |
|
| 1417 | + } |
|
| 1418 | + if ($year == '') { |
|
| 1419 | + $year = date('Y'); |
|
| 1420 | + } |
|
| 1205 | 1421 | $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1206 | 1422 | if (empty($all)) { |
| 1207 | 1423 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1220,7 +1436,9 @@ discard block |
||
| 1220 | 1436 | } |
| 1221 | 1437 | public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1222 | 1438 | global $globalStatsFilters; |
| 1223 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1439 | + if ($filter_name == '') { |
|
| 1440 | + $filter_name = $this->filter_name; |
|
| 1441 | + } |
|
| 1224 | 1442 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1225 | 1443 | $Spotter = new Spotter($this->db); |
| 1226 | 1444 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1238,7 +1456,9 @@ discard block |
||
| 1238 | 1456 | } |
| 1239 | 1457 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1240 | 1458 | $all = $result[0]['nb']; |
| 1241 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1459 | + } else { |
|
| 1460 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1461 | + } |
|
| 1242 | 1462 | } else { |
| 1243 | 1463 | if ($year == '' && $month == '') { |
| 1244 | 1464 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1250,7 +1470,9 @@ discard block |
||
| 1250 | 1470 | } |
| 1251 | 1471 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1252 | 1472 | $all = $result[0]['nb']; |
| 1253 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1473 | + } else { |
|
| 1474 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1475 | + } |
|
| 1254 | 1476 | } |
| 1255 | 1477 | if (empty($all)) { |
| 1256 | 1478 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1269,7 +1491,9 @@ discard block |
||
| 1269 | 1491 | } |
| 1270 | 1492 | public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
| 1271 | 1493 | global $globalStatsFilters; |
| 1272 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1494 | + if ($filter_name == '') { |
|
| 1495 | + $filter_name = $this->filter_name; |
|
| 1496 | + } |
|
| 1273 | 1497 | if ($year == '' && $month == '') { |
| 1274 | 1498 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 1275 | 1499 | try { |
@@ -1280,7 +1504,9 @@ discard block |
||
| 1280 | 1504 | } |
| 1281 | 1505 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1282 | 1506 | $all = $result[0]['nb_airline']; |
| 1283 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1507 | + } else { |
|
| 1508 | + $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1509 | + } |
|
| 1284 | 1510 | if (empty($all)) { |
| 1285 | 1511 | $filters = array(); |
| 1286 | 1512 | $filters = array('year' => $year,'month' => $month); |
@@ -1295,7 +1521,9 @@ discard block |
||
| 1295 | 1521 | } |
| 1296 | 1522 | public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1297 | 1523 | global $globalStatsFilters; |
| 1298 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1524 | + if ($filter_name == '') { |
|
| 1525 | + $filter_name = $this->filter_name; |
|
| 1526 | + } |
|
| 1299 | 1527 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1300 | 1528 | $Spotter = new Spotter($this->db); |
| 1301 | 1529 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1350,7 +1578,9 @@ discard block |
||
| 1350 | 1578 | } |
| 1351 | 1579 | public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 1352 | 1580 | global $globalStatsFilters; |
| 1353 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1581 | + if ($filter_name == '') { |
|
| 1582 | + $filter_name = $this->filter_name; |
|
| 1583 | + } |
|
| 1354 | 1584 | //if ($year == '') $year = date('Y'); |
| 1355 | 1585 | if ($year == '' && $month == '') { |
| 1356 | 1586 | $query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1379,7 +1609,9 @@ discard block |
||
| 1379 | 1609 | } |
| 1380 | 1610 | |
| 1381 | 1611 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 1382 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1612 | + if ($filter_name == '') { |
|
| 1613 | + $filter_name = $this->filter_name; |
|
| 1614 | + } |
|
| 1383 | 1615 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1384 | 1616 | $Spotter = new Spotter($this->db); |
| 1385 | 1617 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1403,7 +1635,9 @@ discard block |
||
| 1403 | 1635 | return $all; |
| 1404 | 1636 | } |
| 1405 | 1637 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 1406 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1638 | + if ($filter_name == '') { |
|
| 1639 | + $filter_name = $this->filter_name; |
|
| 1640 | + } |
|
| 1407 | 1641 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1408 | 1642 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1409 | 1643 | try { |
@@ -1416,7 +1650,9 @@ discard block |
||
| 1416 | 1650 | return $all; |
| 1417 | 1651 | } |
| 1418 | 1652 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 1419 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1653 | + if ($filter_name == '') { |
|
| 1654 | + $filter_name = $this->filter_name; |
|
| 1655 | + } |
|
| 1420 | 1656 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1421 | 1657 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1422 | 1658 | try { |
@@ -1427,7 +1663,9 @@ discard block |
||
| 1427 | 1663 | } |
| 1428 | 1664 | } |
| 1429 | 1665 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 1430 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1666 | + if ($filter_name == '') { |
|
| 1667 | + $filter_name = $this->filter_name; |
|
| 1668 | + } |
|
| 1431 | 1669 | global $globalArchiveMonths, $globalDBdriver; |
| 1432 | 1670 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1433 | 1671 | $Spotter = new Spotter($this->db); |
@@ -1483,7 +1721,9 @@ discard block |
||
| 1483 | 1721 | } |
| 1484 | 1722 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1485 | 1723 | global $globalArchiveMonths, $globalDBdriver; |
| 1486 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1724 | + if ($filter_name == '') { |
|
| 1725 | + $filter_name = $this->filter_name; |
|
| 1726 | + } |
|
| 1487 | 1727 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1488 | 1728 | $Spotter = new Spotter($this->db); |
| 1489 | 1729 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1516,7 +1756,9 @@ discard block |
||
| 1516 | 1756 | } |
| 1517 | 1757 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1518 | 1758 | global $globalArchiveMonths, $globalDBdriver; |
| 1519 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1759 | + if ($filter_name == '') { |
|
| 1760 | + $filter_name = $this->filter_name; |
|
| 1761 | + } |
|
| 1520 | 1762 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1521 | 1763 | $Spotter = new Spotter($this->db); |
| 1522 | 1764 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1547,7 +1789,9 @@ discard block |
||
| 1547 | 1789 | } |
| 1548 | 1790 | public function getStatsAirlineTotal($filter_name = '') { |
| 1549 | 1791 | global $globalArchiveMonths, $globalDBdriver; |
| 1550 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1792 | + if ($filter_name == '') { |
|
| 1793 | + $filter_name = $this->filter_name; |
|
| 1794 | + } |
|
| 1551 | 1795 | if ($globalDBdriver == 'mysql') { |
| 1552 | 1796 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1553 | 1797 | } else { |
@@ -1564,7 +1808,9 @@ discard block |
||
| 1564 | 1808 | } |
| 1565 | 1809 | public function getStatsOwnerTotal($filter_name = '') { |
| 1566 | 1810 | global $globalArchiveMonths, $globalDBdriver; |
| 1567 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1811 | + if ($filter_name == '') { |
|
| 1812 | + $filter_name = $this->filter_name; |
|
| 1813 | + } |
|
| 1568 | 1814 | if ($globalDBdriver == 'mysql') { |
| 1569 | 1815 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1570 | 1816 | } else { |
@@ -1581,7 +1827,9 @@ discard block |
||
| 1581 | 1827 | } |
| 1582 | 1828 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1583 | 1829 | global $globalArchiveMonths, $globalDBdriver; |
| 1584 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1830 | + if ($filter_name == '') { |
|
| 1831 | + $filter_name = $this->filter_name; |
|
| 1832 | + } |
|
| 1585 | 1833 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1586 | 1834 | try { |
| 1587 | 1835 | $sth = $this->db->prepare($query); |
@@ -1590,12 +1838,17 @@ discard block |
||
| 1590 | 1838 | echo "error : ".$e->getMessage(); |
| 1591 | 1839 | } |
| 1592 | 1840 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1593 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1594 | - else return 0; |
|
| 1841 | + if (isset($all[0]['cnt'])) { |
|
| 1842 | + return $all[0]['cnt']; |
|
| 1843 | + } else { |
|
| 1844 | + return 0; |
|
| 1845 | + } |
|
| 1595 | 1846 | } |
| 1596 | 1847 | public function getStatsPilotTotal($filter_name = '') { |
| 1597 | 1848 | global $globalArchiveMonths, $globalDBdriver; |
| 1598 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1849 | + if ($filter_name == '') { |
|
| 1850 | + $filter_name = $this->filter_name; |
|
| 1851 | + } |
|
| 1599 | 1852 | if ($globalDBdriver == 'mysql') { |
| 1600 | 1853 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 1601 | 1854 | } else { |
@@ -1612,7 +1865,9 @@ discard block |
||
| 1612 | 1865 | } |
| 1613 | 1866 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1614 | 1867 | global $globalArchiveMonths, $globalDBdriver; |
| 1615 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1868 | + if ($filter_name == '') { |
|
| 1869 | + $filter_name = $this->filter_name; |
|
| 1870 | + } |
|
| 1616 | 1871 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1617 | 1872 | try { |
| 1618 | 1873 | $sth = $this->db->prepare($query); |
@@ -1621,13 +1876,18 @@ discard block |
||
| 1621 | 1876 | echo "error : ".$e->getMessage(); |
| 1622 | 1877 | } |
| 1623 | 1878 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1624 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1625 | - else return 0; |
|
| 1879 | + if (isset($all[0]['cnt'])) { |
|
| 1880 | + return $all[0]['cnt']; |
|
| 1881 | + } else { |
|
| 1882 | + return 0; |
|
| 1883 | + } |
|
| 1626 | 1884 | } |
| 1627 | 1885 | |
| 1628 | 1886 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1629 | 1887 | global $globalDBdriver; |
| 1630 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1888 | + if ($filter_name == '') { |
|
| 1889 | + $filter_name = $this->filter_name; |
|
| 1890 | + } |
|
| 1631 | 1891 | if ($globalDBdriver == 'mysql') { |
| 1632 | 1892 | $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"; |
| 1633 | 1893 | } else { |
@@ -1643,7 +1903,9 @@ discard block |
||
| 1643 | 1903 | } |
| 1644 | 1904 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1645 | 1905 | global $globalDBdriver; |
| 1646 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1906 | + if ($filter_name == '') { |
|
| 1907 | + $filter_name = $this->filter_name; |
|
| 1908 | + } |
|
| 1647 | 1909 | if ($globalDBdriver == 'mysql') { |
| 1648 | 1910 | $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"; |
| 1649 | 1911 | } else { |
@@ -2116,27 +2378,37 @@ discard block |
||
| 2116 | 2378 | date_default_timezone_set('UTC'); |
| 2117 | 2379 | if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2118 | 2380 | $last_update = $this->getLastStatsUpdate('last_update_stats_marine'); |
| 2119 | - if ($globalDebug) echo '!!! Update Marine stats !!!'."\n"; |
|
| 2381 | + if ($globalDebug) { |
|
| 2382 | + echo '!!! Update Marine stats !!!'."\n"; |
|
| 2383 | + } |
|
| 2120 | 2384 | if (isset($last_update[0]['value'])) { |
| 2121 | 2385 | $last_update_day = $last_update[0]['value']; |
| 2122 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2386 | + } else { |
|
| 2387 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2388 | + } |
|
| 2123 | 2389 | $reset = false; |
| 2124 | 2390 | $Marine = new Marine($this->db); |
| 2125 | 2391 | $filtername = 'marine'; |
| 2126 | 2392 | if ($Connection->tableExists('countries')) { |
| 2127 | - if ($globalDebug) echo 'Count all vessels by countries...'."\n"; |
|
| 2393 | + if ($globalDebug) { |
|
| 2394 | + echo 'Count all vessels by countries...'."\n"; |
|
| 2395 | + } |
|
| 2128 | 2396 | $alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day); |
| 2129 | 2397 | foreach ($alldata as $number) { |
| 2130 | 2398 | $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset); |
| 2131 | 2399 | } |
| 2132 | 2400 | } |
| 2133 | - if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
|
| 2401 | + if ($globalDebug) { |
|
| 2402 | + echo 'Count all vessels by months...'."\n"; |
|
| 2403 | + } |
|
| 2134 | 2404 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2135 | 2405 | $filter_last_month = array('since_date' => $last_month); |
| 2136 | 2406 | $alldata = $Marine->countAllMonths($filter_last_month); |
| 2137 | 2407 | $lastyear = false; |
| 2138 | 2408 | foreach ($alldata as $number) { |
| 2139 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2409 | + if ($number['year_name'] != date('Y')) { |
|
| 2410 | + $lastyear = true; |
|
| 2411 | + } |
|
| 2140 | 2412 | $this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2141 | 2413 | } |
| 2142 | 2414 | echo 'Marine data...'."\n"; |
@@ -2172,26 +2444,36 @@ discard block |
||
| 2172 | 2444 | } |
| 2173 | 2445 | if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2174 | 2446 | $last_update = $this->getLastStatsUpdate('last_update_stats_tracker'); |
| 2175 | - if ($globalDebug) echo '!!! Update tracker stats !!!'."\n"; |
|
| 2447 | + if ($globalDebug) { |
|
| 2448 | + echo '!!! Update tracker stats !!!'."\n"; |
|
| 2449 | + } |
|
| 2176 | 2450 | if (isset($last_update[0]['value'])) { |
| 2177 | 2451 | $last_update_day = $last_update[0]['value']; |
| 2178 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2452 | + } else { |
|
| 2453 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2454 | + } |
|
| 2179 | 2455 | $reset = false; |
| 2180 | 2456 | $Tracker = new Tracker($this->db); |
| 2181 | 2457 | if ($Connection->tableExists('countries')) { |
| 2182 | - if ($globalDebug) echo 'Count all trackers by countries...'."\n"; |
|
| 2458 | + if ($globalDebug) { |
|
| 2459 | + echo 'Count all trackers by countries...'."\n"; |
|
| 2460 | + } |
|
| 2183 | 2461 | $alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day); |
| 2184 | 2462 | foreach ($alldata as $number) { |
| 2185 | 2463 | $this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset); |
| 2186 | 2464 | } |
| 2187 | 2465 | } |
| 2188 | - if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
|
| 2466 | + if ($globalDebug) { |
|
| 2467 | + echo 'Count all vessels by months...'."\n"; |
|
| 2468 | + } |
|
| 2189 | 2469 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2190 | 2470 | $filter_last_month = array('since_date' => $last_month); |
| 2191 | 2471 | $alldata = $Tracker->countAllMonths($filter_last_month); |
| 2192 | 2472 | $lastyear = false; |
| 2193 | 2473 | foreach ($alldata as $number) { |
| 2194 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2474 | + if ($number['year_name'] != date('Y')) { |
|
| 2475 | + $lastyear = true; |
|
| 2476 | + } |
|
| 2195 | 2477 | $this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2196 | 2478 | } |
| 2197 | 2479 | echo 'Tracker data...'."\n"; |
@@ -2228,10 +2510,14 @@ discard block |
||
| 2228 | 2510 | |
| 2229 | 2511 | if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2230 | 2512 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2231 | - if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n"; |
|
| 2513 | + if ($globalDebug) { |
|
| 2514 | + echo '!!! Update aicraft stats !!!'."\n"; |
|
| 2515 | + } |
|
| 2232 | 2516 | if (isset($last_update[0]['value'])) { |
| 2233 | 2517 | $last_update_day = $last_update[0]['value']; |
| 2234 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2518 | + } else { |
|
| 2519 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2520 | + } |
|
| 2235 | 2521 | $reset = false; |
| 2236 | 2522 | //if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) { |
| 2237 | 2523 | if ($globalStatsResetYear) { |
@@ -2240,43 +2526,63 @@ discard block |
||
| 2240 | 2526 | } |
| 2241 | 2527 | $Spotter = new Spotter($this->db); |
| 2242 | 2528 | |
| 2243 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 2529 | + if ($globalDebug) { |
|
| 2530 | + echo 'Count all aircraft types...'."\n"; |
|
| 2531 | + } |
|
| 2244 | 2532 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 2245 | 2533 | foreach ($alldata as $number) { |
| 2246 | 2534 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 2247 | 2535 | } |
| 2248 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 2536 | + if ($globalDebug) { |
|
| 2537 | + echo 'Count all airlines...'."\n"; |
|
| 2538 | + } |
|
| 2249 | 2539 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 2250 | 2540 | foreach ($alldata as $number) { |
| 2251 | 2541 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 2252 | 2542 | } |
| 2253 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 2543 | + if ($globalDebug) { |
|
| 2544 | + echo 'Count all registrations...'."\n"; |
|
| 2545 | + } |
|
| 2254 | 2546 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 2255 | 2547 | foreach ($alldata as $number) { |
| 2256 | 2548 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 2257 | 2549 | } |
| 2258 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 2550 | + if ($globalDebug) { |
|
| 2551 | + echo 'Count all callsigns...'."\n"; |
|
| 2552 | + } |
|
| 2259 | 2553 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 2260 | 2554 | foreach ($alldata as $number) { |
| 2261 | 2555 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2262 | 2556 | } |
| 2263 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 2557 | + if ($globalDebug) { |
|
| 2558 | + echo 'Count all owners...'."\n"; |
|
| 2559 | + } |
|
| 2264 | 2560 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 2265 | 2561 | foreach ($alldata as $number) { |
| 2266 | 2562 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 2267 | 2563 | } |
| 2268 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 2564 | + if ($globalDebug) { |
|
| 2565 | + echo 'Count all pilots...'."\n"; |
|
| 2566 | + } |
|
| 2269 | 2567 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 2270 | 2568 | foreach ($alldata as $number) { |
| 2271 | - if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
|
| 2569 | + if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') { |
|
| 2570 | + $number['pilot_id'] = $number['pilot_name']; |
|
| 2571 | + } |
|
| 2272 | 2572 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 2273 | 2573 | } |
| 2274 | 2574 | |
| 2275 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 2575 | + if ($globalDebug) { |
|
| 2576 | + echo 'Count all departure airports...'."\n"; |
|
| 2577 | + } |
|
| 2276 | 2578 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 2277 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 2579 | + if ($globalDebug) { |
|
| 2580 | + echo 'Count all detected departure airports...'."\n"; |
|
| 2581 | + } |
|
| 2278 | 2582 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 2279 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 2583 | + if ($globalDebug) { |
|
| 2584 | + echo 'Order departure airports...'."\n"; |
|
| 2585 | + } |
|
| 2280 | 2586 | $alldata = array(); |
| 2281 | 2587 | foreach ($pall as $value) { |
| 2282 | 2588 | $icao = $value['airport_departure_icao']; |
@@ -2286,7 +2592,9 @@ discard block |
||
| 2286 | 2592 | $icao = $value['airport_departure_icao']; |
| 2287 | 2593 | if (isset($alldata[$icao])) { |
| 2288 | 2594 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2289 | - } else $alldata[$icao] = $value; |
|
| 2595 | + } else { |
|
| 2596 | + $alldata[$icao] = $value; |
|
| 2597 | + } |
|
| 2290 | 2598 | } |
| 2291 | 2599 | $count = array(); |
| 2292 | 2600 | foreach ($alldata as $key => $row) { |
@@ -2296,11 +2604,17 @@ discard block |
||
| 2296 | 2604 | foreach ($alldata as $number) { |
| 2297 | 2605 | 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); |
| 2298 | 2606 | } |
| 2299 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 2607 | + if ($globalDebug) { |
|
| 2608 | + echo 'Count all arrival airports...'."\n"; |
|
| 2609 | + } |
|
| 2300 | 2610 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 2301 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 2611 | + if ($globalDebug) { |
|
| 2612 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 2613 | + } |
|
| 2302 | 2614 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 2303 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 2615 | + if ($globalDebug) { |
|
| 2616 | + echo 'Order arrival airports...'."\n"; |
|
| 2617 | + } |
|
| 2304 | 2618 | $alldata = array(); |
| 2305 | 2619 | foreach ($pall as $value) { |
| 2306 | 2620 | $icao = $value['airport_arrival_icao']; |
@@ -2310,7 +2624,9 @@ discard block |
||
| 2310 | 2624 | $icao = $value['airport_arrival_icao']; |
| 2311 | 2625 | if (isset($alldata[$icao])) { |
| 2312 | 2626 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2313 | - } else $alldata[$icao] = $value; |
|
| 2627 | + } else { |
|
| 2628 | + $alldata[$icao] = $value; |
|
| 2629 | + } |
|
| 2314 | 2630 | } |
| 2315 | 2631 | $count = array(); |
| 2316 | 2632 | foreach ($alldata as $key => $row) { |
@@ -2321,7 +2637,9 @@ discard block |
||
| 2321 | 2637 | 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); |
| 2322 | 2638 | } |
| 2323 | 2639 | if ($Connection->tableExists('countries')) { |
| 2324 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 2640 | + if ($globalDebug) { |
|
| 2641 | + echo 'Count all flights by countries...'."\n"; |
|
| 2642 | + } |
|
| 2325 | 2643 | //$SpotterArchive = new SpotterArchive(); |
| 2326 | 2644 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2327 | 2645 | $Spotter = new Spotter($this->db); |
@@ -2332,7 +2650,9 @@ discard block |
||
| 2332 | 2650 | } |
| 2333 | 2651 | |
| 2334 | 2652 | if (isset($globalAccidents) && $globalAccidents) { |
| 2335 | - if ($globalDebug) echo 'Count fatalities stats...'."\n"; |
|
| 2653 | + if ($globalDebug) { |
|
| 2654 | + echo 'Count fatalities stats...'."\n"; |
|
| 2655 | + } |
|
| 2336 | 2656 | $Accident = new Accident($this->db); |
| 2337 | 2657 | $this->deleteStatsByType('fatalities_byyear'); |
| 2338 | 2658 | $alldata = $Accident->countFatalitiesByYear(); |
@@ -2348,48 +2668,68 @@ discard block |
||
| 2348 | 2668 | |
| 2349 | 2669 | // Add by month using getstat if month finish... |
| 2350 | 2670 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 2351 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 2671 | + if ($globalDebug) { |
|
| 2672 | + echo 'Count all flights by months...'."\n"; |
|
| 2673 | + } |
|
| 2352 | 2674 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2353 | 2675 | $filter_last_month = array('since_date' => $last_month); |
| 2354 | 2676 | $Spotter = new Spotter($this->db); |
| 2355 | 2677 | $alldata = $Spotter->countAllMonths($filter_last_month); |
| 2356 | 2678 | $lastyear = false; |
| 2357 | 2679 | foreach ($alldata as $number) { |
| 2358 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2680 | + if ($number['year_name'] != date('Y')) { |
|
| 2681 | + $lastyear = true; |
|
| 2682 | + } |
|
| 2359 | 2683 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2360 | 2684 | } |
| 2361 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 2685 | + if ($globalDebug) { |
|
| 2686 | + echo 'Count all military flights by months...'."\n"; |
|
| 2687 | + } |
|
| 2362 | 2688 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2363 | 2689 | foreach ($alldata as $number) { |
| 2364 | 2690 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2365 | 2691 | } |
| 2366 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 2692 | + if ($globalDebug) { |
|
| 2693 | + echo 'Count all owners by months...'."\n"; |
|
| 2694 | + } |
|
| 2367 | 2695 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2368 | 2696 | foreach ($alldata as $number) { |
| 2369 | 2697 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2370 | 2698 | } |
| 2371 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 2699 | + if ($globalDebug) { |
|
| 2700 | + echo 'Count all pilots by months...'."\n"; |
|
| 2701 | + } |
|
| 2372 | 2702 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2373 | 2703 | foreach ($alldata as $number) { |
| 2374 | 2704 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2375 | 2705 | } |
| 2376 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 2706 | + if ($globalDebug) { |
|
| 2707 | + echo 'Count all airlines by months...'."\n"; |
|
| 2708 | + } |
|
| 2377 | 2709 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2378 | 2710 | foreach ($alldata as $number) { |
| 2379 | 2711 | $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2380 | 2712 | } |
| 2381 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 2713 | + if ($globalDebug) { |
|
| 2714 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 2715 | + } |
|
| 2382 | 2716 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2383 | 2717 | foreach ($alldata as $number) { |
| 2384 | 2718 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2385 | 2719 | } |
| 2386 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 2720 | + if ($globalDebug) { |
|
| 2721 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 2722 | + } |
|
| 2387 | 2723 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2388 | 2724 | foreach ($alldata as $number) { |
| 2389 | 2725 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2390 | 2726 | } |
| 2391 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 2392 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2727 | + if ($globalDebug) { |
|
| 2728 | + echo 'Airports data...'."\n"; |
|
| 2729 | + } |
|
| 2730 | + if ($globalDebug) { |
|
| 2731 | + echo '...Departure'."\n"; |
|
| 2732 | + } |
|
| 2393 | 2733 | $this->deleteStatAirport('daily'); |
| 2394 | 2734 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 2395 | 2735 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -2507,7 +2847,9 @@ discard block |
||
| 2507 | 2847 | // Count by airlines |
| 2508 | 2848 | echo '--- Stats by airlines ---'."\n"; |
| 2509 | 2849 | if ($Connection->tableExists('countries')) { |
| 2510 | - if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2850 | + if ($globalDebug) { |
|
| 2851 | + echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2852 | + } |
|
| 2511 | 2853 | $SpotterArchive = new SpotterArchive($this->db); |
| 2512 | 2854 | //$Spotter = new Spotter($this->db); |
| 2513 | 2855 | $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
@@ -2516,37 +2858,53 @@ discard block |
||
| 2516 | 2858 | $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
| 2517 | 2859 | } |
| 2518 | 2860 | } |
| 2519 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2861 | + if ($globalDebug) { |
|
| 2862 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2863 | + } |
|
| 2520 | 2864 | $Spotter = new Spotter($this->db); |
| 2521 | 2865 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 2522 | 2866 | foreach ($alldata as $number) { |
| 2523 | 2867 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 2524 | 2868 | } |
| 2525 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2869 | + if ($globalDebug) { |
|
| 2870 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2871 | + } |
|
| 2526 | 2872 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 2527 | 2873 | foreach ($alldata as $number) { |
| 2528 | 2874 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 2529 | 2875 | } |
| 2530 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 2876 | + if ($globalDebug) { |
|
| 2877 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 2878 | + } |
|
| 2531 | 2879 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 2532 | 2880 | foreach ($alldata as $number) { |
| 2533 | 2881 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2534 | 2882 | } |
| 2535 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 2883 | + if ($globalDebug) { |
|
| 2884 | + echo 'Count all owners by airlines...'."\n"; |
|
| 2885 | + } |
|
| 2536 | 2886 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 2537 | 2887 | foreach ($alldata as $number) { |
| 2538 | 2888 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 2539 | 2889 | } |
| 2540 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 2890 | + if ($globalDebug) { |
|
| 2891 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 2892 | + } |
|
| 2541 | 2893 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 2542 | 2894 | foreach ($alldata as $number) { |
| 2543 | 2895 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 2544 | 2896 | } |
| 2545 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 2897 | + if ($globalDebug) { |
|
| 2898 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 2899 | + } |
|
| 2546 | 2900 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2547 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2901 | + if ($globalDebug) { |
|
| 2902 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2903 | + } |
|
| 2548 | 2904 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2549 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2905 | + if ($globalDebug) { |
|
| 2906 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2907 | + } |
|
| 2550 | 2908 | //$alldata = array(); |
| 2551 | 2909 | foreach ($dall as $value) { |
| 2552 | 2910 | $icao = $value['airport_departure_icao']; |
@@ -2567,11 +2925,17 @@ discard block |
||
| 2567 | 2925 | foreach ($alldata as $number) { |
| 2568 | 2926 | 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); |
| 2569 | 2927 | } |
| 2570 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2928 | + if ($globalDebug) { |
|
| 2929 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2930 | + } |
|
| 2571 | 2931 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2572 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2932 | + if ($globalDebug) { |
|
| 2933 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2934 | + } |
|
| 2573 | 2935 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2574 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 2936 | + if ($globalDebug) { |
|
| 2937 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 2938 | + } |
|
| 2575 | 2939 | //$alldata = array(); |
| 2576 | 2940 | foreach ($dall as $value) { |
| 2577 | 2941 | $icao = $value['airport_arrival_icao']; |
@@ -2590,37 +2954,53 @@ discard block |
||
| 2590 | 2954 | } |
| 2591 | 2955 | $alldata = $pall; |
| 2592 | 2956 | foreach ($alldata as $number) { |
| 2593 | - 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); |
|
| 2957 | + if ($number['airline_icao'] != '') { |
|
| 2958 | + 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); |
|
| 2959 | + } |
|
| 2960 | + } |
|
| 2961 | + if ($globalDebug) { |
|
| 2962 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 2594 | 2963 | } |
| 2595 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 2596 | 2964 | $Spotter = new Spotter($this->db); |
| 2597 | 2965 | $alldata = $Spotter->countAllMonthsByAirlines($filter_last_month); |
| 2598 | 2966 | $lastyear = false; |
| 2599 | 2967 | foreach ($alldata as $number) { |
| 2600 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2968 | + if ($number['year_name'] != date('Y')) { |
|
| 2969 | + $lastyear = true; |
|
| 2970 | + } |
|
| 2601 | 2971 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2602 | 2972 | } |
| 2603 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 2973 | + if ($globalDebug) { |
|
| 2974 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 2975 | + } |
|
| 2604 | 2976 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2605 | 2977 | foreach ($alldata as $number) { |
| 2606 | 2978 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2607 | 2979 | } |
| 2608 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2980 | + if ($globalDebug) { |
|
| 2981 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2982 | + } |
|
| 2609 | 2983 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2610 | 2984 | foreach ($alldata as $number) { |
| 2611 | 2985 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2612 | 2986 | } |
| 2613 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2987 | + if ($globalDebug) { |
|
| 2988 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2989 | + } |
|
| 2614 | 2990 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2615 | 2991 | foreach ($alldata as $number) { |
| 2616 | 2992 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2617 | 2993 | } |
| 2618 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2994 | + if ($globalDebug) { |
|
| 2995 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2996 | + } |
|
| 2619 | 2997 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2620 | 2998 | foreach ($alldata as $number) { |
| 2621 | 2999 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2622 | 3000 | } |
| 2623 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 3001 | + if ($globalDebug) { |
|
| 3002 | + echo '...Departure'."\n"; |
|
| 3003 | + } |
|
| 2624 | 3004 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 2625 | 3005 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 2626 | 3006 | foreach ($dall as $value) { |
@@ -2643,7 +3023,9 @@ discard block |
||
| 2643 | 3023 | foreach ($alldata as $number) { |
| 2644 | 3024 | $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']); |
| 2645 | 3025 | } |
| 2646 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 3026 | + if ($globalDebug) { |
|
| 3027 | + echo '...Arrival'."\n"; |
|
| 3028 | + } |
|
| 2647 | 3029 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 2648 | 3030 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 2649 | 3031 | foreach ($dall as $value) { |
@@ -2667,13 +3049,19 @@ discard block |
||
| 2667 | 3049 | $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']); |
| 2668 | 3050 | } |
| 2669 | 3051 | |
| 2670 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 2671 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 3052 | + if ($globalDebug) { |
|
| 3053 | + echo 'Flights data...'."\n"; |
|
| 3054 | + } |
|
| 3055 | + if ($globalDebug) { |
|
| 3056 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 3057 | + } |
|
| 2672 | 3058 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2673 | 3059 | foreach ($alldata as $number) { |
| 2674 | 3060 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 2675 | 3061 | } |
| 2676 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 3062 | + if ($globalDebug) { |
|
| 3063 | + echo '-> countAllDates...'."\n"; |
|
| 3064 | + } |
|
| 2677 | 3065 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2678 | 3066 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
| 2679 | 3067 | $values = array(); |
@@ -2686,14 +3074,18 @@ discard block |
||
| 2686 | 3074 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 2687 | 3075 | } |
| 2688 | 3076 | |
| 2689 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 3077 | + if ($globalDebug) { |
|
| 3078 | + echo '-> countAllHours...'."\n"; |
|
| 3079 | + } |
|
| 2690 | 3080 | $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
| 2691 | 3081 | foreach ($alldata as $number) { |
| 2692 | 3082 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
| 2693 | 3083 | } |
| 2694 | 3084 | |
| 2695 | 3085 | // Stats by filters |
| 2696 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 3086 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 3087 | + $globalStatsFilters = array(); |
|
| 3088 | + } |
|
| 2697 | 3089 | foreach ($globalStatsFilters as $name => $filter) { |
| 2698 | 3090 | if (!empty($filter)) { |
| 2699 | 3091 | //$filter_name = $filter['name']; |
@@ -2701,7 +3093,9 @@ discard block |
||
| 2701 | 3093 | $reset = false; |
| 2702 | 3094 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 2703 | 3095 | if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) { |
| 2704 | - if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 3096 | + if ($globalDebug) { |
|
| 3097 | + echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 3098 | + } |
|
| 2705 | 3099 | $this->deleteOldStats($filter_name); |
| 2706 | 3100 | unset($last_update); |
| 2707 | 3101 | } |
@@ -2718,39 +3112,55 @@ discard block |
||
| 2718 | 3112 | $reset = true; |
| 2719 | 3113 | } |
| 2720 | 3114 | // Count by filter |
| 2721 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 3115 | + if ($globalDebug) { |
|
| 3116 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 3117 | + } |
|
| 2722 | 3118 | $Spotter = new Spotter($this->db); |
| 2723 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 3119 | + if ($globalDebug) { |
|
| 3120 | + echo 'Count all aircraft types...'."\n"; |
|
| 3121 | + } |
|
| 2724 | 3122 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 2725 | 3123 | foreach ($alldata as $number) { |
| 2726 | 3124 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
| 2727 | 3125 | } |
| 2728 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 3126 | + if ($globalDebug) { |
|
| 3127 | + echo 'Count all airlines...'."\n"; |
|
| 3128 | + } |
|
| 2729 | 3129 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
| 2730 | 3130 | foreach ($alldata as $number) { |
| 2731 | 3131 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
| 2732 | 3132 | } |
| 2733 | - if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
|
| 3133 | + if ($globalDebug) { |
|
| 3134 | + echo 'Count all aircraft registrations...'."\n"; |
|
| 3135 | + } |
|
| 2734 | 3136 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
| 2735 | 3137 | foreach ($alldata as $number) { |
| 2736 | 3138 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
| 2737 | 3139 | } |
| 2738 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 3140 | + if ($globalDebug) { |
|
| 3141 | + echo 'Count all callsigns...'."\n"; |
|
| 3142 | + } |
|
| 2739 | 3143 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
| 2740 | 3144 | foreach ($alldata as $number) { |
| 2741 | 3145 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
| 2742 | 3146 | } |
| 2743 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 3147 | + if ($globalDebug) { |
|
| 3148 | + echo 'Count all owners...'."\n"; |
|
| 3149 | + } |
|
| 2744 | 3150 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
| 2745 | 3151 | foreach ($alldata as $number) { |
| 2746 | 3152 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
| 2747 | 3153 | } |
| 2748 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 3154 | + if ($globalDebug) { |
|
| 3155 | + echo 'Count all pilots...'."\n"; |
|
| 3156 | + } |
|
| 2749 | 3157 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
| 2750 | 3158 | foreach ($alldata as $number) { |
| 2751 | 3159 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2752 | 3160 | } |
| 2753 | - if ($globalDebug) echo 'Count departure airports...'."\n"; |
|
| 3161 | + if ($globalDebug) { |
|
| 3162 | + echo 'Count departure airports...'."\n"; |
|
| 3163 | + } |
|
| 2754 | 3164 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2755 | 3165 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
| 2756 | 3166 | $alldata = array(); |
@@ -2762,7 +3172,9 @@ discard block |
||
| 2762 | 3172 | $icao = $value['airport_departure_icao']; |
| 2763 | 3173 | if (isset($alldata[$icao])) { |
| 2764 | 3174 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2765 | - } else $alldata[$icao] = $value; |
|
| 3175 | + } else { |
|
| 3176 | + $alldata[$icao] = $value; |
|
| 3177 | + } |
|
| 2766 | 3178 | } |
| 2767 | 3179 | $count = array(); |
| 2768 | 3180 | foreach ($alldata as $key => $row) { |
@@ -2772,7 +3184,9 @@ discard block |
||
| 2772 | 3184 | foreach ($alldata as $number) { |
| 2773 | 3185 | 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); |
| 2774 | 3186 | } |
| 2775 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 3187 | + if ($globalDebug) { |
|
| 3188 | + echo 'Count all arrival airports...'."\n"; |
|
| 3189 | + } |
|
| 2776 | 3190 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2777 | 3191 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2778 | 3192 | $alldata = array(); |
@@ -2784,7 +3198,9 @@ discard block |
||
| 2784 | 3198 | $icao = $value['airport_arrival_icao']; |
| 2785 | 3199 | if (isset($alldata[$icao])) { |
| 2786 | 3200 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2787 | - } else $alldata[$icao] = $value; |
|
| 3201 | + } else { |
|
| 3202 | + $alldata[$icao] = $value; |
|
| 3203 | + } |
|
| 2788 | 3204 | } |
| 2789 | 3205 | $count = array(); |
| 2790 | 3206 | foreach ($alldata as $key => $row) { |
@@ -2794,35 +3210,49 @@ discard block |
||
| 2794 | 3210 | foreach ($alldata as $number) { |
| 2795 | 3211 | 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); |
| 2796 | 3212 | } |
| 2797 | - if ($globalDebug) echo 'Count all months...'."\n"; |
|
| 3213 | + if ($globalDebug) { |
|
| 3214 | + echo 'Count all months...'."\n"; |
|
| 3215 | + } |
|
| 2798 | 3216 | $Spotter = new Spotter($this->db); |
| 2799 | 3217 | $alldata = $Spotter->countAllMonths($filter); |
| 2800 | 3218 | $lastyear = false; |
| 2801 | 3219 | foreach ($alldata as $number) { |
| 2802 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 3220 | + if ($number['year_name'] != date('Y')) { |
|
| 3221 | + $lastyear = true; |
|
| 3222 | + } |
|
| 2803 | 3223 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2804 | 3224 | } |
| 2805 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 3225 | + if ($globalDebug) { |
|
| 3226 | + echo 'Count all owners by months...'."\n"; |
|
| 3227 | + } |
|
| 2806 | 3228 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2807 | 3229 | foreach ($alldata as $number) { |
| 2808 | 3230 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2809 | 3231 | } |
| 2810 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 3232 | + if ($globalDebug) { |
|
| 3233 | + echo 'Count all pilots by months...'."\n"; |
|
| 3234 | + } |
|
| 2811 | 3235 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2812 | 3236 | foreach ($alldata as $number) { |
| 2813 | 3237 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2814 | 3238 | } |
| 2815 | - if ($globalDebug) echo 'Count all military by months...'."\n"; |
|
| 3239 | + if ($globalDebug) { |
|
| 3240 | + echo 'Count all military by months...'."\n"; |
|
| 3241 | + } |
|
| 2816 | 3242 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2817 | 3243 | foreach ($alldata as $number) { |
| 2818 | 3244 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2819 | 3245 | } |
| 2820 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 3246 | + if ($globalDebug) { |
|
| 3247 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 3248 | + } |
|
| 2821 | 3249 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2822 | 3250 | foreach ($alldata as $number) { |
| 2823 | 3251 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2824 | 3252 | } |
| 2825 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 3253 | + if ($globalDebug) { |
|
| 3254 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 3255 | + } |
|
| 2826 | 3256 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2827 | 3257 | foreach ($alldata as $number) { |
| 2828 | 3258 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
@@ -8,31 +8,31 @@ discard block |
||
| 8 | 8 | if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType']; |
| 9 | 9 | else $MapType = $globalMapProvider; |
| 10 | 10 | if (isset($_GET['3d'])) { |
| 11 | - setcookie('MapFormat','3d'); |
|
| 11 | + setcookie('MapFormat', '3d'); |
|
| 12 | 12 | } else if (isset($_GET['2d'])) { |
| 13 | - setcookie('MapFormat','2d'); |
|
| 13 | + setcookie('MapFormat', '2d'); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | if (isset($_POST['archive'])) { |
| 17 | - setcookie('archive','true'); |
|
| 18 | - setcookie('archive_begin',strtotime($_POST['start_date'])); |
|
| 19 | - setcookie('archive_end',strtotime($_POST['end_date'])); |
|
| 20 | - setcookie('archive_speed',$_POST['archivespeed']); |
|
| 17 | + setcookie('archive', 'true'); |
|
| 18 | + setcookie('archive_begin', strtotime($_POST['start_date'])); |
|
| 19 | + setcookie('archive_end', strtotime($_POST['end_date'])); |
|
| 20 | + setcookie('archive_speed', $_POST['archivespeed']); |
|
| 21 | 21 | } |
| 22 | 22 | if (isset($_POST['noarchive'])) { |
| 23 | - setcookie('archive','false',-1); |
|
| 24 | - setcookie('archive_begin','',-1); |
|
| 25 | - setcookie('archive_end','',-1); |
|
| 26 | - setcookie('archive_speed','',-1); |
|
| 23 | + setcookie('archive', 'false', -1); |
|
| 24 | + setcookie('archive_begin', '', -1); |
|
| 25 | + setcookie('archive_end', '', -1); |
|
| 26 | + setcookie('archive_speed', '', -1); |
|
| 27 | 27 | } |
| 28 | 28 | // When button "Remove all filters" is clicked |
| 29 | 29 | if (isset($_POST['removefilters'])) { |
| 30 | - $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
|
| 31 | - return strpos($key,'filter_') === 0; |
|
| 30 | + $allfilters = array_filter(array_keys($_COOKIE), function($key) { |
|
| 31 | + return strpos($key, 'filter_') === 0; |
|
| 32 | 32 | }); |
| 33 | 33 | foreach ($allfilters as $filt) { |
| 34 | 34 | unset($_COOKIE[$filt]); |
| 35 | - setcookie($filt,null,-1); |
|
| 35 | + setcookie($filt, null, -1); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | ?> |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 237 | 237 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 238 | 238 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 239 | -<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 239 | +<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 240 | 240 | <?php |
| 241 | 241 | if (!isset($type) || $type == 'aircraft') { |
| 242 | 242 | ?> |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 310 | 310 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 311 | 311 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 312 | -<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 312 | +<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 313 | 313 | <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script> |
| 314 | 314 | <?php |
| 315 | 315 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | ?> |
| 674 | 674 | <div class="search"> |
| 675 | 675 | <form action="<?php print $globalURL; ?>/search" method="get"> |
| 676 | - <input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button> |
|
| 676 | + <input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button> |
|
| 677 | 677 | </form> |
| 678 | 678 | </div> |
| 679 | 679 | <div class="social"> |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | print '</div>'; |
| 692 | 692 | } |
| 693 | 693 | |
| 694 | -if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
| 694 | +if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') { |
|
| 695 | 695 | ?> |
| 696 | 696 | <div class="top-header clear" role="main"> |
| 697 | 697 | <?php |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | </div> |
| 705 | 705 | <?php |
| 706 | 706 | } |
| 707 | -if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false)) |
|
| 707 | +if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false)) |
|
| 708 | 708 | { |
| 709 | 709 | ?> |
| 710 | 710 | <div class="top-header clear" role="main"> |
@@ -717,15 +717,15 @@ discard block |
||
| 717 | 717 | var zoom = 13; |
| 718 | 718 | //create the map |
| 719 | 719 | <?php |
| 720 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 720 | + if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 721 | 721 | ?> |
| 722 | 722 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
| 723 | 723 | <?php |
| 724 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 724 | + } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) { |
|
| 725 | 725 | ?> |
| 726 | 726 | map = L.map('map', { zoomControl:true }); |
| 727 | 727 | <?php |
| 728 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 728 | + } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 729 | 729 | ?> |
| 730 | 730 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
| 731 | 731 | var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map); |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 734 | 734 | var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 735 | 735 | <?php |
| 736 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
| 736 | + } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) { |
|
| 737 | 737 | ?> |
| 738 | 738 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
| 739 | 739 | <?php |
